[148406] trunk/dports/lang/perl5

mojca at macports.org mojca at macports.org
Sat May 7 03:47:26 PDT 2016


Revision: 148406
          https://trac.macports.org/changeset/148406
Author:   mojca at macports.org
Date:     2016-05-07 03:47:26 -0700 (Sat, 07 May 2016)
Log Message:
-----------
perl5.24.0-RC5: pre-release subport (see #51330)

Modified Paths:
--------------
    trunk/dports/lang/perl5/Portfile
    trunk/dports/lang/perl5/files/5.24/avoid-bind9-linking.patch
    trunk/dports/lang/perl5/files/5.24/clean-up-paths.patch
    trunk/dports/lang/perl5/files/5.24/fix-ld-modification.patch
    trunk/dports/lang/perl5/files/5.24/fix-miniperl-linking-PR36438.patch

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

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

Modified: trunk/dports/lang/perl5/Portfile
===================================================================
--- trunk/dports/lang/perl5/Portfile	2016-05-07 09:26:28 UTC (rev 148405)
+++ trunk/dports/lang/perl5/Portfile	2016-05-07 10:47:26 UTC (rev 148406)
@@ -35,6 +35,7 @@
     5.18 4 1 d97181a98f7acc80125b0d2a182a6a2cd7542ceb  1fb4d27b75cd244e849f253320260efe1750641aaff4a18ce0d67556ff1b96a5
     5.20 3 0 499846a1c92e00dd357cb782bc14787b8cd47051  1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b
     5.22 2 0 203afca8995ca426db0af48b78eb606b5d24011a  f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058
+#   5.24 0-RC5 0 3d5f971240ffe48ea152118e4376d3572c6aa78c  98ecd17bc8b56283bad106b133965916aabdbe1370ab51fb0d67a71f8199540b
 }
 
 foreach {perl5.v perl5.subversion perl5.revision perl5.rmd160 perl5.sha256} ${perl5.versions_info} {

Modified: trunk/dports/lang/perl5/files/5.24/avoid-bind9-linking.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/avoid-bind9-linking.patch	2016-05-07 09:23:09 UTC (rev 148404)
+++ trunk/dports/lang/perl5/files/5.24/avoid-bind9-linking.patch	2016-05-07 10:47:26 UTC (rev 148406)
@@ -6,7 +6,7 @@
 ===================================================================
 --- hints/darwin.sh.orig
 +++ hints/darwin.sh
-@@ -337,6 +337,8 @@ i_dbm=undef;
+@@ -482,6 +482,8 @@ i_dbm=undef;
  # NeilW says this should be acceptable on all darwin versions.
  ranlib='ranlib'
  

Modified: trunk/dports/lang/perl5/files/5.24/clean-up-paths.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/clean-up-paths.patch	2016-05-07 09:23:09 UTC (rev 148404)
+++ trunk/dports/lang/perl5/files/5.24/clean-up-paths.patch	2016-05-07 10:47:26 UTC (rev 148406)
@@ -2,7 +2,7 @@
 ===================================================================
 --- Configure.orig
 +++ Configure
-@@ -108,8 +108,8 @@ if test -d c:/. || ( uname -a | grep -i 
+@@ -111,8 +111,8 @@ if test -d c:/. || ( uname -a | grep -i 
  fi
  
  : Proper PATH setting
@@ -13,8 +13,8 @@
  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"
  paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
-@@ -1404,7 +1404,7 @@ archobjs=''
- archname=''
+@@ -1425,7 +1425,7 @@ archobjs=''
+ i_whoami=''
  : 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"
@@ -22,7 +22,7 @@
  locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
  :
  : no include file wanted by default
-@@ -1418,12 +1418,12 @@ libnames=''
+@@ -1442,12 +1442,12 @@ libnames=''
  : change the next line if compiling for Xenix/286 on Xenix/386
  xlibpth='/usr/lib/386 /lib/386'
  : Possible local library directories to search.

Modified: trunk/dports/lang/perl5/files/5.24/fix-ld-modification.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/fix-ld-modification.patch	2016-05-07 09:23:09 UTC (rev 148404)
+++ trunk/dports/lang/perl5/files/5.24/fix-ld-modification.patch	2016-05-07 10:47:26 UTC (rev 148406)
@@ -2,8 +2,8 @@
 ===================================================================
 --- hints/darwin.sh.orig
 +++ hints/darwin.sh
-@@ -203,7 +203,7 @@ case "$osvers" in
-    # https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html
+@@ -292,7 +292,7 @@ case "$osvers" in
+ [7-9].*)   # OS X 10.3.x - 10.5.x
     lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
     case "$ld" in
 -       *MACOSX_DEVELOPMENT_TARGET*) ;;

Modified: trunk/dports/lang/perl5/files/5.24/fix-miniperl-linking-PR36438.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/fix-miniperl-linking-PR36438.patch	2016-05-07 09:23:09 UTC (rev 148404)
+++ trunk/dports/lang/perl5/files/5.24/fix-miniperl-linking-PR36438.patch	2016-05-07 10:47:26 UTC (rev 148406)
@@ -2,13 +2,13 @@
 ===================================================================
 --- Makefile.SH.orig
 +++ Makefile.SH
-@@ -905,7 +905,8 @@ NAMESPACEFLAGS = -force_flat_namespace
+@@ -964,7 +964,8 @@ NAMESPACEFLAGS = -force_flat_namespace
  		$spitshell >>$Makefile <<'!NO!SUBS!'
- lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
+ lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
  	- at rm -f miniperl.xok
 -	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
 +	unset LIBRARY_PATH && \
 +	$(CC) $(subst -L__PREFIX__/lib,,$(CLDFLAGS)) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
- 	    $(mini_obj) $(libs)
+ 	    $(miniperl_objs) $(libs)
  	$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl.  Please run make minitest; exit 1'
  	$(MINIPERL) -f write_buildcustomize.pl

Deleted: trunk/dports/lang/perl5/files/5.24/install-under-short-version-PR43480.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch	2016-05-07 09:23:09 UTC (rev 148404)
+++ trunk/dports/lang/perl5/files/5.24/install-under-short-version-PR43480.patch	2016-05-07 10:47:26 UTC (rev 148406)
@@ -1,39 +0,0 @@
-https://trac.macports.org/ticket/43480
---- Configure.orig
-+++ Configure
-@@ -4331,6 +4331,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 }'`
- 	;;
-@@ -7222,7 +7224,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
-@@ -7470,7 +7472,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
- 	;;
-@@ -7888,7 +7890,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
- 		;;

Copied: trunk/dports/lang/perl5/files/5.24/install-under-short-version-PR43480.patch (from rev 148405, trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch)
===================================================================
--- trunk/dports/lang/perl5/files/5.24/install-under-short-version-PR43480.patch	                        (rev 0)
+++ trunk/dports/lang/perl5/files/5.24/install-under-short-version-PR43480.patch	2016-05-07 10:47:26 UTC (rev 148406)
@@ -0,0 +1,39 @@
+https://trac.macports.org/ticket/43480
+--- Configure.orig
++++ Configure
+@@ -4360,6 +4360,8 @@ dos|vms)
+ *)
+ 	version=`echo $revision $patchlevel $subversion | \
+ 		 $awk '{ printf "%d.%d.%d", $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", $1, $2, $3 }'`
+ 	;;
+@@ -7296,7 +7298,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
+@@ -7544,7 +7548,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
+ 	;;
+@@ -7962,7 +7964,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/20160507/5ed13771/attachment.html>


More information about the macports-changes mailing list