[152001] trunk/dports/lang/perl5

[mojca at macports.org]

Revision: 152001
          https://trac.macports.org/changeset/152001
Author:   mojca at macports.org
Date:     2016-08-26 04:00:16 -0700 (Fri, 26 Aug 2016)
Log Message:
-----------
perl5.16: add a (not-yet-used) patch for installing under short version (see #43480)

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

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

Modified: trunk/dports/lang/perl5/Portfile
===================================================================
--- trunk/dports/lang/perl5/Portfile	2016-08-26 10:57:30 UTC (rev 152000)
+++ trunk/dports/lang/perl5/Portfile	2016-08-26 11:00:16 UTC (rev 152001)
@@ -87,7 +87,7 @@
                             ${perl5.major}/fix-cxx-dNOOP-PR43150.patch
         } else {
             patchfiles-append \
-                            ${perl5.major}/install-under-short-version-PR43480.patch \
+                            ${perl5.major}/install-under-short-version-PR43480.patch
         }
         if {${perl5.major} >= 5.22} {
             # failed test

Copied: trunk/dports/lang/perl5/files/5.16/install-under-short-version-PR43480.patch (from rev 151999, trunk/dports/lang/perl5/files/5.18/install-under-short-version-PR43480.patch)
===================================================================
--- trunk/dports/lang/perl5/files/5.16/install-under-short-version-PR43480.patch	                        (rev 0)
+++ trunk/dports/lang/perl5/files/5.16/install-under-short-version-PR43480.patch	2016-08-26 11:00:16 UTC (rev 152001)
@@ -0,0 +1,39 @@
+https://trac.macports.org/ticket/43480
+--- Configure.orig
++++ Configure
+@@ -4123,6 +4123,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 }'`
+ 	;;
+@@ -6183,7 +6185,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
+@@ -6431,7 +6433,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
+ 	;;
+@@ -6950,7 +6952,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/20160826/29f37b93/attachment-0001.html>