add new build knobs and jigger some existing controls to improve

control over the result of buildworld and installworld; this especially
helps packaging systems such as nanobsd

Reviewed by:	various (posted to arch)
MFC after:	1 month

1 files changed, 26 insertions, 16 deletions

diff --git a/share/Makefile b/share/Makefile
index 5143ea8..4a5f0c4 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -12,20 +12,38 @@ SUBDIR=	${_colldef} \
 	${_man} \
 	${_me} \
 	misc \
-	mk \
+	${_mk} \
 	${_mklocale} \
 	${_monetdef} \
 	${_msgdef} \
 	${_numericdef} \
 	${_sendmail} \
 	skel \
-	snmp \
+	${_snmp} \
 	${_syscons} \
 	tabset \
 	termcap \
 	${_timedef} \
 	${_zoneinfo}
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_BSNMP} != "no"
+_snmp=		snmp
+.endif
+
+.if ${MK_DICT} != "no"
+_dict=	 	dict
+.endif
+
+.if ${MK_EXAMPLES} != "no"
+_examples=	examples
+.endif
+
+.if ${MK_GROFF} != "no"
+_me=		me
+.endif
+
 .if ${MK_LOCALES} != "no"
 _colldef =	colldef
 _mklocale =	mklocale
@@ -35,26 +53,14 @@ _numericdef =	numericdef
 _timedef =	timedef
 .endif
 
-.if ${MK_SYSCONS} != "no"
-_syscons=	syscons
+.if ${MK_MAKE} != "no"
+_mk=		mk
 .endif
 
 .if ${MK_MAN} != "no"
 _man=		man
 .endif
 
-.if ${MK_GROFF} != "no"
-_me=		me
-.endif
-
-.if ${MK_EXAMPLES} != "no"
-_examples=	examples
-.endif
-
-.if ${MK_DICT} != "no"
-_dict=	 	dict
-.endif
-
 .if ${MK_SENDMAIL} != "no"
 _sendmail=	 sendmail
 .endif
@@ -63,6 +69,10 @@ _sendmail=	 sendmail
 _doc=		doc
 .endif
 
+.if ${MK_SYSCONS} != "no"
+_syscons=	syscons
+.endif
+
 .if ${MK_ZONEINFO} != "no"
 _zoneinfo=	zoneinfo
 .endif