Kill off automake18, switching to automake19. Requiem Mors Pacem.

31 files changed, 19 insertions, 389 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 55d8e7a64e80..3482cf67cb82 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -503,7 +503,6 @@ autodia		ports/devel/autodia
 autogen		ports/devel/autogen
 automake14	ports/devel/automake14
 automake15	ports/devel/automake15
-automake18	ports/devel/automake18
 automake19	ports/devel/automake19
 autools		ports/audio/autools
 autopsy		ports/sysutils/autopsy
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 2da1844e896e..388eaa3eb994 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -20,7 +20,7 @@ USE_GCC=	3.4
 USE_GNOME=	gnomeprefix gnometarget libxml2
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-WANT_AUTOMAKE_VER=	18
+WANT_AUTOMAKE_VER=	19
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 248a5c2751b8..a4274dad4097 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-WANT_AUTOMAKE_VER=18
+WANT_AUTOMAKE_VER=19
 USE_X_PREFIX=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
diff --git a/devel/Makefile b/devel/Makefile
index ca7c6cad8cad..fd8daa3f30ad 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -62,7 +62,6 @@
     SUBDIR += autogen
     SUBDIR += automake14
     SUBDIR += automake15
-    SUBDIR += automake18
     SUBDIR += automake19
     SUBDIR += avalon-framework
     SUBDIR += avarice
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index c97e3c27768f..f2fbf9f39b78 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -27,7 +27,7 @@ BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOMAKE_VER=	18
+USE_AUTOMAKE_VER=	19
 USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index c97e3c27768f..f2fbf9f39b78 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -27,7 +27,7 @@ BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOMAKE_VER=	18
+USE_AUTOMAKE_VER=	19
 USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index c97e3c27768f..f2fbf9f39b78 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -27,7 +27,7 @@ BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOMAKE_VER=	18
+USE_AUTOMAKE_VER=	19
 USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index c97e3c27768f..f2fbf9f39b78 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -27,7 +27,7 @@ BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOMAKE_VER=	18
+USE_AUTOMAKE_VER=	19
 USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile
deleted file mode 100644
index c1dae6851674..000000000000
--- a/devel/automake18/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# New ports collection makefile for:	automake18
-# Date created:		15 Feb 2003
-# Whom:			Udo Schweigert
-#
-# $FreeBSD$
-#
-
-PORTNAME=	automake
-PORTVERSION=	1.8.5
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	automake
-DISTNAME=	automake-${PORTVERSION}
-
-MAINTAINER=	ade@FreeBSD.org
-COMMENT=	GNU Standards-compliant Makefile generator (version 1.8)
-
-DEPRECATED=	Please use devel/automake19 instead
-
-WANT_AUTOCONF_VER=259
-WANT_AUTOCONF_RUN=yes
-BUILD_VERSION=	18
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	automake${BUILD_VERSION}
-USE_BZIP2=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_REINPLACE=	yes
-INFO=		automake${BUILD_VERSION}
-
-post-patch:
-	@(cd ${WRKSRC}/doc && \
-		${RM} -f *.info && \
-		${MV} automake.texi automake${BUILD_VERSION}.texi && \
-		${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \
-		${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in \
-	)
-	@${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in
-
-pre-install:
-	@${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
-
-post-install:
-.for i in aclocal automake
-	@${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
-		${PREFIX}/libexec/automake${BUILD_VERSION}/${i}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/devel/automake18/distinfo b/devel/automake18/distinfo
deleted file mode 100644
index 480673fff84c..000000000000
--- a/devel/automake18/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (automake-1.8.5.tar.bz2) = 0114aa6d7dc32112834b68105fb8d7e2
-SIZE (automake-1.8.5.tar.bz2) = 663182
diff --git a/devel/automake18/files/patch-Makefile.in b/devel/automake18/files/patch-Makefile.in
deleted file mode 100644
index f24ffdd88721..000000000000
--- a/devel/automake18/files/patch-Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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
- 
diff --git a/devel/automake18/files/patch-aclocal.in b/devel/automake18/files/patch-aclocal.in
deleted file mode 100644
index 0745a4e187a7..000000000000
--- a/devel/automake18/files/patch-aclocal.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- aclocal.in.orig	Sat Apr 10 10:15:32 2004
-+++ aclocal.in	Wed May 26 14:33:27 2004
-@@ -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,4 +47,5 @@
- # Note also that the versioned directory is handled later.
--$acdir = '@datadir@/aclocal';
-+$acdir = '@datadir@/aclocal@APIPVERSION@';
- $default_acdir = $acdir;
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
- # contains a list of directories, one per line, to be added
-@@ -411,3 +412,3 @@
- 
--  my $traces = ($ENV{AUTOM4TE} || 'autom4te');
-+  my $traces = ($ENV{AUTOM4TE} || 'autom4te259');
-   $traces .= " --language Autoconf-without-aclocal-m4 ";
-@@ -622,7 +623,3 @@
- 
--  # 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;
-+  unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
- 
diff --git a/devel/automake18/files/patch-automake.in b/devel/automake18/files/patch-automake.in
deleted file mode 100644
index de0b9c2f2026..000000000000
--- a/devel/automake18/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/automake18/files/patch-configure b/devel/automake18/files/patch-configure
deleted file mode 100644
index cba1f452d557..000000000000
--- a/devel/automake18/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Sun Apr 25 05:34:33 2004
-+++ configure	Thu May 13 13:22:46 2004
-@@ -276,3 +276,3 @@
- ac_unique_file="automake.in"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY EGREP FGREP LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY EGREP FGREP LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-@@ -1715,6 +1715,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}/automake-${APIVERSION}"
-+pkgvdatadir="\${datadir}/automake${APIPVERSION}"
- 
-@@ -2652,2 +2652,3 @@
- s,@APIVERSION@,$APIVERSION,;t t
-+s,@APIPVERSION@,$APIPVERSION,;t t
- s,@pkgvdatadir@,$pkgvdatadir,;t t
diff --git a/devel/automake18/files/patch-doc::Makefile.in b/devel/automake18/files/patch-doc::Makefile.in
deleted file mode 100644
index b3c320a7de74..000000000000
--- a/devel/automake18/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,35 +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${APIPVERSION}.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 @@
- target_alias = @target_alias@
--info_TEXINFOS = automake.texi
-+info_TEXINFOS = automake${APIPVERSION}.texi
- automake_TEXINFOS = fdl.texi
-@@ -142,3 +143,3 @@
- 
--TAGS_DEPENDENCIES = automake.texi
-+TAGS_DEPENDENCIES = automake${APIPVERSION}.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${APIPVERSION}.texi $(top_srcdir)/configure
-+	@(dir=.; test -f ./automake${APIPVERSION}.texi || dir=$(srcdir); \
-+	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.texi`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
diff --git a/devel/automake18/files/patch-doc::automake.texi b/devel/automake18/files/patch-doc::automake.texi
deleted file mode 100644
index 74e7a004a731..000000000000
--- a/devel/automake18/files/patch-doc::automake.texi
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/automake.texi.orig	Thu May 13 20:41:35 2004
-+++ doc/automake.texi	Thu Oct 14 20:32:26 2004
-@@ -2,4 +2,4 @@
- @c %**start of header
--@setfilename automake.info
--@settitle automake
-+@setfilename automake18.info
-+@settitle automake18
- @setchapternewpage off
-@@ -36,8 +36,3 @@
- @direntry
--* automake: (automake).		Making Makefile.in's.
--@end direntry
--
--@dircategory Individual utilities
--@direntry
--* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-+* automake18: (automake18).		Making Makefile.in's.
- @end direntry
diff --git a/devel/automake18/files/patch-lib::Automake::Config.in b/devel/automake18/files/patch-lib::Automake::Config.in
deleted file mode 100644
index c9c17688d004..000000000000
--- a/devel/automake18/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/automake18/files/patch-lib::Automake::Makefile.in b/devel/automake18/files/patch-lib::Automake::Makefile.in
deleted file mode 100644
index a1ae8ffe243e..000000000000
--- a/devel/automake18/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/automake18/files/patch-m4-Makefile.in b/devel/automake18/files/patch-m4-Makefile.in
deleted file mode 100644
index 5125e696ab2c..000000000000
--- a/devel/automake18/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 = \
diff --git a/devel/automake18/pkg-descr b/devel/automake18/pkg-descr
deleted file mode 100644
index c0c2845eff43..000000000000
--- a/devel/automake18/pkg-descr
+++ /dev/null
@@ -1,14 +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/
-
--- AlanE <alane@freebsd.org>
diff --git a/devel/automake18/pkg-plist b/devel/automake18/pkg-plist
deleted file mode 100644
index cf2be6d499d2..000000000000
--- a/devel/automake18/pkg-plist
+++ /dev/null
@@ -1,117 +0,0 @@
-bin/aclocal%%BUILD_VERSION%%
-bin/automake%%BUILD_VERSION%%
-libexec/automake%%BUILD_VERSION%%/aclocal
-libexec/automake%%BUILD_VERSION%%/automake
-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/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/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%%
-@dirrm libexec/automake%%BUILD_VERSION%%
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index abc88130163a..d31b4c9fac04 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS+=	kiconedit:${PORTSDIR}/graphics/kdegraphics3 \
 
 # KDE_DISTNAME=		${PORTNAME}-${PORTVERSION}_for_KDE_3.1
 
-WANT_AUTOMAKE_VER=	18
+WANT_AUTOMAKE_VER=	19
 WANT_AUTOMAKE_RUN=	yes
 WANT_AUTOCONF_VER=	259
 WANT_AUTOCONF_RUN=	yes
diff --git a/devel/kdevelop/files/patch-parts-appwizard-common-admin-detect-autoconf.sh b/devel/kdevelop/files/patch-parts-appwizard-common-admin-detect-autoconf.sh
index 34ac18440abb..254ee2a0a429 100644
--- a/devel/kdevelop/files/patch-parts-appwizard-common-admin-detect-autoconf.sh
+++ b/devel/kdevelop/files/patch-parts-appwizard-common-admin-detect-autoconf.sh
@@ -23,9 +23,9 @@
    elif test -x "`$WHICH automake-1.7 2>/dev/null`" ; then
      AUTOMAKE="`$WHICH automake-1.7`"
      ACLOCAL="`$WHICH aclocal-1.7`"
-+  elif test -x "`$WHICH automake18 2>/dev/null`" ; then
-+    AUTOMAKE="`$WHICH automake18`"
-+    ACLOCAL="`$WHICH aclocal18`"
++  elif test -x "`$WHICH automake19 2>/dev/null`" ; then
++    AUTOMAKE="`$WHICH automake19`"
++    ACLOCAL="`$WHICH aclocal19`"
    fi
    if test -n "$UNSERMAKE"; then 
       AUTOMAKE="$UNSERMAKE"
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index 7a337b5a9af4..61c05f8fd513 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 USE_KDELIBS_VER=	3
 USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
-WANT_AUTOMAKE_VER=	18
+WANT_AUTOMAKE_VER=	19
 WANT_AUTOCONF_VER=	259
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 74e9c65e7bb6..b20c26a262f5 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	sw@gegenunendlich.de
 COMMENT=	Skeletal based 3d character animation library written in C++
 
 USE_BZIP2=		yes
-USE_AUTOMAKE_VER=	18
+USE_AUTOMAKE_VER=	19
 USE_AUTOHEADER_VER=	259
 USE_LIBTOOL_VER=	15
 INSTALLS_SHLIB=		yes
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 74e9c65e7bb6..b20c26a262f5 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	sw@gegenunendlich.de
 COMMENT=	Skeletal based 3d character animation library written in C++
 
 USE_BZIP2=		yes
-USE_AUTOMAKE_VER=	18
+USE_AUTOMAKE_VER=	19
 USE_AUTOHEADER_VER=	259
 USE_LIBTOOL_VER=	15
 INSTALLS_SHLIB=		yes
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 8dea0d60e3af..14fea05f54ef 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -124,7 +124,7 @@ CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
 
 USE_REINPLACE=	yes
-USE_AUTOMAKE_VER=	18
+USE_AUTOMAKE_VER=	19
 USE_AUTOCONF_VER=	259
 USE_OPENSSL=	yes
 
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index cb6dcbb7dfdc..8c404b02f2a0 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SUBMAKE=	yes
 WANT_AUTOCONF_VER=	259
-WANT_AUTOMAKE_VER=	18
+WANT_AUTOMAKE_VER=	19
 AUTOMAKE_ARGS=	-a -i
 
 MAN1=		vtysh.1
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index cfdb38ffaa9f..e301e2746c4c 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_AUTOCONF_VER=259
-USE_AUTOMAKE_VER=18
+USE_AUTOMAKE_VER=19
 USE_LIBTOOL_VER=15
 LIBTOOLFILES=	acinclude.m4
 INSTALLS_SHLIB=	yes
@@ -110,6 +110,7 @@ post-patch:
 		${WRKSRC}/clamav-milter/clamav-milter.c
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.am
+	@cd ${WRKSRC} && ${ACLOCAL}
 
 post-build:
 	@${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index b00320a5bfbb..633406fa4166 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	GRand Unified Bootloader
 
-USE_AUTOMAKE_VER=	18
+USE_AUTOMAKE_VER=	19
 USE_AUTOCONF_VER=	259
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index a8ed60e677a8..9194a271e1ea 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -17,7 +17,7 @@ COMMENT=	API compatible clone of the Motif toolkit
 
 CONFLICTS?=	open-motif-*
 MANUAL_PACKAGE_BUILD=	do not want to install during interactive build
-WANT_AUTOMAKE_VER=	18
+WANT_AUTOMAKE_VER=	19
 USE_AUTOCONF_VER=	259
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes