Index: projects/bmake/share/mk/bsd.man.mk
===================================================================
--- projects/bmake/share/mk/bsd.man.mk	(revision 283995)
+++ projects/bmake/share/mk/bsd.man.mk	(revision 283996)
@@ -1,263 +1,263 @@
 # $FreeBSD$
 #
 # The include file <bsd.man.mk> handles installing manual pages and
 # their links.
 #
 #
 # +++ variables +++
 #
 # DESTDIR	Change the tree where the man pages gets installed. [not set]
 #
 # MANDIR	Base path for manual installation. [${SHAREDIR}/man/man]
 #
 # MANOWN	Manual owner. [${SHAREOWN}]
 #
 # MANGRP	Manual group. [${SHAREGRP}]
 #
 # MANMODE	Manual mode. [${NOBINMODE}]
 #
 # MANSUBDIR	Subdirectory under the manual page section, i.e. "/i386"
 #		or "/tahoe" for machine specific manual pages.
 #
 # MAN		The manual pages to be installed. For sections see
 #		variable ${SECTIONS}
 #
 # MCOMPRESS_CMD	Program to compress man pages. Output is to
 #		stdout. [${COMPRESS_CMD}]
 #
 # MLINKS	List of manual page links (using a suffix). The
 #		linked-to file must come first, the linked file
 #		second, and there may be multiple pairs. The files
 #		are hard-linked.
 #
 # NO_MLINKS	If you do not want install manual page links. [not set]
 #
 # MANFILTER	command to pipe the raw man page through before compressing
 #		or installing.  Can be used to do sed substitution.
 #
 # MANBUILDCAT	create preformatted manual pages in addition to normal
 #		pages. [not set]
 #
 # MANDOC_CMD	command and flags to create preformatted pages
 #
 # +++ targets +++
 #
 #	maninstall:
 #		Install the manual pages and their links.
 #
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.man.mk cannot be included directly.
 .endif
 
 MINSTALL?=	${INSTALL} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
 
 CATDIR=		${MANDIR:H:S/$/\/cat/}
 CATEXT=		.cat
 MANDOC_CMD?=	mandoc -Tascii
 
 MCOMPRESS_CMD?=	${COMPRESS_CMD}
 MCOMPRESS_EXT?=	${COMPRESS_EXT}
 
 SECTIONS=	1 2 3 4 5 6 7 8 9
 .SUFFIXES:	${SECTIONS:S/^/./g}
 
 # Backwards compatibility.
 .if !defined(MAN)
 .for __sect in ${SECTIONS}
 .if defined(MAN${__sect}) && !empty(MAN${__sect})
 MAN+=	${MAN${__sect}}
 .endif
 .endfor
 .endif
 
 _manpages:
 all-man: _manpages
 
 .if ${MK_MANCOMPRESS} == "no"
 
 # Make special arrangements to filter to a temporary file at build time
 # for MK_MANCOMPRESS == no.
 .if defined(MANFILTER)
 FILTEXTENSION=		.filt
 .else
 FILTEXTENSION=
 .endif
 
 ZEXT=
 
 .if defined(MANFILTER)
 .if defined(MAN) && !empty(MAN)
 CLEANFILES+=	${MAN:T:S/$/${FILTEXTENSION}/g}
 CLEANFILES+=	${MAN:T:S/$/${CATEXT}${FILTEXTENSION}/g}
 .for __page in ${MAN}
 .for __target in ${__page:T:S/$/${FILTEXTENSION}/g}
 _manpages: ${__target}
 ${__target}: ${__page}
 	${MANFILTER} < ${.ALLSRC} > ${.TARGET}
 .endfor
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 .for __target in ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g}
 _manpages: ${__target}
 ${__target}: ${__page}
 	${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} > ${.TARGET}
 .endfor
 .endif
 .endfor
 .endif
 .else
 .if defined(MAN) && !empty(MAN)
 CLEANFILES+=	${MAN:T:S/$/${CATEXT}/g}
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 .for __page in ${MAN}
 .for __target in ${__page:T:S/$/${CATEXT}/g}
 _manpages: ${__target}
 ${__target}: ${__page}
 	${MANDOC_CMD} ${.ALLSRC} > ${.TARGET}
 .endfor
 .endfor
 .else
 _manpages: ${MAN}
 .endif
 .endif
 .endif
 
 .else
 
 ZEXT=		${MCOMPRESS_EXT}
 
 .if defined(MAN) && !empty(MAN)
-.if ${MK_STAGING}
+.if ${MK_STAGING_MAN} == "yes"
 staging: stage_files
 _mansets:= ${MAN:E:O:u:@s@man$s@}
 STAGE_SETS+= ${_mansets}
 .for _page in ${MAN}
 stage_files.man${_page:T:E}: ${_page}
 STAGE_DIR.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR}
 .endfor
 .if !empty(MLINKS)
+STAGE_SETS+= mlinks
 staging: stage_links
-.for __section in ${MLINKS:E:O:u}
-STAGE_LINKS.man${__section}:= ${MLINKS:M*.${__section}:S,^,${MANDIR}${__section}${MANSUBDIR}/,}
-.endfor
+STAGE_LINKS.mlinks:= ${MLINKS:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@}
+stage_links.mlinks: ${_mansets:@s@stage_files.$s@}
 .endif
 .endif
 
 CLEANFILES+=	${MAN:T:S/$/${MCOMPRESS_EXT}/g}
 CLEANFILES+=	${MAN:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g}
 .for __page in ${MAN}
 .for __target in ${__page:T:S/$/${MCOMPRESS_EXT}/}
 _manpages: ${__target}
 ${__target}: ${__page}
 .if defined(MANFILTER)
 	${MANFILTER} < ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET}
 .else
 	${MCOMPRESS_CMD} ${.ALLSRC} > ${.TARGET}
 .endif
 .endfor
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 .for __target in ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/}
 _manpages: ${__target}
 ${__target}: ${__page}
 .if defined(MANFILTER)
 	${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} | ${MCOMPRESS_CMD} > ${.TARGET}
 .else
 	${MANDOC_CMD} ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET}
 .endif
 .endfor
 .endif
 .endfor
 .endif
 
 .endif
 
 maninstall: _maninstall
 _maninstall:
 .if defined(MAN) && !empty(MAN)
 _maninstall: ${MAN}
 .if ${MK_MANCOMPRESS} == "no"
 .if defined(MANFILTER)
 .for __page in ${MAN}
 	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
 .endif
 .endfor
 .else
 	@set ${.ALLSRC:C/\.([^.]*)$/.\1 \1/}; \
 	while : ; do \
 		case $$# in \
 			0) break;; \
 			1) echo "warn: missing extension: $$1"; break;; \
 		esac; \
 		page=$$1; shift; sect=$$1; shift; \
 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
 		${ECHO} ${MINSTALL} $${page} $${d}; \
 		${MINSTALL} $${page} $${d}; \
 	done
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 .for __page in ${MAN}
 	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
 .endfor
 .endif
 .endif
 .else
 .for __page in ${MAN}
 	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
 .endif
 .endfor
 .endif
 .endif
 
 .if !defined(NO_MLINKS) && defined(MLINKS) && !empty(MLINKS)
 	@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
 	while : ; do \
 		case $$# in \
 			0) break;; \
 			[123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
 		esac; \
 		name=$$1; shift; sect=$$1; shift; \
 		l=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
 		name=$$1; shift; sect=$$1; shift; \
 		t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
 		${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
 		rm -f $${t} $${t}${MCOMPRESS_EXT}; \
 		${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
 	done
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 	@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
 	while : ; do \
 		case $$# in \
 			0) break;; \
 			[123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
 		esac; \
 		name=$$1; shift; sect=$$1; shift; \
 		l=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
 		name=$$1; shift; sect=$$1; shift; \
 		t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
 		${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
 		rm -f $${t} $${t}${MCOMPRESS_EXT}; \
 		${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
 	done
 .endif
 .endif
 
 manlint:
 .if defined(MAN) && !empty(MAN)
 .for __page in ${MAN}
 manlint: ${__page}lint
 ${__page}lint: ${__page}
 .if defined(MANFILTER)
 	${MANFILTER} < ${.ALLSRC} | ${MANDOC_CMD} -Tlint
 .else
 	${MANDOC_CMD} -Tlint ${.ALLSRC}
 .endif
 .endfor
 .endif
Index: projects/bmake/share/mk/bsd.opts.mk
===================================================================
--- projects/bmake/share/mk/bsd.opts.mk	(revision 283995)
+++ projects/bmake/share/mk/bsd.opts.mk	(revision 283996)
@@ -1,101 +1,102 @@
 # $FreeBSD$
 #
 # Option file for src builds.
 #
 # Users define WITH_FOO and WITHOUT_FOO on the command line or in /etc/src.conf
 # and /etc/make.conf files. These translate in the build system to MK_FOO={yes,no}
 # with sensible (usually) defaults.
 #
 # Makefiles must include bsd.opts.mk after defining specific MK_FOO options that
 # are applicable for that Makefile (typically there are none, but sometimes there
 # are exceptions). Recursive makes usually add MK_FOO=no for options that they wish
 # to omit from that make.
 #
 # Makefiles must include bsd.mkopt.mk before they test the value of any MK_FOO
 # variable.
 #
 # Makefiles may also assume that this file is included by bsd.own.mk should it
 # need variables defined there prior to the end of the Makefile where
 # bsd.{subdir,lib.bin}.mk is traditionally included.
 #
 # The old-style YES_FOO and NO_FOO are being phased out. No new instances of them
 # should be added. Old instances should be removed since they were just to
 # bridge the gap between FreeBSD 4 and FreeBSD 5.
 #
 # Makefiles should never test WITH_FOO or WITHOUT_FOO directly (although an
 # exception is made for _WITHOUT_SRCONF which turns off this mechanism
 # completely).
 #
 
 .if !target(__<bsd.opts.mk>__)
 __<bsd.opts.mk>__:
 
 .if !defined(_WITHOUT_SRCCONF)
 #
 # Define MK_* variables (which are either "yes" or "no") for users
 # to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
 # make(1) environment.
 # These should be tested with `== "no"' or `!= "no"' in makefiles.
 # The NO_* variables should only be set by makefiles for variables
 # that haven't been converted over.
 #
 
 # Only these options are used by bsd.*.mk. KERBEROS and OPENSSH are
 # unforutnately needed to support statically linking the entire
 # tree. su(1) wouldn't link since it depends on PAM which depends on
 # ssh libraries when building with OPENSSH, and likewise for KERBEROS.
 
 # All other variables used to build /usr/src live in src.opts.mk
 # and variables from both files are documented in src.conf(5).
 
 __DEFAULT_YES_OPTIONS = \
     ASSERT_DEBUG \
     DOCCOMPRESS \
     INCLUDES \
     INSTALLLIB \
     KERBEROS \
     MAN \
     MANCOMPRESS \
     NIS \
     NLS \
     OPENSSH \
     PROFILE \
     SSP \
     SYMVER \
     TOOLCHAIN \
     WARNS
 
 __DEFAULT_NO_OPTIONS = \
     CTF \
     DEBUG_FILES \
     INSTALL_AS_USER
 
 # meta mode related
 __DEFAULT_DEPENDENT_OPTIONS = \
+    STAGING_MAN/STAGING \
     STAGING_PROG/STAGING
     
 .include <bsd.mkopt.mk>
 
 #
 # Supported NO_* options (if defined, MK_* will be forced to "no",
 # regardless of user's setting).
 #
 # These are transitional and will disappaer in the FreeBSD 12.
 #
 .for var in \
     CTF \
     DEBUG_FILES \
     INSTALLLIB \
     MAN \
     PROFILE \
     WARNS
 .if defined(NO_${var})
 # This warning may be premature...
 #.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
 MK_${var}:=no
 .endif
 .endfor
 
 .endif # !_WITHOUT_SRCCONF
 
 .endif