Update to the autotools new world order.

Tested by:	numerous package build runs
Approved by:	portmgr
Thanks to:	des, kris, linimon, pav

9 files changed, 26 insertions, 163 deletions

diff --git a/devel/automake19/files/patch-Makefile.in b/devel/automake19/files/patch-Makefile.in
index f24ffdd88721..1c6577a25247 100644
--- a/devel/automake19/files/patch-Makefile.in
+++ b/devel/automake19/files/patch-Makefile.in
@@ -1,27 +1,6 @@
---- Makefile.in.orig	Sun Mar  7 09:04:32 2004
-+++ Makefile.in	Sun Mar 14 17:07:15 2004
-@@ -82,2 +82,3 @@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
-@@ -154,2 +155,3 @@
-   -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-+  -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \
-   -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
-@@ -590,16 +592,4 @@
- 	@$(POST_INSTALL)
--	@for p in $(bin_SCRIPTS); do \
--	  f="`echo $$p|sed '$(transform)'`"; \
--	  fv="$$f-$(APIVERSION)"; \
--	  rm -f $(DESTDIR)$(bindir)/$$fv; \
--	  echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \
--	  $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \
--	done
- 
- uninstall-hook:
--	@for p in $(bin_SCRIPTS); do \
--	  f="`echo $$p|sed '$(transform)'`"; \
--	  fv="$$f-$(APIVERSION)"; \
--	  rm -f $(DESTDIR)$(bindir)/$$fv; \
--	done
+--- Makefile.in.orig	Sun Jul 10 11:14:52 2005
++++ Makefile.in	Sat Apr 14 16:02:48 2007
+@@ -575,3 +575,2 @@
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  
diff --git a/devel/automake19/files/patch-aclocal.in b/devel/automake19/files/patch-aclocal.in
deleted file mode 100644
index a9df0ac85c20..000000000000
--- a/devel/automake19/files/patch-aclocal.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- aclocal.in.orig	Sat Jul  9 02:28:44 2005
-+++ aclocal.in	Sun May  6 13:54:43 2007
-@@ -31,3 +31,3 @@
- {
--  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
-   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
-@@ -47,3 +47,3 @@
- # Note also that the versioned directory is handled later.
--$acdir = '@datadir@/aclocal';
-+$acdir = '@datadir@/aclocal@APIPVERSION@';
- $default_acdir = $acdir;
-@@ -406,3 +406,3 @@
- 
--  my $traces = ($ENV{AUTOM4TE} || 'autom4te');
-+  my $traces = ($ENV{AUTOM4TE} || 'autom4te259');
-   $traces .= " --language Autoconf-without-aclocal-m4 ";
-@@ -634,8 +634,2 @@
-     if $acdir ne $default_acdir;
--
--  # Search the versioned directory near the end, and then the
--  # unversioned directory last.  Only do this if the user didn't
--  # override acdir.
--  push (@dirlist, "$acdir-$APIVERSION")
--    if $acdir eq $default_acdir;
- 
diff --git a/devel/automake19/files/patch-automake.in b/devel/automake19/files/patch-automake.in
deleted file mode 100644
index de0b9c2f2026..000000000000
--- a/devel/automake19/files/patch-automake.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- automake.in.orig	Sat Apr 10 10:15:32 2004
-+++ automake.in	Wed May 26 14:34:15 2004
-@@ -33,3 +33,3 @@
- {
--  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
-   unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
-@@ -4440,3 +4440,3 @@
- 
--  my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
-+  my $traces = ($ENV{AUTOCONF} || 'autoconf259') . " ";
- 
diff --git a/devel/automake19/files/patch-configure b/devel/automake19/files/patch-configure
deleted file mode 100644
index 6ce0b38a23b1..000000000000
--- a/devel/automake19/files/patch-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.orig	Sun Jul 10 11:14:51 2005
-+++ configure	Thu Jul 28 14:28:34 2005
-@@ -602,2 +602,3 @@
- APIVERSION
-+APIPVERSION
- pkgvdatadir
-@@ -2098,6 +2099,6 @@
- APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'`
--
-+APIPVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\)\.\([0-9]*[a-z]*\).*$/\1\2/'`
- 
- # A versioned directory, defined here for convenience.
--pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION"
-+pkgvdatadir="\${datadir}/automake${APIPVERSION}"
- 
-@@ -3102,2 +3103,3 @@
- APIVERSION=$APIVERSION
-+APIPVERSION=$APIPVERSION
- 
-@@ -3244,2 +3246,3 @@
- APIVERSION!$APIVERSION$ac_delim
-+APIPVERSION!$APIPVERSION$ac_delim
- pkgvdatadir!$pkgvdatadir$ac_delim
-@@ -3256,3 +3259,3 @@
- 
--  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 75; then
-+  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 76; then
-     break
diff --git a/devel/automake19/files/patch-doc::Makefile.in b/devel/automake19/files/patch-doc::Makefile.in
index b3c320a7de74..248932363432 100644
--- a/devel/automake19/files/patch-doc::Makefile.in
+++ b/devel/automake19/files/patch-doc::Makefile.in
@@ -1,35 +1,26 @@
---- doc/Makefile.in.orig	Sun Mar  7 09:04:33 2004
-+++ doc/Makefile.in	Sun Mar 14 17:12:32 2004
-@@ -53,3 +53,3 @@
+--- doc/Makefile.in.orig	Sun Jul 10 11:14:53 2005
++++ doc/Makefile.in	Thu Apr  5 03:30:20 2007
+@@ -54,3 +54,3 @@
  DIST_SOURCES =
 -INFO_DEPS = $(srcdir)/automake.info
-+INFO_DEPS = $(srcdir)/automake${APIPVERSION}.info
++INFO_DEPS = $(srcdir)/automake-@APIVERSION@.info
  TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
-@@ -73,2 +73,3 @@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
-@@ -93,3 +94,3 @@
- LTLIBOBJS = @LTLIBOBJS@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- MODIFICATION_DELAY = @MODIFICATION_DELAY@
-@@ -135,3 +136,3 @@
+@@ -146,3 +146,3 @@
  target_alias = @target_alias@
 -info_TEXINFOS = automake.texi
-+info_TEXINFOS = automake${APIPVERSION}.texi
++info_TEXINFOS = automake-@APIVERSION@.texi
  automake_TEXINFOS = fdl.texi
-@@ -142,3 +143,3 @@
+@@ -153,3 +153,3 @@
  
 -TAGS_DEPENDENCIES = automake.texi
-+TAGS_DEPENDENCIES = automake${APIPVERSION}.texi
++TAGS_DEPENDENCIES = automake-@APIVERSION@.texi
  all: all-am
-@@ -222,5 +223,5 @@
+@@ -238,5 +238,5 @@
  $(srcdir)/version.texi:  $(srcdir)/stamp-vti
 -$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure
 -	@(dir=.; test -f ./automake.texi || dir=$(srcdir); \
 -	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \
-+$(srcdir)/stamp-vti: automake${APIPVERSION}.texi $(top_srcdir)/configure
-+	@(dir=.; test -f ./automake${APIPVERSION}.texi || dir=$(srcdir); \
-+	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.texi`; \
++$(srcdir)/stamp-vti: automake-@APIVERSION@.texi $(top_srcdir)/configure
++	@(dir=.; test -f ./automake-@APIVERSION@.texi || dir=$(srcdir); \
++	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake-@APIVERSION@.texi`; \
  	echo "@set UPDATED $$1 $$2 $$3"; \
diff --git a/devel/automake19/files/patch-doc::automake.texi b/devel/automake19/files/patch-doc::automake.texi
index 54f71944163d..8d4cd99240cc 100644
--- a/devel/automake19/files/patch-doc::automake.texi
+++ b/devel/automake19/files/patch-doc::automake.texi
@@ -1,13 +1,16 @@
---- doc/automake.texi.orig	Mon Nov  1 01:50:48 2004
-+++ doc/automake.texi	Mon Nov  8 15:28:40 2004
+--- doc/automake.texi.orig	Sat Jul  9 02:28:44 2005
++++ doc/automake.texi	Sat Apr 14 15:29:13 2007
 @@ -2,4 +2,4 @@
  @c %**start of header
 -@setfilename automake.info
 -@settitle automake
-+@setfilename automake19.info
-+@settitle automake19
++@setfilename automake-1.9.info
++@settitle Automake-1.9
  @setchapternewpage off
-@@ -36,8 +36,3 @@
+@@ -34,10 +34,5 @@
+ 
+-@dircategory Software development
++@dircategory Programming & development tools
  @direntry
 -* automake: (automake).         Making Makefile.in's.
 -@end direntry
@@ -15,10 +18,5 @@
 -@dircategory Individual utilities
 -@direntry
 -* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-+* automake19: (automake19).         Making Makefile.in's.
++* Automake-1.9: (automake-1.9).         Making Makefile.in's.
  @end direntry
-@@ -9090,3 +9085,3 @@
- @multitable {8888-88-88} {8.8-p8} {8888} {888} {8888} {8888 (88)} {8888 (88)} {888} {888}
--@headitem Date   @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
-+@item Date   @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
- @item 1994-09-19 @tab CVS    @tab  141 @tab     @tab      @tab  299 (24) @tab           @tab     @tab
diff --git a/devel/automake19/files/patch-lib::Automake::Config.in b/devel/automake19/files/patch-lib::Automake::Config.in
deleted file mode 100644
index c9c17688d004..000000000000
--- a/devel/automake19/files/patch-lib::Automake::Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib/Automake/Config.in.orig	Thu Dec 25 10:00:29 2003
-+++ lib/Automake/Config.in	Mon Mar 29 20:23:13 2004
-@@ -25,5 +25,5 @@
- @ISA = qw (Exporter);
--@EXPORT = qw ($APIVERSION $PACKAGE $VERSION $libdir);
-+@EXPORT = qw ($APIVERSION $APIPVERSION $PACKAGE $VERSION $libdir);
- 
--use vars qw ($APIVERSION $PACKAGE $VERSION $libdir);
-+use vars qw ($APIVERSION $APIPVERSION $PACKAGE $VERSION $libdir);
- 
-@@ -32,5 +32,6 @@
- $APIVERSION = '@APIVERSION@';
-+$APIPVERSION = '@APIPVERSION@';
- $PACKAGE = '@PACKAGE@';
- $VERSION = '@VERSION@';
--$libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
-+$libdir = '@datadir@/@PACKAGE@@APIPVERSION@';
- 
diff --git a/devel/automake19/files/patch-lib::Automake::Makefile.in b/devel/automake19/files/patch-lib::Automake::Makefile.in
deleted file mode 100644
index a1ae8ffe243e..000000000000
--- a/devel/automake19/files/patch-lib::Automake::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/Automake/Makefile.in.orig	Sun Mar  7 09:04:33 2004
-+++ lib/Automake/Makefile.in	Mon Mar 29 20:22:26 2004
-@@ -70,2 +70,3 @@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
-@@ -161,2 +162,3 @@
-   -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-+  -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \
-   -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
diff --git a/devel/automake19/files/patch-m4-Makefile.in b/devel/automake19/files/patch-m4-Makefile.in
deleted file mode 100644
index 5125e696ab2c..000000000000
--- a/devel/automake19/files/patch-m4-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/Makefile.in.orig	Sun Mar  7 09:04:33 2004
-+++ m4/Makefile.in	Sun Mar 14 17:09:37 2004
-@@ -60,2 +60,3 @@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
-@@ -122,3 +123,3 @@
- target_alias = @target_alias@
--m4datadir = $(datadir)/aclocal-$(APIVERSION)
-+m4datadir = $(datadir)/aclocal$(APIPVERSION)
- dist_m4data_DATA = \