svn commit: r355159 - in head/Mk: . Uses

[Mathieu Arnold]

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