Update autoconf to 2.69 and automake to 1.12

PR:		166836
Tested by:	Multiple -exp runs (pav)

6 files changed, 49 insertions, 73 deletions

diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 3eaff14b70e2..eeef3583dc17 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -6,28 +6,27 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.11.1
+PORTVERSION=	1.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 DISTNAME=	automake-${PORTVERSION}
 
 MAINTAINER=	autotools@FreeBSD.org
-COMMENT=	GNU Standards-compliant Makefile generator (1.11)
+COMMENT=	GNU Standards-compliant Makefile generator
 
 RUN_DEPENDS=	${AUTOCONF_DEPENDS} \
 		automake-wrapper:${PORTSDIR}/devel/automake-wrapper
 
 USE_AUTOTOOLS=	autoconf:env
-BUILD_VERSION=	1.11
+BUILD_VERSION=	1.12
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	automake111
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
 CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
-INFO=		automake-${BUILD_VERSION}
+INFO=		automake
 MAN1=		aclocal-${BUILD_VERSION}-${BUILD_VERSION}.1 \
 		aclocal-${BUILD_VERSION}.1 \
 		automake-${BUILD_VERSION}-${BUILD_VERSION}.1 \
@@ -35,8 +34,6 @@ MAN1=		aclocal-${BUILD_VERSION}-${BUILD_VERSION}.1 \
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/*.info
-	@${MV} ${WRKSRC}/doc/automake.texi \
-	       ${WRKSRC}/doc/automake-${BUILD_VERSION}.texi
 
 pre-su-install:
 	@${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION}
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index eea5ad4ca3e9..8e89bbae8ddf 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (automake-1.11.1.tar.bz2) = 5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae
-SIZE (automake-1.11.1.tar.bz2) = 1066685
+SHA256 (automake-1.12.tar.xz) = 4f920cad2dc59f1be296b7d7584e3828a36154d16191f3cad60a73e6e9bcf879
+SIZE (automake-1.12.tar.xz) = 1331352
diff --git a/devel/automake/files/patch-Makefile.in b/devel/automake/files/patch-Makefile.in
index 55d85c2ed5b9..4930afd8a81c 100644
--- a/devel/automake/files/patch-Makefile.in
+++ b/devel/automake/files/patch-Makefile.in
@@ -1,6 +1,27 @@
---- Makefile.in.orig	Sun Oct 15 10:25:23 2006
-+++ Makefile.in	Sat Apr 14 16:04:04 2007
-@@ -591,3 +591,2 @@
+--- Makefile.in.orig	2012-04-25 08:49:53.000000000 -0700
++++ Makefile.in	2012-04-26 11:27:28.000000000 -0700
+@@ -173,4 +173,3 @@
+ am__dirstamp = $(am__leading_dot)dirstamp
+-INFO_DEPS = $(srcdir)/doc/automake.info \
+-	$(srcdir)/doc/automake-history.info
++INFO_DEPS = $(srcdir)/doc/automake.info
+ TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
+@@ -626,3 +625,3 @@
+ 
+-dist_system_ac_DATA = m4/acdir/README
++dist_system_ac_DATA = 
+ 
+@@ -2165,3 +2164,3 @@
+ am__tdf = diff-in-tests-lists.tmp
+-info_TEXINFOS = doc/automake.texi doc/automake-history.texi
++info_TEXINFOS = doc/automake.texi
+ doc_automake_TEXINFOS = doc/fdl.texi
+@@ -2200,3 +2199,3 @@
+ dist_noinst_DATA = $(amhello_sources)
+-dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
++dist_doc_DATA = 
+ 
+@@ -3247,3 +3246,2 @@
  	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
+ install-html: install-html-am
diff --git a/devel/automake/files/patch-doc::Makefile.in b/devel/automake/files/patch-doc::Makefile.in
deleted file mode 100644
index 17a9dc7f012c..000000000000
--- a/devel/automake/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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 @@
- DIST_SOURCES =
--INFO_DEPS = $(srcdir)/automake.info
-+INFO_DEPS = $(srcdir)/automake-@APIVERSION@.info
- TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
-@@ -135,3 +136,3 @@
- target_alias = @target_alias@
--info_TEXINFOS = automake.texi
-+info_TEXINFOS = automake-@APIVERSION@.texi
- automake_TEXINFOS = fdl.texi
-@@ -142,3 +143,3 @@
- 
--TAGS_DEPENDENCIES = automake.texi
-+TAGS_DEPENDENCIES = automake-@APIVERSION@.texi
- all: all-am
-@@ -222,5 +223,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-@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/automake/files/patch-doc::automake.texi b/devel/automake/files/patch-doc::automake.texi
index 3d9f61200a71..9f2f250b4671 100644
--- a/devel/automake/files/patch-doc::automake.texi
+++ b/devel/automake/files/patch-doc::automake.texi
@@ -1,26 +1,16 @@
---- doc/automake.texi.orig	Sun Oct 15 10:41:24 2006
-+++ doc/automake.texi	Sat Apr 14 15:32:49 2007
-@@ -2,4 +2,4 @@
- @c %**start of header
--@setfilename automake.info
--@settitle automake
-+@setfilename automake-1.11.info
-+@settitle Automake-1.11
- @setchapternewpage off
-@@ -34,14 +34,5 @@
+--- doc/automake.texi.orig	2012-04-21 07:38:05.000000000 -0700
++++ doc/automake.texi	2012-04-26 11:05:39.000000000 -0700
+@@ -38,3 +38,3 @@
  
--@c info Automake  points to the Automake package's documentation
--@c info automake  points to the automake script's documentation
--@c (Autoconf has a similar setup.)
 -@dircategory Software development
-+@dircategory Programming & development tools
++@dircategory Programming & development toolS
  @direntry
--* Automake: (automake).         Making GNU standards-compliant Makefiles.
--@end direntry
--
+@@ -43,8 +43,2 @@
+ 
 -@dircategory Individual utilities
 -@direntry
--* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
--* automake: (automake)Invoking Automake.        Generating Makefile.in.
-+* Automake-1.11: (automake-1.11).       Making Makefile.in's.
- @end direntry
+-* aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+-* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
+-@end direntry
+-
+ @titlepage
diff --git a/devel/automake/pkg-plist b/devel/automake/pkg-plist
index 76698df4f74c..225bcde3935f 100644
--- a/devel/automake/pkg-plist
+++ b/devel/automake/pkg-plist
@@ -1,6 +1,7 @@
 bin/aclocal-%%BUILD_VERSION%%
 bin/automake-%%BUILD_VERSION%%
 share/aclocal-%%BUILD_VERSION%%/amversion.m4
+share/aclocal-%%BUILD_VERSION%%/ar-lib.m4
 share/aclocal-%%BUILD_VERSION%%/as.m4
 share/aclocal-%%BUILD_VERSION%%/auxdir.m4
 share/aclocal-%%BUILD_VERSION%%/ccstdc.m4
@@ -21,14 +22,12 @@ share/aclocal-%%BUILD_VERSION%%/make.m4
 share/aclocal-%%BUILD_VERSION%%/minuso.m4
 share/aclocal-%%BUILD_VERSION%%/missing.m4
 share/aclocal-%%BUILD_VERSION%%/mkdirp.m4
-share/aclocal-%%BUILD_VERSION%%/multi.m4
 share/aclocal-%%BUILD_VERSION%%/obsol-gt.m4
 share/aclocal-%%BUILD_VERSION%%/obsol-lt.m4
 share/aclocal-%%BUILD_VERSION%%/obsolete.m4
 share/aclocal-%%BUILD_VERSION%%/options.m4
 share/aclocal-%%BUILD_VERSION%%/protos.m4
 share/aclocal-%%BUILD_VERSION%%/python.m4
-share/aclocal-%%BUILD_VERSION%%/regex.m4
 share/aclocal-%%BUILD_VERSION%%/runlog.m4
 share/aclocal-%%BUILD_VERSION%%/sanity.m4
 share/aclocal-%%BUILD_VERSION%%/silent.m4
@@ -45,13 +44,13 @@ share/automake-%%BUILD_VERSION%%/Automake/Configure_ac.pm
 share/automake-%%BUILD_VERSION%%/Automake/DisjConditions.pm
 share/automake-%%BUILD_VERSION%%/Automake/FileUtils.pm
 share/automake-%%BUILD_VERSION%%/Automake/General.pm
+share/automake-%%BUILD_VERSION%%/Automake/Getopt.pm
 share/automake-%%BUILD_VERSION%%/Automake/Item.pm
 share/automake-%%BUILD_VERSION%%/Automake/ItemDef.pm
 share/automake-%%BUILD_VERSION%%/Automake/Location.pm
 share/automake-%%BUILD_VERSION%%/Automake/Options.pm
 share/automake-%%BUILD_VERSION%%/Automake/Rule.pm
 share/automake-%%BUILD_VERSION%%/Automake/RuleDef.pm
-share/automake-%%BUILD_VERSION%%/Automake/Struct.pm
 share/automake-%%BUILD_VERSION%%/Automake/VarDef.pm
 share/automake-%%BUILD_VERSION%%/Automake/Variable.pm
 share/automake-%%BUILD_VERSION%%/Automake/Version.pm
@@ -59,8 +58,6 @@ share/automake-%%BUILD_VERSION%%/Automake/Wrap.pm
 share/automake-%%BUILD_VERSION%%/Automake/XFile.pm
 share/automake-%%BUILD_VERSION%%/COPYING
 share/automake-%%BUILD_VERSION%%/INSTALL
-share/automake-%%BUILD_VERSION%%/acinstall
-share/automake-%%BUILD_VERSION%%/am/ansi2knr.am
 share/automake-%%BUILD_VERSION%%/am/check.am
 share/automake-%%BUILD_VERSION%%/am/check2.am
 share/automake-%%BUILD_VERSION%%/am/clean-hdr.am
@@ -88,7 +85,6 @@ share/automake-%%BUILD_VERSION%%/am/ltlib.am
 share/automake-%%BUILD_VERSION%%/am/ltlibrary.am
 share/automake-%%BUILD_VERSION%%/am/mans-vars.am
 share/automake-%%BUILD_VERSION%%/am/mans.am
-share/automake-%%BUILD_VERSION%%/am/multilib.am
 share/automake-%%BUILD_VERSION%%/am/program.am
 share/automake-%%BUILD_VERSION%%/am/progs.am
 share/automake-%%BUILD_VERSION%%/am/python.am
@@ -101,10 +97,8 @@ share/automake-%%BUILD_VERSION%%/am/texibuild.am
 share/automake-%%BUILD_VERSION%%/am/texinfos.am
 share/automake-%%BUILD_VERSION%%/am/vala.am
 share/automake-%%BUILD_VERSION%%/am/yacc.am
-share/automake-%%BUILD_VERSION%%/ansi2knr.1
-share/automake-%%BUILD_VERSION%%/ansi2knr.c
+share/automake-%%BUILD_VERSION%%/ar-lib
 share/automake-%%BUILD_VERSION%%/compile
-share/automake-%%BUILD_VERSION%%/config-ml.in
 share/automake-%%BUILD_VERSION%%/config.guess
 share/automake-%%BUILD_VERSION%%/config.sub
 share/automake-%%BUILD_VERSION%%/depcomp
@@ -114,11 +108,11 @@ share/automake-%%BUILD_VERSION%%/mdate-sh
 share/automake-%%BUILD_VERSION%%/missing
 share/automake-%%BUILD_VERSION%%/mkinstalldirs
 share/automake-%%BUILD_VERSION%%/py-compile
-share/automake-%%BUILD_VERSION%%/symlink-tree
+share/automake-%%BUILD_VERSION%%/tap-driver.pl
+share/automake-%%BUILD_VERSION%%/tap-driver.sh
+share/automake-%%BUILD_VERSION%%/test-driver
 share/automake-%%BUILD_VERSION%%/texinfo.tex
 share/automake-%%BUILD_VERSION%%/ylwrap
-share/doc/automake/amhello-1.0.tar.gz
-@dirrm share/doc/automake
 @dirrm share/aclocal-%%BUILD_VERSION%%
 @dirrm share/automake-%%BUILD_VERSION%%/Automake
 @dirrm share/automake-%%BUILD_VERSION%%/am