<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[151997] trunk/dports/lang/perl5/files/5.22</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/151997">151997</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-08-26 03:13:39 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>perl5.22: cleanup patches, add a patch for removing the 10.3 target (#51980)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangperl5files522avoidbind9linkingpatch">trunk/dports/lang/perl5/files/5.22/avoid-bind9-linking.patch</a></li>
<li><a href="#trunkdportslangperl5files522avoidnocppprecompPR38913patch">trunk/dports/lang/perl5/files/5.22/avoid-no-cpp-precomp-PR38913.patch</a></li>
<li><a href="#trunkdportslangperl5files522cleanuppathspatch">trunk/dports/lang/perl5/files/5.22/clean-up-paths.patch</a></li>
<li><a href="#trunkdportslangperl5files522fixminiperllinkingPR36438patch">trunk/dports/lang/perl5/files/5.22/fix-miniperl-linking-PR36438.patch</a></li>
<li><a href="#trunkdportslangperl5files522installundershortversionPR43480patch">trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangperl5files522remove103targetPR126360patch">trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangperl5files522avoidbind9linkingpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5/files/5.22/avoid-bind9-linking.patch (151996 => 151997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.22/avoid-bind9-linking.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/avoid-bind9-linking.patch 2016-08-26 10:13:39 UTC (rev 151997)
</span><span class="lines">@@ -2,16 +2,14 @@
</span><span class="cx"> loclibpth="$loclibpth /opt/local/lib/libgcc" ;;
</span><span class="cx"> which is new in 5.22 needs some special "treatment".
</span><span class="cx">
</span><del>-Index: hints/darwin.sh
-===================================================================
</del><span class="cx"> --- hints/darwin.sh.orig
</span><span class="cx"> +++ hints/darwin.sh
</span><del>-@@ -337,6 +337,8 @@ i_dbm=undef;
</del><ins>+@@ -338,7 +338,7 @@ i_dbm=undef;
+ # Configure doesn't detect ranlib on Tiger properly.
</ins><span class="cx"> # NeilW says this should be acceptable on all darwin versions.
</span><span class="cx"> ranlib='ranlib'
</span><del>-
</del><ins>+-
</ins><span class="cx"> +libswanted="$(echo $libswanted | sed -e 's/bind //' -e 's/ bind//')"
</span><del>-+
</del><span class="cx"> # Catch MacPorts gcc/g++ extra libdir
</span><span class="cx"> case "$($cc -v 2>&1)" in
</span><span class="cx"> *"MacPorts gcc"*) loclibpth="$loclibpth /opt/local/lib/libgcc" ;;
</span></span></pre></div>
<a id="trunkdportslangperl5files522avoidnocppprecompPR38913patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5/files/5.22/avoid-no-cpp-precomp-PR38913.patch (151996 => 151997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.22/avoid-no-cpp-precomp-PR38913.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/avoid-no-cpp-precomp-PR38913.patch 2016-08-26 10:13:39 UTC (rev 151997)
</span><span class="lines">@@ -1,13 +1,11 @@
</span><del>-Index: hints/darwin.sh
-===================================================================
</del><span class="cx"> --- hints/darwin.sh.orig
</span><span class="cx"> +++ hints/darwin.sh
</span><del>-@@ -137,8 +137,6 @@ esac
</del><ins>+@@ -137,7 +137,7 @@ esac
</ins><span class="cx">
</span><span class="cx"> # Avoid Apple's cpp precompiler, better for extensions
</span><span class="cx"> if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then
</span><span class="cx"> - cppflags="${cppflags} -no-cpp-precomp"
</span><del>--
</del><ins>++
+
</ins><span class="cx"> # This is necessary because perl's build system doesn't
</span><span class="cx"> # apply cppflags to cc compile lines as it should.
</span><del>- ccflags="${ccflags} ${cppflags}"
</del></span></pre></div>
<a id="trunkdportslangperl5files522cleanuppathspatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5/files/5.22/clean-up-paths.patch (151996 => 151997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.22/clean-up-paths.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/clean-up-paths.patch 2016-08-26 10:13:39 UTC (rev 151997)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><del>-Index: Configure
-===================================================================
</del><span class="cx"> --- Configure.orig
</span><span class="cx"> +++ Configure
</span><span class="cx"> @@ -108,8 +108,8 @@ if test -d c:/. || ( uname -a | grep -i
</span><span class="lines">@@ -13,7 +11,7 @@
</span><span class="cx"> paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
</span><span class="cx"> paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
</span><span class="cx"> paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
</span><del>-@@ -1404,7 +1404,7 @@ archobjs=''
</del><ins>+@@ -1405,7 +1405,7 @@ archobjs=''
</ins><span class="cx"> archname=''
</span><span class="cx"> : Possible local include directories to search.
</span><span class="cx"> : Set locincpth to "" in a hint file to defeat local include searches.
</span><span class="lines">@@ -22,7 +20,7 @@
</span><span class="cx"> locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
</span><span class="cx"> :
</span><span class="cx"> : no include file wanted by default
</span><del>-@@ -1418,12 +1418,12 @@ libnames=''
</del><ins>+@@ -1419,12 +1419,12 @@ libnames=''
</ins><span class="cx"> : change the next line if compiling for Xenix/286 on Xenix/386
</span><span class="cx"> xlibpth='/usr/lib/386 /lib/386'
</span><span class="cx"> : Possible local library directories to search.
</span></span></pre></div>
<a id="trunkdportslangperl5files522fixminiperllinkingPR36438patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5/files/5.22/fix-miniperl-linking-PR36438.patch (151996 => 151997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.22/fix-miniperl-linking-PR36438.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/fix-miniperl-linking-PR36438.patch 2016-08-26 10:13:39 UTC (rev 151997)
</span><span class="lines">@@ -1,14 +1,11 @@
</span><del>-Index: Makefile.SH
-===================================================================
</del><span class="cx"> --- Makefile.SH.orig
</span><span class="cx"> +++ Makefile.SH
</span><del>-@@ -905,7 +905,8 @@ NAMESPACEFLAGS = -force_flat_namespace
</del><ins>+@@ -908,7 +908,7 @@ NAMESPACEFLAGS = -force_flat_namespace
</ins><span class="cx"> $spitshell >>$Makefile <<'!NO!SUBS!'
</span><span class="cx"> lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
</span><span class="cx"> -@rm -f miniperl.xok
</span><span class="cx"> - $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
</span><del>-+ unset LIBRARY_PATH && \
-+ $(CC) $(subst -L__PREFIX__/lib,,$(CLDFLAGS)) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
</del><ins>++ unset LIBRARY_PATH && $(CC) $(subst -L__PREFIX__/lib,,$(CLDFLAGS)) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
</ins><span class="cx"> $(mini_obj) $(libs)
</span><span class="cx"> $(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'
</span><span class="cx"> $(MINIPERL) -f write_buildcustomize.pl
</span></span></pre></div>
<a id="trunkdportslangperl5files522installundershortversionPR43480patch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch (151996 => 151997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch 2016-08-26 10:13:39 UTC (rev 151997)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> *) set dflt privlib lib/$version ;;
</span><span class="cx"> esac
</span><span class="cx"> eval $prefixit
</span><del>-@@ -7490,7 +7494,7 @@ siteprefixexp="$ansexp"
</del><ins>+@@ -7492,7 +7492,7 @@ siteprefixexp="$ansexp"
</ins><span class="cx"> prog=`echo $package | $sed 's/-*[0-9.]*$//'`
</span><span class="cx"> case "$sitelib" in
</span><span class="cx"> '') case "$installstyle" in
</span></span></pre></div>
<a id="trunkdportslangperl5files522remove103targetPR126360patch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch (0 => 151997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch (rev 0)
+++ trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch 2016-08-26 10:13:39 UTC (rev 151997)
</span><span class="lines">@@ -0,0 +1,142 @@
</span><ins>+https://trac.macports.org/ticket/51980
+https://rt.perl.org/Ticket/Display.html?id=126360
+https://rt.perl.org/Ticket/Display.html?id=128980
+http://perl5.git.perl.org/perl.git/commit/53d1d41c81e1de9cc6416dcae828c13d4c5a470a
+
+--- hints/darwin.sh.orig
++++ hints/darwin.sh
+@@ -186,30 +186,125 @@ case "$ld" in
+ ;;
+ esac
+
++# From http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/mk/platform/Darwin.mk
++#
++# OS, Kernel, Xcode Version
++# Note that Xcode gets updates on older systems sometimes.
++# pkgsrc generally expects that the most up-to-date xcode available for
++# an OS version is installed
++#
++# Codename OS Kernel Xcode
++# Cheetah 10.0.x 1.3.1
++# Puma 10.1 1.4.1
++# 10.1.x 5.x.y
++# Jaguar 10.2.x 6.x.y
++# Panther 10.3.x 7.x.y
++# Tiger 10.4.x 8.x.y 2.x (gcc 4.0, 4.0.1 from 2.2)
++# Leopard 10.5.x 9.x.y 3.x (gcc 4.0.1, 4.0.1 and 4.2.1 from 3.1)
++# Snow Leopard 10.6.x 10.x.y 3.2+ (gcc 4.0.1 and 4.2.1)
++# Lion 10.7.x 11.x.y 4.1 (llvm gcc 4.2.1)
++# Mountain Lion 10.8.x 12.x.y 4.5 (llvm gcc 4.2.1)
++# Mavericks 10.9.x 13.x.y 6 (llvm clang 6.0)
++# Yosemite 10.10.x 14.x.y 6 (llvm clang 6.0)
++# El Capitan 10.11.x 15.x.y 7 (llvm clang 7.0)
++
++# MACOSX_DEPLOYMENT_TARGET selects the minimum OS level we want to support
++#
++# It is needed for OS releases before 10.6.
++#
++# https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html
++#
++# If it is set, we also propagate its value to ccflags and ldflags
++# using the -mmacosx-version-min flag. If it is not set, we use
++# the OS X release as the min value for the flag.
++
++# Adds "-mmacosx-version-min=$2" to "$1" unless it already is there.
++add_macosx_version_min () {
++ local v
++ eval "v=\$$1"
++ case " $v " in
++ *"-mmacosx-version-min"*)
++ echo "NOT adding -mmacosx-version-min=$2 to $1 ($v)" >&4
++ ;;
++ *) echo "Adding -mmacosx-version-min=$2 to $1" >&4
++ eval "$1='$v -mmacosx-version-min=$2'"
++ ;;
++ esac
++}
++
+ # Perl bundles do not expect two-level namespace, added in Darwin 1.4.
+ # But starting from perl 5.8.1/Darwin 7 the default is the two-level.
+-case "$osvers" in
+-1.[0-3].*)
++case "$osvers" in # Note: osvers is the kernel version, not the 10.x
++1.[0-3].*) # OS X 10.0.x
+ lddlflags="${ldflags} -bundle -undefined suppress"
+ ;;
+-1.*)
++1.*) # OS X 10.1
+ ldflags="${ldflags} -flat_namespace"
+ lddlflags="${ldflags} -bundle -undefined suppress"
+ ;;
+-[2-6].*)
++[2-6].*) # OS X 10.1.x - 10.2.x (though [2-4] never existed publicly)
+ ldflags="${ldflags} -flat_namespace"
+ lddlflags="${ldflags} -bundle -undefined suppress"
+ ;;
+-*)
+- # MACOSX_DEPLOYMENT_TARGET selects the minimum OS level we want to support
+- # https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html
++[7-9].*) # OS X 10.3.x - 10.5.x
+ lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
+ case "$ld" in
+- *MACOSX_DEVELOPMENT_TARGET*) ;;
++ *MACOSX_DEPLOYMENT_TARGET*) ;;
+ *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
+ esac
+ ;;
++*) # OS X 10.6.x - current
++ # The MACOSX_DEPLOYMENT_TARGET is not needed,
++ # but the -mmacosx-version-min option is always used.
++
++ # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
++ # capturing its value and adding it to the flags.
++ case "$MACOSX_DEPLOYMENT_TARGET" in
++ 10.*)
++ add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
++ add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
++ ;;
++ '')
++ # Empty MACOSX_DEPLOYMENT_TARGET is okay.
++ ;;
++ *)
++ cat <<EOM >&4
++
++*** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
++***
++*** Please either set it to 10.something, or to empty.
++
++EOM
++ exit 1
++ ;;
++ esac
++
++ # Keep the prodvers leading whitespace (Configure magic).
++ # Cannot use $osvers here since that is the kernel version.
++ # sw_vers output what we want
++ # "ProductVersion: 10.10.5" "10.10"
++ # "ProductVersion: 10.11" "10.11"
++ prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
++ case "$prodvers" in
++ 10.*)
++ add_macosx_version_min ccflags $prodvers
++ add_macosx_version_min ldflags $prodvers
++ ;;
++ *)
++ cat <<EOM >&4
++
++*** Unexpected product version $prodvers.
++***
++*** Try running sw_vers and see what its ProductVersion says.
++
++EOM
++ exit 1
++ esac
++
++ lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
++ ;;
+ esac
++
+ ldlibpthname='DYLD_LIBRARY_PATH';
+
+ # useshrplib=true results in much slower startup times.
+
</ins></span></pre>
</div>
</div>
</body>
</html>