11 files changed, 3 insertions, 221 deletions

diff --git a/MOVED b/MOVED
index 28703e825992..04cf660eb0a8 100644
--- a/MOVED
+++ b/MOVED
@@ -4597,3 +4597,4 @@ audio/linux-nerodigitalaudio|audio/linux-neroaaccodec|2010-09-22|Project was ren
 devel/automake16||2010-09-22|Outdated, no longer required by any port
 devel/automake17||2010-09-22|Outdated, was not being used by any port
 devel/automake18||2010-09-22|Outdated, ports (2) migrated to automake19
+devel/automake15||2010-09-23|Outdated, ports migrated to automake19
diff --git a/devel/Makefile b/devel/Makefile
index ad9b34eac3d1..b6656af1af4f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -72,7 +72,6 @@
     SUBDIR += automake110
     SUBDIR += automake111
     SUBDIR += automake14
-    SUBDIR += automake15
     SUBDIR += automake19
     SUBDIR += automoc4
     SUBDIR += autotools
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
deleted file mode 100644
index cb8e391a5734..000000000000
--- a/devel/automake15/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:	automake
-# Date created:		15 March 1997
-# Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	automake
-PORTVERSION=	1.5
-PORTREVISION=	6
-PORTEPOCH=	1
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	automake
-
-# 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.5)
-
-RUN_DEPENDS=	${AUTOCONF_DEPENDS} \
-		automake-wrapper:${PORTSDIR}/devel/automake-wrapper
-
-USE_AUTOTOOLS=	autoconf:267:env
-BUILD_VERSION=	1.5
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	automake15
-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}/*.info
-	@${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake-${BUILD_VERSION}.texi
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@PACKAGE@$$|@PACKAGE@-@VERSION@|'
-	@${REINPLACE_CMD} -e 's|aclocal$$|aclocal-@VERSION@|' \
-		${WRKSRC}/m4/Makefile.in
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/aclocal.in
-
-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/automake15/distinfo b/devel/automake15/distinfo
deleted file mode 100644
index 1c2f2197a564..000000000000
--- a/devel/automake15/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
-SHA256 (automake-1.5.tar.gz) = 24b4775e3143fd3e35db5cbaba80845d9359c7bfd751a6cebe3014fbf6115d78
-SIZE (automake-1.5.tar.gz) = 526934
diff --git a/devel/automake15/files/patch-Makefile.in b/devel/automake15/files/patch-Makefile.in
deleted file mode 100644
index 7e3d1c21d01e..000000000000
--- a/devel/automake15/files/patch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Wed Aug 22 22:49:54 2001
-+++ Makefile.in	Thu Apr  5 02:38:15 2007
-@@ -98,5 +98,5 @@
- TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
--INFO_DEPS = automake.info
-+INFO_DEPS = automake-@VERSION@.info
- DVIS = automake.dvi
--TEXINFOS = automake.texi
-+TEXINFOS = automake-@VERSION@.texi
- 
-@@ -158,4 +158,4 @@
- 	@:
--$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in
--	@(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake.texi`; \
-+$(srcdir)/stamp-vti: automake-@VERSION@.texi $(top_srcdir)/configure.in
-+	@(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake-@VERSION@.texi`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
diff --git a/devel/automake15/files/patch-aclocal.in b/devel/automake15/files/patch-aclocal.in
deleted file mode 100644
index 947ba7e01f19..000000000000
--- a/devel/automake15/files/patch-aclocal.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- aclocal.in.orig	Mon Jul 16 22:36:23 2001
-+++ aclocal.in	Thu Apr  5 03:19:44 2007
-@@ -34,3 +34,3 @@
- # Note that this isn't pkgdatadir, but a separate directory.
--$acdir = "@datadir@/aclocal";
-+$acdir = "@datadir@/aclocal-@VERSION@";
- 
-@@ -117,2 +117,3 @@
- local (@dirlist) = &parse_arguments (@ARGV);
-+push (@dirlist, "%%LOCALBASE%%/share/aclocal") if (!grep(/^--acdir/, @ARGV));
- &scan_m4_files (@dirlist);
-@@ -205,2 +206,3 @@
- 	print $acdir, "\n";
-+	print "%%LOCALBASE%%/share/aclocal", "\n";
- 	exit 0;
diff --git a/devel/automake15/files/patch-automake.in b/devel/automake15/files/patch-automake.in
deleted file mode 100644
index 1890b826646f..000000000000
--- a/devel/automake15/files/patch-automake.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- automake.in.orig	Wed Aug 22 22:26:53 2001
-+++ automake.in	Thu Apr  5 03:21:22 2007
-@@ -34,3 +34,3 @@
-   my $prefix = "@prefix@";
--  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
-+  my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@VERSION@";
-   unshift @INC, "$perllibdir";
-@@ -129,3 +129,3 @@
- my $prefix = "@prefix@";
--my $libdir = "@datadir@/@PACKAGE@";
-+my $libdir = "@datadir@/@PACKAGE@-@VERSION@";
- 
diff --git a/devel/automake15/files/patch-automake.texi b/devel/automake15/files/patch-automake.texi
deleted file mode 100644
index f5ff8df3d272..000000000000
--- a/devel/automake15/files/patch-automake.texi
+++ /dev/null
@@ -1,22 +0,0 @@
---- automake.texi.orig	Wed Aug 22 22:40:36 2001
-+++ automake.texi	Sat Apr 14 15:49:21 2007
-@@ -2,4 +2,4 @@
- @c %**start of header
--@setfilename automake.info
--@settitle automake
-+@setfilename automake-1.5.info
-+@settitle Automake-1.5
- @setchapternewpage off
-@@ -9,10 +9,5 @@
- 
--@dircategory GNU programming tools
-+@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.5: (automake-1.5).		Making Makefile.in's.
- @end direntry
diff --git a/devel/automake15/pkg-descr b/devel/automake15/pkg-descr
deleted file mode 100644
index eeb8b96a2128..000000000000
--- a/devel/automake15/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Automake is an experimental Makefile generator.  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 assumes the project uses autoconf.  If you want automatic
-dependency tracking support, the use of GNU make is also required.
-
-WWW: http://sources.redhat.com/automake/
diff --git a/devel/automake15/pkg-plist b/devel/automake15/pkg-plist
deleted file mode 100644
index 283ab31c8d61..000000000000
--- a/devel/automake15/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/aclocal-%%BUILD_VERSION%%
-bin/automake-%%BUILD_VERSION%%
-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%%/error.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%%/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%%/multi.m4
-share/aclocal-%%BUILD_VERSION%%/obstack.m4
-share/aclocal-%%BUILD_VERSION%%/protos.m4
-share/aclocal-%%BUILD_VERSION%%/ptrdiff.m4
-share/aclocal-%%BUILD_VERSION%%/python.m4
-share/aclocal-%%BUILD_VERSION%%/regex.m4
-share/aclocal-%%BUILD_VERSION%%/sanity.m4
-share/aclocal-%%BUILD_VERSION%%/strip.m4
-share/aclocal-%%BUILD_VERSION%%/strtod.m4
-share/aclocal-%%BUILD_VERSION%%/termios.m4
-share/aclocal-%%BUILD_VERSION%%/winsz.m4
-share/automake-%%BUILD_VERSION%%/Automake/Struct.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/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.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%%/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 ed6dc44a1c5d..23cb6e74f980 100644
--- a/devel/autotools/Makefile
+++ b/devel/autotools/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	autotools
-PORTVERSION=	20100922
+PORTVERSION=	20100923
 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.5 1.9 1.10 1.11
+AVAIL_AUTOMAKE=	1.4 1.9 1.10 1.11
 
 .for VER in ${AVAIL_AUTOCONF}
 RUN_DEPENDS+=	autoconf-${VER}:${PORTSDIR}/devel/autoconf${VER:C/\.//}