Start the dreaded NOFOO -> NO_FOO conversion.

OK'ed by:	core

Makefile

@@ -232,7 +232,7 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MAKEPATH} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 MMAKE=		${MMAKEENV} make \
 		-D_UPGRADING \
-		-DNOMAN -DNOSHARED \
+		-DNOMAN -DNO_MAN -DNOSHARED \
 		-DNO_CPU_CFLAGS -DNO_WERROR
 
 make: .PHONY

Makefile.inc1

@@ -8,7 +8,7 @@
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNOCLEAN do not clean at all
 #	-DNOCRYPT will prevent building of crypt versions
-#	-DNOMAN do not build the manual pages
+#	-DNO_MAN do not build the manual pages
 #	-DNOPROFILE do not build profiled libraries
 #	-DNOGAMES do not go into games subdir
 #	-DNOSHARE do not go into share subdir
@@ -182,7 +182,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
-		-DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \
+		-DNOHTML -DNOINFO -DNOLINT -DNO_MAN -DNOPIC -DNOPROFILE \
 		-DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS
 
 # build-tools stage
@@ -231,7 +231,7 @@ LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		SHLIBDIR=/usr/lib32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-		-DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \
+		-DNO_BIND -DNO_MAN -DNODOC -DNOINFO -DNOHTML \
 		CC="cc ${LIB32CC}" \
 		CXX="c++ ${LIB32CXX}" \
 		OBJC="cc ${LIB32OBJC}" \
@@ -364,7 +364,7 @@ _libraries:
 	@echo ">>> stage 4.2: building libraries"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
-	    ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPROFILE \
+	    ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNO_MAN -DNOPROFILE \
 	    libraries
 _depend:
 	@echo

etc/Makefile

@@ -65,7 +65,7 @@ ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
 FREEBSD=COPYRIGHT
 
 afterinstall:
-.if !defined(NOMAN)
+.if !defined(NO_MAN)
 	cd ${.CURDIR}/../share/man; ${MAKE} makedb
 .endif
 

etc/defaults/Makefile

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

etc/isdn/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 SCRIPTS=	answer			\
 		isdntel.sh		\

etc/mtree/Makefile

@@ -17,7 +17,7 @@ _BIND.include.dist=	BIND.include.dist
 .endif
 .endif
 
-NOOBJ=
+NO_OBJ=
 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=
+NO_OBJ=
 FILESDIR= /etc/namedb
 FILESMODE= 644
 

etc/pam.d/Makefile

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

etc/periodic/Makefile.inc

@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 BINDIR=	/etc/periodic/${.CURDIR:T}
-NOOBJ=
+NO_OBJ=
 FILESMODE= 755

games/fortune/unstr/Makefile

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

games/ppt/Makefile

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

games/primes/Makefile

@@ -3,7 +3,7 @@
 
 PROG=	primes
 SRCS=	pattern.c pr_tbl.c primes.c
-NOMAN=
+NO_MAN=
 DPADD=	${LIBM}
 LDADD=	-lm
 

gnu/lib/libobjc/Makefile

@@ -6,7 +6,7 @@ GCCDIR=	${.CURDIR}/../../../contrib/gcc
 .PATH: ${OBJCDIR}/objc ${OBJCDIR}
 
 LIB=    objc
-NOMAN=
+NO_MAN=
 .if ${MACHINE_ARCH} == "amd64"
 SHLIB_MAJOR= 1
 .else

gnu/usr.bin/binutils/gdbreplay/Makefile

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

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=
+NO_MAN=
 
 DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}

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

@@ -6,7 +6,7 @@
 
 PROG=	c++filt
 SRCS=	cp-demangle.c
-NOMAN=
+NO_MAN=
 
 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=
+NO_MAN=
 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=
+NO_MAN=
 NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/objc -I.

gnu/usr.bin/cc/cc1plus/Makefile

@@ -12,7 +12,7 @@ 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=
+NO_MAN=
 NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/cp -I.

gnu/usr.bin/cc/collect2/Makefile

@@ -6,6 +6,6 @@
 
 PROG=	collect2
 SRCS=	collect2.c tlink.c version.c
-NOMAN=
+NO_MAN=
 
 .include <bsd.prog.mk>

gnu/usr.bin/cc/f771/Makefile

@@ -10,7 +10,7 @@ SRCS=	bad.c bit.c bld.c com.c data.c equiv.c expr.c global.c implic.c info.c \
 	stb.c stc.c std.c ste.c storag.c stp.c str.c sts.c stt.c stu.c stv.c \
 	stw.c symbol.c target.c top.c type.c where.c main.c
 BINDIR=	/usr/libexec
-NOMAN=
+NO_MAN=
 
 CFLAGS+= -I${GCCDIR}/f -I.
 

gnu/usr.bin/cc/include/Makefile

@@ -14,7 +14,7 @@ INCS=	mmintrin.h
 INCS=	ppc-asm.h altivec.h spe.h
 .endif
 
-NOOBJ=
+NO_OBJ=
 
 .include <bsd.init.mk>
 .include <bsd.incs.mk>

gnu/usr.bin/cc/protoize/Makefile

@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../cc_tools ${GCCDIR}
 
 PROG=	protoize
-NOMAN=
+NO_MAN=
 
 # things are rather hard-coded, we work around that here
 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"\"

gnu/usr.bin/dialog/TESTS/Makefile

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

gnu/usr.bin/gdb/Makefile.inc

@@ -43,7 +43,7 @@ GENSRCS+= nm.h tm.h
 .if defined(GDB_CROSS_DEBUGGER)
 CFLAGS+= -DCROSS_DEBUGGER
 GDB_SUFFIX= -${TARGET_ARCH}
-NOMAN=
+NO_MAN=
 .endif
 
 .include "${TARGET_SUBDIR}/Makefile"

gnu/usr.bin/gdb/gdbtui/Makefile

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

gnu/usr.bin/groff/font/devX100-12/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 .include "../Makefile.inc"
 .include "${DIST_DIR}/Makefile.sub"

gnu/usr.bin/groff/font/devX100/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 .include "../Makefile.inc"
 .include "${DIST_DIR}/Makefile.sub"

gnu/usr.bin/groff/font/devX75-12/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 .include "../Makefile.inc"
 .include "${DIST_DIR}/Makefile.sub"

gnu/usr.bin/groff/font/devX75/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 .include "../Makefile.inc"
 .include "${DIST_DIR}/Makefile.sub"

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=
+NO_MAN=
 
 .include <bsd.prog.mk>

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=
+NO_MAN=
 
 .include <bsd.prog.mk>

gnu/usr.bin/texinfo/infokey/Makefile

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

include/arpa/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 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=
+NO_OBJ=
 INCS=	dumprestore.h routed.h rwhod.h talkd.h timed.h
 INCSDIR=${INCLUDEDIR}/protocols
 

kerberos5/libexec/ipropd-master/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	ipropd-master
-NOMAN=
+NO_MAN=
 SRCS=	ipropd_master.c kadm5_err.h
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I. ${LDAPCFLAGS}

kerberos5/libexec/ipropd-slave/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	ipropd-slave
-NOMAN=
+NO_MAN=
 SRCS=	ipropd_slave.c kadm5_err.h
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I. ${LDAPCFLAGS}

kerberos5/tools/asn1_compile/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	asn1_compile
-NOMAN=
+NO_MAN=
 
 SRCS=	gen.c \
 	gen_copy.c \

kerberos5/tools/make-print-version/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	make-print-version
-NOMAN=
+NO_MAN=
 
 .include <bsd.prog.mk>
 

kerberos5/tools/make-roken/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	make-roken
-NOMAN=
+NO_MAN=
 
 CLEANFILES= make-roken.c
 

kerberos5/usr.bin/ksu/Makefile

@@ -5,7 +5,7 @@ PROG=	ksu
 BINMODE=4555
 PRECIOUSPROG=
 .endif
-NOMAN=
+NO_MAN=
 SRCS=	su.c
 CFLAGS+=-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \

lib/libio/Makefile

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

lib/libncp/Makefile

@@ -6,7 +6,7 @@ LIB=		ncp
 
 SHLIB_MAJOR=	1
 
-NOMAN=
+NO_MAN=
 
 SRCS=	ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \
 	ncpl_net.c ncpl_rcfile.c ncpl_conn.c ncpl_nls.c ncpl_msg.c \

lib/librpcsvc/Makefile

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

lib/libsmb/Makefile

@@ -5,7 +5,7 @@ CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 
 LIB=	smb
 SHLIB_MAJOR=	1
-NOMAN=
+NO_MAN=
 
 SRCS=	rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \
 	print.c \

libexec/bootpd/bootpgw/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	bootpgw
-NOMAN=
+NO_MAN=
 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=
+NO_MAN=
 
 .include <bsd.prog.mk>

libexec/save-entropy/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 SCRIPTS=	save-entropy.sh
-NOOBJ=
+NO_OBJ=
 
 .include <bsd.prog.mk>

release/Makefile

@@ -359,7 +359,7 @@ release rerelease:
 .endif
 	mkdir -p ${CHROOTDIR}
 	@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
-	cd ${WORLDDIR} && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \
+	cd ${WORLDDIR} && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNO_MAN \
 	    -DNOPROFILE installworld DESTDIR=${CHROOTDIR}
 	cd ${WORLDDIR}/etc && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
 	if [ -f /etc/resolv.conf ]; then \

release/picobsd/build/picobsd

@@ -182,7 +182,7 @@ create_includes_and_libraries() {
 	    BINOWN=`id -un` BINGRP=`id -gn` \
 	    DESTDIR=${l_usrtree}/.. \
 	    make -m ${SRC}/share/mk \
-		-DNOHTML -DNOINFO -DNOMAN -DNOSHARE -DNOFSCHG "
+		-DNOHTML -DNOINFO -DNO_MAN -DNOSHARE -DNOFSCHG "
 	log "do a 'make obj' in a few places."
 	# This is very version-specific... The following works for 5.0
 	for i in lib secure/lib gnu/lib usr.sbin/pcvt/keycap \

release/picobsd/tinyware/aps/Makefile

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

release/picobsd/tinyware/help/Makefile

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

release/picobsd/tinyware/msg/Makefile

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

release/picobsd/tinyware/ns/Makefile

@@ -4,6 +4,6 @@ PROG=	ns
 SRCS=	ns.c
 
 CFLAGS+= -DBRIDGING
-NOMAN=
+NO_MAN=
 
 .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=
+NO_MAN=
 
 .include <bsd.prog.mk>
 

release/picobsd/tinyware/simple_httpd/Makefile

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

release/picobsd/tinyware/sps/Makefile

@@ -2,7 +2,7 @@
 #
 PROG=sps
 SRCS= 	sps.c
-NOMAN=
+NO_MAN=
 
 .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=
+NO_MAN=
 
 .include <bsd.prog.mk>

release/picobsd/tinyware/vm/Makefile

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

rescue/rescue/Makefile

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

sbin/dhclient/dhcpctl/Makefile

@@ -10,6 +10,6 @@ INTERNALLIB=
 SRCS=	dhcpctl.c callback.c remote.c
 
 MAN=	dhcpctl.3
-NOMAN=
+NO_MAN=
 
 .include <bsd.lib.mk>

sbin/dhclient/omapip/Makefile

@@ -13,6 +13,6 @@ SRCS=	alloc.c array.c auth.c buffer.c connection.c convert.c dispatch.c \
 	message.c mrtrace.c protocol.c result.c support.c toisc.c trace.c
 
 MAN=	omapi.3
-NOMAN=
+NO_MAN=
 
 .include <bsd.lib.mk>

sbin/gvinum/Makefile

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

sbin/mca/Makefile

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

sbin/recoverdisk/Makefile

@@ -2,7 +2,7 @@
 
 PROG=	recoverdisk
 
-NOMAN=
+NO_MAN=
 
 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=
+NO_MAN=
 
 .PATH:	${SRCDIR}
 

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

share/doc/IPv6/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 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=
+NO_OBJ=
 
 FILESGROUPS=	TOP ARM MISC
 TOP=		CHANGES COPYRIGHT FAQ KNOWN_DEFECTS README

share/examples/FreeBSD_version/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	FreeBSD_version
-NOMAN=
+NO_MAN=
 
 install:
 

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

share/examples/autofs/driver/Makefile

@@ -4,7 +4,7 @@
 PROG=autodriver
 
 SRCS=		autodriver.c
-NOMAN=
+NO_MAN=
 WARNS=		4
 CFLAGS+=	-g
 BINDIR?=	/sbin

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.

share/examples/find_interface/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 PROG=	find_interface
-NOMAN=
+NO_MAN=
 
 .include <bsd.prog.mk>

share/examples/ipfilter/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 FILES=	README
 

share/examples/isdn/v21/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=		v21modem
-NOMAN=
+NO_MAN=
 DPADD=		${LIBUTIL} ${LIBM}
 LDADD=		-lutil -lm
 CFLAGS+=	-g -Wall

share/examples/kld/cdev/test/Makefile

@@ -67,7 +67,7 @@
 # $FreeBSD$
 #
 PROG=	testcdev
-NOMAN=
+NO_MAN=
 
 MODSTAT= /sbin/kldstat
 

share/examples/kld/syscall/test/Makefile

@@ -2,6 +2,6 @@
 # $FreeBSD$
 
 PROG  = call
-NOMAN =
+NO_MAN =
 
 .include <bsd.prog.mk>

share/examples/libvgl/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	demo
-NOMAN=
+NO_MAN=
 DPADD=	${LIBVGL}
 LDADD=	-lvgl
 

share/examples/perfmon/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	perfmon
-NOMAN=
+NO_MAN=
 
 install:
 

share/examples/pf/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 FILES=	faq-example1 faq-example2 faq-example3 \
 	ackpri queue1 queue2 queue3 queue4 \

share/examples/ppi/Makefile

@@ -3,6 +3,6 @@
 # $FreeBSD$
 
 PROG=	ppilcd
-NOMAN=
+NO_MAN=
 
 .include <bsd.prog.mk>

share/examples/smbfs/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 BINDIR=	/usr/share/examples/smbfs
 FILES=	dot.nsmbrc
 

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
 

share/info/Makefile

@@ -1,7 +1,7 @@
 #       @(#)Makefile    8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
-NOOBJ=
+NO_OBJ=
 
 .include <bsd.prog.mk>
 

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

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>

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>

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:
 

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

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
 

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} \

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?

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
 

share/security/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 FILES=	lomac-policy.contexts
-NOOBJ=
+NO_OBJ=
 FILESDIR=	${BINDIR}/security
 
 .include "${.CURDIR}/../Makefile.inc"

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'')

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>

share/snmp/mibs/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 FILES=	FREEBSD-MIB.txt
-NOOBJ=
+NO_OBJ=
 FILESDIR=	${SHAREDIR}/snmp/mibs
 
 .include <bsd.prog.mk>

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>

share/syscons/keymaps/Makefile

@@ -45,6 +45,6 @@ FILES=	INDEX.keymaps \
 
 FILESDIR= ${SHAREDIR}/syscons/keymaps
 
-NOOBJ=
+NO_OBJ=
 
 .include <bsd.prog.mk>