Start the dreaded NOFOO -> NO_FOO conversion.

OK'ed by:	core

34 files changed, 64 insertions, 47 deletions

diff --git a/share/dict/Makefile b/share/dict/Makefile
index cf3c9b5..d9e455d 100644
--- a/share/dict/Makefile
+++ b/share/dict/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 # XXX MISSING:	connectives words
 FILES=		README propernames web2 web2a freebsd
diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile
index ed5dce0..62e160c 100644
--- a/share/doc/IPv6/Makefile
+++ b/share/doc/IPv6/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 FILES=		IMPLEMENTATION
 FILESDIR=	${SHAREDIR}/doc/IPv6
 
diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile
index af8cf9a..89d8981 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=
+NO_OBJ=
 
 FILESGROUPS=	TOP ARM MISC
 TOP=		CHANGES COPYRIGHT FAQ KNOWN_DEFECTS README
diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile
index 69dc00b..fcfc6b3 100644
--- a/share/examples/FreeBSD_version/Makefile
+++ b/share/examples/FreeBSD_version/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	FreeBSD_version
-NOMAN=
+NO_MAN=
 
 install:
 
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 0658755..524d38b 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -251,7 +251,7 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 
 BINDIR= ${SHAREDIR}/examples
 
-NOOBJ=
+NO_OBJ=
 
 # 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 58e7697..7a0f159 100644
--- a/share/examples/autofs/driver/Makefile
+++ b/share/examples/autofs/driver/Makefile
@@ -4,7 +4,7 @@
 PROG=autodriver
 
 SRCS=		autodriver.c
-NOMAN=
+NO_MAN=
 WARNS=		4
 CFLAGS+=	-g
 BINDIR?=	/sbin
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index ad74d37..86cb3cd 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -128,7 +128,7 @@
 #NOLIBTHR=		# do not build libthr (1:1 threading library)
 #NO_LPR=		# do not build lpr and related programs
 #NO_MAILWRAPPER=	# do not build the mailwrapper(8) MTA selector
-#NOMAN=			# do not build manual pages
+#NO_MAN=			# do not build manual pages
 #NO_MODULES=		# do not build modules with the kernel
 #NO_NIS=		# do not build NIS support and related programs
 #NO_OBJC=		# do not build Objective C support
@@ -183,7 +183,7 @@
 # If you do not want unformatted manual pages to be compressed
 # when they are installed:
 #
-#NOMANCOMPRESS=
+#NO_MANCOMPRESS=
 #
 #
 # Default format for system documentation, depends on your printer.
diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile
index 184c641..ac6de9c 100644
--- a/share/examples/find_interface/Makefile
+++ b/share/examples/find_interface/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 PROG=	find_interface
-NOMAN=
+NO_MAN=
 
 .include <bsd.prog.mk>
diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile
index f6574f8..4826dac 100644
--- a/share/examples/ipfilter/Makefile
+++ b/share/examples/ipfilter/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 FILES=	README
 
diff --git a/share/examples/isdn/v21/Makefile b/share/examples/isdn/v21/Makefile
index 0229ebe..261cec1 100644
--- a/share/examples/isdn/v21/Makefile
+++ b/share/examples/isdn/v21/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		v21modem
-NOMAN=
+NO_MAN=
 DPADD=		${LIBUTIL} ${LIBM}
 LDADD=		-lutil -lm
 CFLAGS+=	-g -Wall
diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile
index ac228f9..333cdcb 100644
--- a/share/examples/kld/cdev/test/Makefile
+++ b/share/examples/kld/cdev/test/Makefile
@@ -67,7 +67,7 @@
 # $FreeBSD$
 #
 PROG=	testcdev
-NOMAN=
+NO_MAN=
 
 MODSTAT= /sbin/kldstat
 
diff --git a/share/examples/kld/syscall/test/Makefile b/share/examples/kld/syscall/test/Makefile
index 5f11f061..c02d89d 100644
--- a/share/examples/kld/syscall/test/Makefile
+++ b/share/examples/kld/syscall/test/Makefile
@@ -2,6 +2,6 @@
 # $FreeBSD$
 
 PROG  = call
-NOMAN =
+NO_MAN =
 
 .include <bsd.prog.mk>
diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile
index 3f06217..6b4e916 100644
--- a/share/examples/libvgl/Makefile
+++ b/share/examples/libvgl/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	demo
-NOMAN=
+NO_MAN=
 DPADD=	${LIBVGL}
 LDADD=	-lvgl
 
diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile
index e1e7e9f..de59b9e 100644
--- a/share/examples/perfmon/Makefile
+++ b/share/examples/perfmon/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	perfmon
-NOMAN=
+NO_MAN=
 
 install:
 
diff --git a/share/examples/pf/Makefile b/share/examples/pf/Makefile
index 9abced7..9eabea1 100644
--- a/share/examples/pf/Makefile
+++ b/share/examples/pf/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 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 7d3627e..9b0d0d5 100644
--- a/share/examples/ppi/Makefile
+++ b/share/examples/ppi/Makefile
@@ -3,6 +3,6 @@
 # $FreeBSD$
 
 PROG=	ppilcd
-NOMAN=
+NO_MAN=
 
 .include <bsd.prog.mk>
diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile
index 82c06f5..9e5b99a 100644
--- a/share/examples/smbfs/Makefile
+++ b/share/examples/smbfs/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 BINDIR=	/usr/share/examples/smbfs
 FILES=	dot.nsmbrc
 
diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile
index 0e465db..eb66815 100644
--- a/share/examples/smbfs/print/Makefile
+++ b/share/examples/smbfs/print/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 BINDIR=	/usr/share/examples/smbfs/print
 FILES=	lj6l ljspool printcap.sample tolj
 
diff --git a/share/info/Makefile b/share/info/Makefile
index 024d6ce..0110e02 100644
--- a/share/info/Makefile
+++ b/share/info/Makefile
@@ -1,7 +1,7 @@
 #       @(#)Makefile    8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 .include <bsd.prog.mk>
 
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 6f2a984..03f32c4 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -488,7 +488,7 @@ and related programs.
 Set to not build the
 .Xr mailwrapper 8
 MTA selector.
-.It Va NOMAN
+.It Va NO_MAN
 .Pq Vt bool
 Set to not build manual pages.
 .It Va NO_NIS
@@ -564,7 +564,7 @@ Set to not build the
 .Nm libthr
 (1:1 threading)
 library.
-.It Va NOMANCOMPRESS
+.It Va NO_MANCOMPRESS
 .Pq Vt bool
 Set to install man pages uncompressed.
 .It Va NOPROFILE
diff --git a/share/misc/Makefile b/share/misc/Makefile
index 413b312..975fe76 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=
+NO_OBJ=
 FILESDIR=	${BINDIR}/misc
 
 .include <bsd.prog.mk>
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 0a2fe21..326048e 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -2,7 +2,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 FILES=	bsd.README
-FILES+=	bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk
+FILES+=	bsd.compat.mk bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk
 FILES+=	bsd.incs.mk bsd.info.mk bsd.init.mk
 FILES+=	bsd.kmod.mk
 FILES+=	bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk
@@ -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=
+NO_OBJ=
 FILESDIR=	${BINDIR}/mk
 
 .include <bsd.prog.mk>
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 521f8ac..d8754f1 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -308,7 +308,7 @@ To build foo from foo.c with a manual page foo.2, add the line:
 
 If foo does not have a manual page at all, add the line:
 
-	NOMAN=	noman
+	NO_MAN=	noman
 
 If foo has multiple source files, add the line:
 
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
new file mode 100644
index 0000000..4f02df09
--- /dev/null
+++ b/share/mk/bsd.compat.mk
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+.if !defined(BURN_BRIDGES)
+.for oldnew in \
+	NOMAN:NO_MAN \
+	NOMANCOMPRESS:NO_MANCOMPRESS \
+	NOOBJ:NO_OBJ
+.for old in ${oldnew:C/:.*//}
+.for new in ${oldnew:C/.*://}
+.if defined(${old}) && !defined(${new})
+.warning ${old} is deprecated in favor of ${new}
+${new}=	${${old}}
+.endif
+.endfor
+.endfor
+.endfor
+.endif
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 8e4239e..5b98da7 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -170,7 +170,7 @@ ${LINTLIB}: ${LINTOBJS}
 
 all: ${_LIBS}
 
-.if !defined(NOMAN)
+.if !defined(NO_MAN)
 all: _manpages
 .endif
 
@@ -246,7 +246,7 @@ _libinstall:
 .include <bsd.incs.mk>
 .include <bsd.links.mk>
 
-.if !defined(NOMAN)
+.if !defined(NO_MAN)
 realinstall: _maninstall
 .ORDER: beforeinstall _maninstall
 .endif
@@ -258,7 +258,7 @@ lint: ${SRCS:M*.c}
 	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}
 .endif
 
-.if !defined(NOMAN)
+.if !defined(NO_MAN)
 .include <bsd.man.mk>
 .endif
 
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 4a06c58..e10efff 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -30,7 +30,7 @@
 #		second, and there may be multiple pairs. The files 
 #		are hard-linked.
 #
-# NOMANCOMPRESS	If you do not want unformatted manual pages to be 
+# NO_MANCOMPRESS	If you do not want unformatted manual pages to be 
 #		compressed when they are installed. [not set]
 #
 # NOMLINKS	If you do not want install manual page links. [not set]
@@ -77,10 +77,10 @@ MAN+=	${MAN${sect}}
 _manpages:
 all-man: _manpages
 
-.if defined(NOMANCOMPRESS)
+.if defined(NO_MANCOMPRESS)
 
 # Make special arrangements to filter to a temporary file at build time
-# for NOMANCOMPRESS.
+# for NO_MANCOMPRESS.
 .if defined(MANFILTER)
 FILTEXTENSION=		.filt
 .else
@@ -162,7 +162,7 @@ maninstall: _maninstall
 _maninstall:
 .if defined(MAN) && !empty(MAN)
 _maninstall: ${MAN}
-.if defined(NOMANCOMPRESS)
+.if defined(NO_MANCOMPRESS)
 .if defined(MANFILTER)
 .for page in ${MAN}
 	${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 40735ae..40c676b 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -23,7 +23,7 @@
 #
 #		E.g. use `env MAKEOBJDIRPREFIX=/somewhere/obj make'
 #
-# NOOBJ		Do not create object directories.  This should not be set
+# NO_OBJ	Do not create object directories.  This should not be set
 #		if anything is built.
 #
 # +++ targets +++
@@ -65,7 +65,7 @@ CANONICALOBJDIR:=/usr/obj${.CURDIR}
 # issue a warning differentiating between cases 6 and (3 or 4).
 #
 objwarn:
-.if !defined(NOOBJ) && ${.OBJDIR} != ${CANONICALOBJDIR} && \
+.if !defined(NO_OBJ) && ${.OBJDIR} != ${CANONICALOBJDIR} && \
     !(defined(MAKEOBJDIRPREFIX) && exists(${CANONICALOBJDIR}/)) && \
     !(defined(MAKEOBJDIR) && exists(${MAKEOBJDIR}/))
 .if ${.OBJDIR} == ${.CURDIR}
@@ -76,7 +76,7 @@ objwarn:
 .endif
 .endif
 
-.if !defined(NOOBJ)
+.if !defined(NO_OBJ)
 .if !target(obj)
 obj: .PHONY
 	@if ! test -d ${CANONICALOBJDIR}/; then \
@@ -98,7 +98,7 @@ objlink:
 		echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \
 	fi
 .endif
-.endif !defined(NOOBJ)
+.endif !defined(NO_OBJ)
 
 #
 # where would that obj directory be?
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index a37e179..5d08816 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -74,7 +74,7 @@ ${PROG}: ${OBJS}
 
 .endif
 
-.if	!defined(NOMAN) && !defined(MAN) && \
+.if	!defined(NO_MAN) && !defined(MAN) && \
 	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
 	!defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
 	!defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \
@@ -85,7 +85,7 @@ MAN1=	${MAN}
 .endif
 
 all: objwarn ${PROG} ${SCRIPTS}
-.if !defined(NOMAN)
+.if !defined(NO_MAN)
 all: _manpages
 .endif
 
@@ -177,7 +177,7 @@ NLSNAME?=	${PROG}
 .include <bsd.incs.mk>
 .include <bsd.links.mk>
 
-.if !defined(NOMAN)
+.if !defined(NO_MAN)
 realinstall: _maninstall
 .ORDER: beforeinstall _maninstall
 .endif
@@ -191,7 +191,7 @@ lint: ${SRCS:M*.c}
 .endif
 .endif
 
-.if !defined(NOMAN)
+.if !defined(NO_MAN)
 .include <bsd.man.mk>
 .endif
 
diff --git a/share/security/Makefile b/share/security/Makefile
index 8303eea..c25a52d 100644
--- a/share/security/Makefile
+++ b/share/security/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 FILES=	lomac-policy.contexts
-NOOBJ=
+NO_OBJ=
 FILESDIR=	${BINDIR}/security
 
 .include "${.CURDIR}/../Makefile.inc"
diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile
index 2b4a9d1..ef5fd38 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=
+NO_OBJ=
 
 # 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 0422a87..ffe8015 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=
+NO_OBJ=
 
 .include <bsd.prog.mk>
diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile
index e79dbc0..8de73c9 100644
--- a/share/snmp/mibs/Makefile
+++ b/share/snmp/mibs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 FILES=	FREEBSD-MIB.txt
-NOOBJ=
+NO_OBJ=
 FILESDIR=	${SHAREDIR}/snmp/mibs
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index 534630d..e915309 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=
+NO_OBJ=
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index aa7d1ca..d803988 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -45,6 +45,6 @@ FILES=	INDEX.keymaps \
 
 FILESDIR= ${SHAREDIR}/syscons/keymaps
 
-NOOBJ=
+NO_OBJ=
 
 .include <bsd.prog.mk>