<!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>[154367] trunk/dports/lang/perl5</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 { white-space: pre-line; 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/154367">154367</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-10-28 21:57:18 +0200 (Fri, 28 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>perl5: backport fixes to 5.16-5.20 (closes #51980)
* backport fixes for MACOSX_DEPLOYMENT_TARGET from 5.24 and fix build on 10.12 for 5.16-5.20 (closes #51980)
* add `-Dinstallstyle='lib/perl5'` to avoid problems with a prefix like `/opt/perl5`
* replace `-D(cc|cpp|ld)flags` with `-A(cc|cpp|ld)flags` for all perl versions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangperl5Portfile">trunk/dports/lang/perl5/Portfile</a></li>
<li><a href="#trunkdportslangperl5files524fixldmodificationpatch">trunk/dports/lang/perl5/files/5.24/fix-ld-modification.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangperl5files516remove103targetPR126360patch">trunk/dports/lang/perl5/files/5.16/remove-10.3-target-PR126360.patch</a></li>
<li><a href="#trunkdportslangperl5files518remove103targetPR126360patch">trunk/dports/lang/perl5/files/5.18/remove-10.3-target-PR126360.patch</a></li>
<li><a href="#trunkdportslangperl5files520remove103targetPR126360patch">trunk/dports/lang/perl5/files/5.20/remove-10.3-target-PR126360.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangperl5files518fixldmodificationpatch">trunk/dports/lang/perl5/files/5.18/fix-ld-modification.patch</a></li>
<li><a href="#trunkdportslangperl5files520fixldmodificationpatch">trunk/dports/lang/perl5/files/5.20/fix-ld-modification.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangperl5Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5/Portfile (154366 => 154367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/Portfile 2016-10-28 19:44:19 UTC (rev 154366)
+++ trunk/dports/lang/perl5/Portfile 2016-10-28 19:57:18 UTC (rev 154367)
</span><span class="lines">@@ -31,9 +31,9 @@
</span><span class="cx"> # - revision
</span><span class="cx"> # - rmd160 sha256
</span><span class="cx"> set perl5.versions_info {
</span><del>- 5.16 3 2 f25fdd72449156a7cbe989e8bd339fdba1afabc0 bb7bc735e6813b177dcfccd480defcde7eddefa173b5967eac11babd1bfa98e8
- 5.18 4 1 d97181a98f7acc80125b0d2a182a6a2cd7542ceb 1fb4d27b75cd244e849f253320260efe1750641aaff4a18ce0d67556ff1b96a5
- 5.20 3 0 499846a1c92e00dd357cb782bc14787b8cd47051 1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b
</del><ins>+ 5.16 3 3 f25fdd72449156a7cbe989e8bd339fdba1afabc0 bb7bc735e6813b177dcfccd480defcde7eddefa173b5967eac11babd1bfa98e8
+ 5.18 4 2 d97181a98f7acc80125b0d2a182a6a2cd7542ceb 1fb4d27b75cd244e849f253320260efe1750641aaff4a18ce0d67556ff1b96a5
+ 5.20 3 1 499846a1c92e00dd357cb782bc14787b8cd47051 1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b
</ins><span class="cx"> 5.22 2 1 203afca8995ca426db0af48b78eb606b5d24011a f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058
</span><span class="cx"> 5.24 0 0 756bf07069e91eabe3dac3a47aec5097d48f8963 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0
</span><span class="cx"> }
</span><span class="lines">@@ -67,8 +67,7 @@
</span><span class="cx">
</span><span class="cx"> # TODO: revise patch naming scheme
</span><span class="cx"> patchfiles ${perl5.major}/clean-up-paths.patch \
</span><del>- ${perl5.major}/avoid-no-cpp-precomp-PR38913.patch \
- ${perl5.major}/fix-ld-modification.patch
</del><ins>+ ${perl5.major}/avoid-no-cpp-precomp-PR38913.patch
</ins><span class="cx">
</span><span class="cx"> # Prevent build from picking up the bind9 port's static libbind, which
</span><span class="cx"> # duplicates symbols from /usr/lib/libdl (r10638).
</span><span class="lines">@@ -75,9 +74,13 @@
</span><span class="cx"> patchfiles-append ${perl5.major}/avoid-bind9-linking.patch
</span><span class="cx">
</span><span class="cx"> # Prevent miniperl linking from accidentally finding our libstdc++
</span><del>- # (#36438).
</del><ins>+ # https://trac.macports.org/ticket/36438
</ins><span class="cx"> patchfiles-append ${perl5.major}/fix-miniperl-linking-PR36438.patch
</span><span class="cx">
</span><ins>+ # Install files under 5.xx rather than 5.xx.yy
+ # https://trac.macports.org/ticket/43480
+ patchfiles-append ${perl5.major}/install-under-short-version-PR43480.patch
+
</ins><span class="cx"> if {${perl5.major} == 5.16} {
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> ${perl5.major}/use-stdbool.patch
</span><span class="lines">@@ -85,9 +88,6 @@
</span><span class="cx"> # and https://rt.perl.org/Public/Bug/Display.html?id=121714.
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> ${perl5.major}/fix-cxx-dNOOP-PR43150.patch
</span><del>- } else {
- patchfiles-append \
- ${perl5.major}/install-under-short-version-PR43480.patch
</del><span class="cx"> }
</span><span class="cx"> if {${perl5.major} >= 5.22} {
</span><span class="cx"> # failed test
</span><span class="lines">@@ -100,11 +100,9 @@
</span><span class="cx"> # https://trac.macports.org/ticket/52012
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> ${perl5.major}/patch-dist-Time-HiRes-HiRes.xs.diff
</span><del>- }
- # This should be added to other perl versions as well
- if {${perl5.major} == 5.22} {
- patchfiles-delete \
</del><ins>+ patchfiles-append \
</ins><span class="cx"> ${perl5.major}/fix-ld-modification.patch
</span><ins>+ } else {
</ins><span class="cx"> # Do not compile for 10.3/10.4
</span><span class="cx"> # https://trac.macports.org/ticket/51980
</span><span class="cx"> patchfiles-append \
</span><span class="lines">@@ -133,6 +131,7 @@
</span><span class="cx"> {-Dcc="$CC"} \
</span><span class="cx"> -Dman1ext=1pm \
</span><span class="cx"> -Dman3ext=3pm \
</span><ins>+ -Dinstallstyle='lib/perl5' \
</ins><span class="cx"> -Dman1dir='${prefix}/share/man/man1p' \
</span><span class="cx"> -Dman3dir='${prefix}/share/man/man3p' \
</span><span class="cx"> -Dsitebin='${prefix}/libexec/perl${perl5.major}/sitebin' \
</span><span class="lines">@@ -143,23 +142,10 @@
</span><span class="cx"> -Dvendorman3dir='${prefix}/share/perl${perl5.major}/man/man3' \
</span><span class="cx"> -Dpager='/usr/bin/less -sR' \
</span><span class="cx"> -Dperlpath="${perl5.bin}" \
</span><del>- -Dstartperl="#!${perl5.bin}"
- # flags with -A should be used for all versions of perl,
- # but for the time being we wanted to avoid rebuilding (revbumping) old perl version
- # so changing the flags is scheduled for later
- if {${version} >= 5.22} {
- configure.post_args-append \
- {-Acppflags="$CPPFLAGS"} \
- {-Accflags="$CFLAGS"} \
- {-Aldflags="$LDFLAGS"} \
- {-Dinstallstyle="lib/perl5"}
- } else {
- configure.post_args-append \
- {-Dcppflags="$CPPFLAGS"} \
- {-Dccflags="$CFLAGS"} \
- {-Dldflags="$LDFLAGS"} \
- {-Dld="env MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET $CC"}
- }
</del><ins>+ -Dstartperl="#!${perl5.bin}" \
+ {-Acppflags="$CPPFLAGS"} \
+ {-Accflags="$CFLAGS"} \
+ {-Aldflags="$LDFLAGS"}
</ins><span class="cx">
</span><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx"> post-configure {
</span></span></pre></div>
<a id="trunkdportslangperl5files516remove103targetPR126360patchfromrev152002trunkdportslangperl5files522remove103targetPR126360patch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/perl5/files/5.16/remove-10.3-target-PR126360.patch (from rev 152002, trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch) (0 => 154367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.16/remove-10.3-target-PR126360.patch (rev 0)
+++ trunk/dports/lang/perl5/files/5.16/remove-10.3-target-PR126360.patch 2016-10-28 19:57:18 UTC (rev 154367)
</span><span class="lines">@@ -0,0 +1,160 @@
</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
+@@ -143,7 +143,7 @@ esac
+
+ # Shared library extension is .dylib.
+ # Bundle extension is .bundle.
+-ld='cc';
++
+ so='dylib';
+ dlext='bundle';
+ usedl='define';
+@@ -167,28 +167,137 @@ case "$ccdlflags" in # If passed in from command line, presume user knows best
+ ;;
+ esac
+
++# Allow the user to override ld, but modify it as necessary below
++case "$ld" in
++ '') case "$cc" in
++ # If the cc is explicitly something else than cc (or empty),
++ # set the ld to be that explicitly something else. Conversely,
++ # if the cc is 'cc' (or empty), set the ld to be 'cc'.
++ cc|'') ld='cc';;
++ *) ld="$cc" ;;
++ esac
++ ;;
++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"
+ ;;
+-*)
++[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>
<a id="trunkdportslangperl5files518fixldmodificationpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/perl5/files/5.18/fix-ld-modification.patch (154366 => 154367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.18/fix-ld-modification.patch 2016-10-28 19:44:19 UTC (rev 154366)
+++ trunk/dports/lang/perl5/files/5.18/fix-ld-modification.patch 2016-10-28 19:57:18 UTC (rev 154367)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- hints/darwin.sh.orig
-+++ hints/darwin.sh
-@@ -143,7 +143,7 @@ esac
-
- # Shared library extension is .dylib.
- # Bundle extension is .bundle.
--ld='cc';
-+
- so='dylib';
- dlext='bundle';
- usedl='define';
-@@ -184,7 +184,7 @@ case "$osvers" in
- *)
- lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
- case "$ld" in
-- *MACOSX_DEVELOPMENT_TARGET*) ;;
-+ *MACOSX_DEPLOYMENT_TARGET*) ;;
- *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
- esac
- ;;
</del></span></pre></div>
<a id="trunkdportslangperl5files518remove103targetPR126360patchfromrev152002trunkdportslangperl5files522remove103targetPR126360patch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/perl5/files/5.18/remove-10.3-target-PR126360.patch (from rev 152002, trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch) (0 => 154367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.18/remove-10.3-target-PR126360.patch (rev 0)
+++ trunk/dports/lang/perl5/files/5.18/remove-10.3-target-PR126360.patch 2016-10-28 19:57:18 UTC (rev 154367)
</span><span class="lines">@@ -0,0 +1,160 @@
</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
+@@ -143,7 +143,7 @@ esac
+
+ # Shared library extension is .dylib.
+ # Bundle extension is .bundle.
+-ld='cc';
++
+ so='dylib';
+ dlext='bundle';
+ usedl='define';
+@@ -167,28 +167,137 @@ case "$ccdlflags" in # If passed in from command line, presume user knows best
+ ;;
+ esac
+
++# Allow the user to override ld, but modify it as necessary below
++case "$ld" in
++ '') case "$cc" in
++ # If the cc is explicitly something else than cc (or empty),
++ # set the ld to be that explicitly something else. Conversely,
++ # if the cc is 'cc' (or empty), set the ld to be 'cc'.
++ cc|'') ld='cc';;
++ *) ld="$cc" ;;
++ esac
++ ;;
++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"
+ ;;
+-*)
++[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>
<a id="trunkdportslangperl5files520fixldmodificationpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/perl5/files/5.20/fix-ld-modification.patch (154366 => 154367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.20/fix-ld-modification.patch 2016-10-28 19:44:19 UTC (rev 154366)
+++ trunk/dports/lang/perl5/files/5.20/fix-ld-modification.patch 2016-10-28 19:57:18 UTC (rev 154367)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- hints/darwin.sh.orig
-+++ hints/darwin.sh
-@@ -197,7 +197,7 @@ case "$osvers" in
- *)
- lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
- case "$ld" in
-- *MACOSX_DEVELOPMENT_TARGET*) ;;
-+ *MACOSX_DEPLOYMENT_TARGET*) ;;
- *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
- esac
- ;;
</del></span></pre></div>
<a id="trunkdportslangperl5files520remove103targetPR126360patchfromrev152002trunkdportslangperl5files522remove103targetPR126360patch"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/perl5/files/5.20/remove-10.3-target-PR126360.patch (from rev 152002, trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch) (0 => 154367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.20/remove-10.3-target-PR126360.patch (rev 0)
+++ trunk/dports/lang/perl5/files/5.20/remove-10.3-target-PR126360.patch 2016-10-28 19:57:18 UTC (rev 154367)
</span><span class="lines">@@ -0,0 +1,139 @@
</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
+@@ -180,28 +180,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"
+ ;;
+-*)
++[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>
<a id="trunkdportslangperl5files524fixldmodificationpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5/files/5.24/fix-ld-modification.patch (154366 => 154367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.24/fix-ld-modification.patch 2016-10-28 19:44:19 UTC (rev 154366)
+++ trunk/dports/lang/perl5/files/5.24/fix-ld-modification.patch 2016-10-28 19:57:18 UTC (rev 154367)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- hints/darwin.sh.orig
</span><span class="cx"> +++ hints/darwin.sh
</span><del>-@@ -292,7 +292,7 @@ case "$osvers" in
</del><ins>+@@ -294,7 +294,7 @@ case "$osvers" in
</ins><span class="cx"> [7-9].*) # OS X 10.3.x - 10.5.x
</span><span class="cx"> lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
</span><span class="cx"> case "$ld" in
</span></span></pre>
</div>
</div>
</body>
</html>