Complete de-orbit burn sequence for automake19 and automake110.

Special thanks to Travis Thaxton (travis <at> thax.org) for his recent
kind hardware donation, without which this particular part of the
never-ending autotools work would have taken _considerably_ longer to do.

17 files changed, 4 insertions, 473 deletions

diff --git a/MOVED b/MOVED
index b93d62675df2..c407be7fbe0e 100644
--- a/MOVED
+++ b/MOVED
@@ -4622,3 +4622,5 @@ sysutils/rsyslog55-pgsql|sysutils/rsyslog5-pgsql|2010-10-05|Renamed
 sysutils/rsyslog55-relp|sysutils/rsyslog5-relp|2010-10-05|Renamed
 sysutils/rsyslog55-rfc3195|sysutils/rsyslog5-rfc3195|2010-10-05|Renamed
 sysutils/rsyslog55-snmpl|sysutils/rsyslog5-snmp|2010-10-05|Renamed
+devel/automake19||2010-10-07|No longer required by any port
+devel/automake110||2010-10-07|No longer required by any port
diff --git a/devel/Makefile b/devel/Makefile
index 1f4225155b48..9b4cdc1d7075 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -69,10 +69,8 @@
     SUBDIR += autodist
     SUBDIR += autogen
     SUBDIR += automake-wrapper
-    SUBDIR += automake110
     SUBDIR += automake111
     SUBDIR += automake14
-    SUBDIR += automake19
     SUBDIR += automoc4
     SUBDIR += autotools
     SUBDIR += avalon-framework
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
deleted file mode 100644
index 7b1202c2b538..000000000000
--- a/devel/automake110/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	automake110
-# Date created:		5th December 2006
-# Whom:			Ade Lovett <ade@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	automake
-PORTVERSION=	1.10.3
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	automake
-DISTNAME=	automake-${PORTVERSION}
-
-# note: before committing to this port, contact portmgr to arrange for an
-# experimental ports run.  Untested commits may be backed out at portmgr's
-# discretion.
-MAINTAINER=	autotools@FreeBSD.org
-COMMENT=	GNU Standards-compliant Makefile generator (1.10)
-
-RUN_DEPENDS=	${AUTOCONF_DEPENDS} \
-		automake-wrapper:${PORTSDIR}/devel/automake-wrapper
-
-USE_AUTOTOOLS=	autoconf:267:env
-BUILD_VERSION=	1.10
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	automake110
-USE_BZIP2=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
-CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
-INFO=		automake-${BUILD_VERSION}
-
-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}
-	@${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION}
-
-.include <bsd.port.mk>
diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo
deleted file mode 100644
index de67d8d287c8..000000000000
--- a/devel/automake110/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (automake-1.10.3.tar.bz2) = b8e67fb458da396bc35555af7ef2b49f
-SHA256 (automake-1.10.3.tar.bz2) = e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc
-SIZE (automake-1.10.3.tar.bz2) = 957505
diff --git a/devel/automake110/files/patch-Makefile.in b/devel/automake110/files/patch-Makefile.in
deleted file mode 100644
index 55d85c2ed5b9..000000000000
--- a/devel/automake110/files/patch-Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
---- Makefile.in.orig	Sun Oct 15 10:25:23 2006
-+++ Makefile.in	Sat Apr 14 16:04:04 2007
-@@ -591,3 +591,2 @@
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
diff --git a/devel/automake110/files/patch-doc::Makefile.in b/devel/automake110/files/patch-doc::Makefile.in
deleted file mode 100644
index 17a9dc7f012c..000000000000
--- a/devel/automake110/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/automake110/files/patch-doc::automake.texi b/devel/automake110/files/patch-doc::automake.texi
deleted file mode 100644
index d5ebb1253d29..000000000000
--- a/devel/automake110/files/patch-doc::automake.texi
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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.10.info
-+@settitle Automake-1.10
- @setchapternewpage off
-@@ -34,14 +34,5 @@
- 
--@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
- @direntry
--* Automake: (automake).         Making GNU standards-compliant Makefiles.
--@end direntry
--
--@dircategory Individual utilities
--@direntry
--* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
--* automake: (automake)Invoking Automake.        Generating Makefile.in.
-+* Automake-1.10: (automake-1.10).       Making Makefile.in's.
- @end direntry
diff --git a/devel/automake110/pkg-descr b/devel/automake110/pkg-descr
deleted file mode 100644
index 5d7f85e52d7f..000000000000
--- a/devel/automake110/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Automake is a tool for automatically generating Makefiles compliant with
-the GNU Coding Standards. It was inspired by the 4.4BSD make and include
-files, but aims to be portable and to conform to the GNU standards for
-Makefile variables and targets. Automake is a Perl script. The input files
-are called Makefile.am. The output files are called Makefile.in; They are
-intended for use with Autoconf. Automake requires certain things to be done
-in your configure.in. This package also includes the "aclocal"
-program. aclocal is a program to generate an 'aclocal.m4' based on the
-contents of 'configure.in'. It is useful as an extensible, maintainable
-mechanism for augmenting autoconf.
-
-WWW: http://www.gnu.org/software/automake/
diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist
deleted file mode 100644
index 3c226e808f6b..000000000000
--- a/devel/automake110/pkg-plist
+++ /dev/null
@@ -1,120 +0,0 @@
-bin/aclocal-%%BUILD_VERSION%%
-bin/automake-%%BUILD_VERSION%%
-share/aclocal-%%BUILD_VERSION%%/amversion.m4
-share/aclocal-%%BUILD_VERSION%%/as.m4
-share/aclocal-%%BUILD_VERSION%%/auxdir.m4
-share/aclocal-%%BUILD_VERSION%%/ccstdc.m4
-share/aclocal-%%BUILD_VERSION%%/cond.m4
-share/aclocal-%%BUILD_VERSION%%/depend.m4
-share/aclocal-%%BUILD_VERSION%%/depout.m4
-share/aclocal-%%BUILD_VERSION%%/dmalloc.m4
-share/aclocal-%%BUILD_VERSION%%/gcj.m4
-share/aclocal-%%BUILD_VERSION%%/header.m4
-share/aclocal-%%BUILD_VERSION%%/init.m4
-share/aclocal-%%BUILD_VERSION%%/install-sh.m4
-share/aclocal-%%BUILD_VERSION%%/lead-dot.m4
-share/aclocal-%%BUILD_VERSION%%/lex.m4
-share/aclocal-%%BUILD_VERSION%%/lispdir.m4
-share/aclocal-%%BUILD_VERSION%%/maintainer.m4
-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%%/strip.m4
-share/aclocal-%%BUILD_VERSION%%/substnot.m4
-share/aclocal-%%BUILD_VERSION%%/tar.m4
-share/aclocal-%%BUILD_VERSION%%/upc.m4
-share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm
-share/automake-%%BUILD_VERSION%%/Automake/Channels.pm
-share/automake-%%BUILD_VERSION%%/Automake/Condition.pm
-share/automake-%%BUILD_VERSION%%/Automake/Config.pm
-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/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
-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/clean-hdr.am
-share/automake-%%BUILD_VERSION%%/am/clean.am
-share/automake-%%BUILD_VERSION%%/am/compile.am
-share/automake-%%BUILD_VERSION%%/am/configure.am
-share/automake-%%BUILD_VERSION%%/am/data.am
-share/automake-%%BUILD_VERSION%%/am/dejagnu.am
-share/automake-%%BUILD_VERSION%%/am/depend.am
-share/automake-%%BUILD_VERSION%%/am/depend2.am
-share/automake-%%BUILD_VERSION%%/am/distdir.am
-share/automake-%%BUILD_VERSION%%/am/footer.am
-share/automake-%%BUILD_VERSION%%/am/header-vars.am
-share/automake-%%BUILD_VERSION%%/am/header.am
-share/automake-%%BUILD_VERSION%%/am/install.am
-share/automake-%%BUILD_VERSION%%/am/inst-vars.am
-share/automake-%%BUILD_VERSION%%/am/java.am
-share/automake-%%BUILD_VERSION%%/am/lang-compile.am
-share/automake-%%BUILD_VERSION%%/am/lex.am
-share/automake-%%BUILD_VERSION%%/am/library.am
-share/automake-%%BUILD_VERSION%%/am/libs.am
-share/automake-%%BUILD_VERSION%%/am/libtool.am
-share/automake-%%BUILD_VERSION%%/am/lisp.am
-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
-share/automake-%%BUILD_VERSION%%/am/remake-hdr.am
-share/automake-%%BUILD_VERSION%%/am/scripts.am
-share/automake-%%BUILD_VERSION%%/am/subdirs.am
-share/automake-%%BUILD_VERSION%%/am/tags.am
-share/automake-%%BUILD_VERSION%%/am/texi-vers.am
-share/automake-%%BUILD_VERSION%%/am/texibuild.am
-share/automake-%%BUILD_VERSION%%/am/texinfos.am
-share/automake-%%BUILD_VERSION%%/am/yacc.am
-share/automake-%%BUILD_VERSION%%/ansi2knr.1
-share/automake-%%BUILD_VERSION%%/ansi2knr.c
-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
-share/automake-%%BUILD_VERSION%%/elisp-comp
-share/automake-%%BUILD_VERSION%%/install-sh
-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%%/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
-@dirrm share/automake-%%BUILD_VERSION%%
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
deleted file mode 100644
index 99b515dcfe39..000000000000
--- a/devel/automake19/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# New ports collection makefile for:	automake19
-# Date created:		15 Feb 2003
-# Whom:			Udo Schweigert
-#
-# $FreeBSD$
-#
-
-PORTNAME=	automake
-PORTVERSION=	1.9.6
-PORTREVISION=	4
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	automake
-DISTNAME=	automake-${PORTVERSION}
-
-# note: before committing to this port, contact portmgr to arrange for an
-# experimental ports run.  Untested commits may be backed out at portmgr's
-# discretion.
-MAINTAINER=	autotools@FreeBSD.org
-COMMENT=	GNU Standards-compliant Makefile generator (1.9)
-
-RUN_DEPENDS=	${AUTOCONF_DEPENDS} \
-		automake-wrapper:${PORTSDIR}/devel/automake-wrapper
-
-USE_AUTOTOOLS=	autoconf:267:env
-BUILD_VERSION=	1.9
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	automake19
-USE_BZIP2=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO"=makeinfo --no-split"
-CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
-INFO=		automake-${BUILD_VERSION}
-
-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}
-	@${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION}
-
-.include <bsd.port.mk>
diff --git a/devel/automake19/distinfo b/devel/automake19/distinfo
deleted file mode 100644
index 739f4985d6be..000000000000
--- a/devel/automake19/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (automake-1.9.6.tar.bz2) = c11b8100bb311492d8220378fd8bf9e0
-SHA256 (automake-1.9.6.tar.bz2) = 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d
-SIZE (automake-1.9.6.tar.bz2) = 765505
diff --git a/devel/automake19/files/patch-Makefile.in b/devel/automake19/files/patch-Makefile.in
deleted file mode 100644
index 1c6577a25247..000000000000
--- a/devel/automake19/files/patch-Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
---- 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-doc::Makefile.in b/devel/automake19/files/patch-doc::Makefile.in
deleted file mode 100644
index 248932363432..000000000000
--- a/devel/automake19/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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-@APIVERSION@.info
- TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
-@@ -146,3 +146,3 @@
- target_alias = @target_alias@
--info_TEXINFOS = automake.texi
-+info_TEXINFOS = automake-@APIVERSION@.texi
- automake_TEXINFOS = fdl.texi
-@@ -153,3 +153,3 @@
- 
--TAGS_DEPENDENCIES = automake.texi
-+TAGS_DEPENDENCIES = automake-@APIVERSION@.texi
- all: all-am
-@@ -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-@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
deleted file mode 100644
index 8d4cd99240cc..000000000000
--- a/devel/automake19/files/patch-doc::automake.texi
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 automake-1.9.info
-+@settitle Automake-1.9
- @setchapternewpage off
-@@ -34,10 +34,5 @@
- 
--@dircategory Software development
-+@dircategory Programming & development tools
- @direntry
--* automake: (automake).         Making Makefile.in's.
--@end direntry
--
--@dircategory Individual utilities
--@direntry
--* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-+* Automake-1.9: (automake-1.9).         Making Makefile.in's.
- @end direntry
diff --git a/devel/automake19/pkg-descr b/devel/automake19/pkg-descr
deleted file mode 100644
index 5d7f85e52d7f..000000000000
--- a/devel/automake19/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Automake is a tool for automatically generating Makefiles compliant with
-the GNU Coding Standards. It was inspired by the 4.4BSD make and include
-files, but aims to be portable and to conform to the GNU standards for
-Makefile variables and targets. Automake is a Perl script. The input files
-are called Makefile.am. The output files are called Makefile.in; They are
-intended for use with Autoconf. Automake requires certain things to be done
-in your configure.in. This package also includes the "aclocal"
-program. aclocal is a program to generate an 'aclocal.m4' based on the
-contents of 'configure.in'. It is useful as an extensible, maintainable
-mechanism for augmenting autoconf.
-
-WWW: http://www.gnu.org/software/automake/
diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist
deleted file mode 100644
index d56ad0b1f647..000000000000
--- a/devel/automake19/pkg-plist
+++ /dev/null
@@ -1,116 +0,0 @@
-bin/aclocal-%%BUILD_VERSION%%
-bin/automake-%%BUILD_VERSION%%
-share/aclocal-%%BUILD_VERSION%%/amversion.m4
-share/aclocal-%%BUILD_VERSION%%/as.m4
-share/aclocal-%%BUILD_VERSION%%/auxdir.m4
-share/aclocal-%%BUILD_VERSION%%/ccstdc.m4
-share/aclocal-%%BUILD_VERSION%%/cond.m4
-share/aclocal-%%BUILD_VERSION%%/depend.m4
-share/aclocal-%%BUILD_VERSION%%/depout.m4
-share/aclocal-%%BUILD_VERSION%%/dmalloc.m4
-share/aclocal-%%BUILD_VERSION%%/gcj.m4
-share/aclocal-%%BUILD_VERSION%%/header.m4
-share/aclocal-%%BUILD_VERSION%%/init.m4
-share/aclocal-%%BUILD_VERSION%%/install-sh.m4
-share/aclocal-%%BUILD_VERSION%%/lead-dot.m4
-share/aclocal-%%BUILD_VERSION%%/lex.m4
-share/aclocal-%%BUILD_VERSION%%/lispdir.m4
-share/aclocal-%%BUILD_VERSION%%/maintainer.m4
-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%%/strip.m4
-share/aclocal-%%BUILD_VERSION%%/tar.m4
-share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm
-share/automake-%%BUILD_VERSION%%/Automake/Channels.pm
-share/automake-%%BUILD_VERSION%%/Automake/Condition.pm
-share/automake-%%BUILD_VERSION%%/Automake/Config.pm
-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/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
-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/clean-hdr.am
-share/automake-%%BUILD_VERSION%%/am/clean.am
-share/automake-%%BUILD_VERSION%%/am/compile.am
-share/automake-%%BUILD_VERSION%%/am/configure.am
-share/automake-%%BUILD_VERSION%%/am/data.am
-share/automake-%%BUILD_VERSION%%/am/dejagnu.am
-share/automake-%%BUILD_VERSION%%/am/depend.am
-share/automake-%%BUILD_VERSION%%/am/depend2.am
-share/automake-%%BUILD_VERSION%%/am/distdir.am
-share/automake-%%BUILD_VERSION%%/am/footer.am
-share/automake-%%BUILD_VERSION%%/am/header-vars.am
-share/automake-%%BUILD_VERSION%%/am/header.am
-share/automake-%%BUILD_VERSION%%/am/install.am
-share/automake-%%BUILD_VERSION%%/am/inst-vars.am
-share/automake-%%BUILD_VERSION%%/am/java.am
-share/automake-%%BUILD_VERSION%%/am/lang-compile.am
-share/automake-%%BUILD_VERSION%%/am/lex.am
-share/automake-%%BUILD_VERSION%%/am/library.am
-share/automake-%%BUILD_VERSION%%/am/libs.am
-share/automake-%%BUILD_VERSION%%/am/libtool.am
-share/automake-%%BUILD_VERSION%%/am/lisp.am
-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
-share/automake-%%BUILD_VERSION%%/am/remake-hdr.am
-share/automake-%%BUILD_VERSION%%/am/scripts.am
-share/automake-%%BUILD_VERSION%%/am/subdirs.am
-share/automake-%%BUILD_VERSION%%/am/tags.am
-share/automake-%%BUILD_VERSION%%/am/texi-vers.am
-share/automake-%%BUILD_VERSION%%/am/texibuild.am
-share/automake-%%BUILD_VERSION%%/am/texinfos.am
-share/automake-%%BUILD_VERSION%%/am/yacc.am
-share/automake-%%BUILD_VERSION%%/ansi2knr.1
-share/automake-%%BUILD_VERSION%%/ansi2knr.c
-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
-share/automake-%%BUILD_VERSION%%/elisp-comp
-share/automake-%%BUILD_VERSION%%/install-sh
-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%%/texinfo.tex
-share/automake-%%BUILD_VERSION%%/ylwrap
-@dirrm share/aclocal-%%BUILD_VERSION%%
-@dirrm share/automake-%%BUILD_VERSION%%/Automake
-@dirrm share/automake-%%BUILD_VERSION%%/am
-@dirrm share/automake-%%BUILD_VERSION%%
diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile
index 23cb6e74f980..df47b1337050 100644
--- a/devel/autotools/Makefile
+++ b/devel/autotools/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	autotools
-PORTVERSION=	20100923
+PORTVERSION=	20101007
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -23,7 +23,7 @@ NO_BUILD=	yes
 NO_FETCH=	yes
 
 AVAIL_AUTOCONF=	2.13 2.67
-AVAIL_AUTOMAKE=	1.4 1.9 1.10 1.11
+AVAIL_AUTOMAKE=	1.4 1.11
 
 .for VER in ${AVAIL_AUTOCONF}
 RUN_DEPENDS+=	autoconf-${VER}:${PORTSDIR}/devel/autoconf${VER:C/\.//}