<!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>[119340] trunk/dports/lang/perl5.14</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/119340">119340</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-04-22 18:06:09 -0700 (Tue, 22 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>perl5.14: cosmetic clean-up</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangperl514Portfile">trunk/dports/lang/perl5.14/Portfile</a></li>
<li><a href="#trunkdportslangperl514filespatchConfigurediff">trunk/dports/lang/perl5.14/files/patch-Configure.diff</a></li>
<li><a href="#trunkdportslangperl514filespatchMakefileSHdiff">trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff</a></li>
<li><a href="#trunkdportslangperl514filespatcht_comp_requiretdiff">trunk/dports/lang/perl5.14/files/patch-t_comp_require.t.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangperl514filespatchdarwinshdiff">trunk/dports/lang/perl5.14/files/patch-darwin.sh.diff</a></li>
<li><a href="#trunkdportslangperl514filespatchperlcdiff">trunk/dports/lang/perl5.14/files/patch-perl.c.diff</a></li>
<li><a href="#trunkdportslangperl514filespatchtokecdiff">trunk/dports/lang/perl5.14/files/patch-toke.c.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangperl514Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5.14/Portfile (119339 => 119340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.14/Portfile        2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/Portfile        2014-04-23 01:06:09 UTC (rev 119340)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> 
</span><span class="cx"> platform darwin {
</span><span class="cx">     patchfiles-append   patch-hints_darwin.sh.diff
</span><del>-##  patchfiles-append   patch-hints_darwin.diff \
-##                      patch-perl.c.diff
</del><span class="cx"> 
</span><span class="cx">     # Prevent miniperl build from finding libstdcxx (#36438).
</span><span class="cx">     patchfiles-append   patch-Makefile.SH.diff
</span><span class="lines">@@ -51,14 +49,15 @@
</span><span class="cx"> configure.env       LC_ALL=C
</span><span class="cx"> configure.cmd       sh Configure
</span><span class="cx"> configure.pre_args
</span><del>-configure.universal_args-delete --disable-dependency-tracking
-configure.post_args -des    \
-                    -Dprefix='${prefix}'    \
</del><ins>+configure.universal_args-delete \
+                    --disable-dependency-tracking
+configure.post_args -des \
+                    -Dprefix='${prefix}' \
</ins><span class="cx">                     -Dscriptdir='${prefix}/bin' \
</span><span class="cx">                     -Dcppflags=&quot;\${CPPFLAGS}&quot; \
</span><span class="cx">                     -Dccflags=&quot;\${CFLAGS}&quot; \
</span><span class="cx">                     -Dldflags=&quot;\${LDFLAGS}&quot; \
</span><del>-                    -Dvendorprefix='${prefix}'  \
</del><ins>+                    -Dvendorprefix='${prefix}' \
</ins><span class="cx">                     -Dusemultiplicity=y \
</span><span class="cx">                     -Dusethreads \
</span><span class="cx">                     -Duseshrplib \
</span><span class="lines">@@ -124,9 +123,9 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-## livecheck.type  regex
-## livecheck.url   http://www.cpan.org/src
-## livecheck.regex latest_[join [lrange [split ${version} .] 0 1] .]_is_(\\d+(?:\\.\\d+)*)
</del><ins>+## livecheck.type   regex
+## livecheck.url    http://www.cpan.org/src
+## livecheck.regex  latest_[join [lrange [split ${version} .] 0 1] .]_is_(\\d+(?:\\.\\d+)*)
</ins><span class="cx"> 
</span><span class="cx"> livecheck.type      regex
</span><span class="cx"> livecheck.url       http://www.cpan.org/src
</span></span></pre></div>
<a id="trunkdportslangperl514filespatchConfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5.14/files/patch-Configure.diff (119339 => 119340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.14/files/patch-Configure.diff        2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-Configure.diff        2014-04-23 01:06:09 UTC (rev 119340)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- Configure.orig        2011-05-07 20:10:08.000000000 -0700
-+++ Configure        2011-06-13 12:50:01.000000000 -0700
</del><ins>+--- Configure.orig
++++ Configure
</ins><span class="cx"> @@ -106,7 +106,7 @@
</span><span class="cx">  fi
</span><span class="cx">  
</span></span></pre></div>
<a id="trunkdportslangperl514filespatchMakefileSHdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff (119339 => 119340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff        2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-Makefile.SH.diff        2014-04-23 01:06:09 UTC (rev 119340)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- Makefile.SH.orig        2011-09-26 05:44:34.000000000 -0400
-+++ Makefile.SH        2013-05-12 13:05:36.000000000 -0400
</del><ins>+--- Makefile.SH.orig
++++ Makefile.SH
</ins><span class="cx"> @@ -830,7 +830,8 @@
</span><span class="cx">                  $spitshell &gt;&gt;$Makefile &lt;&lt;'!NO!SUBS!'
</span><span class="cx">  $(MINIPERL_EXE): $&amp; miniperlmain$(OBJ_EXT) $(mini_obj) opmini$(OBJ_EXT) perlmini$(OBJ_EXT)
</span></span></pre></div>
<a id="trunkdportslangperl514filespatchdarwinshdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/perl5.14/files/patch-darwin.sh.diff (119339 => 119340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.14/files/patch-darwin.sh.diff        2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-darwin.sh.diff        2014-04-23 01:06:09 UTC (rev 119340)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- hints/darwin.sh.orig        2009-04-14 11:38:15.000000000 -0700
-+++ hints/darwin.sh        2010-03-19 16:23:44.000000000 -0700
-@@ -134,7 +134,6 @@

- # Shared library extension is .dylib.
- # Bundle extension is .bundle.
--ld='cc';
- so='dylib';
- dlext='bundle';
- usedl='define';
</del></span></pre></div>
<a id="trunkdportslangperl514filespatchperlcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/perl5.14/files/patch-perl.c.diff (119339 => 119340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.14/files/patch-perl.c.diff        2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-perl.c.diff        2014-04-23 01:06:09 UTC (rev 119340)
</span><span class="lines">@@ -1,102 +0,0 @@
</span><del>---- perl.c        2009-04-22 11:07:41.000000000 -0700
-+++ perl.c        2009-08-24 10:55:26.000000000 -0700
-@@ -4873,45 +4873,14 @@
-     }

- /* Use the ~-expanded versions of APPLLIB (undocumented),
--    ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
-+    original order: ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
-+    macports order: SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB and PRIVLIB 
- */
- #ifdef APPLLIB_EXP
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
- #endif

--#ifdef ARCHLIB_EXP
--    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
--#endif
--#ifdef MACOS_TRADITIONAL
--    {
--        Stat_t tmpstatbuf;
--            SV * privdir = newSV(0);
--        char * macperl = PerlEnv_getenv(&quot;MACPERL&quot;);
--        
--        if (!macperl)
--            macperl = &quot;&quot;;
--        
--        Perl_sv_setpvf(aTHX_ privdir, &quot;%slib:&quot;, macperl);
--        if (PerlLIO_stat(SvPVX(privdir), &amp;tmpstatbuf) &gt;= 0 &amp;&amp; S_ISDIR(tmpstatbuf.st_mode))
--            incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
--        Perl_sv_setpvf(aTHX_ privdir, &quot;%ssite_perl:&quot;, macperl);
--        if (PerlLIO_stat(SvPVX(privdir), &amp;tmpstatbuf) &gt;= 0 &amp;&amp; S_ISDIR(tmpstatbuf.st_mode))
--            incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
--        
--           SvREFCNT_dec(privdir);
--    }
--    if (!PL_tainting)
--        incpush(&quot;:&quot;, FALSE, FALSE, TRUE, FALSE);
--#else
--#ifndef PRIVLIB_EXP
--#  define PRIVLIB_EXP &quot;/usr/local/lib/perl5:/usr/local/lib/perl&quot;
--#endif
--#if defined(WIN32)
--    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
--#else
--    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
--#endif
--
-+/* start site* locations */
- #ifdef SITEARCH_EXP
-     /* sitearch is always relative to sitelib on Windows for
-      * DLL-based path intuition to work correctly */
-@@ -4933,7 +4902,9 @@
-     /* Search for version-specific dirs below here */
-     incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
- #endif
-+/* end site* locations */

-+/* start vendor* locations */
- #ifdef PERL_VENDORARCH_EXP
-     /* vendorarch is always relative to vendorlib on Windows for
-      * DLL-based path intuition to work correctly */
-@@ -4953,6 +4924,40 @@
- #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
-     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
- #endif
-+/* end vendor* locations */
-+
-+#ifdef ARCHLIB_EXP
-+    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
-+#endif
-+#ifdef MACOS_TRADITIONAL
-+    {
-+        Stat_t tmpstatbuf;
-+            SV * privdir = newSV(0);
-+        char * macperl = PerlEnv_getenv(&quot;MACPERL&quot;);
-+        
-+        if (!macperl)
-+            macperl = &quot;&quot;;
-+        
-+        Perl_sv_setpvf(aTHX_ privdir, &quot;%slib:&quot;, macperl);
-+        if (PerlLIO_stat(SvPVX(privdir), &amp;tmpstatbuf) &gt;= 0 &amp;&amp; S_ISDIR(tmpstatbuf.st_mode))
-+            incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
-+        Perl_sv_setpvf(aTHX_ privdir, &quot;%ssite_perl:&quot;, macperl);
-+        if (PerlLIO_stat(SvPVX(privdir), &amp;tmpstatbuf) &gt;= 0 &amp;&amp; S_ISDIR(tmpstatbuf.st_mode))
-+            incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
-+        
-+           SvREFCNT_dec(privdir);
-+    }
-+    if (!PL_tainting)
-+        incpush(&quot;:&quot;, FALSE, FALSE, TRUE, FALSE);
-+#else
-+#ifndef PRIVLIB_EXP
-+#  define PRIVLIB_EXP &quot;/usr/local/lib/perl5:/usr/local/lib/perl&quot;
-+#endif
-+#if defined(WIN32)
-+    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
-+#else
-+    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
-+#endif

- #ifdef PERL_OTHERLIBDIRS
-     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
</del></span></pre></div>
<a id="trunkdportslangperl514filespatcht_comp_requiretdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/perl5.14/files/patch-t_comp_require.t.diff (119339 => 119340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.14/files/patch-t_comp_require.t.diff        2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-t_comp_require.t.diff        2014-04-23 01:06:09 UTC (rev 119340)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- t/comp/require.t.orig        2007-12-18 02:47:08.000000000 -0800
-+++ t/comp/require.t        2009-05-13 21:20:43.000000000 -0700
</del><ins>+--- t/comp/require.t.orig
++++ t/comp/require.t
</ins><span class="cx"> @@ -15,7 +15,7 @@
</span><span class="cx">  
</span><span class="cx">  my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
</span></span></pre></div>
<a id="trunkdportslangperl514filespatchtokecdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/perl5.14/files/patch-toke.c.diff (119339 => 119340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/perl5.14/files/patch-toke.c.diff        2014-04-23 00:51:38 UTC (rev 119339)
+++ trunk/dports/lang/perl5.14/files/patch-toke.c.diff        2014-04-23 01:06:09 UTC (rev 119340)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- toke.c.orig        2007-12-18 02:47:08.000000000 -0800
-+++ toke.c        2009-05-13 21:21:32.000000000 -0700
-@@ -692,6 +692,7 @@
- #else
-     parser-&gt;nexttoke = 0;
- #endif
-+    parser-&gt;error_count = oparser ? oparser-&gt;error_count : 0;
-     parser-&gt;copline = NOLINE;
-     parser-&gt;lex_state = LEX_NORMAL;
-     parser-&gt;expect = XSTATE;
</del></span></pre>
</div>
</div>

</body>
</html>