<!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>[137299] trunk/dports/devel</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/137299">137299</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-06-08 11:06:10 -0700 (Mon, 08 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>autoconf, libtool: Use system M4 on Leopard and later
Still trying to minimize dependencies of Autotools and Libtool.
Specific to `libtool`:
- Avoid a weird, inadvertent dependency on the `m4` port if it's present
at compile time.
- Bake the path to the system M4 into libtoolize to prevent it from
picking up different executables depending on whether said `m4` port
is installed or not. (Setting "M4" in the calling environment will
still override libtoolize's default.)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelautoconfPortfile">trunk/dports/devel/autoconf/Portfile</a></li>
<li><a href="#trunkdportsdevellibtoolPortfile">trunk/dports/devel/libtool/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/libtool/files/</li>
<li><a href="#trunkdportsdevellibtoolfileshardcodem4patch">trunk/dports/devel/libtool/files/hardcode-m4.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelautoconfPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/autoconf/Portfile (137298 => 137299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/autoconf/Portfile 2015-06-08 18:06:07 UTC (rev 137298)
+++ trunk/dports/devel/autoconf/Portfile 2015-06-08 18:06:10 UTC (rev 137299)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> name autoconf
</span><span class="cx"> epoch 1
</span><span class="cx"> version 2.69
</span><del>-revision 4
</del><ins>+revision 5
</ins><span class="cx"> categories devel
</span><span class="cx"> # the license is GPL-3+ with an exception:
</span><span class="cx"> # http://www.gnu.org/licenses/autoconf-exception.html
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> package can use, in the form of m4 macro calls.
</span><span class="cx"> homepage http://www.gnu.org/software/autoconf/
</span><span class="cx">
</span><ins>+depends_lib port:gettext
</ins><span class="cx"> installs_libs no
</span><del>-depends_lib port:gettext port:m4
</del><span class="cx">
</span><span class="cx"> master_sites gnu
</span><span class="cx"> use_xz yes
</span><span class="lines">@@ -45,6 +45,14 @@
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> 0001-tests-avoid-spurious-test-failure-with-libtool-2.4.3.patch
</span><span class="cx">
</span><ins>+# The README prescribes GNU M4 1.4.6 or later, which Leopard and later
+# have. Tiger only provides 1.4.2.
+if {${os.platform} eq "darwin" && ${os.major} >= 9} {
+ configure.env M4=/usr/bin/m4
+} else {
+ depends_lib-append port:m4
+}
+
</ins><span class="cx"> # It should be safe to use the system Perl, since the scripts only use
</span><span class="cx"> # core modules. The README prescribes 5.6 or later, and Tiger has 5.8.6.
</span><span class="cx"> configure.perl /usr/bin/perl
</span></span></pre></div>
<a id="trunkdportsdevellibtoolPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libtool/Portfile (137298 => 137299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libtool/Portfile 2015-06-08 18:06:07 UTC (rev 137298)
+++ trunk/dports/devel/libtool/Portfile 2015-06-08 18:06:10 UTC (rev 137299)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name libtool
</span><span class="cx"> version 2.4.6
</span><ins>+revision 1
</ins><span class="cx"> categories devel sysutils
</span><span class="cx"> platforms darwin freebsd
</span><span class="cx"> # Scripts are GPL-2+, libltdl is LGPL-2+, but all parts that tend to be
</span><span class="lines">@@ -23,12 +24,19 @@
</span><span class="cx"> checksums rmd160 6f4b4c3e89426652da3acffa707f71bb4ccee26a \
</span><span class="cx"> sha256 e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3
</span><span class="cx">
</span><ins>+# For consistency, always use the M4 detected by configure.
+patchfiles hardcode-m4.patch
+post-patch {
+ # Stop build from trying to regenerate this after patching.
+ touch ${worksrcpath}/doc/libtoolize.1
+}
+
</ins><span class="cx"> # Leopard and later provide GNU M4 1.4.6, which works fine. Tiger's
</span><span class="cx"> # 1.4.2 does not (#47545).
</span><span class="cx"> # - http://lists.gnu.org/archive/html/libtool/2014-12/msg00002.html
</span><span class="cx"> # - http://lists.gnu.org/archive/html/libtool/2015-01/msg00004.html
</span><span class="cx"> if {${os.platform} eq "darwin" && ${os.major} >= 9} {
</span><del>- depends_lib bin:gm4:m4
</del><ins>+ configure.env M4=/usr/bin/m4
</ins><span class="cx"> } else {
</span><span class="cx"> depends_lib port:m4
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdevellibtoolfileshardcodem4patch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libtool/files/hardcode-m4.patch (0 => 137299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libtool/files/hardcode-m4.patch (rev 0)
+++ trunk/dports/devel/libtool/files/hardcode-m4.patch 2015-06-08 18:06:10 UTC (rev 137299)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
++++ Makefile.in
+@@ -694,6 +694,7 @@ configure_edit = $(bootstrap_edit) \
+ -e 's|@LN_S\@|$(LN_S)|g' \
+ -e "s|@ltdl_ac_aux_dir\@|$(ltdl_ac_aux_dir)|g" \
+ -e 's|@macro_dir\@|$(macro_dir)|g' \
++ -e 's|@M4\@|$(M4)|g' \
+ -e 's|@pkgauxdir\@|$(pkgauxdir)|g' \
+ -e 's|@pkgaux_files\@|$(pkgaux_scripts) $(pkgaux_data_files)|g' \
+ -e 's|@pkgaux_install_files\@|$(pkgaux_install_files)|g' \
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -29875,6 +29875,7 @@ FGREP='`$ECHO "$FGREP" | $SED "$delay_si
+ LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+ NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+ LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
++M4='`$ECHO "$M4" | $SED "$delay_single_quote_subst"`'
+ max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+@@ -30305,6 +30306,7 @@ FGREP \
+ LD \
+ NM \
+ LN_S \
++M4 \
+ lt_SP2NL \
+ lt_NL2SP \
+ reload_flag \
+@@ -31531,6 +31533,9 @@ NM=$lt_NM
+ # Whether we need soft or hard links.
+ LN_S=$lt_LN_S
+
++# GNU M4.
++M4=$lt_M4$
++
+ # What is the maximum length of a command?
+ max_cmd_len=$max_cmd_len
+
+Index: libtoolize.in
+===================================================================
+--- libtoolize.in.orig
++++ libtoolize.in
+@@ -44,6 +44,7 @@
+ : ${FGREP="@FGREP@"}
+ : ${GREP="@GREP@"}
+ : ${LN_S="@LN_S@"}
++: ${M4="@M4@"}
+ : ${SED="@SED@"}
+
+
</ins></span></pre>
</div>
</div>
</body>
</html>