NODOCCOMPRESS -> NO_DOCCOMPRESS

NOINFO -> NO_INFO
NOINFOCOMPRESS -> NO_INFOCOMPRESS
NOLINT -> NO_LINT
NOPIC -> NO_PIC
NOPROFILE -> NO_PROFILE

30 files changed, 74 insertions, 68 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 03abe3f..679308c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -9,10 +9,10 @@
 #	-DNOCLEAN do not clean at all
 #	-DNOCRYPT will prevent building of crypt versions
 #	-DNO_MAN do not build the manual pages
-#	-DNOPROFILE do not build profiled libraries
+#	-DNO_PROFILE do not build profiled libraries
 #	-DNOGAMES do not go into games subdir
 #	-DNOSHARE do not go into share subdir
-#	-DNOINFO do not make or install info files
+#	-DNO_INFO do not make or install info files
 #	-DNO_LIBC_R do not build libc_r.
 #	-DNO_FORTRAN do not build g77 and related libraries.
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
@@ -182,14 +182,14 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
-		-DNOHTML -DNOINFO -DNOLINT -DNO_MAN -DNOPIC -DNOPROFILE \
+		-DNOHTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PIC -DNO_PROFILE \
 		-DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
-		BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS
+		BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB
@@ -231,7 +231,7 @@ LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		SHLIBDIR=/usr/lib32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-		-DNO_BIND -DNO_MAN -DNODOC -DNOINFO -DNOHTML \
+		-DNO_BIND -DNO_MAN -DNO_INFO -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 -DNO_MAN -DNOPROFILE \
+	    ${WMAKE} -DNOFSCHG -DNOHTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PROFILE \
 	    libraries
 _depend:
 	@echo
diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc
index b1acfb9..5de8a1e 100644
--- a/gnu/Makefile.inc
+++ b/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=
+NO_LINT=
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index dc71a21..49a4ca6 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -99,13 +99,13 @@ Version${x}.c: ${SRCDIR}/lib${x}77/Version.c
 ${E77OBJS}: f2cext.c
 	${CC} ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 ${E77OBJS:.o=.So}: f2cext.c
 	${CC} ${PICFLAG} -DPIC ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} \
 	    ${.ALLSRC:M*.c}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${E77OBJS:.o=.po}: f2cext.c
 	${CC} -p ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index a408488..6eb28b8 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -192,12 +192,12 @@ ${OBJS} beforedepend: ${COMMONHDRS}
 ${OBJS_T}: libgcc2.c
 	${XCC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 ${OBJS_S}: libgcc2.c
 	${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${OBJS_P}: libgcc2.c
 	${XCC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
@@ -208,13 +208,13 @@ ${ASM_T}: ${_lib1asmsrc}
 	${XCC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.TARGET} ${.ALLSRC:N*.h}
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 ${ASM_S}: ${_lib1asmsrc}
 	${XCC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.TARGET} ${.ALLSRC:N*.h}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${ASM_P}: ${_lib1asmsrc}
 	${XCC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.TARGET} ${.ALLSRC:N*.h}
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index c447413..bcf4d2d 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -6,7 +6,7 @@ GCCDIR=	${.CURDIR}/../../../contrib/gcc
 .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
 
 LIB=		gcov
-NOPROFILE=
+NO_PROFILE=
 
 CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED
 CFLAGS+=	-D_PTHREADS -DGTHREAD_USE_WEAK
@@ -32,12 +32,12 @@ ${OBJS} beforedepend: ${COMMONHDRS}
 ${OBJS_T}: libgcov.c
 	${CC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 ${OBJS_S}: libgcov.c
 	${CC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${OBJS_P}: libgcc2.c
 	${CC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 4d10ae0..dd67f2c 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -11,7 +11,7 @@ NO_MAN=
 SHLIB_MAJOR= 1
 .else
 # XXX is this still correct?
-NOPIC=	# works but method lookup slowdown is significant
+NO_PIC=	# works but method lookup slowdown is significant
 .endif
 
 SRCS=   archive.c class.c encoding.c gc.c hash.c init.c misc.c \
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 6f6a41c..49ac261 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NOLINT=
+NO_LINT=
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index a0e98e1..08512b3 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -27,10 +27,10 @@ PRECIOUSLIB=
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${SHLIBDIR}/libpthread.so
 .endif
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
 .endif
 .endif
diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
index 5cac818..b9b174d 100644
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -3,7 +3,7 @@
 
 LIB=compat
 CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
-NOPIC=
+NO_PIC=
 
 .PATH:	${.CURDIR}/4.1/${MACHINE_ARCH} ${.CURDIR}/4.1 \
 	${.CURDIR}/4.3/${MACHINE_ARCH} ${.CURDIR}/4.3 \
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index d47da8f..ebc5991 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -21,8 +21,8 @@ CFLAGS+=	-DPC98
 .endif
 
 CLEANFILES+=	tmp.c tst01 tst01.o
-NOPROFILE=
-NOPIC=
+NO_PROFILE=
+NO_PIC=
 
 MAN=		libdisk.3
 
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index 1eb3eb4..38334cc 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -234,7 +234,7 @@ SYMLINKS+=libncurses.a ${LIBDIR}/libtermlib.a
 SYMLINKS+=libncurses.a ${LIBDIR}/libmytinfo.a
 SYMLINKS+=libncurses.a ${LIBDIR}/libtinfo.a
 .endif
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 # no need for major at all, it's an ld-time redirection only
 SYMLINKS+=libncurses.so ${LIBDIR}/libcurses.so
 SYMLINKS+=libncurses.so ${LIBDIR}/libtermcap.so
@@ -242,7 +242,7 @@ SYMLINKS+=libncurses.so ${LIBDIR}/libtermlib.so
 SYMLINKS+=libncurses.so ${LIBDIR}/libmytinfo.so
 SYMLINKS+=libncurses.so ${LIBDIR}/libtinfo.so
 .endif
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermcap_p.a
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermlib_p.a
@@ -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=
+NO_LINT=
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index e6763e9..43f3b16 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -39,7 +39,7 @@ OPENPAM=	${.CURDIR}/../../../contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man
 
 LIB=	pam
-NOPROFILE=
+NO_PROFILE=
 
 SRCS=	openpam_borrow_cred.c \
 	openpam_configure.c \
diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc
index 1fa92e8..317b3fe 100644
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@@ -3,7 +3,7 @@
 PAMDIR=		${.CURDIR}/../../../../contrib/openpam
 
 NOINSTALLLIB=
-NOPROFILE=
+NO_PROFILE=
 
 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=
+NO_PIC=
 .else
 SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
 DPADD+=		${LIBPAM}
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 3261f34..0b961be 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -7,8 +7,8 @@
 #
 
 LIB=		stand
-NOPROFILE=
-NOPIC=
+NO_PROFILE=
+NO_PIC=
 INCS=		stand.h
 MAN=		libstand.3
 
diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index 417f431..8a3f6b4 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -5,6 +5,6 @@ SHLIB_MAJOR=	2
 
 SRCS=	main.c yyerror.c
 
-NOPIC=
+NO_PIC=
 
 .include <bsd.lib.mk>
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 1eb3eb4..38334cc 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -234,7 +234,7 @@ SYMLINKS+=libncurses.a ${LIBDIR}/libtermlib.a
 SYMLINKS+=libncurses.a ${LIBDIR}/libmytinfo.a
 SYMLINKS+=libncurses.a ${LIBDIR}/libtinfo.a
 .endif
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 # no need for major at all, it's an ld-time redirection only
 SYMLINKS+=libncurses.so ${LIBDIR}/libcurses.so
 SYMLINKS+=libncurses.so ${LIBDIR}/libtermcap.so
@@ -242,7 +242,7 @@ SYMLINKS+=libncurses.so ${LIBDIR}/libtermlib.so
 SYMLINKS+=libncurses.so ${LIBDIR}/libmytinfo.so
 SYMLINKS+=libncurses.so ${LIBDIR}/libtinfo.so
 .endif
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermcap_p.a
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libtermlib_p.a
@@ -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=
+NO_LINT=
 
 .include <bsd.lib.mk>
diff --git a/libexec/Makefile b/libexec/Makefile
index 100cd04..1324a43 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -43,7 +43,7 @@ _ypxfr=		ypxfr
 _ftp-proxy=	ftp-proxy
 .endif
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 _rtld-elf=	rtld-elf
 .endif
 
diff --git a/release/Makefile b/release/Makefile
index 57987da..da9ef81 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -359,8 +359,8 @@ 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 -DNO_MAN \
-	    -DNOPROFILE installworld DESTDIR=${CHROOTDIR}
+	cd ${WORLDDIR} && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNO_INFO -DNO_MAN \
+	    -DNO_PROFILE installworld DESTDIR=${CHROOTDIR}
 	cd ${WORLDDIR}/etc && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
 	if [ -f /etc/resolv.conf ]; then \
 		cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index b5e6054..5467c42 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -154,7 +154,7 @@ create_includes_and_libraries2() {
     MAKEOBJDIRPREFIX=${l_objtree}
     export MAKEOBJDIRPREFIX
     ( cd ${SRC};
-    make -DNOCLEAN -DNOPROFILE -DNOGAMES -DNO_LIBC_R -DPICOBSD buildworld
+    make -DNOCLEAN -DNO_PROFILE -DNOGAMES -DNO_LIBC_R -DPICOBSD buildworld
     )
 }
 
@@ -182,7 +182,7 @@ create_includes_and_libraries() {
 	    BINOWN=`id -un` BINGRP=`id -gn` \
 	    DESTDIR=${l_usrtree}/.. \
 	    make -m ${SRC}/share/mk \
-		-DNOHTML -DNOINFO -DNO_MAN -DNOSHARE -DNOFSCHG "
+		-DNOHTML -DNO_INFO -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 \
@@ -190,7 +190,7 @@ create_includes_and_libraries() {
 	    (cd ${i}; eval $e obj)
 	done
 	log "now make the static libraries"
-	eval $e -DNOPROFILE -DNOPIC libraries
+	eval $e -DNO_PROFILE -DNO_PIC libraries
 	(cd ${SRC}/usr.sbin/config
 	eval $e		# build binary
 	eval $e	install	# install it
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 512b90a..24d8d67 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -4,7 +4,7 @@ LIB=		crypto
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	3
 
-NOLINT=
+NO_LINT=
 
 .if exists(Makefile.man)
 .include "Makefile.man"
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index b16cdd8..8827f05 100644
--- a/secure/lib/libssh/Makefile
+++ b/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=
+NO_LINT=
 
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT}
 LDADD+=	-lcrypto -lcrypt
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 07c6f67..6976426 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -3,7 +3,7 @@
 LIB=		ssl
 SHLIB_MAJOR=	3
 
-NOLINT=
+NO_LINT=
 
 .if exists(Makefile.man)
 .include "Makefile.man"
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 5818569..05be9d1 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -119,7 +119,7 @@
 #NO_GDB=		# do not build GDB
 #NO_I4B=		# do not build isdn4bsd package
 #NOINET6=		# do not build IPv6 related programs and libraries
-#NOINFO=		# do not make or install info files
+#NO_INFO=		# do not make or install info files
 #NO_IPFILTER=		# do not build IP Filter package
 #NOIPSEC= 		# do not build traceroute(8) with IPSEC support
 #NO_KERBEROS=		# do not build and install Kerberos 5 (KTH Heimdal)
@@ -135,7 +135,7 @@
 #NO_OPENSSH=		# do not build OpenSSH
 #NO_OPENSSL=		# do not build OpenSSL (implies NO_KERBEROS/NO_OPENSSH)
 #NO_PF=			# do not build PF firewall package
-#NOPROFILE=		# Avoid compiling profiled libraries
+#NO_PROFILE=		# Avoid compiling profiled libraries
 #NO_SENDMAIL=		# do not build sendmail and related programs
 #NOSHARE=		# do not go into the share subdir
 #NOSHARED= 		# build /bin and /sbin dynamically linked (bad idea
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 8ef203e..7f50fd8 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -541,7 +541,7 @@ Set to not build any crypto code.
 .It Va NOGAMES
 .Pq Vt bool
 Set to not build games.
-.It Va NOINFO
+.It Va NO_INFO
 .Pq Vt bool
 Set to not make or install
 .Xr info 5
@@ -567,7 +567,7 @@ library.
 .It Va NO_MANCOMPRESS
 .Pq Vt bool
 Set to install man pages uncompressed.
-.It Va NOPROFILE
+.It Va NO_PROFILE
 .Pq Vt bool
 Set to avoid compiling profiled libraries.
 .It Va NOSHARE
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index e15d480..3fb52ec 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -3,12 +3,18 @@
 .if !defined(BURN_BRIDGES)
 .for oldnew in \
 	NOATM:NO_ATM \
+	NODOCCOMPRESS:NO_DOCCOMPRESS \
+	NOINFO:NO_INFO \
+	NOINFOCOMPRESS:NO_INFOCOMPRESS \
 	NOLIBC_R:NO_LIBC_R \
 	NOLIBPTHREAD:NO_LIBPTHREAD \
 	NOLIBTHR:NO_LIBTHR \
+	NOLINT:NO_LINT \
 	NOMAN:NO_MAN \
 	NOMANCOMPRESS:NO_MANCOMPRESS \
-	NOOBJ:NO_OBJ
+	NOOBJ:NO_OBJ \
+	NOPIC:NO_PIC \
+	NOPROFILE:NO_PROFILE
 .for old in ${oldnew:C/:.*//}
 .for new in ${oldnew:C/.*://}
 .if defined(${old}) && !defined(${new})
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 79a8e8c..539d4c3 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -19,7 +19,7 @@
 #
 # MACROS	Macro packages used to build the document.  [not set]
 #
-# NODOCCOMPRESS	If you do not want formatted troff documents to be
+# NO_DOCCOMPRESS If you do not want formatted troff documents to be
 #		compressed when they are installed.  [not set]
 #
 # PRINTERDEVICE	Indicates which output formats will be generated
@@ -87,7 +87,7 @@ DCOMPRESS_CMD?=	${COMPRESS_CMD}
 DFILE.html=	${DOC}.html
 .endfor
 .for _dev in ${PRINTERDEVICE:Nhtml}
-.if defined(NODOCCOMPRESS)
+.if defined(NO_DOCCOMPRESS)
 DFILE.${_dev}=	${DOC}.${_dev}
 .else
 DFILE.${_dev}=	${DOC}.${_dev}${DCOMPRESS_EXT}
@@ -119,7 +119,7 @@ print: ${DFILE.${_dev}}
 .endfor
 print:
 .for _dev in ${PRINTERDEVICE}
-.if defined(NODOCCOMPRESS)
+.if defined(NO_DOCCOMPRESS)
 	${LPR} ${DFILE.${_dev}}
 .else
 	${DCOMPRESS_CMD} -d ${DFILE.${_dev}} | ${LPR}
@@ -166,7 +166,7 @@ CLEANFILES+=	_stamp.extra
 ${DFILE.${_dev}}: _stamp.extra
 .endif
 ${DFILE.${_dev}}: ${SRCS}
-.if defined(NODOCCOMPRESS)
+.if defined(NO_DOCCOMPRESS)
 	${ROFF.${_dev}} ${.ALLSRC:N_stamp.extra} > ${.TARGET}
 .else
 	${ROFF.${_dev}} ${.ALLSRC:N_stamp.extra} | ${DCOMPRESS_CMD} > ${.TARGET}
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index 67b1ab3..bc5d570 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -53,9 +53,9 @@
 #
 # MAKEINFOFLAGS		Options for ${MAKEINFO} command. [--no-split]
 #
-# NOINFO	Do not make or install info files. [not set]
+# NO_INFO	Do not make or install info files. [not set]
 #
-# NOINFOCOMPRESS	If you do not want info files be
+# NO_INFOCOMPRESS	If you do not want info files be
 #			compressed when they are installed. [not set]
 #
 # TEX		A program for converting tex files into dvi files [tex]
@@ -123,9 +123,9 @@ DVIPS2ASCII?=	dvips2ascii
 IFILENS+=	${INFO:S/$/.${_f}/}
 .endfor
 
-.if !defined(NOINFO)
+.if !defined(NO_INFO)
 CLEANFILES+=	${IFILENS}
-.if !defined(NOINFOCOMPRESS)
+.if !defined(NO_INFOCOMPRESS)
 CLEANFILES+=	${IFILENS:S/$/${ICOMPRESS_EXT}/}
 IFILES=	${IFILENS:S/$/${ICOMPRESS_EXT}/:S/.html${ICOMPRESS_EXT}/.html/}
 all: ${IFILES}
@@ -171,7 +171,7 @@ CLEANFILES+=	${INFO:S/$/-la.texi/}
 CLEANFILES+=	${INFO:S/$/.info.*.html/} ${INFO:S/$/.info/}
 .endif
 
-.if !defined(NOINFO) && defined(INFO)
+.if !defined(NO_INFO) && defined(INFO)
 install: ${INSTALLINFODIRS}
 .if !empty(IFILES:N*.html)
 	${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 5b98da7..8caa88e 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -8,7 +8,7 @@
 # SHLIB_NAME will be defined only if we are to create a shared library.
 # SHLIB_LINK will be defined only if we are to create a link to it.
 # INSTALL_PIC_ARCHIVE will be defined only if we are to create a PIC archive.
-.if defined(NOPIC)
+.if defined(NO_PIC)
 .undef SHLIB_NAME
 .undef INSTALL_PIC_ARCHIVE
 .else
@@ -115,7 +115,7 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS}
 
 .if !defined(INTERNALLIB)
 
-.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
+.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
 _LIBS+=		lib${LIB}_p.a
 POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
 
@@ -155,7 +155,7 @@ lib${LIB}_pic.a: ${SOBJS}
 	${RANLIB} ${.TARGET}
 .endif
 
-.if defined(WANT_LINT) && !defined(NOLINT) && defined(LIB) && !empty(LIB)
+.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
 LINTLIB=	llib-l${LIB}.ln
 _LIBS+=		${LINTLIB}
 LINTOBJS+=	${SRCS:M*.c:.c=.ln}
@@ -211,7 +211,7 @@ _libinstall:
 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
 .endif
-.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
+.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
 .endif
@@ -236,7 +236,7 @@ _libinstall:
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
 .endif
-.if defined(WANT_LINT) && !defined(NOLINT) && defined(LIB) && !empty(LIB)
+.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
 .endif
@@ -289,7 +289,7 @@ clean:
 	rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS}
 .endif
 .if !defined(INTERNALLIB)
-.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
+.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
 	rm -f ${POBJS} ${POBJS:S/$/.tmp/}
 .endif
 .if defined(SHLIB_NAME) || \
diff --git a/tools/tools/nanobsd/make.conf b/tools/tools/nanobsd/make.conf
index 56c798d..0a47e39 100644
--- a/tools/tools/nanobsd/make.conf
+++ b/tools/tools/nanobsd/make.conf
@@ -21,7 +21,7 @@ NO_HESIOD_LIBC=
 NOHTML=
 NO_I4B=
 NOINET6=
-NOINFO=
+NO_INFO=
 NO_IPFILTER=
 NO_KERBEROS=
 NO_LIBTHR=
@@ -31,7 +31,7 @@ NO_MODULES=
 NO_NIS=
 NO_OBJC=
 NO_PF=
-NOPROFILE=
+NO_PROFILE=
 NORADIUS=
 NO_RESCUE=
 NO_SENDMAIL=
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index 043d65f..51d71b6 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -2,12 +2,12 @@
 
 LIB=    ln
 SRCS=   libmain.c libyywrap.c
-NOPIC=
+NO_PIC=
 
 LINKS=  ${LIBDIR}/libln.a ${LIBDIR}/libl.a
 LINKS+=	${LIBDIR}/libln.a ${LIBDIR}/libfl.a
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a
 LINKS+=	${LIBDIR}/libln_p.a ${LIBDIR}/libfl_p.a
 .endif