From owner-svn-ports-all@FreeBSD.ORG Sun May 25 11:37:29 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BF4AEA5; Sun, 25 May 2014 11:37:29 +0000 (UTC) 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 9291827BE; Sun, 25 May 2014 11:37:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PBbTBC001755; Sun, 25 May 2014 11:37:29 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4PBbTw1001752; Sun, 25 May 2014 11:37:29 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201405251137.s4PBbTw1001752@svn.freebsd.org> From: Mathieu Arnold Date: Sun, 25 May 2014 11:37:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355159 - in 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.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2014 11:37:29 -0000 Author: mat Date: Sun May 25 11:37:28 2014 New Revision: 355159 URL: http://svnweb.freebsd.org/changeset/ports/355159 QAT: https://qat.redports.org/buildarchive/r355159/ Log: - Add a USE_PERL5=fixpacklist to account for ports creating one when not using USE_PERL5=configure or USE_PERL5=modbuildtiny. - Change perl5.mk to use a specific target and not abuse post-stage. Reviewed by: bapt With Hat: portmgr Sponsored by: Absolight Modified: head/Mk/Uses/perl5.mk head/Mk/bsd.port.mk Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Sun May 25 10:47:39 2014 (r355158) +++ head/Mk/Uses/perl5.mk Sun May 25 11:37:28 2014 (r355159) @@ -24,7 +24,9 @@ # SITE_PERL - Directory name where site specific perl packages go. # This value is added to PLIST_SUB. # USE_PERL5 - If set, this port uses perl5 in one or more of the extract, -# patch, build, install or run phases. +# patch, build, install or run phases. The fixpacklist is +# needed in some cases, when a .packlist is created, it may +# reference ${STAGEDIR} # It can also have configure, modbuild and modbuildtiny when # the port needs to run Makefile.PL, Build.PL and a # Module::Build::Tiny flavor of Build.PL. @@ -254,8 +256,8 @@ do-install: .endif # modbuild # TODO: change to ${_USE_PERL5:Mconfigure} when M::B creates .packlist -.if ${USE_PERL5:Mconfigure} || ${USE_PERL5:Mmodbuildtiny} -post-stage:: +.if ${USE_PERL5:Mconfigure} || ${USE_PERL5:Mmodbuildtiny} || ${USE_PERL5:Mfixpacklist} +fix-packlist:: -@[ -d ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto ] && ${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \; .endif Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun May 25 10:47:39 2014 (r355158) +++ head/Mk/bsd.port.mk Sun May 25 11:37:28 2014 (r355159) @@ -6569,7 +6569,7 @@ _STAGE_SEQ+= create-users-groups do-inst install-rc-script install-ldconfig-file install-license \ install-desktop-entries add-plist-info add-plist-docs \ add-plist-examples add-plist-data add-plist-post \ - move-uniquefiles-plist fix-plist-sequence + move-uniquefiles-plist fix-plist-sequence fix-packlist .if defined(DEVELOPER) _STAGE_SEQ+= stage-qa .endif