From d4f4a127acf113c22dad3f736c28f9b908e9f54c Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 9 Apr 2015 21:57:27 +0200
Subject: [PATCH] Clean up no longer used NOINFO and NOINFOCOMPRESS make.conf
 variables.

---
 Makefile.inc1              | 4 ++--
 etc/defaults/make.conf     | 2 --
 share/man/man5/make.conf.5 | 8 --------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 87daee6125..6b40ea53a6 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -262,7 +262,7 @@ BMAKEENV=	MAKEOBJDIRPREFIX=${BTOOLSDEST} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 
 BMAKE=		${BMAKEENV} make -f Makefile.inc1 -DBOOTSTRAPPING \
-		-DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
+		-DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \
 		-DNO_WERROR -DNO_NLS -DSYSBUILD
 
 # build-tool stage
@@ -409,7 +409,7 @@ _libraries:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4b: building libraries"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries
+	cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOMAN -DNOFSCHG libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index d5ae1085c2..3fde1c8ca3 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -113,8 +113,6 @@ THREAD_LIB?=	thread_xu
 #NO_OPENSSH=	true	# do not build OpenSSH
 #NO_OPENSSL=	true	# do not build OpenSSL (implies NO_OPENSSH)
 #NO_SHARE=	true	# do not enter the share subdirectory
-#NOINFO=	true	# do not make or install info files
-#NOINFOCOMPRESS=true	# do not compress info files
 #NOMAN=		true	# do not build manual pages
 #NOMANCOMPRESS=	true	# do not compress man pages
 #NOPROFILE=	true	# Avoid compiling profiled libraries
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 8f7325f42c..2f8402b088 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -435,14 +435,6 @@ instead of
 .Pq Vt bool
 Set to not install certain components with flag schg.
 This is useful in a jailed environment.
-.It Va NOINFO
-.Pq Vt bool
-Set to not make or install
-.Xr info 5
-files.
-.It Va NOINFOCOMPRESS
-.Pq Vt bool
-Set to not compress the info pages.
 .It Va NOMAN
 .Pq Vt bool
 Set to not build manual pages
-- 
2.41.0