<!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>[144219] trunk/dports/devel/globus-core</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/144219">144219</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-01-04 15:53:50 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>globus-core: fixes for perl (<a href="https://trac.macports.org/changeset/144216">r144216</a>, #48365), still broken (#50215)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglobuscorePortfile">trunk/dports/devel/globus-core/Portfile</a></li>
<li><a href="#trunkdportsdevelglobuscorefilespatchglobuscoreautomakeobsoletemacrodiff">trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff</a></li>
<li><a href="#trunkdportsdevelglobuscorefilespatchglobuscoreperldirdiff">trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelglobuscorePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/globus-core/Portfile (144218 => 144219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/globus-core/Portfile 2016-01-04 23:48:57 UTC (rev 144218)
+++ trunk/dports/devel/globus-core/Portfile 2016-01-04 23:53:50 UTC (rev 144219)
</span><span class="lines">@@ -45,8 +45,18 @@
</span><span class="cx"> patchfiles patch-globus-core-automake-obsolete-macro.diff \
</span><span class="cx"> patch-globus-core-perldir.diff
</span><span class="cx">
</span><del>-patch.pre_args -p1
</del><ins>+post-patch {
+ reinplace "s|@@PERLLIB@@|${perl5.lib}|" ${worksrcpath}/configure.in
+ reinplace "s|libtoolize|glibtoolize|g" ${worksrcpath}/bootstrap
+}
</ins><span class="cx">
</span><ins>+# this should probably be an "autoconf" step
+pre-configure {
+ file delete -force ${worksrcpath}/autom4te.cache
+ system "cd ${worksrcpath} && \
+ GLOBUS_LOCATION=${prefix} GPT_LOCATION=${prefix} ./bootstrap"
+}
+
</ins><span class="cx"> depends_build port:grid-packaging-tools \
</span><span class="cx"> port:libtool \
</span><span class="cx"> port:autoconf \
</span><span class="lines">@@ -76,13 +86,6 @@
</span><span class="cx"> build.env-append GPT_LOCATION=${prefix} \
</span><span class="cx"> GLOBUS_LOCATION=${prefix}
</span><span class="cx">
</span><del>-pre-configure {
- file delete -force ${worksrcpath}/autom4te.cache
- reinplace "s/libtoolize/glibtoolize/g" ${worksrcpath}/bootstrap
- system "cd ${worksrcpath} && \
- GLOBUS_LOCATION=${prefix} GPT_LOCATION=${prefix} ./bootstrap"
-}
-
</del><span class="cx"> post-destroot {
</span><span class="cx"> # These scripts are intended to be sourced, not executed
</span><span class="cx"> system "chmod 644 ${destroot}${prefix}/share/globus/globus-build-env-*.sh"
</span></span></pre></div>
<a id="trunkdportsdevelglobuscorefilespatchglobuscoreautomakeobsoletemacrodiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff (144218 => 144219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff 2016-01-04 23:48:57 UTC (rev 144218)
+++ trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff 2016-01-04 23:53:50 UTC (rev 144219)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- globus_core-8.9.orig/configure.in 2011-12-05 21:27:20.000000000 +0100
-+++ globus_core-8.9/configure.in 2013-01-18 11:50:18.742812017 +0100
</del><ins>+--- configure.in.orig
++++ configure.in
</ins><span class="cx"> @@ -21,7 +21,7 @@
</span><span class="cx"> GPT_INIT
</span><span class="cx"> AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION,0)
</span></span></pre></div>
<a id="trunkdportsdevelglobuscorefilespatchglobuscoreperldirdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff (144218 => 144219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff 2016-01-04 23:48:57 UTC (rev 144218)
+++ trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff 2016-01-04 23:53:50 UTC (rev 144219)
</span><span class="lines">@@ -1,15 +1,11 @@
</span><del>---- globus_core-8.9-orig/configure.in 2011-12-05 21:27:20.000000000 +0100
-+++ globus_core-8.9/configure.in 2013-06-21 16:28:42.471409885 +0200
-@@ -89,7 +89,11 @@
</del><ins>+--- configure.in.orig
++++ configure.in
+@@ -89,7 +89,7 @@
</ins><span class="cx"> perlmoduledir=$withval
</span><span class="cx"> ],
</span><span class="cx"> [
</span><span class="cx"> - perlmoduledir='${prefix}/lib/perl'
</span><del>-+ if test -x ${prefix}/bin/perl ; then
-+ perlmoduledir=`${prefix}/bin/perl -V:installvendorlib | cut -d\' -f 2`
-+ else
-+ perlmoduledir='${prefix}/lib/perl'
-+ fi
</del><ins>++ perlmoduledir=@@PERLLIB@@
</ins><span class="cx"> ])
</span><span class="cx"> AC_SUBST(perlmoduledir)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>