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

any fake value.

40 files changed, 45 insertions, 41 deletions

diff --git a/tools/diag/dumpvfscache/Makefile b/tools/diag/dumpvfscache/Makefile
index 14cd360..312bec3 100644
--- a/tools/diag/dumpvfscache/Makefile
+++ b/tools/diag/dumpvfscache/Makefile
@@ -4,7 +4,7 @@ PROG=	dumpvfscache
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 
-NOMAN=	1
+NOMAN=
 
 test:	${PROG}
 	./${PROG} > a
diff --git a/tools/diag/localeck/Makefile b/tools/diag/localeck/Makefile
index 2136e30..a09e400 100644
--- a/tools/diag/localeck/Makefile
+++ b/tools/diag/localeck/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	localeck
-NOMAN=	noman
+NOMAN=
 WARNS?=	4
 
 LOCALEDIR?= /usr/share/locale
diff --git a/tools/regression/fsx/Makefile b/tools/regression/fsx/Makefile
index c459487..45dc649 100644
--- a/tools/regression/fsx/Makefile
+++ b/tools/regression/fsx/Makefile
@@ -2,6 +2,6 @@
 
 PROG=	fsx
 
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile
index 2166aee..c8b1e18f 100644
--- a/tools/regression/gaithrstress/Makefile
+++ b/tools/regression/gaithrstress/Makefile
@@ -3,5 +3,5 @@
 PROG=	gaithrstress
 LDADD+=	-pthread
 
-NOMAN=	yes
+NOMAN=
 .include <bsd.prog.mk>
diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile
index e4ac676..8cd1661 100644
--- a/tools/regression/geom/ConfCmp/Makefile
+++ b/tools/regression/geom/ConfCmp/Makefile
@@ -6,7 +6,7 @@ SRCS+=	subr_sbuf.c
 
 .PATH:	../../../../sys/kern
 
-NOOBJ=	youbet
+NOOBJ=
 WARNS?=	5
 CFLAGS+=	 -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -static
 # Uncomment for ElectricFence
@@ -15,7 +15,7 @@ CFLAGS+=	 -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -
 DPADD += ${LIBBSDXML}
 LDADD += -lbsdxml
 
-NOMAN=	yeah
+NOMAN=
 CLEANFILES	+= _*
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile
index ef8972c..57fd8f1 100644
--- a/tools/regression/geom/MdLoad/Makefile
+++ b/tools/regression/geom/MdLoad/Makefile
@@ -4,7 +4,7 @@ PROG=	MdLoad
 DPADD=	${LIBSBUF} ${LIBBSDXML}
 LDADD=	-lsbuf -lbsdxml
 
-NOMAN=	sorry
+NOMAN=
 
 
 WARNS?=	4
diff --git a/tools/regression/ia64_unaligned/Makefile b/tools/regression/ia64_unaligned/Makefile
index a5f1107..de17b19 100644
--- a/tools/regression/ia64_unaligned/Makefile
+++ b/tools/regression/ia64_unaligned/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 PROG= unaligned
-NOMAN= t
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/include/tgmath/Makefile b/tools/regression/include/tgmath/Makefile
index 16dcb59..3ed7480 100644
--- a/tools/regression/include/tgmath/Makefile
+++ b/tools/regression/include/tgmath/Makefile
@@ -2,6 +2,6 @@
 
 PROG=	tgmath
 CFLAGS+= -fno-builtin -std=c99
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/netatalk/simple_send/Makefile b/tools/regression/netatalk/simple_send/Makefile
index 54e486f..9fa445c 100644
--- a/tools/regression/netatalk/simple_send/Makefile
+++ b/tools/regression/netatalk/simple_send/Makefile
@@ -3,6 +3,6 @@
 #
 
 PROG=	simple_send
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/netinet/ipsockopt/Makefile b/tools/regression/netinet/ipsockopt/Makefile
index 25af26a..dd83aa9 100644
--- a/tools/regression/netinet/ipsockopt/Makefile
+++ b/tools/regression/netinet/ipsockopt/Makefile
@@ -3,6 +3,6 @@
 #
 
 PROG=	ipsockopt
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/netinet/tcpconnect/Makefile b/tools/regression/netinet/tcpconnect/Makefile
index abc9535..9d5a8d9 100644
--- a/tools/regression/netinet/tcpconnect/Makefile
+++ b/tools/regression/netinet/tcpconnect/Makefile
@@ -3,6 +3,6 @@
 #
 
 PROG=	tcpconnect
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/netinet/tcpstream/Makefile b/tools/regression/netinet/tcpstream/Makefile
index 296eebb..0da68d9 100644
--- a/tools/regression/netinet/tcpstream/Makefile
+++ b/tools/regression/netinet/tcpstream/Makefile
@@ -4,6 +4,6 @@
 
 CFLAGS+=	-Wall
 PROG=	tcpstream
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/nfsmmap/test1/Makefile b/tools/regression/nfsmmap/test1/Makefile
index 54a7b9d..e18acbe 100644
--- a/tools/regression/nfsmmap/test1/Makefile
+++ b/tools/regression/nfsmmap/test1/Makefile
@@ -1,5 +1,7 @@
+# $FreeBSD$
+
 PROG= test1
-NOMAN= t
+NOMAN=
 NFSSERVER?= herring.nlsystems.com
 CLEANFILES= test1.zeros test1.good test1.data test1.scratch
 
diff --git a/tools/regression/nfsmmap/test2/Makefile b/tools/regression/nfsmmap/test2/Makefile
index 460c0b2..6b5ed59 100644
--- a/tools/regression/nfsmmap/test2/Makefile
+++ b/tools/regression/nfsmmap/test2/Makefile
@@ -1,5 +1,7 @@
+# $FreeBSD$
+
 PROG= test2
-NOMAN= t
+NOMAN=
 NFSSERVER?= herring.nlsystems.com
 CLEANFILES= test2.zeros test2.good test2.data test2.scratch
 
diff --git a/tools/regression/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile
index f19516d..d137245 100644
--- a/tools/regression/p1003_1b/Makefile
+++ b/tools/regression/p1003_1b/Makefile
@@ -11,7 +11,7 @@ SRCS=\
 	sched.c \
 	yield.c
 
-NOMAN=1
+NOMAN=
 
 CFLAGS+=-DNO_MEMLOCK
 .include <bsd.prog.mk>
diff --git a/tools/regression/pipe/Makefile b/tools/regression/pipe/Makefile
index ff9f501..9d22373 100644
--- a/tools/regression/pipe/Makefile
+++ b/tools/regression/pipe/Makefile
@@ -4,7 +4,7 @@
 # "make" then "make regress".
 #
 PROG=	bigpipetest
-NOMAN=	yes
+NOMAN=
 
 regress:
 	@if ./bigpipetest; then \
diff --git a/tools/regression/security/access/Makefile b/tools/regression/security/access/Makefile
index 4b8039f..16e796f 100644
--- a/tools/regression/security/access/Makefile
+++ b/tools/regression/security/access/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	testaccess
-NOMAN=	yes
+NOMAN=
 
 SRCS=	testaccess.c
 CFLAGS	+= -Wall
diff --git a/tools/regression/security/proc_to_proc/Makefile b/tools/regression/security/proc_to_proc/Makefile
index 65323f4..3950943 100644
--- a/tools/regression/security/proc_to_proc/Makefile
+++ b/tools/regression/security/proc_to_proc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	testuid
-NOMAN=	yes
+NOMAN=
 
 ADDITIONAL_FLAGS=-DSETSUGID_SUPPORTED
 #ADDITIONAL_FLAGS=	-DSETSUGID_SUPPORTED_BUT_NO_LIBC_STUB
diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile
index 69ac015..7512f89 100644
--- a/tools/regression/sockets/accept_fd_leak/Makefile
+++ b/tools/regression/sockets/accept_fd_leak/Makefile
@@ -3,7 +3,7 @@
 #
 
 PROG=	accept_fd_leak
-NOMAN=	yes
+NOMAN=
 
 regress:
 	./accept_fd_leak
diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile
index 66ae99a..0110cbb 100644
--- a/tools/regression/sockets/accf_data_attach/Makefile
+++ b/tools/regression/sockets/accf_data_attach/Makefile
@@ -3,7 +3,7 @@
 #
 
 PROG=	accf_data_attach
-NOMAN=	yes
+NOMAN=
 
 accf_data_attach: accf_data_attach.c
 	gcc -Wall -o accf_data_attach accf_data_attach.c
diff --git a/tools/regression/sockets/socketpair/Makefile b/tools/regression/sockets/socketpair/Makefile
index bf389c9..2c51e89 100644
--- a/tools/regression/sockets/socketpair/Makefile
+++ b/tools/regression/sockets/socketpair/Makefile
@@ -3,7 +3,7 @@
 #
 
 PROG=	socketpair
-NOMAN=	yes
+NOMAN=
 
 socketpair: socketpair.c
 	gcc -Wall -o socketpair socketpair.c
diff --git a/tools/regression/sysvmsg/Makefile b/tools/regression/sysvmsg/Makefile
index 45f7b72..ec23650 100644
--- a/tools/regression/sysvmsg/Makefile
+++ b/tools/regression/sysvmsg/Makefile
@@ -3,7 +3,7 @@
 # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:56:59 thorpej Exp $
 
 PROG=	msgtest
-NOMAN=	yes
+NOMAN=
 
 regress:
 	@if ./msgtest ./msgtest; then \
diff --git a/tools/regression/sysvsem/Makefile b/tools/regression/sysvsem/Makefile
index f5a3726..4426ccc 100644
--- a/tools/regression/sysvsem/Makefile
+++ b/tools/regression/sysvsem/Makefile
@@ -3,7 +3,7 @@
 # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $
 
 PROG=	semtest
-NOMAN=	yes
+NOMAN=
 
 regress:
 	@if ./semtest ./semtest; then \
diff --git a/tools/regression/sysvshm/Makefile b/tools/regression/sysvshm/Makefile
index 9905385..d34b203 100644
--- a/tools/regression/sysvshm/Makefile
+++ b/tools/regression/sysvshm/Makefile
@@ -3,7 +3,7 @@
 # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $
 
 PROG=	shmtest
-NOMAN=	yes
+NOMAN=
 
 regress:
 	@if ./shmtest ./shmtest; then \
diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile
index b3fe79e..c3c853d 100644
--- a/tools/regression/tls/libxx/Makefile
+++ b/tools/regression/tls/libxx/Makefile
@@ -5,6 +5,6 @@ SHLIB_MAJOR=	1
 
 SRCS=	xx.c
 #CFLAGS+=-mtls-dialect=sun
-NOMAN=	t
+NOMAN=
 
 .include <bsd.lib.mk>
diff --git a/tools/regression/tls/libyy/Makefile b/tools/regression/tls/libyy/Makefile
index c425977..e9627e4 100644
--- a/tools/regression/tls/libyy/Makefile
+++ b/tools/regression/tls/libyy/Makefile
@@ -5,6 +5,6 @@ SHLIB_MAJOR=	1
 
 SRCS=	yy.c
 CFLAGS+=-fpic
-NOMAN=	t
+NOMAN=
 
 .include <bsd.lib.mk>
diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile
index 86ed613..5a5e58a 100644
--- a/tools/regression/tls/ttls1/Makefile
+++ b/tools/regression/tls/ttls1/Makefile
@@ -3,7 +3,7 @@
 PROG=	ttls1
 LDADD+=	-L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx
 LDADD+=	-L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy
-NOMAN=	t
+NOMAN=
 DEBUG_FLAGS= -g
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile
index 63b5d07..ba348a4 100644
--- a/tools/regression/tls/ttls2/Makefile
+++ b/tools/regression/tls/ttls2/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	ttls2
 LDADD+= -lpthread
-NOMAN=	t
+NOMAN=
 DEBUG_FLAGS= -g
 
 .include <bsd.prog.mk>
diff --git a/tools/test/malloc/Makefile b/tools/test/malloc/Makefile
index 6637ab1..7487815 100644
--- a/tools/test/malloc/Makefile
+++ b/tools/test/malloc/Makefile
@@ -3,7 +3,7 @@ PROG=	malloc
 SRCS=	main.c
 .PATH:	${.CURDIR}/../../../lib/libc/stdlib
 
-NOMAN=	sorry
+NOMAN=
 
 test:	malloc
 	@echo
diff --git a/tools/test/ppsapi/Makefile b/tools/test/ppsapi/Makefile
index e9670fe..99d29f5 100644
--- a/tools/test/ppsapi/Makefile
+++ b/tools/test/ppsapi/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	ppsapitest
-NOMAN=	yeah
+NOMAN=
 
 WARNS?=	5
 
diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile
index 4267b72..337cc31 100644
--- a/tools/tools/aac/Makefile
+++ b/tools/tools/aac/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	aac_checkq
-NOMAN=	sorry
+NOMAN=
 BINDIR?=/usr/local/bin
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/gdb_regofs/Makefile b/tools/tools/gdb_regofs/Makefile
index 28b62a6..b439650 100644
--- a/tools/tools/gdb_regofs/Makefile
+++ b/tools/tools/gdb_regofs/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 PROG=gdb_regofs
 SRCS=${MACHINE_ARCH}.c
-NOMAN=yes
+NOMAN=
 .include <bsd.prog.mk>
diff --git a/tools/tools/ministat/Makefile b/tools/tools/ministat/Makefile
index 17e26c2..547e4bc 100644
--- a/tools/tools/ministat/Makefile
+++ b/tools/tools/ministat/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 PROG=	ministat
-NOMAN=	yes
+NOMAN=
 DPADD=	${LIBM}
 LDADD=	-lm
 
diff --git a/tools/tools/netrate/netblast/Makefile b/tools/tools/netrate/netblast/Makefile
index 910fa63..0f5afc9 100644
--- a/tools/tools/netrate/netblast/Makefile
+++ b/tools/tools/netrate/netblast/Makefile
@@ -3,6 +3,6 @@
 #
 
 PROG=	netblast
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/netrate/netreceive/Makefile b/tools/tools/netrate/netreceive/Makefile
index 998ad0b..f3bb15a 100644
--- a/tools/tools/netrate/netreceive/Makefile
+++ b/tools/tools/netrate/netreceive/Makefile
@@ -3,6 +3,6 @@
 #
 
 PROG=	netreceive
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/netrate/netsend/Makefile b/tools/tools/netrate/netsend/Makefile
index a26b629..3225f09 100644
--- a/tools/tools/netrate/netsend/Makefile
+++ b/tools/tools/netrate/netsend/Makefile
@@ -4,6 +4,6 @@
 
 CFLAGS+=	-Wall
 PROG=	netsend
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/pirtool/Makefile b/tools/tools/pirtool/Makefile
index 1087143..a799952 100644
--- a/tools/tools/pirtool/Makefile
+++ b/tools/tools/pirtool/Makefile
@@ -2,6 +2,6 @@
 
 PROG=   pirtool
 SRCS=   pirtool.c
-NOMAN=  defined
+NOMAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/raidtest/Makefile b/tools/tools/raidtest/Makefile
index e629f82..c46cc62 100644
--- a/tools/tools/raidtest/Makefile
+++ b/tools/tools/raidtest/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	raidtest
-NOMAN=	true
+NOMAN=
 WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/recoverdisk/Makefile b/tools/tools/recoverdisk/Makefile
index f667aec..a3a578d 100644
--- a/tools/tools/recoverdisk/Makefile
+++ b/tools/tools/recoverdisk/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	recoverdisk
 
-NOMAN=1
+NOMAN=
 
 WARNS?=	5
 
diff --git a/tools/tools/syscall_timing/Makefile b/tools/tools/syscall_timing/Makefile
index 0ebdb0e..4f8f663 100644
--- a/tools/tools/syscall_timing/Makefile
+++ b/tools/tools/syscall_timing/Makefile
@@ -4,6 +4,6 @@
 
 PROG=	syscall_timing
 CFLAGS+=	-static -O
-NOMAN=	yes
+NOMAN=
 
 .include <bsd.prog.mk>