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

[Mathieu Arnold]

Author: mat
Date: Mon Jun  2 08:48:13 2014
New Revision: 356204
URL: http://svnweb.freebsd.org/changeset/ports/356204
QAT: https://qat.redports.org/buildarchive/r356204/

Log:
  Apply a band-aid on Perl ports plists for perl 5.20.
  
  This is not the right fix, but with this, we can move forward.
  
  With hat:	perl@, 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	Mon Jun  2 08:44:07 2014	(r356203)
+++ head/Mk/Uses/perl5.mk	Mon Jun  2 08:48:13 2014	(r356204)
@@ -265,6 +265,11 @@ fix-packlist::
 	-@[ -d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto ] && ${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
 .endif
 
+.if ${PERL_LEVEL} >= 502000
+fix-plist-perl:
+	-@${REINPLACE_CMD} '/\.bs$$/d' ${TMPPLIST}
+.endif
+
 .if !target(regression-test)
 TEST_ARGS+=	${MAKE_ARGS}
 TEST_ENV+=	${MAKE_ENV}

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Jun  2 08:44:07 2014	(r356203)
+++ head/Mk/bsd.port.mk	Mon Jun  2 08:48:13 2014	(r356204)
@@ -6523,7 +6523,7 @@ _STAGE_SUSEQ=	create-users-groups do-ins
 				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 fix-packlist
+				move-uniquefiles-plist fix-plist-sequence fix-packlist fix-plist-perl
 .if defined(DEVELOPER)
 _STAGE_SUSEQ+=	stage-qa
 .endif
@@ -6536,7 +6536,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 fix-packlist
+				move-uniquefiles-plist fix-plist-sequence fix-packlist fix-plist-perl
 .if defined(DEVELOPER)
 _STAGE_SEQ+=	stage-qa
 .endif
@@ -6570,7 +6570,7 @@ _INSTALL_SUSEQ= check-umask install-mtre
 				desktop-file-post-install kmod-post-install shared-mime-post-install webplugin-post-install \
 				post-install post-install-script add-plist-buildinfo \
 				add-plist-info add-plist-docs add-plist-examples \
-				add-plist-data add-plist-post fix-plist-sequence \
+				add-plist-data add-plist-post fix-plist-sequence fix-plist-perl \
 				compress-man install-ldconfig-file fake-pkg security-check
 _PACKAGE_DEP=	install
 _PACKAGE_SEQ=	package-message pre-package pre-package-script \