svn commit: r413019 - in head/lang: perl5-devel perl5.18 perl5.20 perl5.22

[Mathieu Arnold]

Author: mat
Date: Mon Apr 11 11:29:31 2016
New Revision: 413019
URL: https://svnweb.freebsd.org/changeset/ports/413019

Log:
  Patch Config_heavy.pl so that -L${WRKSRC} is not removed after Perl is built.
  
  Sponsored by:	Absolight

Modified:
  head/lang/perl5-devel/Makefile   (contents, props changed)
  head/lang/perl5.18/Makefile   (contents, props changed)
  head/lang/perl5.20/Makefile   (contents, props changed)
  head/lang/perl5.22/Makefile   (contents, props changed)

Modified: head/lang/perl5-devel/Makefile
==============================================================================
--- head/lang/perl5-devel/Makefile	Mon Apr 11 11:12:09 2016	(r413018)
+++ head/lang/perl5-devel/Makefile	Mon Apr 11 11:29:31 2016	(r413019)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	perl
-PORTREVISION=	0
+PORTREVISION=	1
 # XXX Remove second line, uncomment first
 #DISTVERSION=	${PERL_VERSION}
 DISTVERSION=	${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//}
@@ -271,10 +271,15 @@ post-patch-PTHREAD-off:
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \
 		${WRKSRC}/hints/freebsd.sh
 
-.if ${CC} == /nxb-bin/usr/bin/cc
 post-build:
+	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
+		${WRKSRC}/lib/Config_heavy.pl
+.if ${CC} == /nxb-bin/usr/bin/cc
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${WRKSRC}/lib/Config.pm ${WRKSRC}/lib/Config_heavy.pl
+# Restore Config.pm's timestamp so that Perl's build system does not think it
+# needs to rebuild everything.
+	@${TOUCH} -r ${WRKSRC}/lib/Config.pm.bak ${WRKSRC}/lib/Config.pm
 .endif
 
 post-install:

Modified: head/lang/perl5.18/Makefile
==============================================================================
--- head/lang/perl5.18/Makefile	Mon Apr 11 11:12:09 2016	(r413018)
+++ head/lang/perl5.18/Makefile	Mon Apr 11 11:29:31 2016	(r413019)
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN/../../src/5.0
 DIST_SUBDIR=	perl
@@ -238,10 +238,15 @@ post-patch-PTHREAD-off:
 		${WRKSRC}/hints/freebsd.sh
 .endif
 
-.if ${CC} == /nxb-bin/usr/bin/cc
 post-build:
+	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
+		${WRKSRC}/lib/Config_heavy.pl
+.if ${CC} == /nxb-bin/usr/bin/cc
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${WRKSRC}/lib/Config.pm ${WRKSRC}/lib/Config_heavy.pl
+# Restore Config.pm's timestamp so that Perl's build system does not think it
+# needs to rebuild everything.
+	@${TOUCH} -r ${WRKSRC}/lib/Config.pm.bak ${WRKSRC}/lib/Config.pm
 .endif
 
 post-install:

Modified: head/lang/perl5.20/Makefile
==============================================================================
--- head/lang/perl5.20/Makefile	Mon Apr 11 11:12:09 2016	(r413018)
+++ head/lang/perl5.20/Makefile	Mon Apr 11 11:29:31 2016	(r413019)
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN/../../src/5.0
 DIST_SUBDIR=	perl
@@ -233,10 +233,15 @@ post-patch-PTHREAD-off:
 		${WRKSRC}/hints/freebsd.sh
 .endif
 
-.if ${CC} == /nxb-bin/usr/bin/cc
 post-build:
+	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
+		${WRKSRC}/lib/Config_heavy.pl
+.if ${CC} == /nxb-bin/usr/bin/cc
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${WRKSRC}/lib/Config.pm ${WRKSRC}/lib/Config_heavy.pl
+# Restore Config.pm's timestamp so that Perl's build system does not think it
+# needs to rebuild everything.
+	@${TOUCH} -r ${WRKSRC}/lib/Config.pm.bak ${WRKSRC}/lib/Config.pm
 .endif
 
 post-install:

Modified: head/lang/perl5.22/Makefile
==============================================================================
--- head/lang/perl5.22/Makefile	Mon Apr 11 11:12:09 2016	(r413018)
+++ head/lang/perl5.22/Makefile	Mon Apr 11 11:29:31 2016	(r413019)
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 DISTVERSION=	${PERL_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN/../../src/5.0 CPAN/../by-authors/id/S/SH/SHAY
 DIST_SUBDIR=	perl
@@ -231,10 +231,15 @@ post-patch-PTHREAD-off:
 		${WRKSRC}/hints/freebsd.sh
 .endif
 
-.if ${CC} == /nxb-bin/usr/bin/cc
 post-build:
+	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
+		${WRKSRC}/lib/Config_heavy.pl
+.if ${CC} == /nxb-bin/usr/bin/cc
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${WRKSRC}/lib/Config.pm ${WRKSRC}/lib/Config_heavy.pl
+# Restore Config.pm's timestamp so that Perl's build system does not think it
+# needs to rebuild everything.
+	@${TOUCH} -r ${WRKSRC}/lib/Config.pm.bak ${WRKSRC}/lib/Config.pm
 .endif
 
 post-install: