[131319] trunk/dports/lang/perl5.20

[larryv at macports.org]

Revision: 131319
          https://trac.macports.org/changeset/131319
Author:   larryv at macports.org
Date:     2015-01-09 10:49:37 -0800 (Fri, 09 Jan 2015)
Log Message:
-----------
perl5.20: Tweak patching

Modified Paths:
--------------
    trunk/dports/lang/perl5.20/Portfile

Added Paths:
-----------
    trunk/dports/lang/perl5.20/files/install-under-short-version-PR43480.patch

Removed Paths:
-------------
    trunk/dports/lang/perl5.20/files/patch-Configure.diff

Modified: trunk/dports/lang/perl5.20/Portfile
===================================================================
--- trunk/dports/lang/perl5.20/Portfile	2015-01-09 17:47:39 UTC (rev 131318)
+++ trunk/dports/lang/perl5.20/Portfile	2015-01-09 18:49:37 UTC (rev 131319)
@@ -28,9 +28,8 @@
 checksums           rmd160  8a33e7ef2cbe4b11c83187176656454794f6d26d \
                     sha256  ede5ded37e7fb6139b04728cfca826f17076f9888dbfd100a56834dbeb04657c
 
-patchfiles          patch-Configure.diff
-
-pre-configure {
+patchfiles          install-under-short-version.patch
+post-patch {
     reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Configure
 }
 

Copied: trunk/dports/lang/perl5.20/files/install-under-short-version-PR43480.patch (from rev 131318, trunk/dports/lang/perl5.20/files/patch-Configure.diff)
===================================================================
--- trunk/dports/lang/perl5.20/files/install-under-short-version-PR43480.patch	                        (rev 0)
+++ trunk/dports/lang/perl5.20/files/install-under-short-version-PR43480.patch	2015-01-09 18:49:37 UTC (rev 131319)
@@ -0,0 +1,39 @@
+https://trac.macports.org/ticket/43480
+--- Configure.orig
++++ Configure
+@@ -4265,6 +4265,8 @@ dos|vms)
+ *)
+ 	version=`echo $revision $patchlevel $subversion | \
+ 		 $awk '{ printf "%d.%d.%d\n", $1, $2, $3 }'`
++	version_short=`echo $revision $patchlevel | \
++		 $awk '{ printf "%d.%d\n", $1, $2 }'`
+ 	api_versionstring=`echo $api_revision $api_version $api_subversion | \
+ 		 $awk '{ printf "%d.%d.%d\n", $1, $2, $3 }'`
+ 	;;
+@@ -6499,7 +6501,7 @@ esac
+ : /opt/perl/lib/perl5... would be redundant.
+ : The default "style" setting is made in installstyle.U
+ case "$installstyle" in
+-*lib/perl5*) set dflt privlib lib/$package/$version ;;
++*lib/perl5*) set dflt privlib lib/$package/$version_short ;;
+ *)	 set dflt privlib lib/$version ;;
+ esac
+ eval $prefixit
+@@ -6747,7 +6749,7 @@ siteprefixexp="$ansexp"
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ case "$sitelib" in
+ '') case "$installstyle" in
+-	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
++	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version_short ;;
+ 	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
+ 	esac
+ 	;;
+@@ -7165,7 +7167,7 @@ case "$vendorprefix" in
+ 	'')
+ 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ 		case "$installstyle" in
+-		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
++		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version_short ;;
+ 		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
+ 		esac
+ 		;;

Deleted: trunk/dports/lang/perl5.20/files/patch-Configure.diff
===================================================================
--- trunk/dports/lang/perl5.20/files/patch-Configure.diff	2015-01-09 17:47:39 UTC (rev 131318)
+++ trunk/dports/lang/perl5.20/files/patch-Configure.diff	2015-01-09 18:49:37 UTC (rev 131319)
@@ -1,39 +0,0 @@
-https://trac.macports.org/ticket/43480
---- Configure.orig
-+++ Configure
-@@ -4265,6 +4265,8 @@ dos|vms)
- *)
- 	version=`echo $revision $patchlevel $subversion | \
- 		 $awk '{ printf "%d.%d.%d\n", $1, $2, $3 }'`
-+	version_short=`echo $revision $patchlevel | \
-+		 $awk '{ printf "%d.%d\n", $1, $2 }'`
- 	api_versionstring=`echo $api_revision $api_version $api_subversion | \
- 		 $awk '{ printf "%d.%d.%d\n", $1, $2, $3 }'`
- 	;;
-@@ -6499,7 +6501,7 @@ esac
- : /opt/perl/lib/perl5... would be redundant.
- : The default "style" setting is made in installstyle.U
- case "$installstyle" in
--*lib/perl5*) set dflt privlib lib/$package/$version ;;
-+*lib/perl5*) set dflt privlib lib/$package/$version_short ;;
- *)	 set dflt privlib lib/$version ;;
- esac
- eval $prefixit
-@@ -6747,7 +6749,7 @@ siteprefixexp="$ansexp"
- prog=`echo $package | $sed 's/-*[0-9.]*$//'`
- case "$sitelib" in
- '') case "$installstyle" in
--	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
-+	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version_short ;;
- 	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
- 	esac
- 	;;
-@@ -7165,7 +7167,7 @@ case "$vendorprefix" in
- 	'')
- 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
- 		case "$installstyle" in
--		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
-+		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version_short ;;
- 		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
- 		esac
- 		;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150109/bee92801/attachment.html>