Revision: 132521 https://trac.macports.org/changeset/132521 Author: larryv@macports.org Date: 2015-02-03 00:32:30 -0800 (Tue, 03 Feb 2015) Log Message: ----------- 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. Modified Paths: -------------- trunk/dports/devel/autoconf/Portfile Added Paths: ----------- trunk/dports/devel/autoconf/files/use-macports-tools.patch Removed Paths: ------------- trunk/dports/devel/autoconf/files/libtool-prefix.patch Modified: trunk/dports/devel/autoconf/Portfile =================================================================== --- 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) @@ -6,7 +6,7 @@ name autoconf epoch 1 version 2.69 -revision 2 +revision 3 categories devel # the license is GPL-3+ with an exception: # http://www.gnu.org/licenses/autoconf-exception.html @@ -37,9 +37,11 @@ checksums rmd160 666aa45a58e856968c651e2a3b44be38de9c14e4 \ sha256 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 -# The libtool port installs "glibtool" and "glibtoolize". -patch.pre_args -p1 -patchfiles libtool-prefix.patch +patchfiles use-macports-tools.patch +post-patch { + # Stop build from trying to regenerate this after patching. + touch ${worksrcpath}/man/autoreconf.1 +} configure.perl ${prefix}/bin/perl Deleted: trunk/dports/devel/autoconf/files/libtool-prefix.patch =================================================================== --- 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) @@ -1,57 +0,0 @@ -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 Copied: trunk/dports/devel/autoconf/files/use-macports-tools.patch (from rev 132518, trunk/dports/devel/autoconf/files/libtool-prefix.patch) =================================================================== --- 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) @@ -0,0 +1,41 @@ +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