From 3bdf775801b218aa5a89564839405b122f4b233e Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 13 Apr 2014 05:21:56 +0000 Subject: 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. --- usr.sbin/bhyvectl/Makefile | 2 +- usr.sbin/bootparamd/callbootd/Makefile | 2 +- usr.sbin/bsdinstall/distextract/Makefile | 2 +- usr.sbin/bsdinstall/distfetch/Makefile | 2 +- usr.sbin/bsdinstall/scripts/Makefile | 2 +- usr.sbin/crunch/examples/Makefile | 2 +- usr.sbin/ctm/ctm_dequeue/Makefile | 2 +- usr.sbin/ctm/ctm_smail/Makefile | 2 +- usr.sbin/ctm/mkCTM/Makefile | 2 +- usr.sbin/fifolog/fifolog_reader/Makefile | 2 +- usr.sbin/fifolog/fifolog_writer/Makefile | 2 +- usr.sbin/lpr/filters.ru/koi2855/Makefile | 2 +- usr.sbin/lpr/filters.ru/koi2alt/Makefile | 2 +- usr.sbin/lpr/filters/Makefile | 2 +- usr.sbin/ntp/ntp-keygen/Makefile | 2 +- usr.sbin/ntp/ntpd/Makefile | 2 +- usr.sbin/ntp/ntpdate/Makefile | 2 +- usr.sbin/ntp/ntpdc/Makefile | 2 +- usr.sbin/ntp/ntpq/Makefile | 2 +- usr.sbin/ntp/ntptime/Makefile | 2 +- usr.sbin/portsnap/make_index/Makefile | 2 +- usr.sbin/portsnap/phttpget/Makefile | 2 +- usr.sbin/rpc.ypupdated/Makefile | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/bhyvectl/Makefile b/usr.sbin/bhyvectl/Makefile index df3f19c56c3c..5f879fe79bee 100644 --- a/usr.sbin/bhyvectl/Makefile +++ b/usr.sbin/bhyvectl/Makefile @@ -5,7 +5,7 @@ PROG= bhyvectl SRCS= bhyvectl.c -NO_MAN= +MAN= DPADD= ${LIBVMMAPI} ${LIBUTIL} LDADD= -lvmmapi -lutil diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile index 0137407f818d..28b1e263f4df 100644 --- a/usr.sbin/bootparamd/callbootd/Makefile +++ b/usr.sbin/bootparamd/callbootd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= callbootd -NO_MAN= +MAN= SRCS= callbootd.c ${GENSRCS} GENSRCS=bootparam_prot.h bootparam_prot_clnt.c bootparam_prot_xdr.c diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile index 486c99eb2a9b..1910b23d956c 100644 --- a/usr.sbin/bsdinstall/distextract/Makefile +++ b/usr.sbin/bsdinstall/distextract/Makefile @@ -6,7 +6,7 @@ DPADD= ${LIBARCHIVE} ${LIBDIALOG} ${LIBM} LDADD= -larchive -ldialog -lm WARNS?= 6 -NO_MAN= true +MAN= .include diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile index 9c4becdd22f2..08eb91c07352 100644 --- a/usr.sbin/bsdinstall/distfetch/Makefile +++ b/usr.sbin/bsdinstall/distfetch/Makefile @@ -6,7 +6,7 @@ DPADD= ${LIBFETCH} ${LIBDIALOG} ${LIBM} LDADD= -lfetch -ldialog -lm WARNS?= 6 -NO_MAN= true +MAN= .include diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile index 07e3338252a6..efe9700fbfcb 100644 --- a/usr.sbin/bsdinstall/scripts/Makefile +++ b/usr.sbin/bsdinstall/scripts/Makefile @@ -5,6 +5,6 @@ SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \ rootpass script services time umount wlanconfig zfsboot BINDIR= /usr/libexec/bsdinstall -NO_MAN= true +MAN= .include diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile index 120830196c66..01b924226c45 100644 --- a/usr.sbin/crunch/examples/Makefile +++ b/usr.sbin/crunch/examples/Makefile @@ -11,7 +11,7 @@ CONF= $(CRUNCHED).conf OUTMK= $(CRUNCHED).mk OUTPUTS= $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache -NO_MAN= +MAN= CLEANFILES+= $(CRUNCHED) *.o *.lo *.c *.mk *.cache CLEANDIRFILES+= $(OUTPUTS) diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile index 18dd52557d42..d2f5648869a3 100644 --- a/usr.sbin/ctm/ctm_dequeue/Makefile +++ b/usr.sbin/ctm/ctm_dequeue/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../ctm_rmail PROG= ctm_dequeue -NO_MAN= +MAN= SRCS= ctm_dequeue.c error.c CFLAGS+= -I${.CURDIR}/../ctm_rmail diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile index 15209e42b69e..4c98d31e24a5 100644 --- a/usr.sbin/ctm/ctm_smail/Makefile +++ b/usr.sbin/ctm/ctm_smail/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../ctm_rmail PROG= ctm_smail -NO_MAN= +MAN= SRCS= ctm_smail.c error.c CFLAGS+= -I${.CURDIR}/../ctm_rmail diff --git a/usr.sbin/ctm/mkCTM/Makefile b/usr.sbin/ctm/mkCTM/Makefile index cefd70448c68..745956cad61f 100644 --- a/usr.sbin/ctm/mkCTM/Makefile +++ b/usr.sbin/ctm/mkCTM/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= mkctm -NO_MAN= +MAN= DPADD= ${LIBMD} LDADD= -lmd diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile b/usr.sbin/fifolog/fifolog_reader/Makefile index 7dcc8c2e2f17..c88f10e95295 100644 --- a/usr.sbin/fifolog/fifolog_reader/Makefile +++ b/usr.sbin/fifolog/fifolog_reader/Makefile @@ -4,7 +4,7 @@ PROG= fifolog_reader CFLAGS+= -I${.CURDIR}/../lib -NO_MAN= # see ../fifolog_create/fifolog.1 +MAN= DPADD= ${LIBFIFOLOG} ${LIBUTIL} ${LIBZ} LDADD= ${LIBFIFOLOG} -lutil -lz diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile b/usr.sbin/fifolog/fifolog_writer/Makefile index b6ceb6312319..9d802c7eb3ee 100644 --- a/usr.sbin/fifolog/fifolog_writer/Makefile +++ b/usr.sbin/fifolog/fifolog_writer/Makefile @@ -4,7 +4,7 @@ PROG= fifolog_writer CFLAGS+= -I${.CURDIR}/../lib -NO_MAN= # see ../fifolog_create/fifolog.1 +MAN= DPADD= ${LIBFIFOLOG} ${LIBUTIL} ${LIBZ} LDADD= ${LIBFIFOLOG} -lutil -lz diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile index 361783ed24e4..71ffc09eb3ff 100644 --- a/usr.sbin/lpr/filters.ru/koi2855/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= koi2855 -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../../common_source diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile index e410d9a7cd9b..98f7ffe13e2c 100644 --- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= koi2alt -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../../common_source diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile index b55b536c1ce6..f1bc58643ebc 100644 --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -4,7 +4,7 @@ BINDIR= /usr/libexec/lpr PROG= lpf -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../common_source diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile index a0fee4422d51..26716c2ff001 100644 --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= +MAN= .include diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 175ad67b227b..1ac4c7249f71 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= +MAN= .include diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile index 0814e8edda61..f55ec92bc5d9 100644 --- a/usr.sbin/ntp/ntpdate/Makefile +++ b/usr.sbin/ntp/ntpdate/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate PROG= ntpdate -NO_MAN= +MAN= SRCS= ntpdate.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index 17c5f39b7fce..81d2671078af 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= +MAN= .include diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index 205a0be736cd..eb4297341d1c 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= +MAN= .include diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile index db5885ddceb3..d3bf7a74cfd9 100644 --- a/usr.sbin/ntp/ntptime/Makefile +++ b/usr.sbin/ntp/ntptime/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/util PROG= ntptime -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/portsnap/make_index/Makefile b/usr.sbin/portsnap/make_index/Makefile index 87768f6035ef..92e91450e4fd 100644 --- a/usr.sbin/portsnap/make_index/Makefile +++ b/usr.sbin/portsnap/make_index/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= make_index -NO_MAN= +MAN= BINDIR= ${LIBEXECDIR} diff --git a/usr.sbin/portsnap/phttpget/Makefile b/usr.sbin/portsnap/phttpget/Makefile index 6f003e3b975a..a43672f6e762 100644 --- a/usr.sbin/portsnap/phttpget/Makefile +++ b/usr.sbin/portsnap/phttpget/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= phttpget -NO_MAN= +MAN= BINDIR= ${LIBEXECDIR} diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile index ffef7d493108..03c1142f5efa 100644 --- a/usr.sbin/rpc.ypupdated/Makefile +++ b/usr.sbin/rpc.ypupdated/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr PROG= rpc.ypupdated -NO_MAN= +MAN= SRCS= ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \ yp_error.c update.c ypupdated_server.c \ yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c -- cgit v1.2.3