<!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>[132521] trunk/dports/devel/autoconf</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/132521">132521</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-02-03 00:32:30 -0800 (Tue, 03 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>autoconf: Force `autoreconf(1)` to use MacPorts' tools
This prevents `PATH` from affecting which copies of `automake(1)`,
`aclocal(1)`, `glibtoolize(1)`, and `autopoint(1)` are called. Users
should use the appropriate environment variables for overrides.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelautoconfPortfile">trunk/dports/devel/autoconf/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelautoconffilesusemacportstoolspatch">trunk/dports/devel/autoconf/files/use-macports-tools.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelautoconffileslibtoolprefixpatch">trunk/dports/devel/autoconf/files/libtool-prefix.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 (132520 => 132521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/autoconf/Portfile 2015-02-03 08:27:55 UTC (rev 132520)
+++ trunk/dports/devel/autoconf/Portfile 2015-02-03 08:32:30 UTC (rev 132521)
</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 2
</del><ins>+revision 3
</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">@@ -37,9 +37,11 @@
</span><span class="cx"> checksums rmd160 666aa45a58e856968c651e2a3b44be38de9c14e4 \
</span><span class="cx"> sha256 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684
</span><span class="cx">
</span><del>-# The libtool port installs "glibtool" and "glibtoolize".
-patch.pre_args -p1
-patchfiles libtool-prefix.patch
</del><ins>+patchfiles use-macports-tools.patch
+post-patch {
+ # Stop build from trying to regenerate this after patching.
+ touch ${worksrcpath}/man/autoreconf.1
+}
</ins><span class="cx">
</span><span class="cx"> configure.perl ${prefix}/bin/perl
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelautoconffileslibtoolprefixpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/autoconf/files/libtool-prefix.patch (132520 => 132521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/autoconf/files/libtool-prefix.patch 2015-02-03 08:27:55 UTC (rev 132520)
+++ trunk/dports/devel/autoconf/files/libtool-prefix.patch 2015-02-03 08:32:30 UTC (rev 132521)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-Index: autoconf-2.69/bin/autoreconf.in
-===================================================================
---- autoconf-2.69.orig/bin/autoreconf.in
-+++ autoconf-2.69/bin/autoreconf.in
-@@ -55,7 +55,7 @@ use strict;
- $help = "Usage: $0 [OPTION]... [DIRECTORY]...
-
- Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint'
--(formerly `gettextize'), and `libtoolize' where appropriate)
-+(formerly `gettextize'), and `glibtoolize' where appropriate)
- repeatedly to remake the GNU Build System files in specified
- DIRECTORIES and their subdirectories (defaulting to `.').
-
-@@ -111,7 +111,7 @@ my $autoheader = $ENV{'AUTOHEADER'} || '
- my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
- my $automake = $ENV{'AUTOMAKE'} || 'automake';
- my $aclocal = $ENV{'ACLOCAL'} || 'aclocal';
--my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
-+my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize';
- my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint';
- my $make = $ENV{'MAKE'} || 'make';
-
-Index: autoconf-2.69/man/Makefile.in
-===================================================================
---- autoconf-2.69.orig/man/Makefile.in
-+++ autoconf-2.69/man/Makefile.in
-@@ -447,7 +447,7 @@ uninstall-man: uninstall-man1
- $(srcdir)/autoconf.1: $(common_dep) $(binsrcdir)/autoconf.as
- $(srcdir)/autoheader.1: $(common_dep) $(binsrcdir)/autoheader.in
- $(srcdir)/autom4te.1: $(common_dep) $(binsrcdir)/autom4te.in
--$(srcdir)/autoreconf.1: $(common_dep) $(binsrcdir)/autoreconf.in
-+$(srcdir)/autoreconf.1: $(common_dep)
- $(srcdir)/autoscan.1: $(common_dep) $(binsrcdir)/autoscan.in
- $(srcdir)/autoupdate.1: $(common_dep) $(binsrcdir)/autoupdate.in
- $(srcdir)/ifnames.1: $(common_dep) $(binsrcdir)/ifnames.in
-Index: autoconf-2.69/man/autoreconf.1
-===================================================================
---- autoconf-2.69.orig/man/autoreconf.1
-+++ autoconf-2.69/man/autoreconf.1
-@@ -7,7 +7,7 @@ autoreconf \- Update generated configura
- [\fIOPTION\fR]... [\fIDIRECTORY\fR]...
- .SH DESCRIPTION
- Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint'
--(formerly `gettextize'), and `libtoolize' where appropriate)
-+(formerly `gettextize'), and `glibtoolize' where appropriate)
- repeatedly to remake the GNU Build System files in specified
- DIRECTORIES and their subdirectories (defaulting to `.').
- .PP
-@@ -118,7 +118,7 @@ There is NO WARRANTY, to the extent perm
- .BR config.guess (1),
- .BR config.sub (1),
- .BR ifnames (1),
--.BR libtool (1).
-+.BR glibtool (1).
- .PP
- The full documentation for
- .B autoreconf
</del></span></pre></div>
<a id="trunkdportsdevelautoconffilesusemacportstoolspatchfromrev132518trunkdportsdevelautoconffileslibtoolprefixpatch"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/autoconf/files/use-macports-tools.patch (from rev 132518, trunk/dports/devel/autoconf/files/libtool-prefix.patch) (0 => 132521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/autoconf/files/use-macports-tools.patch (rev 0)
+++ trunk/dports/devel/autoconf/files/use-macports-tools.patch 2015-02-03 08:32:30 UTC (rev 132521)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+Index: bin/autoreconf.in
+===================================================================
+--- bin/autoreconf.in.orig
++++ bin/autoreconf.in
+@@ -109,10 +109,10 @@ Written by David J. MacKenzie and Akim D
+ my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@';
+ my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
+ my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
+-my $automake = $ENV{'AUTOMAKE'} || 'automake';
+-my $aclocal = $ENV{'ACLOCAL'} || 'aclocal';
+-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
+-my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint';
++my $automake = $ENV{'AUTOMAKE'} || '@bindir@/automake';
++my $aclocal = $ENV{'ACLOCAL'} || '@bindir@/aclocal';
++my $libtoolize = $ENV{'LIBTOOLIZE'} || '@bindir@/glibtoolize';
++my $autopoint = $ENV{'AUTOPOINT'} || '@bindir@/autopoint';
+ my $make = $ENV{'MAKE'} || 'make';
+
+ # --install -- as --add-missing in other tools.
+Index: man/autoreconf.1
+===================================================================
+--- man/autoreconf.1.orig
++++ man/autoreconf.1
+@@ -7,7 +7,7 @@ autoreconf \- Update generated configura
+ [\fIOPTION\fR]... [\fIDIRECTORY\fR]...
+ .SH DESCRIPTION
+ Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint'
+-(formerly `gettextize'), and `libtoolize' where appropriate)
++(formerly `gettextize'), and `glibtoolize' where appropriate)
+ repeatedly to remake the GNU Build System files in specified
+ DIRECTORIES and their subdirectories (defaulting to `.').
+ .PP
+@@ -118,7 +118,7 @@ There is NO WARRANTY, to the extent perm
+ .BR config.guess (1),
+ .BR config.sub (1),
+ .BR ifnames (1),
+-.BR libtool (1).
++.BR glibtool (1).
+ .PP
+ The full documentation for
+ .B autoreconf
</ins></span></pre>
</div>
</div>
</body>
</html>