From owner-svn-ports-all@FreeBSD.ORG  Sat Oct 19 19:11:20 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BB82BA85;
 Sat, 19 Oct 2013 19:11:20 +0000 (UTC)
 (envelope-from sunpoet@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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7A0962BAE;
 Sat, 19 Oct 2013 19:11:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9JJBKkc035942;
 Sat, 19 Oct 2013 19:11:20 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9JJBKg7035941;
 Sat, 19 Oct 2013 19:11:20 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201310191911.r9JJBKg7035941@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 19 Oct 2013 19:11:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330925 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Oct 2013 19:11:20 -0000

Author: sunpoet
Date: Sat Oct 19 19:11:19 2013
New Revision: 330925
URL: http://svnweb.freebsd.org/changeset/ports/330925

Log:
  - Add staging support for USE_PERL5=modbuild*
  - Remove STAGEDIR prefix from .packlist

Modified:
  head/Mk/Uses/perl5.mk

Modified: head/Mk/Uses/perl5.mk
==============================================================================
--- head/Mk/Uses/perl5.mk	Sat Oct 19 18:49:07 2013	(r330924)
+++ head/Mk/Uses/perl5.mk	Sat Oct 19 19:11:19 2013	(r330925)
@@ -170,22 +170,27 @@ CONFIGURE_SCRIPT?=	Build.PL
 .if ${PORTNAME} != Module-Build
 BUILD_DEPENDS+=		${SITE_PERL}/Module/Build.pm:${PORTSDIR}/devel/p5-Module-Build
 .endif
+CONFIGURE_ARGS+=--create_packlist 0
 .endif
 .if ${_USE_PERL5:Mmodbuildtiny}
 .if ${PORTNAME} != Module-Build-Tiny
 BUILD_DEPENDS+=		${SITE_PERL}/Module/Build/Tiny.pm:${PORTSDIR}/devel/p5-Module-Build-Tiny
 .endif
+CONFIGURE_ARGS+=--create_packlist 1
 .endif
 ALL_TARGET?=
 PL_BUILD?=		Build
 CONFIGURE_ARGS+= \
-		create_packlist=0 \
-		install_path=lib="${PREFIX}/${SITE_PERL_REL}" \
-		install_path=arch="${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}" \
-		install_path=script="${PREFIX}/bin" \
-		install_path=bin="${PREFIX}/bin" \
-		install_path=libdoc="${MAN3PREFIX}/man/man3" \
-		install_path=bindoc="${MAN1PREFIX}/man/man1"
+		--install_path lib="${PREFIX}/${SITE_PERL_REL}" \
+		--install_path arch="${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}" \
+		--install_path script="${PREFIX}/bin" \
+		--install_path bin="${PREFIX}/bin" \
+		--install_path libdoc="${MAN3PREFIX}/man/man3" \
+		--install_path bindoc="${MAN1PREFIX}/man/man1"
+.if !defined(NO_STAGE)
+CONFIGURE_ARGS+=--destdir ${STAGEDIR}
+DESTDIRNAME=	--destdir
+.endif
 .elif ${_USE_PERL5:Mconfigure}
 CONFIGURE_ARGS+=	INSTALLDIRS="site"
 .endif # modbuild
@@ -243,14 +248,20 @@ do-configure:
 .if ${_USE_PERL5:Mmodbuild*}
 .if !target(do-build)
 do-build:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET})
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${ALL_TARGET} ${MAKE_ARGS})
 .endif # !target(do-build)
 
 .if !${USES:Mgmake}
 .if !target(do-install)
 do-install:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${INSTALL_TARGET} ${MAKE_ARGS})
 .endif # !target(do-install)
 .endif # ! USES=gmake
 .endif # modbuild
+
+post-stage::
+# TODO: change to ${_USE_PERL5:Mconfigure} when M::B creates .packlist
+.if ${USE_PERL5:Mconfigure} || ${USE_PERL5:Mmodbuildtiny}
+	@${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
+.endif
 .endif # defined(_POSTMKINCLUDED)