NO_MAN= has been deprecated in favor of MAN= for some time, go ahead · samir-repo/src@3bdf775

Commit

NO_MAN= has been deprecated in favor of MAN= for some time, go ahead

and finish the job. ncurses is now the only Makefile in the tree that
uses it since it wasn't a simple mechanical change, and will be
addressed in a future commit.

Loading branch information

bsdimp committed Apr 13, 2014

1 parent e091995 commit 3bdf775

cddl/usr.bin/sgsmsg/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     # This program is required as a bootstrap tool for 'make buildworld'
     PROG=		sgsmsg
-    NO_MAN=
+    MAN=
     SRCS=		avl.c sgsmsg.c string_table.c findprime.c
     WARNS?=		0
@@ Expand Down @@

cddl/usr.bin/zinject/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     PROG=	zinject
     SRCS=	zinject.c translate.c
-    NO_MAN=
+    MAN=
     WARNS?=	0
     CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
@@ Expand Down @@

cddl/usr.bin/zlook/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     .PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zlook
     PROG=	zlook
-    NO_MAN=
+    MAN=
     WARNS?=	0
     CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
@@ Expand Down @@

cddl/usr.bin/ztest/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     .PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest
     PROG=	ztest
-    NO_MAN=
+    MAN=
     WARNS?=	0
     CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
@@ Expand Down @@

cddl/usr.sbin/zhack/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack
     PROG=	zhack
-    NO_MAN=
+    MAN=
     WARNS?=	0
     CSTD=	c99
@@ Expand Down @@

contrib/libucl/Makefile.am

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,4 @@ EXTRA_DIST = uthash README.md @@
     pkgconfigdir = $(libdir)/pkgconfig
     pkgconfig_DATA = libucl.pc
-    SUBDIRS = src tests utils doc
+    SUBDIRS = src tests utils doc

contrib/libucl/doc/Makefile.am

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ dist_man_MANS = libucl.3 @@
     gen-man: @PANDOC@
     	tail -n +$$(grep -n '# Synopsis' api.md | cut -d':' -f1) api.md | \
     	cat pandoc.template - | sed -e 's/^# \(.*\)/# \U\1/' | \
-    	@PANDOC@ -s -f markdown -t man -o libucl.3
+    	@PANDOC@ -s -f markdown -t man -o libucl.3

contrib/libucl/tests/Makefile.am

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,4 @@ test_schema_SOURCES = test_schema.c @@
     test_schema_LDADD = $(common_test_ldadd)
     test_schema_CFLAGS = $(common_test_cflags)
-    check_PROGRAMS = test_basic test_speed test_generate test_schema
+    check_PROGRAMS = test_basic test_speed test_generate test_schema

contrib/libucl/utils/Makefile.am

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ UTL = ucl_chargen ucl_objdump @@
     else
     UTL =
     endif
-    bin_PROGRAMS = $(UTL)
+    bin_PROGRAMS = $(UTL)

contrib/ofed/usr.bin/ibsendtrap/Makefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,7 +7,7 @@ PROG=   ibsendtrap
  
    SRCS=   ibsendtrap.c ibdiag_common.c

    LDADD=	-libumad -libcommon -libmad

    CFLAGS+= -I${DIAGPATH}/include

    NO_MAN=	true

    MAN=

    WARNS?= 1

contrib/ofed/usr.lib/libsdp/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ SDPDIR= ${.CURDIR}/../../libsdp/src @@
     LIB=		ibsdp
     SHLIB_MAJOR=	1
     NO_PROFILE=
-    NO_MAN=
+    MAN=
     SRCS=	log.c match.c port.c config_parser.c config_scanner.c
@@ Expand Down @@

crypto/heimdal/appl/Makefile.am

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,4 +26,4 @@ SUBDIRS = \ @@
     	  kf					\
     	  $(dir_dce)
-    EXTRA_DIST = NTMakefile
+    EXTRA_DIST = NTMakefile

crypto/heimdal/appl/ftp/Makefile.am

Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ include $(top_srcdir)/Makefile.am.common

		SUBDIRS = common ftp ftpd

		EXTRA_DIST = NTMakefile
		EXTRA_DIST = NTMakefile

crypto/heimdal/appl/ftp/common/Makefile.am

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ libcommon_a_SOURCES = \ @@
     	buffer.c \
     	common.h
-    EXTRA_DIST = NTMakefile
+    EXTRA_DIST = NTMakefile

crypto/heimdal/lib/Makefile.am

-Original file line number
+Diff line change
@@ Expand Up / @@ -42,4 +42,4 @@ SUBDIRS = \ @@
     	$(dir_otp) \
     	$(dir_dce)
-    EXTRA_DIST = NTMakefile heimdal
+    EXTRA_DIST = NTMakefile heimdal

crypto/heimdal/lib/ipc/Makefile.am

-Original file line number
+Diff line change
@@ Expand Up / @@ -64,4 +64,4 @@ CLEANFILES = $(built_ipcc) $(built_ipcs) @@
     $(srcdir)/client.c: $(built_ipcc)
     $(srcdir)/server.c: $(built_ipcs)
-    endif
+    endif

games/fortune/unstr/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     # $FreeBSD$
     PROG=	unstr
-    NO_MAN=
+    MAN=
     CFLAGS+= -I${.CURDIR}/../strfile
     .include <bsd.prog.mk>

games/ppt/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     # $FreeBSD$
     PROG=	ppt
-    NO_MAN=
+    MAN=
     .include <bsd.prog.mk>

games/primes/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     PROG=	primes
     SRCS=	pattern.c pr_tbl.c primes.c
-    NO_MAN=
+    MAN=
     DPADD=	${LIBM}
     LDADD=	-lm
@@ Expand Down @@

gnu/usr.bin/cc/c++/Makefile

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     # $FreeBSD$
-    NO_MAN=
+    MAN=
     .include <bsd.own.mk>
     .include "../Makefile.inc"
@@ Expand Down @@

gnu/usr.bin/cc/c++filt/Makefile

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     # $FreeBSD$
-    NO_MAN=
+    MAN=
     .include <bsd.own.mk>
     .include "../Makefile.inc"
@@ Expand Down @@

gnu/usr.bin/cc/cc1/Makefile

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     # $FreeBSD$
-    NO_MAN=
+    MAN=
     .include <bsd.own.mk>
     .include "../Makefile.inc"
@@ Expand Down @@

gnu/usr.bin/cc/cc1plus/Makefile

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     # $FreeBSD$
-    NO_MAN=
+    MAN=
     .include <bsd.own.mk>
     .include "../Makefile.inc"
@@ Expand Down @@

gnu/usr.bin/cc/collect2/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,6 @@ @@
     PROG=	collect2
     SRCS=	collect2.c tlink.c version.c
-    NO_MAN=
+    MAN=
     .include <bsd.prog.mk>

gnu/usr.bin/cc/protoize/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     .PATH: ${.CURDIR}/../cc_tools ${GCCDIR}
     PROG=	protoize
-    NO_MAN=
+    MAN=
     # things are rather hard-coded, we work around that here
     CFLAGS+= -DDEFAULT_TARGET_VERSION=\"\"
@@ Expand Down @@

gnu/usr.bin/gdb/Makefile.inc

-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ GENSRCS+= nm.h tm.h @@
     .if defined(GDB_CROSS_DEBUGGER)
     CFLAGS+= -DCROSS_DEBUGGER -I${BMAKE_ROOT}/../..
     GDB_SUFFIX= -${TARGET_ARCH}
-    NO_MAN=
+    MAN=
     .endif
     .include "${TARGET_SUBDIR}/Makefile"
@@ Expand Down @@

gnu/usr.bin/gdb/gdbtui/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     PROG=	gdbtui${GDB_SUFFIX}
     SRCS=	tui-main.c
-    NO_MAN=
+    MAN=
     BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
     	${OBJ_BU}/libiberty/libiberty.a
@@ Expand Down @@

gnu/usr.bin/groff/src/devices/grohtml/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,6 @@ PROG_CXX= post-grohtml @@
     SRCS=		post-html.cpp html-table.cpp html-text.cpp output.cpp
     DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
     LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
-    NO_MAN=
+    MAN=
     .include <bsd.prog.mk>

gnu/usr.bin/groff/src/preproc/html/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,6 @@ PROG_CXX= pre-grohtml @@
     SRCS=		pre-html.cpp pushback.cpp
     DPADD=		${LIBGROFF}
     LDADD=		${LIBGROFF}
-    NO_MAN=
+    MAN=
     .include <bsd.prog.mk>

kerberos5/libexec/digest-service/Makefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    # $FreeBSD$

    PROG=	digest-service

    NO_MAN=	1

    MAN=

    CFLAGS+=	-I${KRB5DIR}/kdc \

    		-I${KRB5DIR}/lib/asn1 \

    		-I${KRB5DIR}/lib/krb5 \

kerberos5/libexec/ipropd-slave/Makefile

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     # $FreeBSD$
     PROG=	ipropd-slave
-    NO_MAN=
+    MAN=
     SRCS=	ipropd_common.c ipropd_slave.c kadm5_err.h
     CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
     	-I. ${LDAPCFLAGS}
@@ Expand Down @@

kerberos5/tools/asn1_compile/Makefile

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     # $FreeBSD$
     PROG=	asn1_compile
-    NO_MAN=
+    MAN=
     LIBROKEN_A=	${.OBJDIR}/../../lib/libroken/libroken.a
     LDADD=	${LIBROKEN_A} ${LIBVERS}
     DPADD=	${LIBROKEN_A} ${LIBVERS}
@@ Expand Down @@

kerberos5/tools/make-roken/Makefile

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     # $FreeBSD$
     PROG=	make-roken
-    NO_MAN=
+    MAN=
     CLEANFILES= make-roken.c
@@ Expand Down @@

kerberos5/tools/slc/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ PROG= slc @@
     LIBROKEN_A=     ${.OBJDIR}/../../lib/libroken/libroken.a
     LDADD=  ${LIBROKEN_A} ${LIBVERS}
     DPADD=  ${LIBROKEN_A} ${LIBVERS}
-    NO_MAN=
+    MAN=
     SRCS=	roken.h \
     	slc-gram.y \
@@ Expand Down @@

kerberos5/usr.bin/hxtool/Makefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    # $FreeBSD$

    PROG=	hxtool

    NO_MAN=	1

    MAN=

    CFLAGS+=	-I${KRB5DIR}/lib/hx509 \

    		-I${KRB5DIR}/lib/asn1 \

    		-I${KRB5DIR}/lib/roken \

kerberos5/usr.bin/ksu/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ PROG= ksu @@
     BINMODE=4555
     PRECIOUSPROG=
     .endif
-    NO_MAN=
+    MAN=
     SRCS=	su.c
     CFLAGS+=-I${KRB5DIR}/lib/roken
     DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
@@ Expand Down @@

lib/libarchive/test/Makefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,7 +2,7 @@
  
    LIBARCHIVEDIR=	${.CURDIR}/../../../contrib/libarchive

    NO_MAN=yes

    MAN=

    PROG=libarchive_test

    INTERNALPROG=yes  # Don't install this; it's just for testing

lib/libauditd/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,6 @@ CFLAGS+= -I${OPENBSMDIR} -I${LIBBSMDIR} @@
     WARNS?=		3
-    NO_MAN=
+    MAN=
     .include <bsd.lib.mk>

lib/libproc/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,6 @@ DPADD+= ${LIBSTDCPLUSPLUS} @@
     SHLIB_MAJOR=	2
-    NO_MAN=
+    MAN=
     .include <bsd.lib.mk>

lib/libproc/test/t1-bkpt/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,6 @@ SRCS= t1-bkpt.c @@
     LDADD=	-lproc -lelf -lrtld_db -lutil
     DPADD=	${LIBPROC} ${LIBELF}
-    NO_MAN=
+    MAN=
     .include <bsd.prog.mk>

lib/libproc/test/t2-name2map/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,6 @@ SRCS= t2-name2map.c @@
     LDADD=	-lproc -lelf -lrtld_db -lutil
     DPADD=	${LIBPROC} ${LIBELF}
-    NO_MAN=
+    MAN=
     .include <bsd.prog.mk>

lib/libproc/test/t3-name2sym/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,6 @@ SRCS= t3-name2sym.c @@
     LDADD=	-lproc -lelf -lrtld_db -lutil
     DPADD=	${LIBPROC} ${LIBELF}
-    NO_MAN=
+    MAN=
     .include <bsd.prog.mk>

lib/ncurses/form/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -158,7 +158,7 @@ MLINKS= form_cursor.3 pos_form_cursor.3 \ @@
     	form_win.3 set_form_sub.3 \
     	form_win.3 set_form_win.3
     .else
-    NO_MAN=
+    MAN=
     .endif
     .include <bsd.lib.mk>
@@ Expand Down @@

lib/ncurses/menu/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -130,7 +130,7 @@ MLINKS= menu_attributes.3 menu_back.3 \ @@
     	mitem_value.3 set_item_value.3 \
     	mitem_visible.3 item_visible.3
     .else
-    NO_MAN=
+    MAN=
     .endif
     .include <bsd.lib.mk>
@@ Expand Down @@

lib/ncurses/ncurses/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -549,12 +549,12 @@ MAN+= \ @@
     	curs_ins_wstr.3 \
     	curs_printw.3 \
     	curs_scanw.3
-    .endif
-    CLEANFILES+=	${MAN:M*.3}
     MAN+=	term.5 terminfo.5
     MAN+=	term.7
+    .endif
+    CLEANFILES+=	${MAN:M*.3}
     MLINKS=	ncurses.3 curses.3 \
     	curs_addch.3 addch.3 \
@@ Expand Down @@

lib/ncurses/panel/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,7 @@ MLINKS= panel.3 bottom_panel.3 \ @@
     	panel.3 top_panel.3 \
     	panel.3 update_panels.3
     .else
-    NO_MAN=
+    MAN=
     .endif
     .include <bsd.lib.mk>
@@ Expand Down @@

libexec/bootpd/bootpgw/Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     # $FreeBSD$
     PROG=	bootpgw
-    NO_MAN=
+    MAN=
     SRCS=	bootpgw.c getif.c hwaddr.c report.c rtmsg.c
     SRCDIR=	${.CURDIR}/..
@@ Expand Down @@

0 comments on commit `3bdf775`

Please sign in to comment.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

0 comments on commit `3bdf775`

Commit

There are no files selected for viewing

0 comments on commit 3bdf775

0 comments on commit `3bdf775`