Changeset 79451

Timestamp:

06/13/11 14:39:53 (4 years ago)

Author:

ricci@…

Message:

add perl5.14, but don't make it the default perl5 yet
first part of resolving #29812 (second part will be flipping perl5.14 to be the default)

Location:

trunk/dports/lang

Files:

• perl5.14 (copied) (copied from trunk/dports/lang/perl5.12)
• perl5.14/Portfile (modified) (5 diffs)
• perl5.14/files/patch-Configure.diff (modified) (3 diffs)
• perl5/Portfile (modified) (2 diffs)

trunk/dports/lang/perl5.14/Portfile

@@ -3 +3 @@
 PortSystem      1.0
 
-name            perl5.12
-version         5.12.3
+name            perl5.14
+version         5.14.0
 revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
@@ -10 +10 @@
 platforms       darwin freebsd linux
 maintainers     ricci openmaintainer
-description     Perl 5.12.x - Practical Extraction and Report Language
+description     Perl 5.14.x - Practical Extraction and Report Language
 
 long_description \
@@ -23 +23 @@
 master_sites    http://www.cpan.org/src/5.0/
 
-checksums           md5     72f3f7e1c700e79bbf9d9279ca5b42d9 \
-                    sha1    86d77c6cbc7a60068dc14c88ffd0729324d1174f \
-                    rmd160  e3c5825aa800e2304dd815858880372500a4f9a0
+checksums           md5     e7457deea78330c5f8eebb2fd2a45479 \
+                    sha1    da5e991f9d4a6728eccfc190c5ddbed3c02a94fe \
+                    rmd160  15aeb6c272d01ba0bbf938c9b198f03bd787b5e7
 
 patchfiles      patch-Configure.diff patch-handy.h.stdbool.diff
@@ -76 +76 @@
     set platsuffix "-2level"
 }
-if { [variant_isset threads] } {
-    configure.args-append "-D inc_version_list=\"5.12.2/${os.platform}-thread-multi${platsuffix} 5.12.2 5.12.1/${os.platform}-thread-multi${platsuffix} 5.12.1 5.12.0/${os.platform}-thread-multi${platsuffix} 5.12.0\""
-} else {
-    configure.args-append "-D inc_version_list=\"5.12.2/${os.platform}-multi${platsuffix} 5.12.2 5.12.1/${os.platform}-multi${platsuffix} 5.12.1 5.12.0/${os.platform}-multi${platsuffix} 5.12.0\""
-}
 
 if {[variant_isset universal]} {
@@ -129 +124 @@
 livecheck.type  regex
 livecheck.url   http://www.cpan.org/src
-livecheck.regex {perl-(5\.12\.\d)\.}
+livecheck.regex {perl-(5\.14\.\d)\.}

trunk/dports/lang/perl5.14/files/patch-Configure.diff

@@ -1 @@
---- Configure.orig      2009-08-18 12:03:53.000000000 -0700
-+++ Configure   2009-11-10 21:13:09.000000000 -0800
-@@ -103,7 +103,7 @@
+--- Configure.orig      2011-05-07 20:10:08.000000000 -0700
++++ Configure   2011-06-13 12:50:01.000000000 -0700
+@@ -106,7 +106,7 @@
  fi
  
@@ -10 +10 @@
  paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
  paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
-@@ -1303,12 +1303,12 @@
+@@ -1311,7 +1311,7 @@
+ archname=''
+ : Possible local include directories to search.
+ : Set locincpth to "" in a hint file to defeat local include searches.
+-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
++locincpth="/opt/local/include /usr/gnu/include"
+ locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
+ :
+ : no include file wanted by default
+@@ -1330,12 +1330,12 @@
  : change the next line if compiling for Xenix/286 on Xenix/386
  xlibpth='/usr/lib/386 /lib/386'
@@ -25 +34 @@
  test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
  test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
-@@ -1329,7 +1329,7 @@
- 
- : Possible local include directories to search.
- : Set locincpth to "" in a hint file to defeat local include searches.
--locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
-+locincpth="/opt/local/include /usr/gnu/include"
- locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
- :
- : no include file wanted by default

trunk/dports/lang/perl5/Portfile

@@ -25 +25 @@
 } elseif {[variant_isset perl5_10]} {
     set branch 5.10
+} elseif {[variant_isset perl5_14]} {
+    set branch 5.14
 } else {
     set branch 5.12
@@ -75 +77 @@
 }
 
-variant perl5_8 conflicts perl5_10 perl5_12 description { use perl 5.8 instead of perl 5.10 or perl 5.12} {
+variant perl5_8 conflicts perl5_10 perl5_12 perl5_14 description { use perl 5.8 instead of perl 5.10, perl 5.12, or perl 5.14} {
     depends_lib-append  port:perl5.8
 }
 
-variant perl5_10 conflicts perl5_12 perl5_8 description { use perl 5.10 instead of perl 5.8 or perl 5.12} {
+variant perl5_10 conflicts perl5_8 perl5_12 perl5_14 description { use perl 5.10 instead of perl 5.8, perl 5.12, perl 5.14} {
     depends_lib-append  port:perl5.10
 }
 
-variant perl5_12 conflicts perl5_10 perl5_8 description { use perl 5.12 instead of perl 5.8 or perl 5.10 } {
+variant perl5_12 conflicts perl5_8 perl5_10 perl5_14 description { use perl 5.12 instead of perl 5.8, perl 5.10, or perl 5.14} {
     depends_lib-append  port:perl5.12
 }
 
+variant perl5_14 conflicts perl5_8 perl5_10 perl5_12 description { use perl 5.14 instead of perl 5.8, perl 5.10, or perl 5.12} {
+    depends_lib-append  port:perl5.14
+}
+
 livecheck.type     none