NODOCCOMPRESS -> NO_DOCCOMPRESS

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

6 files changed, 26 insertions, 20 deletions

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