For variables that are only checked with defined(), don't provide

any fake value.

Makefile.inc1

@@ -502,7 +502,7 @@ redistribute:
 
 .if !defined(KERNCONF) && defined(KERNEL)
 KERNCONF=	${KERNEL}
-KERNWARN=	yes
+KERNWARN=
 .else
 KERNCONF?=	GENERIC
 .endif

etc/defaults/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 FILES=	devfs.rules pccard.conf periodic.conf rc.conf
-NOOBJ=	noobj
+NOOBJ=
 FILESDIR= /etc/defaults
 FILESMODE= 444
 

etc/mtree/Makefile

@@ -17,7 +17,7 @@ _BIND.include.dist=	BIND.include.dist
 .endif
 .endif
 
-NOOBJ=	noobj
+NOOBJ=
 FILESDIR= /etc/mtree
 
 .include <bsd.prog.mk>

etc/namedb/Makefile

@@ -2,7 +2,7 @@
 
 FILES=	PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
 	make-localhost
-NOOBJ=	noobj
+NOOBJ=
 FILESDIR= /etc/namedb
 FILESMODE= 644
 

etc/pam.d/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=	noobj
+NOOBJ=
 FILES=	README ftpd gdm imap kde login other passwd pop3 \
 	rexecd rsh sshd su system telnetd xdm
 FILESDIR=	/etc/pam.d

games/fortune/unstr/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	unstr
-NOMAN=	noman
+NOMAN=
 CFLAGS+=-Wall -I${.CURDIR}/../strfile
 
 .include <bsd.prog.mk>

games/ppt/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	ppt
-NOMAN=	noman
+NOMAN=
 
 WARNS?=	6
 

games/primes/Makefile

@@ -1,8 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
+# $FreeBSD$
 
 PROG=	primes
 SRCS=	pattern.c pr_tbl.c primes.c
-NOMAN=	noman
+NOMAN=
 DPADD=	${LIBM}
 LDADD=	-lm
 

gnu/Makefile.inc

@@ -3,4 +3,4 @@
 # Do not lint the GNU stuff. It is all externally maintained and
 # lint output is wasteful noise here.
 
-NOLINT=	true
+NOLINT=

gnu/lib/libgcc/Makefile

@@ -13,7 +13,7 @@ LIB=	gcc
 #SHLIB_MAJOR=	1
 
 # We need to install libgcc_pic.a as well, for use by shared libs.
-INSTALL_PIC_ARCHIVE=    yes     
+INSTALL_PIC_ARCHIVE=
 
 #
 # XXX This is a hack, but it seems to work.

gnu/lib/libgcov/Makefile

@@ -6,7 +6,7 @@ GCCDIR=	${.CURDIR}/../../../contrib/gcc
 .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
 
 LIB=		gcov
-NOPROFILE=	yes
+NOPROFILE=
 
 CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED
 CFLAGS+=	-D_PTHREADS -DGTHREAD_USE_WEAK

gnu/lib/libobjc/Makefile

@@ -6,12 +6,12 @@ GCCDIR=	${.CURDIR}/../../../contrib/gcc
 .PATH: ${OBJCDIR}/objc ${OBJCDIR}
 
 LIB=    objc
-NOMAN=	sorry
+NOMAN=
 .if ${MACHINE_ARCH} == "amd64"
 SHLIB_MAJOR= 1
 .else
 # XXX is this still correct?
-NOPIC=	works but method lookup slowdown is significant
+NOPIC=	# works but method lookup slowdown is significant
 .endif
 
 SRCS=   archive.c class.c encoding.c gc.c hash.c init.c misc.c \

gnu/usr.bin/Makefile

@@ -24,7 +24,7 @@ SUBDIR= bc \
 	texinfo
  
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc"
-NO_GDB=	not yet
+NO_GDB=	# not yet
 .endif
 
 .if !defined(NO_CXX)

gnu/usr.bin/binutils/as/Makefile

@@ -4,7 +4,7 @@
 # BINDIR
 .include "${.CURDIR}/../../Makefile.inc"
 WARNS?=	2
-NO_WERROR= yes
+NO_WERROR=
 .include "${.CURDIR}/../Makefile.inc0"
 
 .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config

gnu/usr.bin/binutils/gdbreplay/Makefile

@@ -10,7 +10,7 @@ GDBDIR=	${.CURDIR}/../../../../contrib/gdb
 .PATH:	${GDBDIR}/gdb
 
 PROG=	gdbreplay
-NOMAN=	yes
+NOMAN=
 
 SRCS=	gdbreplay.c
 

gnu/usr.bin/binutils/libbfd/Makefile

@@ -17,7 +17,7 @@ WARNS?=	2
 .endif
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/bfd
-INTERNALLIB=	true
+INTERNALLIB=
 CLEANFILES+=	bfdver.h config.h targmatch.h
 
 SELARCH=

gnu/usr.bin/binutils/libbinutils/Makefile

@@ -14,6 +14,6 @@ CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
-INTERNALLIB=	true
+INTERNALLIB=
 
 .include <bsd.lib.mk>

gnu/usr.bin/binutils/libiberty/Makefile

@@ -16,6 +16,6 @@ SRCS+=	regex.c splay-tree.c
 
 WARNS?=	1
 CFLAGS+=	-DHAVE_CONFIG_H
-INTERNALLIB=	true
+INTERNALLIB=
 
 .include <bsd.lib.mk>

gnu/usr.bin/binutils/libopcodes/Makefile

@@ -8,7 +8,7 @@ LIB=	opcodes
 SRCS+=	dis-buf.c dis-init.c disassemble.c
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/opcodes -I${SRCDIR}/bfd
-INTERNALLIB=	true
+INTERNALLIB=
 
 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
 # binutils release. FreeBSD only distributes the bits that are required to

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

@@ -9,7 +9,7 @@ PROG=	c++
 SRCS=	gcc.c g++spec.c
 LINKS=	${BINDIR}/c++ ${BINDIR}/g++
 LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
-NOMAN=	1
+NOMAN=
 
 DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}

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

@@ -6,7 +6,7 @@
 
 PROG=	c++filt
 SRCS=	cp-demangle.c cplus-dem+%DIKED.c
-NOMAN=	1
+NOMAN=
 
 CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\"
 

gnu/usr.bin/cc/cc1/Makefile

@@ -7,7 +7,7 @@
 PROG=	cc1
 SRCS=	main.c c-parse+%DIKED.c c-lang.c stub-objc.c
 BINDIR=	/usr/libexec
-NOMAN=	1
+NOMAN=
 NOSHARED?=yes
 
 CFLAGS+= -I.

gnu/usr.bin/cc/cc1obj/Makefile

@@ -7,7 +7,7 @@
 PROG=	cc1obj
 SRCS=	main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c
 BINDIR=	/usr/libexec
-NOMAN=	1
+NOMAN=
 NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/objc -I.

gnu/usr.bin/cc/cc1plus/Makefile

@@ -12,12 +12,12 @@ SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
 	search.c semantics.c tree.c typeck.c typeck2.c optimize.c 
 
 BINDIR=	/usr/libexec
-NOMAN=	1
+NOMAN=
 NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/cp -I.
 
-PADD=	${LIBCC_INT}
+DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------

gnu/usr.bin/cc/cc_int/Makefile

@@ -5,7 +5,7 @@
 .PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
 
 LIB=		cc_int
-INTERNALLIB=	YES
+INTERNALLIB=
 
 # Files from libiberty.
 SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \

gnu/usr.bin/cvs/lib/Makefile

@@ -9,7 +9,7 @@ MAINTAINER=	peter@FreeBSD.org
 .PATH: ${CVSDIR}/man
 
 LIB=		cvs
-INTERNALLIB=	YES
+INTERNALLIB=
 
 # gnu must be before lib to pick correct regex.h
 CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}/usr/include/gnu \

gnu/usr.bin/cvs/libdiff/Makefile

@@ -7,7 +7,7 @@ MAINTAINER=	peter@FreeBSD.org
 .PATH:	${CVSDIR}/diff
 
 LIB=		diff
-INTERNALLIB=	YES
+INTERNALLIB=
 
 # gnu must be before lib to pick correct regex.h
 CFLAGS+= -I../lib -I${DESTDIR}/usr/include/gnu \

gnu/usr.bin/dialog/TESTS/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=		noobj
+NOOBJ=
 FILES=		README checklist ftreebox infobox inputbox menubox msgbox \
 		prgbox radiolist textbox treebox yesno
 FILESDIR=	${SHAREDIR}/examples/dialog

gnu/usr.bin/gdb/gdbtui/Makefile

@@ -2,7 +2,7 @@
 
 PROG=	gdbtui
 SRCS=	tui-main.c
-NOMAN=	noman
+NOMAN=
 
 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
 	${OBJ_BU}/libiberty/libiberty.a

gnu/usr.bin/gdb/libgdb/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	gdb
-INTERNALLIB= yes
+INTERNALLIB=
 SRCS=	annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c bcache.c	\
 	bfd-target.c block.c blockframe.c breakpoint.c buildsym.c	\
 	c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c		\

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

@@ -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
-NOMAN=		YES
+NOMAN=
 
 .include <bsd.prog.mk>

gnu/usr.bin/groff/src/libs/libbib/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=		bib
-INTERNALLIB=	YES
+INTERNALLIB=
 SRCS=		common.cpp index.cpp linear.cpp search.cpp map.c
 
 .include <bsd.lib.mk>

gnu/usr.bin/groff/src/libs/libdriver/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=		driver
-INTERNALLIB=	YES
+INTERNALLIB=
 SRCS=		input.cpp printer.cpp
 
 .include <bsd.lib.mk>

gnu/usr.bin/groff/src/libs/libgroff/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=		groff
-INTERNALLIB=	YES
+INTERNALLIB=
 SRCS=		assert.cpp change_lf.cpp cmap.cpp color.cpp cset.cpp device.cpp errarg.cpp\
 		error.cpp fatal.cpp filename.cpp font.cpp fontfile.cpp geometry.cpp\
 		htmlhint.cpp invalid.cpp lf.cpp lineno.cpp macropath.cpp\

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

@@ -4,6 +4,6 @@ PROG_CXX=	pre-grohtml
 SRCS=		pre-html.cpp pushback.cpp
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
-NOMAN=		YES
+NOMAN=
 
 .include <bsd.prog.mk>

gnu/usr.bin/man/lib/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	man
-INTERNALLIB= true
+INTERNALLIB=
 
 CFLAGS+= -DSTDC_HEADERS
 CLEANFILES+= config.h

gnu/usr.bin/rcs/lib/Makefile

@@ -9,6 +9,6 @@ SRCS    = maketime.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \
 	  rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \
 	  rcsutil.c merger.c version.c
 
-INTERNALLIB=		true
+INTERNALLIB=
 
 .include <bsd.lib.mk>

gnu/usr.bin/texinfo/infokey/Makefile

@@ -2,7 +2,7 @@
 
 PROG=	infokey
 SRCS=	infokey.c key.c
-NOMAN=	noman
+NOMAN=
 
 DPADD=	${LIBTXI}
 LDADD=	${LIBTXI}

gnu/usr.bin/texinfo/libtxi/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	txi
-INTERNALLIB= true
+INTERNALLIB=
 
 SRCS=   substring.c xexit.c xmalloc.c xstrdup.c
 

include/arpa/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=	noobj
+NOOBJ=
 INCS=	ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
 INCSDIR=${INCLUDEDIR}/arpa
 

include/protocols/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=	noobj
+NOOBJ=
 INCS=	dumprestore.h routed.h rwhod.h talkd.h timed.h
 INCSDIR=${INCLUDEDIR}/protocols
 

lib/bind/lwres/Makefile

@@ -7,7 +7,7 @@ SRCDIR=		${BIND_DIR}/lib/lwres
 
 # Unlike other BIND libs, this should be installed unless the user says NO.
 .if !defined(NO_BIND_LIBS_LWRES)
-WITH_BIND_LIBS=	YES
+WITH_BIND_LIBS=
 .endif
 
 .include	"${LIB_BIND_DIR}/config.mk"

lib/libalias/Makefile

@@ -9,6 +9,6 @@ SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
 	alias_util.c alias_old.c
 INCS=	alias.h
 WARNS?=	6
-NO_WERROR=	true
+NO_WERROR=
 
 .include <bsd.lib.mk>

lib/libbsnmp/Makefile.inc

@@ -2,5 +2,5 @@
 
 SHLIB_MAJOR=	2
 WARNS?=		6
-NO_WERROR=	yes
+NO_WERROR=
 INCSDIR=	${INCLUDEDIR}/bsnmp

lib/libc/Makefile

@@ -16,8 +16,8 @@ WARNS?=	2
 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
 CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH}
 CLEANFILES+=tags
-INSTALL_PIC_ARCHIVE=	yes
+INSTALL_PIC_ARCHIVE=
-PRECIOUSLIB=	yes
+PRECIOUSLIB=
 
 # Define (empty) variables so that make doesn't give substitution
 # errors if the included makefiles don't change these:

lib/libc/alpha/Makefile.inc

@@ -6,4 +6,4 @@
 #
 # Alpha is 64-bit, so it doesn't need quad functions:
 #
-NO_QUAD=1
+NO_QUAD=

lib/libc/amd64/Makefile.inc

@@ -6,4 +6,4 @@
 #
 # AMD64 is 64-bit, so it doesn't need quad functions:
 #
-NO_QUAD=1
+NO_QUAD=

lib/libc/ia64/Makefile.inc

@@ -6,4 +6,4 @@
 #
 # IA-64 is 64-bit, so it doesn't need quad functions:
 #
-NO_QUAD=1
+NO_QUAD=

lib/libc/sparc64/Makefile.inc

@@ -8,4 +8,4 @@
 #
 # sparc64 is 64-bit, so it doesn't need quad functions.
 #
-NO_QUAD=1
+NO_QUAD=

lib/libc_r/Makefile

@@ -20,7 +20,7 @@ CFLAGS+=-D_LOCK_DEBUG
 # enable extra internal consistancy checks
 CFLAGS+=-D_PTHREADS_INVARIANTS
 
-PRECIOUSLIB=	yes
+PRECIOUSLIB=
 
 .include "${.CURDIR}/uthread/Makefile.inc"
 .include "${.CURDIR}/sys/Makefile.inc"

lib/libcrypt/Makefile

@@ -30,6 +30,6 @@ SRCS+=		auth.c property.c
 CFLAGS+=	-D${sym}=__${sym}
 .endfor
 
-PRECIOUSLIB=	yes
+PRECIOUSLIB=
 
 .include <bsd.lib.mk>

lib/libdisk/Makefile

@@ -21,8 +21,8 @@ CFLAGS+=	-DPC98
 .endif
 
 CLEANFILES+=	tmp.c tst01 tst01.o
-NOPROFILE=	yes
+NOPROFILE=
-NOPIC=		yes
+NOPIC=
 
 MAN=		libdisk.3
 

lib/libio/Makefile

@@ -6,6 +6,6 @@ SRCS=		io.c swiz.c bwx.c alpha_sethae.c
 
 CFLAGS+= 	-Wall -Wa,-mev56
 
-NOMAN=1
+NOMAN=
 
 .include <bsd.lib.mk>

lib/libkse/Makefile

@@ -36,7 +36,7 @@ LDFLAGS= -Wl,--version-script=${.CURDIR}/pthread.map
 # enable extra internal consistancy checks
 CFLAGS+=-D_PTHREADS_INVARIANTS -Wall
 
-PRECIOUSLIB=	yes
+PRECIOUSLIB=
 
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 .include "${.CURDIR}/support/Makefile.inc"

lib/libncurses/Makefile

@@ -556,6 +556,6 @@ MLINKS+=curs_window.3 delwin.3 curs_window.3 derwin.3 curs_window.3 dupwin.3 \
 MLINKS+=default_colors.3 assume_default_colors.3 \
 	default_colors.3 use_default_colors.3
 
-NOLINT=	true
+NOLINT=
 
 .include <bsd.lib.mk>

lib/libpam/libpam/Makefile

@@ -39,7 +39,7 @@ OPENPAM=	${.CURDIR}/../../../contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man
 
 LIB=	pam
-NOPROFILE=	YES
+NOPROFILE=
 
 SRCS=	openpam_borrow_cred.c \
 	openpam_configure.c \

lib/libpam/modules/Makefile.inc

@@ -2,8 +2,8 @@
 
 PAMDIR=		${.CURDIR}/../../../../contrib/openpam
 
-NOINSTALLLIB=	yes
+NOINSTALLLIB=
-NOPROFILE=	yes
+NOPROFILE=
 
 CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
 WARNS?=	4
@@ -12,7 +12,7 @@ WARNS?=	4
 # For the static case, libpam.a depends on the modules.
 # For the dynamic case, the modules depend on libpam.so.N
 .if defined(_NO_LIBPAM_SO_YET)
-NOPIC=		YES
+NOPIC=
 .else
 SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
 DPADD+=		${LIBPAM}

lib/libpthread/Makefile

@@ -36,7 +36,7 @@ LDFLAGS= -Wl,--version-script=${.CURDIR}/pthread.map
 # enable extra internal consistancy checks
 CFLAGS+=-D_PTHREADS_INVARIANTS -Wall
 
-PRECIOUSLIB=	yes
+PRECIOUSLIB=
 
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 .include "${.CURDIR}/support/Makefile.inc"

lib/librpcsvc/Makefile

@@ -23,7 +23,7 @@ SRCS+= ${GENSRCS} ${OTHERSRCS} ${SECRPCSRCS}
 
 CLEANFILES+= ${GENSRCS}
 
-NOMAN= noman
+NOMAN=
 
 .include <bsd.lib.mk>
 

lib/libsm/Makefile

@@ -29,7 +29,7 @@ SRCS+=	assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \
 	niprop.c mpeix.c
 CLEANFILES+=sm_os.h
 
-INTERNALLIB=		true
+INTERNALLIB=
 
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h

lib/libsmdb/Makefile

@@ -15,7 +15,7 @@ SRCS+=	sm_os.h
 SRCS+=	smdb.c smdb1.c smdb2.c smndbm.c
 CLEANFILES+=sm_os.h
 
-INTERNALLIB=		true
+INTERNALLIB=
 
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h

lib/libsmutil/Makefile

@@ -15,7 +15,7 @@ SRCS+=	sm_os.h
 SRCS+=	debug.c err.c lockfile.c safefile.c snprintf.c cf.c
 CLEANFILES+=sm_os.h
 
-INTERNALLIB=		true
+INTERNALLIB=
 
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h

lib/libstand/Makefile

@@ -7,8 +7,8 @@
 #
 
 LIB=		stand
-NOPROFILE=	YES
+NOPROFILE=
-NOPIC=		YES
+NOPIC=
 INCS=		stand.h
 MAN=		libstand.3
 

lib/libtelnet/Makefile

@@ -6,7 +6,7 @@ TELNETDIR=	${.CURDIR}/../../contrib/telnet
 
 LIB=		telnet
 
-INTERNALLIB=	yes
+INTERNALLIB=
 
 SRCS=		genget.c getent.c misc.c
 CFLAGS+=	-I${TELNETDIR}

lib/libthr/Makefile

@@ -18,7 +18,7 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
 # enable extra internal consistancy checks
 CFLAGS+=-D_PTHREADS_INVARIANTS
 
-PRECIOUSLIB=	yes
+PRECIOUSLIB=
 
 WARNS?=	2
 

lib/libxpg4/Makefile

@@ -5,6 +5,6 @@ SHLIB_MAJOR=    3
 
 SRCS=	fakelib.c
 
-NOMAN= YES
+NOMAN=
 
 .include <bsd.lib.mk>

lib/liby/Makefile

@@ -5,6 +5,6 @@ SHLIB_MAJOR=	2
 
 SRCS=	main.c yyerror.c
 
-NOPIC=	true
+NOPIC=
 
 .include <bsd.lib.mk>

lib/ncurses/ncurses/Makefile

@@ -556,6 +556,6 @@ MLINKS+=curs_window.3 delwin.3 curs_window.3 derwin.3 curs_window.3 dupwin.3 \
 MLINKS+=default_colors.3 assume_default_colors.3 \
 	default_colors.3 use_default_colors.3
 
-NOLINT=	true
+NOLINT=
 
 .include <bsd.lib.mk>

libexec/bootpd/bootpgw/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	bootpgw
-NOMAN=  true
+NOMAN=
 SRCS=	bootpgw.c getif.c hwaddr.c report.c rtmsg.c
 
 SRCDIR=	${.CURDIR}/..

libexec/pt_chown/Makefile

@@ -4,6 +4,6 @@ PROG=	pt_chown
 SRCS=	pt_chown.c
 BINOWN=	root
 BINMODE=4555
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>

libexec/rtld-elf/Makefile

@@ -25,7 +25,7 @@ MLINKS=		rtld.1 ld-elf.so.1.1 \
 .if defined(LDSCRIPT)
 KERN_OSRELDATE!=	/sbin/sysctl -n kern.osreldate 2>/dev/null || echo 0
 .if ${KERN_OSRELDATE} >= 400001
-LDSO_IS_EXECUTABLE=	yes
+LDSO_IS_EXECUTABLE=
 .endif
 .endif
 

release/picobsd/tinyware/aps/Makefile

@@ -2,7 +2,7 @@
 #
 PROG=ps
 SRCS+=main.c
-NOMAN=yes
+NOMAN=
 
 .include <bsd.prog.mk>
 

release/picobsd/tinyware/help/Makefile

@@ -2,7 +2,7 @@
 #
 PROG=help
 SRCS+=help.c
-NOMAN=yes
+NOMAN=
 
 .include <bsd.prog.mk>
 

release/picobsd/tinyware/msg/Makefile

@@ -2,7 +2,7 @@
 #
 PROG=msg
 SRCS= 	msg.c
-NOMAN=yes
+NOMAN=
 
 .include <bsd.prog.mk>
 

release/picobsd/tinyware/ns/Makefile

@@ -4,6 +4,6 @@ PROG=	ns
 SRCS=	ns.c
 
 CFLAGS+= -DBRIDGING
-NOMAN= yes
+NOMAN=
 
 .include <bsd.prog.mk>

release/picobsd/tinyware/oinit/Makefile

@@ -15,7 +15,7 @@ CFLAGS=		-DSH_PATH=\"${SH_PATH}\" -DSH_NAME=\"${SH_NAME}\" \
 
 #LDADD=		-lutil -ledit -ltermcap
 LDADD=-lutil
-NOMAN=yes
+NOMAN=
 
 .include <bsd.prog.mk>
 

release/picobsd/tinyware/simple_httpd/Makefile

@@ -2,6 +2,6 @@
 #
 PROG=simple_httpd
 SRCS= 	simple_httpd.c
-NOMAN=yes
+NOMAN=
 
 .include <bsd.prog.mk>

release/picobsd/tinyware/sps/Makefile

@@ -2,7 +2,7 @@
 #
 PROG=sps
 SRCS= 	sps.c
-NOMAN=yes
+NOMAN=
 
 .include <bsd.prog.mk>
 

release/picobsd/tinyware/view/Makefile

@@ -4,6 +4,6 @@ PROG=view
 SRCS=view.c
 CFLAGS+=-I/usr/local/include
 LDADD+=-L/usr/local/lib -lpng -lvgl -lz -lm
-NOMAN=yes
+NOMAN=
 
 .include <bsd.prog.mk>

release/picobsd/tinyware/vm/Makefile

@@ -3,7 +3,7 @@
 PROG=vm
 #CFLAGS+=
 SRCS= 	vm.c
-NOMAN=yes
+NOMAN=
 
 .include <bsd.prog.mk>
 

rescue/librescue/Makefile

@@ -15,7 +15,7 @@
        ${.CURDIR}/../../lib/libutil 
 
 LIB=		rescue
-INTERNALLIB=	yes	# Don't install this library
+INTERNALLIB=	# Don't install this library
 SRCS=		exec.c getusershell.c login_class.c popen.c rcmdsh.c \
 		sysctl.c system.c
 

rescue/rescue/Makefile

@@ -215,7 +215,7 @@ CANONICALOBJDIR:= ${MAKEOBJDIRPREFIX}${.CURDIR}
 CANONICALOBJDIR:= /usr/obj${.CURDIR}
 .endif
 
-NOMAN=	true
+NOMAN=
 CLEANFILES+= $(CONF) *.o *.lo *.c *.mk *.cache *.a *.h
 
 # Program names and their aliases contribute hardlinks to 'rescue' executable,

sbin/dhclient/common/Makefile

@@ -6,7 +6,7 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 .PATH: ${DIST_DIR}/common
 
 LIB=	dhcp
-INTERNALLIB=		true
+INTERNALLIB=
 
 SRCS=	alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c dispatch.c \
 	dlpi.c dns.c ethernet.c execute.c fddi.c icmp.c inet.c lpf.c \

sbin/dhclient/dhcpctl/Makefile

@@ -5,11 +5,11 @@ DIST_DIR=	${.CURDIR}/../../../contrib/isc-dhcp
 .PATH: ${DIST_DIR}/dhcpctl
 
 LIB=	dhcpctl
-INTERNALLIB=	true
+INTERNALLIB=
 
 SRCS=	dhcpctl.c callback.c remote.c
 
 MAN=	dhcpctl.3
-NOMAN=	true
+NOMAN=
 
 .include <bsd.lib.mk>

sbin/dhclient/dst/Makefile

@@ -6,7 +6,7 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 .PATH: ${DIST_DIR}/dst
 
 LIB=	 dst
-INTERNALLIB=		true
+INTERNALLIB=
 
 SRCS=	base64.c dst_api.c dst_support.c hmac_link.c md5_dgst.c prandom.c
 

sbin/dhclient/minires/Makefile

@@ -6,7 +6,7 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 .PATH: ${DIST_DIR}/minires
 
 LIB=	res
-INTERNALLIB=		true
+INTERNALLIB=
 
 SRCS=	ns_date.c ns_name.c ns_parse%FIXED.c ns_samedomain.c ns_sign.c ns_verify.c \
 	res_comp.c res_findzonecut.c res_init.c res_mkquery.c res_mkupdate.c \

sbin/dhclient/omapip/Makefile

@@ -6,13 +6,13 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
 .PATH: ${DIST_DIR}/omapip
 
 LIB=	 omapi
-INTERNALLIB=		true
+INTERNALLIB=
 
 SRCS=	alloc.c array.c auth.c buffer.c connection.c convert.c dispatch.c \
 	errwarn.c generic.c handle.c hash.c inet_addr.c listener.c \
 	message.c mrtrace.c protocol.c result.c support.c toisc.c trace.c
 
 MAN=	omapi.3
-NOMAN=	true
+NOMAN=
 
 .include <bsd.lib.mk>

sbin/growfs/Makefile

@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-#GFSDBG=YES  
+#GFSDBG=
 
 PROG=   growfs
 SRCS=   growfs.c

sbin/gvinum/Makefile

@@ -2,7 +2,7 @@
 
 PROG=	gvinum
 SRCS=	gvinum.c gvinum.h geom_vinum_share.c
-NOMAN=	notyet
+NOMAN=	# not yet
 
 CFLAGS+=	-I${.CURDIR}/../../sys
 

sbin/mca/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 PROG=	mca
 WARNS?=	4
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>

sbin/recoverdisk/Makefile

@@ -2,7 +2,7 @@
 
 PROG=	recoverdisk
 
-NOMAN=1
+NOMAN=
 
 WARNS?=	5
 

sbin/rtsol/Makefile

@@ -21,7 +21,7 @@ SRCS=	rtsold.c rtsol.c if.c probe.c rtsock.c
 CFLAGS+=-DINET6 -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DSMALL
 WARNS?=	0
 
-NOMAN=	yes
+NOMAN=
 
 .PATH:	${SRCDIR}
 

secure/lib/libcrypto/Makefile

@@ -4,7 +4,7 @@ LIB=		crypto
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	3
 
-NOLINT=		true
+NOLINT=
 
 .if exists(Makefile.man)
 .include "Makefile.man"

secure/lib/libssh/Makefile

@@ -30,7 +30,7 @@ DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
 LDADD+=	-lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
 .endif
 
-NOLINT=	true
+NOLINT=
 
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT}
 LDADD+=	-lcrypto -lcrypt

secure/lib/libssl/Makefile

@@ -3,7 +3,7 @@
 LIB=		ssl
 SHLIB_MAJOR=	3
 
-NOLINT=		true
+NOLINT=
 
 .if exists(Makefile.man)
 .include "Makefile.man"

share/dict/Makefile

@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
-NOOBJ=		noobj
+NOOBJ=
 
 # XXX MISSING:	connectives words
 FILES=		README propernames web2 web2a freebsd

share/doc/IPv6/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=		noobj
+NOOBJ=
 FILES=		IMPLEMENTATION
 FILESDIR=	${SHAREDIR}/doc/IPv6
 

share/doc/bind9/Makefile

@@ -5,7 +5,7 @@ SRCDIR=		${BIND_DIR}/doc
 
 .PATH: ${BIND_DIR} ${SRCDIR}/arm ${SRCDIR}/misc
 
-NOOBJ=		noobj
+NOOBJ=
 
 FILESGROUPS=	TOP ARM MISC
 TOP=		CHANGES COPYRIGHT FAQ KNOWN_DEFECTS README

share/doc/papers/bufbio/Makefile

@@ -5,7 +5,7 @@ DOC=		bio
 SRCS=		bio.ms-patched
 EXTRA=		bufsize.eps
 MACROS=		-ms
-USE_PIC=	YES
+USE_PIC=
 CLEANFILES=	bio.ms-patched
 
 bio.ms-patched: bio.ms

share/doc/papers/devfs/Makefile

@@ -4,6 +4,6 @@ VOLUME=		papers
 DOC=		devfs
 SRCS=		paper.me
 MACROS=		-me
-USE_PIC=	YES
+USE_PIC=
 
 .include <bsd.doc.mk>