From 6d726b6c09094afd97f1528cfff8b27850279b0d Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Fri, 11 May 2012 20:38:09 +0000 Subject: Update autoconf to 2.69 and automake to 1.12 PR: 166836 Tested by: Multiple -exp runs (pav) --- devel/automake/files/patch-Makefile.in | 29 ++++++++++++++++++++---- devel/automake/files/patch-doc::Makefile.in | 26 ---------------------- devel/automake/files/patch-doc::automake.texi | 32 +++++++++------------------ 3 files changed, 36 insertions(+), 51 deletions(-) delete mode 100644 devel/automake/files/patch-doc::Makefile.in (limited to 'devel/automake/files') 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 -- cgit v1.2.3