diff options
author | ngie <ngie@FreeBSD.org> | 2014-12-31 23:25:37 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2014-12-31 23:25:37 +0000 |
commit | d4c625976a2fea5fc437c319a55efef1bcc29c2c (patch) | |
tree | 598489661071937f5a8c541a42e28c07b21b569b /usr.bin | |
parent | 649535f73cbb860495bc6d26c156d95935fcb6fd (diff) | |
download | FreeBSD-src-d4c625976a2fea5fc437c319a55efef1bcc29c2c.zip FreeBSD-src-d4c625976a2fea5fc437c319a55efef1bcc29c2c.tar.gz |
MFC r264400,r265836:
r264400:
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.
r265836:
Remove last two NO_MAN= in the tree. In both of these cases, MAN= is
what is needed.
Diffstat (limited to 'usr.bin')
26 files changed, 27 insertions, 25 deletions
diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile index affe91b..97b9615 100644 --- a/usr.bin/bzip2recover/Makefile +++ b/usr.bin/bzip2recover/Makefile @@ -4,7 +4,7 @@ BZ2DIR= ${.CURDIR}/../../contrib/bzip2 .PATH: ${BZ2DIR} PROG= bzip2recover -NO_MAN= +MAN= NO_WMISSING_VARIABLE_DECLARATIONS= diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile index 00c7582..0f64ad3 100644 --- a/usr.bin/clang/clang-tblgen/Makefile +++ b/usr.bin/clang/clang-tblgen/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= +MAN= .include <bsd.own.mk> PROG_CXX=clang-tblgen diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile index 7a2c56a..9159088 100644 --- a/usr.bin/clang/llvm-mc/Makefile +++ b/usr.bin/clang/llvm-mc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= +MAN= .include <bsd.own.mk> PROG_CXX=llvm-mc diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index f20d331..a12cfd1 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= +MAN= .include <bsd.own.mk> PROG_CXX=llvm-objdump diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile index 01b771b..0279026 100644 --- a/usr.bin/clang/llvm-rtdyld/Makefile +++ b/usr.bin/clang/llvm-rtdyld/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= +MAN= .include <bsd.own.mk> PROG_CXX=llvm-rtdyld diff --git a/usr.bin/clang/macho-dump/Makefile b/usr.bin/clang/macho-dump/Makefile index bafd150..0452583 100644 --- a/usr.bin/clang/macho-dump/Makefile +++ b/usr.bin/clang/macho-dump/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= +MAN= .include <bsd.own.mk> PROG_CXX=macho-dump diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile index 4c8a6e5..13293b0 100644 --- a/usr.bin/cpio/test/Makefile +++ b/usr.bin/cpio/test/Makefile @@ -64,7 +64,7 @@ SRCS+= test_utils.c CLEANFILES+= list.h bsdcpio_test -NO_MAN=yes +MAN= PROG=bsdcpio_test DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile index 7703897..fb0e660 100644 --- a/usr.bin/dirname/Makefile +++ b/usr.bin/dirname/Makefile @@ -2,6 +2,6 @@ # $FreeBSD$ PROG= dirname -NO_MAN= +MAN= .include <bsd.prog.mk> diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile index eb39dd1..0591c4d 100644 --- a/usr.bin/locate/bigram/Makefile +++ b/usr.bin/locate/bigram/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= locate.bigram -NO_MAN= +MAN= BINDIR= ${LIBEXECDIR} CFLAGS+= -I${.CURDIR}/../locate diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile index 20eef8c..dc2075f 100644 --- a/usr.bin/locate/code/Makefile +++ b/usr.bin/locate/code/Makefile @@ -3,7 +3,7 @@ PROG= locate.code CFLAGS+=-I${.CURDIR}/../locate -NO_MAN= +MAN= BINDIR= ${LIBEXECDIR} .include <bsd.prog.mk> diff --git a/usr.bin/mkcsmapper_static/Makefile b/usr.bin/mkcsmapper_static/Makefile index 0c6e10d..b2a1a13 100644 --- a/usr.bin/mkcsmapper_static/Makefile +++ b/usr.bin/mkcsmapper_static/Makefile @@ -5,7 +5,7 @@ PROG= mkcsmapper_static SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ citrus_lookup_factory.c citrus_pivot_factory.c -NO_MAN= yes +MAN= NO_SHARED= yes build-tools: mkcsmapper_static diff --git a/usr.bin/mkesdb_static/Makefile b/usr.bin/mkesdb_static/Makefile index 7328efc..613b25e 100644 --- a/usr.bin/mkesdb_static/Makefile +++ b/usr.bin/mkesdb_static/Makefile @@ -5,7 +5,7 @@ PROG= mkesdb_static SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ citrus_lookup_factory.c -NO_MAN= yes +MAN= NO_SHARED= yes build-tools: mkesdb_static diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile index 76d923a..5c67c37 100644 --- a/usr.bin/svn/svn/Makefile +++ b/usr.bin/svn/svn/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +MAN= + .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svn diff --git a/usr.bin/svn/svnadmin/Makefile b/usr.bin/svn/svnadmin/Makefile index 2a07947..3220cde 100644 --- a/usr.bin/svn/svnadmin/Makefile +++ b/usr.bin/svn/svnadmin/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= svnadmin.1 +MAN= .include "${.CURDIR}/../Makefile.inc" diff --git a/usr.bin/svn/svndumpfilter/Makefile b/usr.bin/svn/svndumpfilter/Makefile index 5554dff..864f376 100644 --- a/usr.bin/svn/svndumpfilter/Makefile +++ b/usr.bin/svn/svndumpfilter/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= svndumpfilter.1 +MAN= .include "${.CURDIR}/../Makefile.inc" diff --git a/usr.bin/svn/svnlook/Makefile b/usr.bin/svn/svnlook/Makefile index 618a473..3d8b1a0 100644 --- a/usr.bin/svn/svnlook/Makefile +++ b/usr.bin/svn/svnlook/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= svnlook.1 +MAN= .include "${.CURDIR}/../Makefile.inc" diff --git a/usr.bin/svn/svnmucc/Makefile b/usr.bin/svn/svnmucc/Makefile index 8ec8d1f..23a98e3 100644 --- a/usr.bin/svn/svnmucc/Makefile +++ b/usr.bin/svn/svnmucc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= svnmucc.1 +MAN= .include "${.CURDIR}/../Makefile.inc" diff --git a/usr.bin/svn/svnrdump/Makefile b/usr.bin/svn/svnrdump/Makefile index 8500f5f..afeae00 100644 --- a/usr.bin/svn/svnrdump/Makefile +++ b/usr.bin/svn/svnrdump/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= svnrdump.1 +MAN= .include "${.CURDIR}/../Makefile.inc" diff --git a/usr.bin/svn/svnserve/Makefile b/usr.bin/svn/svnserve/Makefile index 6a39d4d..f1fa314 100644 --- a/usr.bin/svn/svnserve/Makefile +++ b/usr.bin/svn/svnserve/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= svnserve.1 +MAN= .include "${.CURDIR}/../Makefile.inc" diff --git a/usr.bin/svn/svnsync/Makefile b/usr.bin/svn/svnsync/Makefile index a1f6e25..a8cd380 100644 --- a/usr.bin/svn/svnsync/Makefile +++ b/usr.bin/svn/svnsync/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= svnsync.1 +MAN= .include "${.CURDIR}/../Makefile.inc" diff --git a/usr.bin/svn/svnversion/Makefile b/usr.bin/svn/svnversion/Makefile index fb2a7a2..ca28ec3 100644 --- a/usr.bin/svn/svnversion/Makefile +++ b/usr.bin/svn/svnversion/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NO_MAN= svnversion.1 +MAN= .include "${.CURDIR}/../Makefile.inc" diff --git a/usr.bin/tar/test/Makefile b/usr.bin/tar/test/Makefile index 5e849fe..89d0242 100644 --- a/usr.bin/tar/test/Makefile +++ b/usr.bin/tar/test/Makefile @@ -66,7 +66,7 @@ SRCS+= test_utils.c CLEANFILES+= list.h -NO_MAN=yes +MAN= PROG=bsdtar_test DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile index 14014fa..f53af5a 100644 --- a/usr.bin/unexpand/Makefile +++ b/usr.bin/unexpand/Makefile @@ -2,6 +2,6 @@ # $FreeBSD$ PROG= unexpand -NO_MAN= +MAN= .include <bsd.prog.mk> diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile index f49bb48..7f3dde0 100644 --- a/usr.bin/uudecode/Makefile +++ b/usr.bin/uudecode/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -NO_MAN= +MAN= .include <bsd.own.mk> diff --git a/usr.bin/vgrind/RETEST/Makefile b/usr.bin/vgrind/RETEST/Makefile index 8712ebb..4d931de 100644 --- a/usr.bin/vgrind/RETEST/Makefile +++ b/usr.bin/vgrind/RETEST/Makefile @@ -4,7 +4,7 @@ PROG= retest SRCS= regexp.c retest.c .PATH: ${.CURDIR}/.. -NO_MAN= +MAN= install: diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile index eaee124..8f4a4ad 100644 --- a/usr.bin/xlint/lint2/Makefile +++ b/usr.bin/xlint/lint2/Makefile @@ -5,7 +5,7 @@ PROG= lint2 SRCS= main2.c hash.c read.c mem.c mem2.c chk.c msg.c emit.c emit2.c inittyp.c -NO_MAN= +MAN= CFLAGS+=-I${.CURDIR}/../lint1 LINTFLAGS=-abehrz |