[123698] trunk/dports/lang/perl5.18

[mojca at macports.org]

Revision: 123698
          https://trac.macports.org/changeset/123698
Author:   mojca at macports.org
Date:     2014-08-12 23:17:58 -0700 (Tue, 12 Aug 2014)
Log Message:
-----------
perl5.18: remove the subrelease number (#43480)

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

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

Modified: trunk/dports/lang/perl5.18/Portfile
===================================================================
--- trunk/dports/lang/perl5.18/Portfile	2014-08-13 03:19:52 UTC (rev 123697)
+++ trunk/dports/lang/perl5.18/Portfile	2014-08-13 06:17:58 UTC (rev 123698)
@@ -5,6 +5,7 @@
 
 name                perl5.18
 version             5.18.2
+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.18/files/patch-Configure.diff
===================================================================
--- trunk/dports/lang/perl5.18/files/patch-Configure.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.18/files/patch-Configure.diff	2014-08-13 06:17:58 UTC (rev 123698)
@@ -0,0 +1,38 @@
+--- Configure.orig
++++ Configure
+@@ -4132,6 +4132,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 }'`
+ 	;;
+@@ -6218,7 +6220,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
+@@ -6466,7 +6468,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
+ 	;;
+@@ -6985,7 +6987,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/20140812/9d5f7a3a/attachment.html>