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

any fake value.

63 files changed, 90 insertions, 89 deletions

diff --git a/share/dict/Makefile b/share/dict/Makefile
index 34d25c3..cf3c9b5 100644
--- a/share/dict/Makefile
+++ b/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
diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile
index 4e4f34f..ed5dce0 100644
--- a/share/doc/IPv6/Makefile
+++ b/share/doc/IPv6/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=		noobj
+NOOBJ=
 FILES=		IMPLEMENTATION
 FILESDIR=	${SHAREDIR}/doc/IPv6
 
diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile
index 6fe2bc6..af8cf9a 100644
--- a/share/doc/bind9/Makefile
+++ b/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
diff --git a/share/doc/papers/bufbio/Makefile b/share/doc/papers/bufbio/Makefile
index 524ee04..9bdd487 100644
--- a/share/doc/papers/bufbio/Makefile
+++ b/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
diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile
index 8683c94..53a79fc 100644
--- a/share/doc/papers/devfs/Makefile
+++ b/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>
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index 41acd7a..7f7670c 100644
--- a/share/doc/papers/diskperf/Makefile
+++ b/share/doc/papers/diskperf/Makefile
@@ -6,6 +6,6 @@ DOC=		diskperf
 SRCS=		abs.ms motivation.ms equip.ms methodology.ms tests.ms \
 		results.ms conclusions.ms appendix.ms
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/jail/Makefile b/share/doc/papers/jail/Makefile
index 8e9fd28..5d49354 100644
--- a/share/doc/papers/jail/Makefile
+++ b/share/doc/papers/jail/Makefile
@@ -5,7 +5,7 @@ DOC=		jail
 SRCS=		paper.ms-patched
 EXTRA=		implementation.ms mgt.ms future.ms jail01.eps
 MACROS=		-ms
-USE_SOELIM=	YES
+USE_SOELIM=
 CLEANFILES=	paper.ms-patched
 
 paper.ms-patched: paper.ms
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index ebb5cde..e706f0a 100644
--- a/share/doc/papers/kernmalloc/Makefile
+++ b/share/doc/papers/kernmalloc/Makefile
@@ -6,10 +6,10 @@ DOC=		kernmalloc
 SRCS=		kernmalloc.t appendix.ms
 EXTRA=		alloc.fig usage.tbl
 MACROS=		-ms
-USE_EQN=	YES
-USE_PIC=	YES
-USE_SOELIM=	YES
-USE_TBL=	YES
+USE_EQN=
+USE_PIC=
+USE_SOELIM=
+USE_TBL=
 CLEANFILES=	appendix.ms
 
 appendix.ms: appendix.t
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index 53e5a49..33416d6 100644
--- a/share/doc/papers/kerntune/Makefile
+++ b/share/doc/papers/kerntune/Makefile
@@ -6,9 +6,9 @@ DOC=		kerntune
 SRCS=		0.t 1.t 2.t 3.t 4.t
 EXTRA=		fig2.pic
 MACROS=		-ms
-USE_EQN=	YES
-USE_PIC=	YES
-USE_SOELIM=	YES
-USE_TBL=	YES
+USE_EQN=
+USE_PIC=
+USE_SOELIM=
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile
index 788873c..f968068 100644
--- a/share/doc/papers/nqnfs/Makefile
+++ b/share/doc/papers/nqnfs/Makefile
@@ -5,7 +5,7 @@ VOLUME=		papers
 DOC=		nqnfs
 SRCS=		nqnfs.me
 MACROS=		-me
-USE_PIC=	YES
-USE_TBL=	YES
+USE_PIC=
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile
index 54a8e1c..aa31449 100644
--- a/share/doc/papers/px/Makefile
+++ b/share/doc/papers/px/Makefile
@@ -7,8 +7,8 @@ SRCS=		tmac.p pxin0.n pxin1.n pxin2.n pxin3.n pxin4.n
 EXTRA=		fig1.1.n fig1.2.n fig1.3.n fig2.3.n fig2.4.n fig3.2.n \
 		fig3.3.n table2.1.n table2.2.n table2.3.n table3.1.n
 MACROS=		-ms
-USE_SOELIM=	YES
-USE_TBL=	YES
+USE_SOELIM=
+USE_TBL=
 CLEANFILES=	fig2.3.n
 
 fig2.3.n: fig2.3.raw
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index ad7e38e..88ab5af 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -6,7 +6,7 @@ DOC=		releng
 SRCS=		stubs 0.t 1.t 2.t 3.t
 EXTRA=		ref.bib
 MACROS=		-ms
-USE_REFER=	YES
+USE_REFER=
 CLEANFILES=	stubs
 
 stubs:
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index a6e89f5..9ddbc9d 100644
--- a/share/doc/papers/sysperf/Makefile
+++ b/share/doc/papers/sysperf/Makefile
@@ -6,8 +6,8 @@ DOC=		sysperf
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t appendix.tmp
 EXTRA=		a1.t a2.t
 MACROS=		-ms
-USE_EQN=	YES
-USE_TBL=	YES
+USE_EQN=
+USE_TBL=
 CLEANFILES=	appendix.tmp
 
 appendix.tmp: a1.t a2.t
diff --git a/share/doc/papers/timecounter/Makefile b/share/doc/papers/timecounter/Makefile
index 252dba3..f6d158b 100644
--- a/share/doc/papers/timecounter/Makefile
+++ b/share/doc/papers/timecounter/Makefile
@@ -9,9 +9,9 @@ SRCS=	tmac.usenix timecounter.ms-patched
 EXTRA=	fig1.eps fig2.eps fig3.eps fig4.eps fig5.eps gps.ps intr.ps
 MACROS=	-ms
 CLEANFILES=	timecounter.ms-patched
-USE_PIC=1
-USE_EQN=1
-USE_TBL=1
+USE_PIC=
+USE_EQN=
+USE_TBL=
 
 timecounter.ms-patched: timecounter.ms
 	sed -E -e 's;(gps|intr).ps;${.CURDIR}/&;' -e 's;fig[0-9].eps;${.CURDIR}/&;' \
diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile
index 78c7eb0..14a2f70 100644
--- a/share/doc/psd/01.cacm/Makefile
+++ b/share/doc/psd/01.cacm/Makefile
@@ -5,8 +5,8 @@ VOLUME=		psd/01.cacm
 SRCS=		stubs p.mac p1 p2 p3 p4 p5 p6
 EXTRA=		ref.bib
 MACROS=		-ms
-USE_REFER=	YES
-USE_TBL=	YES
+USE_REFER=
+USE_TBL=
 CLEANFILES=	stubs
 
 stubs:
diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile
index 51aaa80..89d0dc3 100644
--- a/share/doc/psd/02.implement/Makefile
+++ b/share/doc/psd/02.implement/Makefile
@@ -5,9 +5,9 @@ VOLUME=		psd/02.implement
 SRCS=		stubs implement
 EXTRA=		ref.bib
 MACROS=		-ms
-USE_PIC=	YES
-USE_REFER=	YES
-USE_SOELIM=	YES
+USE_PIC=
+USE_REFER=
+USE_SOELIM=
 CLEANFILES=	stubs
 
 stubs:
diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile
index 48b9414..2c0ec7b 100644
--- a/share/doc/psd/05.sysman/Makefile
+++ b/share/doc/psd/05.sysman/Makefile
@@ -5,6 +5,6 @@ VOLUME=		psd/05.sysman
 SRCS=		0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \
 		2.0.t 2.1.t 2.2.t 2.3.t 2.4.t 2.5.t a.t
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/06.Clang/Makefile b/share/doc/psd/06.Clang/Makefile
index cbd9af2..877a97c 100644
--- a/share/doc/psd/06.Clang/Makefile
+++ b/share/doc/psd/06.Clang/Makefile
@@ -4,6 +4,6 @@
 VOLUME=		psd/06.Clang
 SRCS=		Clang.ms
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/13.rcs/rcs/Makefile b/share/doc/psd/13.rcs/rcs/Makefile
index 41a630e..6d94aed 100644
--- a/share/doc/psd/13.rcs/rcs/Makefile
+++ b/share/doc/psd/13.rcs/rcs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SRCS=		rcs.ms
-USE_PIC=	YES
-USE_TBL=	YES
+USE_PIC=
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile
index e597df2..4381c98 100644
--- a/share/doc/psd/15.yacc/Makefile
+++ b/share/doc/psd/15.yacc/Makefile
@@ -6,7 +6,7 @@ SRCS=		stubs ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \
 		ssA ssB ssa ssb ssc ssd
 EXTRA=		ref.bib
 MACROS=		-ms
-USE_REFER=	YES
+USE_REFER=
 CLEANFILES=	stubs
 
 stubs:
diff --git a/share/doc/psd/16.lex/Makefile b/share/doc/psd/16.lex/Makefile
index 4049bd6..6dea7c0 100644
--- a/share/doc/psd/16.lex/Makefile
+++ b/share/doc/psd/16.lex/Makefile
@@ -4,6 +4,6 @@
 VOLUME=		psd/16.lex
 SRCS=		lex.ms
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile
index 30ec4e0..1097072 100644
--- a/share/doc/psd/18.gprof/Makefile
+++ b/share/doc/psd/18.gprof/Makefile
@@ -6,10 +6,10 @@ SRCS=		header.me abstract.me intro.me profiling.me gathering.me \
 		postp.me present.me refs.me
 EXTRA=		postp1.pic postp2.pic postp3.pic pres1.pic pres2.pic
 MACROS=		-me
-USE_SOELIM=	YES
-USE_PIC=	YES
-USE_TBL=	YES
-USE_EQN=	YES
+USE_SOELIM=
+USE_PIC=
+USE_TBL=
+USE_EQN=
 SRCDIR=		${.CURDIR}/../../../../usr.bin/gprof/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile
index aabef10..934cdea 100644
--- a/share/doc/psd/20.ipctut/Makefile
+++ b/share/doc/psd/20.ipctut/Makefile
@@ -7,8 +7,8 @@ MACROS=		-me
 EXTRA=		dgramread.c dgramsend.c fig2.pic fig3.pic fig8.pic pipe.c \
 		socketpair.c strchkread.c streamread.c streamwrite.c \
 		udgramread.c udgramsend.c ustreamread.c ustreamwrite.c
-USE_SOELIM=	YES
-USE_PIC=	YES
-USE_TBL=	YES
+USE_SOELIM=
+USE_PIC=
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile
index 67ceab8..67c3d6c 100644
--- a/share/doc/psd/21.ipc/Makefile
+++ b/share/doc/psd/21.ipc/Makefile
@@ -4,6 +4,6 @@
 VOLUME=		psd/21.ipc
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile
index 4d14019..4c38add 100644
--- a/share/doc/psd/22.rpcgen/Makefile
+++ b/share/doc/psd/22.rpcgen/Makefile
@@ -3,7 +3,7 @@
 VOLUME=		psd/22.rpcgen
 SRCS=		stubs rpcgen.ms
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile
index 00e15d8..77849b6 100644
--- a/share/doc/psd/23.rpc/Makefile
+++ b/share/doc/psd/23.rpc/Makefile
@@ -3,8 +3,8 @@
 VOLUME=		psd/23.rpc
 SRCS=		stubs rpc.prog.ms
 MACROS=		-ms
-USE_TBL=	YES
-USE_PIC=	YES
+USE_TBL=
+USE_PIC=
 SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile
index 2338152..878dca1 100644
--- a/share/doc/psd/24.xdr/Makefile
+++ b/share/doc/psd/24.xdr/Makefile
@@ -3,7 +3,7 @@
 VOLUME=		psd/24.xdr
 SRCS=		stubs xdr.nts.ms
 MACROS=		-ms
-USE_EQN=	YES
+USE_EQN=
 SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile
index 07e5ec1..105135e 100644
--- a/share/doc/psd/25.xdrrfc/Makefile
+++ b/share/doc/psd/25.xdrrfc/Makefile
@@ -3,7 +3,7 @@
 VOLUME=		psd/25.xdrrfc
 SRCS=		stubs xdr.rfc.ms
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile
index 233aa99..79214f1 100644
--- a/share/doc/psd/26.rpcrfc/Makefile
+++ b/share/doc/psd/26.rpcrfc/Makefile
@@ -3,7 +3,7 @@
 VOLUME=		psd/26.rpcrfc
 SRCS=		stubs rpc.rfc.ms
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile
index 3eaa6e8..5904787 100644
--- a/share/doc/psd/27.nfsrpc/Makefile
+++ b/share/doc/psd/27.nfsrpc/Makefile
@@ -3,7 +3,7 @@
 VOLUME=		psd/27.nfsrfc
 SRCS=		stubs nfs.rfc.ms
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/28.cvs/Makefile b/share/doc/psd/28.cvs/Makefile
index 92f9339..a624732 100644
--- a/share/doc/psd/28.cvs/Makefile
+++ b/share/doc/psd/28.cvs/Makefile
@@ -3,8 +3,8 @@
 VOLUME=		psd/28.cvs
 SRCS=		cvs-paper.ms
 MACROS=		-ms
-USE_PIC=	YES
-USE_TBL=	YES
+USE_PIC=
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../contrib/cvs/doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile
index 3572f4c..b2d9c30 100644
--- a/share/doc/smm/01.setup/Makefile
+++ b/share/doc/smm/01.setup/Makefile
@@ -4,6 +4,6 @@
 VOLUME=		smm/01.setup
 SRCS=		stubs 0.t 1.t 2.t 3.t 4.t 5.t 6.t
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile
index e801d6b..26ed70a 100644
--- a/share/doc/smm/02.config/Makefile
+++ b/share/doc/smm/02.config/Makefile
@@ -4,7 +4,7 @@
 VOLUME=		smm/02.config
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../usr.sbin/config/SMM.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile
index 4454d63..d63aae2 100644
--- a/share/doc/smm/05.fastfs/Makefile
+++ b/share/doc/smm/05.fastfs/Makefile
@@ -4,7 +4,7 @@
 VOLUME=		smm/05.fastfs
 SRCS=		0.t 1.t 2.t 3.t 4.t 5.t 6.t
 MACROS=		-ms
-USE_TBL=	YES
-USE_EQN=	YES
+USE_TBL=
+USE_EQN=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile
index a236647..482ed79 100644
--- a/share/doc/smm/08.sendmailop/Makefile
+++ b/share/doc/smm/08.sendmailop/Makefile
@@ -4,8 +4,8 @@
 VOLUME=		smm/08.sendmailop
 SRCS=		op.me
 MACROS=		-me
-USE_PIC=	YES
-USE_EQN=	YES
+USE_PIC=
+USE_EQN=
 SRCDIR=		${.CURDIR}/../../../../contrib/sendmail/doc/op
 
 .include <bsd.doc.mk>
diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile
index b926b87..1d9ed5c 100644
--- a/share/doc/smm/12.timed/Makefile
+++ b/share/doc/smm/12.timed/Makefile
@@ -5,8 +5,8 @@ VOLUME=		smm/12.timed
 SRCS=		timed.ms
 EXTRA=		date loop time unused
 MACROS=		-ms
-USE_SOELIM=	YES
-USE_TBL=	YES
+USE_SOELIM=
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../usr.sbin/timed/SMM.doc/timed
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile
index e917c82..d22a7b9 100644
--- a/share/doc/usd/04.csh/Makefile
+++ b/share/doc/usd/04.csh/Makefile
@@ -4,7 +4,7 @@
 VOLUME=		usd/04.csh
 SRCS=		tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
 MACROS=		-ms
-USE_SOELIM=	YES
+USE_SOELIM=
 SRCDIR=		${.CURDIR}/../../../../bin/csh/USD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile
index f858309..d5a6d3c 100644
--- a/share/doc/usd/07.mail/Makefile
+++ b/share/doc/usd/07.mail/Makefile
@@ -5,7 +5,7 @@ VOLUME=		usd/07.mail
 SRCS=		mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
 		mail7.nr mail8.nr mail9.nr maila.nr
 MACROS=		-me
-USE_TBL=	YES
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../usr.bin/mail/USD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile
index 17fbbec..143333f 100644
--- a/share/doc/usd/10.exref/summary/Makefile
+++ b/share/doc/usd/10.exref/summary/Makefile
@@ -2,6 +2,6 @@
 
 DOC=		summary
 SRCS=		ex.summary
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index ab44651..f412b62 100644
--- a/share/doc/usd/11.vitut/Makefile
+++ b/share/doc/usd/11.vitut/Makefile
@@ -4,7 +4,7 @@
 VOLUME=		usd/11.edit
 SRCS=		edittut.ms
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/edit
 
 # index for versatec is different from the one in edit.tut
diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile
index ab55a90..425536d 100644
--- a/share/doc/usd/12.vi/summary/Makefile
+++ b/share/doc/usd/12.vi/summary/Makefile
@@ -2,6 +2,6 @@
 
 DOC=		summary
 SRCS=		vi.summary
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile
index 3809036..6021b09 100644
--- a/share/doc/usd/12.vi/vi/Makefile
+++ b/share/doc/usd/12.vi/vi/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 SRCS=		vi.in vi.chars
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index ac9f088..d7bb392 100644
--- a/share/doc/usd/13.viref/Makefile
+++ b/share/doc/usd/13.viref/Makefile
@@ -7,8 +7,8 @@ EXTRA=		ex.cmd.roff ref.so set.opt.roff vi.cmd.roff
 MACROS=		-me
 CLEANFILES=	vi.ref-patched index
 TRFLAGS=	-U		# this is to hide warnings only
-USE_SOELIM=	YES
-USE_TBL=	YES
+USE_SOELIM=
+USE_TBL=
 SRCDIR=		${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/vi.ref
 
 vi.ref-patched: vi.ref
diff --git a/share/doc/usd/21.troff/Makefile b/share/doc/usd/21.troff/Makefile
index 0f9bfa2..92ed429 100644
--- a/share/doc/usd/21.troff/Makefile
+++ b/share/doc/usd/21.troff/Makefile
@@ -3,6 +3,6 @@
 
 VOLUME=		usd/21.troff
 SRCS=		m.mac m0 m0a m1 m2 m3 m4 m5 table1 table2
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/examples/Makefile b/share/examples/Makefile
index d284821..0658755 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -251,7 +251,7 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 
 BINDIR= ${SHAREDIR}/examples
 
-NOOBJ=  noobj
+NOOBJ=
 
 # Define SHARED to indicate whether you want symbolic links to the system
 # source (``symlinks''), or a separate copy (``copies''); (latter useful
diff --git a/share/examples/autofs/driver/Makefile b/share/examples/autofs/driver/Makefile
index 558af68..58e7697 100644
--- a/share/examples/autofs/driver/Makefile
+++ b/share/examples/autofs/driver/Makefile
@@ -4,7 +4,7 @@
 PROG=autodriver
 
 SRCS=		autodriver.c
-NOMAN=		YES
+NOMAN=
 WARNS=		4
 CFLAGS+=	-g
 BINDIR?=	/sbin
diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile
index 5ddabd3..f6574f8 100644
--- a/share/examples/ipfilter/Makefile
+++ b/share/examples/ipfilter/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=	noobj
+NOOBJ=
 
 FILES=	README
 
diff --git a/share/examples/isdn/v21/Makefile b/share/examples/isdn/v21/Makefile
index 5fa4f0c..0229ebe 100644
--- a/share/examples/isdn/v21/Makefile
+++ b/share/examples/isdn/v21/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		v21modem
-NOMAN=		1
+NOMAN=
 DPADD=		${LIBUTIL} ${LIBM}
 LDADD=		-lutil -lm
 CFLAGS+=	-g -Wall
diff --git a/share/examples/kld/syscall/test/Makefile b/share/examples/kld/syscall/test/Makefile
index 5968689..5f11f061 100644
--- a/share/examples/kld/syscall/test/Makefile
+++ b/share/examples/kld/syscall/test/Makefile
@@ -1,6 +1,7 @@
 # Makefile for simple caller of syscall
+# $FreeBSD$
 
 PROG  = call
-NOMAN = noman
+NOMAN =
 
 .include <bsd.prog.mk>
diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile
index 080a74d..3f06217 100644
--- a/share/examples/libvgl/Makefile
+++ b/share/examples/libvgl/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	demo
-NOMAN=	yes
+NOMAN=
 DPADD=	${LIBVGL}
 LDADD=	-lvgl
 
diff --git a/share/examples/pf/Makefile b/share/examples/pf/Makefile
index fbc655c..9abced7 100644
--- a/share/examples/pf/Makefile
+++ b/share/examples/pf/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=	noobj
+NOOBJ=
 
 FILES=	faq-example1 faq-example2 faq-example3 \
 	ackpri queue1 queue2 queue3 queue4 \
diff --git a/share/examples/ppi/Makefile b/share/examples/ppi/Makefile
index 1836d8a..7d3627e 100644
--- a/share/examples/ppi/Makefile
+++ b/share/examples/ppi/Makefile
@@ -3,6 +3,6 @@
 # $FreeBSD$
 
 PROG=	ppilcd
-NOMAN=	YES
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile
index 609dfc3..82c06f5 100644
--- a/share/examples/smbfs/Makefile
+++ b/share/examples/smbfs/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=	noobj
+NOOBJ=
 BINDIR=	/usr/share/examples/smbfs
 FILES=	dot.nsmbrc
 
diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile
index 2370801..0e465db 100644
--- a/share/examples/smbfs/print/Makefile
+++ b/share/examples/smbfs/print/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=	noobj
+NOOBJ=
 BINDIR=	/usr/share/examples/smbfs/print
 FILES=	lj6l ljspool printcap.sample tolj
 
diff --git a/share/info/Makefile b/share/info/Makefile
index 2f19ee8..024d6ce 100644
--- a/share/info/Makefile
+++ b/share/info/Makefile
@@ -1,7 +1,7 @@
 #       @(#)Makefile    8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
-NOOBJ=  noobj
+NOOBJ=
 
 .include <bsd.prog.mk>
 
diff --git a/share/misc/Makefile b/share/misc/Makefile
index 2303ddd..413b312 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -4,7 +4,7 @@
 FILES=	ascii birthtoken bsd-family-tree eqnchar flowers init.ee \
 	iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
 	scsi_modes usb_hid_usages
-NOOBJ=	noobj
+NOOBJ=
 FILESDIR=	${BINDIR}/misc
 
 .include <bsd.prog.mk>
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 7cedf1f..0a2fe21 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -10,7 +10,7 @@ FILES+=	bsd.obj.mk bsd.own.mk
 FILES+=	bsd.port.mk bsd.port.post.mk  bsd.port.pre.mk bsd.port.subdir.mk
 FILES+=	bsd.prog.mk bsd.subdir.mk bsd.sys.mk
 FILES+=	sys.mk
-NOOBJ=	noobj
+NOOBJ=
 FILESDIR=	${BINDIR}/mk
 
 .include <bsd.prog.mk>
diff --git a/share/security/Makefile b/share/security/Makefile
index 0484e0d..8303eea 100644
--- a/share/security/Makefile
+++ b/share/security/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 FILES=	lomac-policy.contexts
-NOOBJ=	noobj
+NOOBJ=
 FILESDIR=	${BINDIR}/security
 
 .include "${.CURDIR}/../Makefile.inc"
diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile
index 9574e68..2b4a9d1 100644
--- a/share/sendmail/Makefile
+++ b/share/sendmail/Makefile
@@ -9,7 +9,7 @@ CFFILES!=	(cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type
 
 DDIR=	${DESTDIR}/usr/share/sendmail
 
-NOOBJ=	noobj
+NOOBJ=
 
 # Define SHARED to indicate whether you want symbolic links to the system
 # source (``symlinks''), or a separate copy (``copies'')
diff --git a/share/skel/Makefile b/share/skel/Makefile
index 1626964..0422a87 100644
--- a/share/skel/Makefile
+++ b/share/skel/Makefile
@@ -9,6 +9,6 @@ FILES1DIR=	/usr/share/skel
 FILES2DIR=	/usr/share/skel
 FILES1MODE=	0644
 FILES2MODE=	0600
-NOOBJ=		noobj
+NOOBJ=
 
 .include <bsd.prog.mk>
diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile
index c7aad2d..e79dbc0 100644
--- a/share/snmp/mibs/Makefile
+++ b/share/snmp/mibs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 FILES=	FREEBSD-MIB.txt
-NOOBJ=	noobj
+NOOBJ=
 FILESDIR=	${SHAREDIR}/snmp/mibs
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index 44db821..534630d 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -32,6 +32,6 @@ FILES=	armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
 
 FILESDIR= ${SHAREDIR}/syscons/fonts
 
-NOOBJ=	noobj
+NOOBJ=
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index 5a189e4..aa7d1ca 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -45,6 +45,6 @@ FILES=	INDEX.keymaps \
 
 FILESDIR= ${SHAREDIR}/syscons/keymaps
 
-NOOBJ=	noobj
+NOOBJ=
 
 .include <bsd.prog.mk>