<!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>[151998] 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 { 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/151998">151998</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-08-26 03:25:24 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>perl5.22: do not compile for 10.3, always install to lib/perl5, proper flags, revbump (#51980)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangperl5Portfile">trunk/dports/lang/perl5/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangperl5files522fixldmodificationpatch">trunk/dports/lang/perl5/files/5.22/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 (151997 => 151998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/Portfile 2016-08-26 10:13:39 UTC (rev 151997)
+++ trunk/dports/lang/perl5/Portfile 2016-08-26 10:25:24 UTC (rev 151998)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> 5.16 3 2 f25fdd72449156a7cbe989e8bd339fdba1afabc0 bb7bc735e6813b177dcfccd480defcde7eddefa173b5967eac11babd1bfa98e8
</span><span class="cx"> 5.18 4 1 d97181a98f7acc80125b0d2a182a6a2cd7542ceb 1fb4d27b75cd244e849f253320260efe1750641aaff4a18ce0d67556ff1b96a5
</span><span class="cx"> 5.20 3 0 499846a1c92e00dd357cb782bc14787b8cd47051 1b40068166c242e34a536836286e70b78410602a80615143301e52aa2901493b
</span><del>- 5.22 2 0 203afca8995ca426db0af48b78eb606b5d24011a f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058
</del><ins>+ 5.22 2 1 203afca8995ca426db0af48b78eb606b5d24011a f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058
</ins><span class="cx"> 5.24 0 0 756bf07069e91eabe3dac3a47aec5097d48f8963 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0
</span><span class="cx"> }
</span><span class="cx"> # 5.22 3-RC3 0 24f508e342cb824d96254e91ffd35b09ed740382 9074ac008f11aa5ea3df91a646fa8c23fec37923c729e06a8bc54be4fa710d07
</span><span class="lines">@@ -70,6 +70,14 @@
</span><span class="cx"> ${perl5.major}/avoid-no-cpp-precomp-PR38913.patch \
</span><span class="cx"> ${perl5.major}/fix-ld-modification.patch
</span><span class="cx">
</span><ins>+ # Prevent build from picking up the bind9 port's static libbind, which
+ # duplicates symbols from /usr/lib/libdl (r10638).
+ patchfiles-append ${perl5.major}/avoid-bind9-linking.patch
+
+ # Prevent miniperl linking from accidentally finding our libstdc++
+ # (#36438).
+ patchfiles-append ${perl5.major}/fix-miniperl-linking-PR36438.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">@@ -88,20 +96,21 @@
</span><span class="cx"> ${perl5.major}/patch-dist-IO-t-cachepropagate-unix.t.diff
</span><span class="cx"> }
</span><span class="cx"> if {${perl5.major} == 5.24} {
</span><del>- # build error on Sierra (maybe also relevant for other perl versions?)
</del><ins>+ # Prevent build error on Sierra
</ins><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><span class="cx"> }
</span><ins>+ # This should be added to other perl versions as well
+ if {${perl5.major} == 5.22} {
+ patchfiles-delete \
+ ${perl5.major}/fix-ld-modification.patch
+ # Do not compile for 10.3/10.4
+ # https://trac.macports.org/ticket/51980
+ patchfiles-append \
+ ${perl5.major}/remove-10.3-target-PR126360.patch
+ }
</ins><span class="cx">
</span><del>- # Prevent build from picking up the bind9 port's static libbind, which
- # duplicates symbols from /usr/lib/libdl (r10638).
- patchfiles-append ${perl5.major}/avoid-bind9-linking.patch
-
- # Prevent miniperl linking from accidentally finding our libstdc++
- # (#36438).
- patchfiles-append ${perl5.major}/fix-miniperl-linking-PR36438.patch
-
</del><span class="cx"> post-patch {
</span><span class="cx"> reinplace -W ${worksrcpath} "s|__PREFIX__|${prefix}|g" \
</span><span class="cx"> Configure Makefile.SH
</span><span class="lines">@@ -138,11 +147,12 @@
</span><span class="cx"> # flags with -A should be used for all versions of perl,
</span><span class="cx"> # but for the time being we wanted to avoid rebuilding (revbumping) old perl version
</span><span class="cx"> # so changing the flags is scheduled for later
</span><del>- if {${version} > 5.22} {
</del><ins>+ if {${version} >= 5.22} {
</ins><span class="cx"> configure.post_args-append \
</span><span class="cx"> {-Acppflags="$CPPFLAGS"} \
</span><span class="cx"> {-Accflags="$CFLAGS"} \
</span><span class="cx"> {-Aldflags="$LDFLAGS"} \
</span><ins>+ {-Dinstallstyle="lib/perl5"}
</ins><span class="cx"> } else {
</span><span class="cx"> configure.post_args-append \
</span><span class="cx"> {-Dcppflags="$CPPFLAGS"} \
</span></span></pre></div>
<a id="trunkdportslangperl5files522fixldmodificationpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/perl5/files/5.22/fix-ld-modification.patch (151997 => 151998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5/files/5.22/fix-ld-modification.patch 2016-08-26 10:13:39 UTC (rev 151997)
+++ trunk/dports/lang/perl5/files/5.22/fix-ld-modification.patch 2016-08-26 10:25:24 UTC (rev 151998)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-Index: hints/darwin.sh
-===================================================================
---- 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
- 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>
</div>
</body>
</html>