From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 19:11:57 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 43888D68;
 Thu,  4 Jun 2015 19:11:57 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 32A9C19F8;
 Thu,  4 Jun 2015 19:11:57 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t54JBvof060535;
 Thu, 4 Jun 2015 19:11:57 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t54JBuxG060531;
 Thu, 4 Jun 2015 19:11:56 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201506041911.t54JBuxG060531@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 4 Jun 2015 19:11:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r283996 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jun 2015 19:11:57 -0000

Author: sjg
Date: Thu Jun  4 19:11:56 2015
New Revision: 283996
URL: https://svnweb.freebsd.org/changeset/base/283996

Log:
  Add dependent option STAGING_MAN/STAGING
  
  Use a single mlinks set, since some libs (eg. libc) do cross section
  links.

Modified:
  projects/bmake/share/mk/bsd.man.mk
  projects/bmake/share/mk/bsd.opts.mk

Modified: projects/bmake/share/mk/bsd.man.mk
==============================================================================
--- projects/bmake/share/mk/bsd.man.mk	Thu Jun  4 18:23:41 2015	(r283995)
+++ projects/bmake/share/mk/bsd.man.mk	Thu Jun  4 19:11:56 2015	(r283996)
@@ -127,7 +127,7 @@ _manpages: ${MAN}
 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}
@@ -136,10 +136,10 @@ 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
 

Modified: projects/bmake/share/mk/bsd.opts.mk
==============================================================================
--- projects/bmake/share/mk/bsd.opts.mk	Thu Jun  4 18:23:41 2015	(r283995)
+++ projects/bmake/share/mk/bsd.opts.mk	Thu Jun  4 19:11:56 2015	(r283996)
@@ -72,6 +72,7 @@ __DEFAULT_NO_OPTIONS = \
 
 # meta mode related
 __DEFAULT_DEPENDENT_OPTIONS = \
+    STAGING_MAN/STAGING \
     STAGING_PROG/STAGING
     
 .include <bsd.mkopt.mk>