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

[mojca at macports.org]

Revision: 120890
          https://trac.macports.org/changeset/120890
Author:   mojca at macports.org
Date:     2014-06-10 16:24:30 -0700 (Tue, 10 Jun 2014)
Log Message:
-----------
perl5.20: remove accidental leftovers from 5.18, remove subrelease numbers (#43480)

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

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

Removed Paths:
-------------
    trunk/dports/lang/perl5.20/files/perl5.18

Modified: trunk/dports/lang/perl5.20/Portfile
===================================================================
--- trunk/dports/lang/perl5.20/Portfile	2014-06-10 22:45:15 UTC (rev 120889)
+++ trunk/dports/lang/perl5.20/Portfile	2014-06-10 23:24:30 UTC (rev 120890)
@@ -5,6 +5,7 @@
 
 name                perl5.20
 version             5.20.0
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          lang
 license             {Artistic-1 GPL}
@@ -27,6 +28,8 @@
 
 depends_lib-append  port:gdbm
 
+patchfiles          patch-Configure.diff
+
 pre-configure {
     reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Configure
 }
@@ -64,13 +67,6 @@
                     -D perlpath="${prefix}/bin/perl${branch}" \
                     -D startperl="#!${prefix}/bin/perl${branch}"
 
-# Allow perl to find p5-* ports installed by previous (minor) versions
-set platsuffix ""
-if {${os.platform} eq "darwin"} {
-    set platsuffix "-2level"
-}
-configure.args-append "-D inc_version_list=\"5.18.0/${os.platform}-thread-multi${platsuffix} 5.18.0 \""
-
 if {[variant_isset universal]} {
     post-configure {
         system "cd ${worksrcpath} && ed - ${worksrcpath}/config.h < ${filespath}/config.h.ed"

Added: trunk/dports/lang/perl5.20/files/patch-Configure.diff
===================================================================
--- trunk/dports/lang/perl5.20/files/patch-Configure.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.20/files/patch-Configure.diff	2014-06-10 23:24:30 UTC (rev 120890)
@@ -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/perl5.18
===================================================================
--- trunk/dports/lang/perl5.20/files/perl5.18	2014-06-10 22:45:15 UTC (rev 120889)
+++ trunk/dports/lang/perl5.20/files/perl5.18	2014-06-10 23:24:30 UTC (rev 120890)
@@ -1,42 +0,0 @@
-bin/a2p-5.18
-bin/c2ph-5.18
-bin/config_data-5.18
-bin/corelist-5.18
-bin/cpan-5.18
-bin/cpan2dist-5.18
-bin/cpanp-5.18
-bin/cpanp-run-perl-5.18
-bin/enc2xs-5.18
-bin/find2perl-5.18
-bin/h2ph-5.18
-bin/h2xs-5.18
-bin/instmodsh-5.18
-bin/json_pp-5.18
-bin/libnetcfg-5.18
-bin/perl5.18
-bin/perl5.18.1
-bin/perlbug-5.18
-bin/perldoc-5.18
-bin/perlivp-5.18
-bin/perlthanks-5.18
-bin/piconv-5.18
-bin/pl2pm-5.18
-bin/pod2html-5.18
-bin/pod2latex-5.18
-bin/pod2man-5.18
-bin/pod2text-5.18
-bin/pod2usage-5.18
-bin/podchecker-5.18
-bin/podselect-5.18
-bin/prove-5.18
-bin/psed-5.18
-bin/pstruct-5.18
-bin/ptar-5.18
-bin/ptardiff-5.18
-bin/ptargrep-5.18
-bin/s2p-5.18
-bin/shasum-5.18
-bin/splain-5.18
-bin/xsubpp-5.18
-bin/zipdetails-5.18
--
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140610/469502a0/attachment-0001.html>