<!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>[120890] trunk/dports/lang/perl5.20</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/120890">120890</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-10 16:24:30 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>perl5.20: remove accidental leftovers from 5.18, remove subrelease numbers (#43480)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangperl520Portfile">trunk/dports/lang/perl5.20/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangperl520filespatchConfigurediff">trunk/dports/lang/perl5.20/files/patch-Configure.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangperl520filesperl518">trunk/dports/lang/perl5.20/files/perl5.18</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangperl520Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5.20/Portfile (120889 => 120890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.20/Portfile 2014-06-10 22:45:15 UTC (rev 120889)
+++ trunk/dports/lang/perl5.20/Portfile 2014-06-10 23:24:30 UTC (rev 120890)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name perl5.20
</span><span class="cx"> version 5.20.0
</span><ins>+revision 1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories lang
</span><span class="cx"> license {Artistic-1 GPL}
</span><span class="lines">@@ -27,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:gdbm
</span><span class="cx">
</span><ins>+patchfiles patch-Configure.diff
+
</ins><span class="cx"> pre-configure {
</span><span class="cx"> reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Configure
</span><span class="cx"> }
</span><span class="lines">@@ -64,13 +67,6 @@
</span><span class="cx"> -D perlpath="${prefix}/bin/perl${branch}" \
</span><span class="cx"> -D startperl="#!${prefix}/bin/perl${branch}"
</span><span class="cx">
</span><del>-# Allow perl to find p5-* ports installed by previous (minor) versions
-set platsuffix ""
-if {${os.platform} eq "darwin"} {
- set platsuffix "-2level"
-}
-configure.args-append "-D inc_version_list=\"5.18.0/${os.platform}-thread-multi${platsuffix} 5.18.0 \""
-
</del><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx"> post-configure {
</span><span class="cx"> system "cd ${worksrcpath} && ed - ${worksrcpath}/config.h < ${filespath}/config.h.ed"
</span></span></pre></div>
<a id="trunkdportslangperl520filespatchConfigurediff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/perl5.20/files/patch-Configure.diff (0 => 120890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.20/files/patch-Configure.diff (rev 0)
+++ trunk/dports/lang/perl5.20/files/patch-Configure.diff 2014-06-10 23:24:30 UTC (rev 120890)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+https://trac.macports.org/ticket/43480
+--- Configure.orig
++++ Configure
+@@ -4265,6 +4265,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 }'`
+ ;
+@@ -6499,7 +6501,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
+@@ -6747,7 +6749,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
+ ;
+@@ -7165,7 +7167,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
+ ;
</ins></span></pre></div>
<a id="trunkdportslangperl520filesperl518"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/perl5.20/files/perl5.18 (120889 => 120890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.20/files/perl5.18 2014-06-10 22:45:15 UTC (rev 120889)
+++ trunk/dports/lang/perl5.20/files/perl5.18 2014-06-10 23:24:30 UTC (rev 120890)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-bin/a2p-5.18
-bin/c2ph-5.18
-bin/config_data-5.18
-bin/corelist-5.18
-bin/cpan-5.18
-bin/cpan2dist-5.18
-bin/cpanp-5.18
-bin/cpanp-run-perl-5.18
-bin/enc2xs-5.18
-bin/find2perl-5.18
-bin/h2ph-5.18
-bin/h2xs-5.18
-bin/instmodsh-5.18
-bin/json_pp-5.18
-bin/libnetcfg-5.18
-bin/perl5.18
-bin/perl5.18.1
-bin/perlbug-5.18
-bin/perldoc-5.18
-bin/perlivp-5.18
-bin/perlthanks-5.18
-bin/piconv-5.18
-bin/pl2pm-5.18
-bin/pod2html-5.18
-bin/pod2latex-5.18
-bin/pod2man-5.18
-bin/pod2text-5.18
-bin/pod2usage-5.18
-bin/podchecker-5.18
-bin/podselect-5.18
-bin/prove-5.18
-bin/psed-5.18
-bin/pstruct-5.18
-bin/ptar-5.18
-bin/ptardiff-5.18
-bin/ptargrep-5.18
-bin/s2p-5.18
-bin/shasum-5.18
-bin/splain-5.18
-bin/xsubpp-5.18
-bin/zipdetails-5.18
--
</del></span></pre>
</div>
</div>
</body>
</html>