[111253] trunk/dports/devel/autoconf

[larryv at macports.org]

Revision: 111253
          https://trac.macports.org/changeset/111253
Author:   larryv at macports.org
Date:     2013-09-17 16:10:26 -0700 (Tue, 17 Sep 2013)
Log Message:
-----------
autoconf: Fix regression introduced by r111228 wherein autoreconf didn't
look for glibtoolize (#40517).

Revision Links:
--------------
    https://trac.macports.org/changeset/111228

Modified Paths:
--------------
    trunk/dports/devel/autoconf/Portfile

Added Paths:
-----------
    trunk/dports/devel/autoconf/files/libtool-prefix.patch

Removed Paths:
-------------
    trunk/dports/devel/autoconf/files/glibtool.patch

Modified: trunk/dports/devel/autoconf/Portfile
===================================================================
--- trunk/dports/devel/autoconf/Portfile	2013-09-17 23:00:49 UTC (rev 111252)
+++ trunk/dports/devel/autoconf/Portfile	2013-09-17 23:10:26 UTC (rev 111253)
@@ -5,7 +5,7 @@
 name             autoconf
 epoch            1
 version          2.69
-revision         1
+revision         2
 categories       devel
 # the license is GPL-3+ with an exception:
 # http://www.gnu.org/licenses/autoconf-exception.html
@@ -36,7 +36,8 @@
                  port:m4
 
 # The libtool port installs "glibtool" and "glibtoolize".
-patchfiles       glibtool.patch
+patch.pre_args   -p1
+patchfiles       libtool-prefix.patch
 
 configure.perl   ${prefix}/bin/perl
 

Deleted: trunk/dports/devel/autoconf/files/glibtool.patch
===================================================================
--- trunk/dports/devel/autoconf/files/glibtool.patch	2013-09-17 23:00:49 UTC (rev 111252)
+++ trunk/dports/devel/autoconf/files/glibtool.patch	2013-09-17 23:10:26 UTC (rev 111253)
@@ -1,22 +0,0 @@
-Index: man/autoreconf.1
-===================================================================
---- man.orig/autoreconf.1
-+++ 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

Added: trunk/dports/devel/autoconf/files/libtool-prefix.patch
===================================================================
--- trunk/dports/devel/autoconf/files/libtool-prefix.patch	                        (rev 0)
+++ trunk/dports/devel/autoconf/files/libtool-prefix.patch	2013-09-17 23:10:26 UTC (rev 111253)
@@ -0,0 +1,57 @@
+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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130917/816924d2/attachment-0001.html>