author: Ade Lovett <ade@FreeBSD.org> 2004-07-01 17:06:41 +0000
committer: Ade Lovett <ade@FreeBSD.org> 2004-07-01 17:06:41 +0000
commit: 328b757bf2b6c173ce65d3872ea462f25a5d5f9b (patch)
tree: 9a761809da3b45684b09bc2f0d6091132e77c78a
parent: ab98d6018836ec7c6f81c02805fae5314c044f04 (diff)
download: ports-328b757bf2b6c173ce65d3872ea462f25a5d5f9b.tar.gz
ports-328b757bf2b6c173ce65d3872ea462f25a5d5f9b.zip
82 files changed, 211 insertions, 1123 deletions
diff --git a/MOVED b/MOVED
index 5b4257d48baa..34940e2e1547 100644
--- a/MOVED
+++ b/MOVED
@@ -1179,3 +1179,6 @@ converters/xunicode||2004-06-21|no longer maintained
 www/mozilla-devel-gtk1||2004-06-28|removed obsolete port
 security/drwebd|security/drweb|2004-06-29|functionality already in security/drweb
 www/drivel|deskutils/drivel|2004-06-30|moved to category deskutils
+devel/autoconf257||2004-07-01|autotools cleanup
+devel/automake17||2004-07-01|autotools cleanup
+devel/libtool14||2004-07-01|autotools cleanup
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk
index 43f7b7a09fe4..52427082f4e5 100644
--- a/Mk/bsd.autotools.mk
+++ b/Mk/bsd.autotools.mk
@@ -109,7 +109,7 @@ Autotools_Include_MAINTAINER=	ade@FreeBSD.org
 #
 # - Only set GNU_CONFIGURE automatically if USE_<x>_VER is specified,
 #	since WANT_<x>_VER implies that we want the environment, but not
-#	the configuration steps.  XXX: this may break some ports
+#	the configuration steps.
 #
 # Things to do:
 # - Move both autoconf and automake to true versioned ports
@@ -134,6 +134,9 @@ Autotools_Include_MAINTAINER=	ade@FreeBSD.org
 . if defined(USE_${i})
 . error USE_${i} deprecated: replace with USE_${i}_VER=...
 . endif
+. if defined(WANT_${i})
+. error WANT_${i} deprecated: replace with WANT_${i}_VER=...
+. endif
 .endfor
 
 #---------------------------------------------------------------------------
@@ -285,9 +288,16 @@ LIBTOOL=			${LOCALBASE}/bin/libtool${LIBTOOL_SUFFIX}
 LIBTOOLIZE=			${LOCALBASE}/bin/libtoolize${LIBTOOL_SUFFIX}
 LIBTOOL_LIBEXECDIR=	${LOCALBASE}/libexec/libtool${LIBTOOL_SUFFIX}
 LIBTOOL_SHAREDIR=	${LOCALBASE}/share/libtool${LIBTOOL_SUFFIX}
-LIBTOOL_PATH=		${LIBTOOL_LIBEXECDIR}:
-LIBTOOL_VARS=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
 LIBTOOL_VERSION=	${WANT_LIBTOOL_VER}
+LIBTOOL_M4=			${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
+LTMAIN=				${LIBTOOL_SHAREDIR}/ltmain.sh
+. if ${LIBTOOL_VERSION} == 13
+LTCONFIG=			${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}
+. else
+LTCONFIG=			${TRUE}
+. endif
+LIBTOOL_PATH=		${LIBTOOL_LIBEXECDIR}:
+LIBTOOL_VARS=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} LIBTOOL_M4=${LIBTOOL_M4} LTCONFIG=${LTCONFIG}
 
 LIBTOOL_DEPENDS=	${LIBTOOL}:${PORTSDIR}/devel/libtool${LIBTOOL_SUFFIX}
 BUILD_DEPENDS+=		${LIBTOOL_DEPENDS}
@@ -355,18 +365,18 @@ AUTOHEADER_ENV+=${AUTOTOOLS_VARS}
 #
 .if !target(run-autotools)
 run-autotools:
-.if defined(USE_AUTOMAKE_VER)
+. if defined(USE_AUTOMAKE_VER)
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
 		${AUTOMAKE_ARGS})
-.endif
-.if defined(USE_AUTOCONF_VER)
+. endif
+. if defined(USE_AUTOCONF_VER)
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
 		${AUTOCONF_ARGS})
-.endif
-.if defined(USE_AUTOHEADER_VER)
+. endif
+. if defined(USE_AUTOHEADER_VER)
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
 		${AUTOHEADER_ARGS})
-.endif
+. endif
 .endif
 
 # patch-autotools
@@ -376,15 +386,16 @@ run-autotools:
 #
 .if !target(patch-autotools)
 patch-autotools:
-.if defined(USE_LIBTOOL_VER)
-	 @(cd ${PATCH_WRKSRC}; \
-	 for file in ${LIBTOOLFILES}; do \
+. if defined(USE_LIBTOOL_VER)
+	@(cd ${PATCH_WRKSRC}; \
+	for file in ${LIBTOOLFILES}; do \
 		${CP} $$file $$file.tmp; \
-		${SED} -e "s^\$$ac_aux_dir/ltconfig^${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}^g" \
-			-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LIBTOOL_SHAREDIR}/ltmain.sh^g" \
+		${SED} -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
+			   -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
 			$$file.tmp > $$file; \
-	 done);
-.else
+		${RM} $$file.tmp; \
+	done);
+. else
 	@${DO_NADA}
-.endif
+. endif
 .endif
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index c081941b74e9..68d3b96855af 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -27,7 +27,7 @@ PATCH_WRKSRC=	${WRKSRC}/..
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}/pd-0.37-1test1/src
 
 .include <bsd.port.pre.mk>
diff --git a/audio/swami/Makefile b/audio/swami/Makefile
index 6591688fd0df..0f8120bf22df 100644
--- a/audio/swami/Makefile
+++ b/audio/swami/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=		popt:${PORTSDIR}/devel/popt \
 USE_X_PREFIX=		yes
 USE_BZIP2=		yes
 USE_REINPLACE=		yes
-USE_LIBTOOL_VER=	14
+USE_LIBTOOL_VER=	13
 USE_GNOME=		gnomelibs gnometarget
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index 71a22ef8a651..f8f675007ac6 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -25,8 +25,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	257
-USE_AUTOHEADER_VER=	257
+USE_AUTOCONF_VER=	259
+USE_AUTOHEADER_VER=	259
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index d8ce695345c0..c1cb4b4e90c9 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Use C++ object API to allow applications to connect to databases
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/databases/firebird-devel/Makefile b/databases/firebird-devel/Makefile
index 8a37a1250a7e..fc71d908a6dd 100644
--- a/databases/firebird-devel/Makefile
+++ b/databases/firebird-devel/Makefile
@@ -19,9 +19,9 @@ COMMENT=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+WANT_LIBTOOL_VER=	13
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	257
+WANT_AUTOCONF_VER=	259
 USE_GCC=	3.3
 
 CONFLICTS=	firebird-1.*
@@ -52,9 +52,6 @@ pre-everything::
 	@sleep 10
 .endif
 
-patch-autotools:
-	@${DO_NADA}
-
 do-configure:
 	@(cd ${WRKSRC} && ${ENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} ./autogen.sh --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
 
diff --git a/databases/firebird-devel/files/patch-autogen.sh b/databases/firebird-devel/files/patch-autogen.sh
index 509fba8c7bae..4fc68f20e112 100644
--- a/databases/firebird-devel/files/patch-autogen.sh
+++ b/databases/firebird-devel/files/patch-autogen.sh
@@ -5,7 +5,7 @@
  DIE=0
  
 -VER=`autoconf --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'`
-+VER=`autoconf257 --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'`
++VER=`autoconf259 --version|grep '^[Aa]utoconf'|sed 's/^[^0-9]*//'`
  case "$VER" in
   0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \
   2\.[1-4][0-9] | 2\.5[0-6][a-z]* )
@@ -33,11 +33,11 @@
  
  echo "Running autoheader ..."
 -autoheader || exit 1
-+autoheader257 || exit 1
++autoheader259 || exit 1
  
  echo "Running autoconf ..."
 -autoconf || exit 1
-+autoconf257 || exit 1
++autoconf259 || exit 1
  
  # If NOCONFIGURE is set, skip the call to configure
  if test "x$NOCONFIGURE" = "x"; then
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 2f946684b883..600fc09ef212 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -18,7 +18,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_LIBTOOL_VER=	13
-WANT_AUTOCONF_VER=	257
+WANT_AUTOCONF_VER=	259
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=5.0
diff --git a/databases/freetds-devel/files/patch-aclocal-m4 b/databases/freetds-devel/files/patch-aclocal-m4
index 4538fd1e29b7..e69de29bb2d1 100644
--- a/databases/freetds-devel/files/patch-aclocal-m4
+++ b/databases/freetds-devel/files/patch-aclocal-m4
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Wed Aug  6 07:55:55 2003
-+++ aclocal.m4	Wed Aug  6 07:56:00 2003
-@@ -441,7 +441,7 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
--AC_PREREQ([2.54])
-+AC_PREREQ([2.53])
- 
- # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
- # the ones we care about.
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 2f946684b883..600fc09ef212 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -18,7 +18,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_LIBTOOL_VER=	13
-WANT_AUTOCONF_VER=	257
+WANT_AUTOCONF_VER=	259
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=5.0
diff --git a/databases/freetds/files/patch-aclocal-m4 b/databases/freetds/files/patch-aclocal-m4
index 4538fd1e29b7..e69de29bb2d1 100644
--- a/databases/freetds/files/patch-aclocal-m4
+++ b/databases/freetds/files/patch-aclocal-m4
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Wed Aug  6 07:55:55 2003
-+++ aclocal.m4	Wed Aug  6 07:56:00 2003
-@@ -441,7 +441,7 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
--AC_PREREQ([2.54])
-+AC_PREREQ([2.53])
- 
- # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
- # the ones we care about.
diff --git a/databases/mysql-administrator/Makefile b/databases/mysql-administrator/Makefile
index 7ec5508a2c92..6a4f7133b54c 100644
--- a/databases/mysql-administrator/Makefile
+++ b/databases/mysql-administrator/Makefile
@@ -28,7 +28,7 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 WANT_AUTOMAKE_VER=	14
-WANT_AUTOCONF_VER=	257
+WANT_AUTOCONF_VER=	259
 CONFIGURE_ENV+=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 USE_ICONV=	yes
diff --git a/databases/pgcluster/Makefile b/databases/pgcluster/Makefile
index bc1613dd4628..3e68c7f683c3 100644
--- a/databases/pgcluster/Makefile
+++ b/databases/pgcluster/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
 WRKSRC?=	${WRKDIR}/postgresql-${BASEPGSQL}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 MAKE_FLAGS=	# empty
 MAKEFILE=	# empty
 CONFLICTS=	postgresql-*
@@ -80,11 +80,11 @@ post-patch:
 post-build:
 .if !defined(WITHOUT_PGCLUSTER_REPLICATION)
 	${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pgrp run-autotools do-configure
-	${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pgrp AUTOCONF=autoconf257 do-build
+	${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pgrp AUTOCONF=${AUTOCONF} do-build
 .endif
 .if !defined(WITHOUT_PGCLUSTER_LOADBALANCER)
 	${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pglb run-autotools do-configure
-	${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pglb AUTOCONF=autconf257 do-build
+	${MAKE} WRKSRC=${WRKSRC}/src/pgcluster/pglb AUTOCONF=${AUTOCONF} do-build
 .endif
 
 pre-install:
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 4e636574b915..017621f94aec 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-WANT_AUTOMAKE_VER=17
+WANT_AUTOMAKE_VER=18
 USE_X_PREFIX=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
diff --git a/devel/Makefile b/devel/Makefile
index 241693a8e308..b34bf3a7d2b1 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -57,13 +57,11 @@
     SUBDIR += autobook
     SUBDIR += autoconf
     SUBDIR += autoconf213
-    SUBDIR += autoconf257
     SUBDIR += autoconf259
     SUBDIR += autodia
     SUBDIR += autogen
     SUBDIR += automake
     SUBDIR += automake14
-    SUBDIR += automake17
     SUBDIR += automake18
     SUBDIR += avalon-framework
     SUBDIR += avarice
@@ -447,7 +445,6 @@
     SUBDIR += libticalcs
     SUBDIR += libtifiles
     SUBDIR += libtool13
-    SUBDIR += libtool14
     SUBDIR += libtool15
     SUBDIR += libukcprog
     SUBDIR += libunicode
diff --git a/devel/ac-archive/Makefile b/devel/ac-archive/Makefile
index e4dedbfcfc56..82443e017f0a 100644
--- a/devel/ac-archive/Makefile
+++ b/devel/ac-archive/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A set of useful GNU autoconf macros
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 6959b03be4a8..0839b490ad35 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -29,8 +29,8 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOMAKE_VER=	17
-USE_AUTOCONF_VER=	257
+USE_AUTOMAKE_VER=	18
+USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_GMAKE=		yes
@@ -77,8 +77,6 @@ PKGNAMESUFFIX=	-db4
 .endif
 .endif
 
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
-
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(APR_UTIL_WITHOUT_THREADS)
@@ -128,11 +126,11 @@ pre-configure:
 .endfor
 
 run-autotools:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
 	${RM} -fr xml/expat
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
-		${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+		${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 6959b03be4a8..0839b490ad35 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -29,8 +29,8 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOMAKE_VER=	17
-USE_AUTOCONF_VER=	257
+USE_AUTOMAKE_VER=	18
+USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_GMAKE=		yes
@@ -77,8 +77,6 @@ PKGNAMESUFFIX=	-db4
 .endif
 .endif
 
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
-
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(APR_UTIL_WITHOUT_THREADS)
@@ -128,11 +126,11 @@ pre-configure:
 .endfor
 
 run-autotools:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
 	${RM} -fr xml/expat
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
-		${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+		${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 6959b03be4a8..0839b490ad35 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -29,8 +29,8 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOMAKE_VER=	17
-USE_AUTOCONF_VER=	257
+USE_AUTOMAKE_VER=	18
+USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_GMAKE=		yes
@@ -77,8 +77,6 @@ PKGNAMESUFFIX=	-db4
 .endif
 .endif
 
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
-
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(APR_UTIL_WITHOUT_THREADS)
@@ -128,11 +126,11 @@ pre-configure:
 .endfor
 
 run-autotools:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
 	${RM} -fr xml/expat
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
-		${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+		${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 6959b03be4a8..0839b490ad35 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -29,8 +29,8 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOMAKE_VER=	17
-USE_AUTOCONF_VER=	257
+USE_AUTOMAKE_VER=	18
+USE_AUTOCONF_VER=	259
 WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_GMAKE=		yes
@@ -77,8 +77,6 @@ PKGNAMESUFFIX=	-db4
 .endif
 .endif
 
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
-
 pre-extract:
 	@${ECHO_MSG} ""
 .if defined(APR_UTIL_WITHOUT_THREADS)
@@ -128,11 +126,11 @@ pre-configure:
 .endfor
 
 run-autotools:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
 	${RM} -fr xml/expat
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
-		${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+		${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
diff --git a/devel/autoconf257/Makefile b/devel/autoconf257/Makefile
deleted file mode 100644
index 6c1c7e8e36ed..000000000000
--- a/devel/autoconf257/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-# New ports collection makefile for:	autoconf
-# Date created:		7 October 1995
-# Whom:			torstenb@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	autoconf
-PORTVERSION=	2.57
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	autoconf
-DISTNAME=	autoconf-${PORTVERSION}
-
-MAINTAINER=	ade@FreeBSD.org
-COMMENT=	Automatically configure source code on many Un*x platforms (version 2.57)
-
-DEPRECATED=	Please use devel/autoconf259 instead
-EXPIRATION_DATE=31st December 2004
-
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		help2man:${PORTSDIR}/misc/help2man
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-
-BUILD_VERSION=	257
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	autoconf${BUILD_VERSION}
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USE_REINPLACE=	yes
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
-CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh \
-		missing	mkinstalldirs
-
-MAN1_PAGES=	autoconf autoheader autom4te autoreconf autoscan \
-		autoupdate config.guess config.sub ifnames
-MAN1=		${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g}
-
-.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOCONF' or 'USE_AUTOCONF_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
-
-post-patch:
-	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure)
-	@(cd ${WRKSRC}/man && \
-		for file in *.[1x]; do \
-			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2${BUILD_VERSION},g ; \
-						s,(config\.guess|config\.sub|ifnames),\1${BUILD_VERSION},g' $$file ; \
-		done)
-	@(cd ${WRKSRC}/doc && \
-		${RM} -f *.info && \
-		${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \
-		${MV} standards.texi standards${BUILD_VERSION}.texi && \
-		${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \
-		${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in)
-
-post-install:
-.for FILE in ${GENERIC_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/devel/autoconf257/distinfo b/devel/autoconf257/distinfo
deleted file mode 100644
index 8c14bcf19f42..000000000000
--- a/devel/autoconf257/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (autoconf-2.57.tar.bz2) = 407ea53787ce13f5ca427e9a51e05bc2
-SIZE (autoconf-2.57.tar.bz2) = 811439
diff --git a/devel/autoconf257/files/patch-autoconf.texi b/devel/autoconf257/files/patch-autoconf.texi
deleted file mode 100644
index 50e1e8e7acab..000000000000
--- a/devel/autoconf257/files/patch-autoconf.texi
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/autoconf.texi.orig	Tue Dec  3 07:16:32 2002
-+++ doc/autoconf.texi	Sun Jun  1 19:17:51 2003
-@@ -1,9 +1,9 @@
- \input texinfo @c -*-texinfo-*-
- @comment ========================================================
- @comment %**start of header
--@setfilename autoconf.info
-+@setfilename autoconf257.info
- @include version.texi
--@settitle Autoconf
-+@settitle Autoconf257
- @setchapternewpage odd
- @setcontentsaftertitlepage
- @finalout
-@@ -97,7 +97,7 @@
- 
- @dircategory GNU programming tools
- @direntry
--* Autoconf: (autoconf).         Create source code configuration scripts
-+* Autoconf257: (autoconf257).         Create source code configuration scripts
- @end direntry
- 
- @dircategory Individual utilities
diff --git a/devel/autoconf257/files/patch-standards.texi b/devel/autoconf257/files/patch-standards.texi
deleted file mode 100644
index 51c669fafb1b..000000000000
--- a/devel/autoconf257/files/patch-standards.texi
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/standards.texi.orig	Sun Jun  1 18:52:56 2003
-+++ doc/standards.texi	Sun Jun  1 18:54:00 2003
-@@ -1,6 +1,6 @@
- \input texinfo @c -*-texinfo-*-
- @c %**start of header
--@setfilename standards.info
-+@setfilename standards257.info
- @settitle GNU Coding Standards
- @c This date is automagically updated when you save this file:
- @set lastupdate November 23, 2002
-@@ -8,7 +8,7 @@
- 
- @dircategory GNU organization
- @direntry
--* Standards: (standards).        GNU coding standards.
-+* Standards257: (standards257).        GNU coding standards.
- @end direntry
- 
- @c @setchapternewpage odd
diff --git a/devel/autoconf257/pkg-descr b/devel/autoconf257/pkg-descr
deleted file mode 100644
index c404cc852ea8..000000000000
--- a/devel/autoconf257/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Autoconf is an extensible package of m4 macros that produce shell
-scripts to automatically configure software source code packages.
-These scripts can adapt the packages to many kinds of UNIX-like
-systems without manual user intervention.  Autoconf creates a
-configuration script for a package from a template file that lists the
-operating system features that the package can use, in the form of m4
-macro calls.
-
-WWW: http://www.gnu.org/software/autoconf/
diff --git a/devel/autoconf257/pkg-plist b/devel/autoconf257/pkg-plist
deleted file mode 100644
index 26f1b36ec1cc..000000000000
--- a/devel/autoconf257/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-bin/autoconf%%BUILD_VERSION%%
-bin/autoheader%%BUILD_VERSION%%
-bin/autom4te%%BUILD_VERSION%%
-bin/autoreconf%%BUILD_VERSION%%
-bin/autoscan%%BUILD_VERSION%%
-bin/autoupdate%%BUILD_VERSION%%
-bin/ifnames%%BUILD_VERSION%%
-@unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
-@unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
-info/autoconf%%BUILD_VERSION%%.info
-info/standards%%BUILD_VERSION%%.info
-@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
-@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
-share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
-share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
-share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
-share/autoconf%%BUILD_VERSION%%/INSTALL
-share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f
-share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/c.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/fortran.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/functions.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/general.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/headers.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/status.m4
-share/autoconf%%BUILD_VERSION%%/autoconf/types.m4
-share/autoconf%%BUILD_VERSION%%/autom4te.cfg
-share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list
-share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4
-share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f
-share/autoconf%%BUILD_VERSION%%/autotest/general.m4
-share/autoconf%%BUILD_VERSION%%/config.guess
-share/autoconf%%BUILD_VERSION%%/config.sub
-share/autoconf%%BUILD_VERSION%%/elisp-comp
-share/autoconf%%BUILD_VERSION%%/install-sh
-share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4
-share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f
-share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4
-share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f
-share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4
-share/autoconf%%BUILD_VERSION%%/mdate-sh
-share/autoconf%%BUILD_VERSION%%/missing
-share/autoconf%%BUILD_VERSION%%/mkinstalldirs
-@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
-@dirrm share/autoconf%%BUILD_VERSION%%/autotest
-@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
-@dirrm share/autoconf%%BUILD_VERSION%%/autoconf
-@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te
-@dirrm share/autoconf%%BUILD_VERSION%%
diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
deleted file mode 100644
index 703cb52ef499..000000000000
--- a/devel/automake17/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for:	automake17
-# Date created:		15 Feb 2003
-# Whom:			Udo Schweigert
-#
-# $FreeBSD$
-#
-
-PORTNAME=	automake
-PORTVERSION=	1.7.9
-PORTREVISION=	1
-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.7)
-
-DEPRECATED=	Please use devel/automake18 instead
-EXPIRATION_DATE=31st December 2004
-
-WANT_AUTOCONF_VER=257
-WANT_AUTOCONF_RUN=yes
-BUILD_VERSION=	17
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	automake${BUILD_VERSION}
-USE_BZIP2=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	AUTOCONF=autoconf257 AUTOHEADER=autoheader257 MAKEINFO=makeinfo
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_REINPLACE=	yes
-
-.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-
-post-patch:
-	@(cd ${WRKSRC} && \
-		${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' aclocal.in \
-	)
-
-.include <bsd.port.mk>
diff --git a/devel/automake17/distinfo b/devel/automake17/distinfo
deleted file mode 100644
index ac809094802b..000000000000
--- a/devel/automake17/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (automake-1.7.9.tar.bz2) = 571fd0b0598eb2a27dcf68adcfddfacb
-SIZE (automake-1.7.9.tar.bz2) = 577705
diff --git a/devel/automake17/files/patch-Makefile.in b/devel/automake17/files/patch-Makefile.in
deleted file mode 100644
index 0a0b0eaade6a..000000000000
--- a/devel/automake17/files/patch-Makefile.in
+++ /dev/null
@@ -1,69 +0,0 @@
---- Makefile.in.orig	Sun May 18 07:21:29 2003
-+++ Makefile.in	Sun Jun 29 04:06:13 2003
-@@ -40,2 +40,3 @@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
-@@ -99,3 +100,3 @@
- bin_SCRIPTS = automake aclocal
--info_TEXINFOS = automake.texi
-+info_TEXINFOS = automake${APIPVERSION}.texi
- 
-@@ -110,3 +111,3 @@
- 
--TAGS_DEPENDENCIES = automake.texi
-+TAGS_DEPENDENCIES = automake${APIPVERSION}.texi
- 
-@@ -121,2 +122,3 @@
- 	    -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-+	    -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \
- 	    -e 's,[@]SHELL[@],$(SHELL),g'
-@@ -143,3 +145,3 @@
- am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
--INFO_DEPS = automake.info
-+INFO_DEPS = automake${APIPVERSION}.info
- DVIS = automake.dvi
-@@ -147,3 +149,3 @@
- PSS = automake.ps
--TEXINFOS = automake.texi
-+TEXINFOS = automake${APIPVERSION}.texi
- 
-@@ -202,3 +204,3 @@
- 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+	 --no-split -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
- 
-@@ -213,9 +215,10 @@
- 	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
--automake.info: automake.texi version.texi
--automake.dvi: automake.texi version.texi
--automake.pdf: automake.texi version.texi
-+
-+automake${APIPVERSION}.info: automake${APIPVERSION}.texi version.texi
-+automake${APIPVERSION}.dvi: automake${APIPVERSION}.texi version.texi
-+automake${APIPVERSION}.pdf: automake${APIPVERSION}.texi version.texi
- version.texi:  stamp-vti
--stamp-vti: automake.texi $(top_srcdir)/configure
--	@(dir=.; test -f ./automake.texi || dir=$(srcdir); \
--	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \
-+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"; \
-@@ -678,16 +681,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/automake17/files/patch-aclocal.in b/devel/automake17/files/patch-aclocal.in
deleted file mode 100644
index 0740a6dda4f9..000000000000
--- a/devel/automake17/files/patch-aclocal.in
+++ /dev/null
@@ -1,63 +0,0 @@
---- aclocal.in.orig	Sat Oct 12 23:14:57 2002
-+++ aclocal.in	Thu Feb 13 14:57:16 2003
-@@ -29,7 +29,7 @@
- 
- BEGIN
- {
--  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
-   unshift @INC, $perllibdir;
- }
- 
-@@ -42,8 +42,9 @@
- $PACKAGE = '@PACKAGE@';
- # Note that this isn't pkgdatadir, but a separate directory.
- # 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
- # to the dirlist in addition to $acdir, as if -I had been
- # added to the command line.  If acdir has been redirected,
-@@ -188,11 +189,7 @@
-     $default_dirlist="$acdir/dirlist"
- 	if $acdir ne $default_acdir;
- 
--    # 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/.";
- 
-     # By default $(datadir)/aclocal doesn't exist.  We don't want to
-     # get an error in the case where we are searching the default
-@@ -290,12 +287,13 @@
- 	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
-     }
- 
-+    local (@skipinolist) = ();
-     local ($m4dir);
-     foreach $m4dir (@dirlist)
-     {
- 	opendir (DIR, $m4dir)
- 	    || die "aclocal: couldn't open directory `$m4dir': $!\n";
--	local ($file, $fullfile);
-+	local ($file, $fullfile, $ino);
- 	foreach $file (sort grep (! /^\./, readdir (DIR)))
- 	{
- 	    # Only examine .m4 files.
-@@ -305,6 +303,12 @@
- 	    next if $file eq 'aclocal.m4';
- 
- 	    $fullfile = $m4dir . '/' . $file;
-+
-+	    # Do not scan a file more than once.
-+	    $ino = (stat($fullfile))[1];
-+	    next if grep($ino eq $_, @skipinolist);
-+	    push @skipinolist, $ino;
-+
- 	    $file_contents{$fullfile} = &scan_file ($fullfile);
- 	}
- 	closedir (DIR);
diff --git a/devel/automake17/files/patch-automake.in b/devel/automake17/files/patch-automake.in
deleted file mode 100644
index f9500dbe28a3..000000000000
--- a/devel/automake17/files/patch-automake.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- automake.in.orig	Wed Oct 16 20:33:56 2002
-+++ automake.in	Thu Feb 13 14:05:50 2003
-@@ -31,7 +31,7 @@
- 
- BEGIN
- {
--  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
-   unshift @INC, $perllibdir;
- }
- 
-@@ -126,7 +126,7 @@
- # VERSION as string so that eg version 0.30 will print correctly.
- my $VERSION = '@VERSION@';
- my $PACKAGE = '@PACKAGE@';
--my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
-+my $libdir = '@datadir@/@PACKAGE@@APIPVERSION@';
- 
- # Some regular expressions.  One reason to put them here is that it
- # makes indentation work better in Emacs.
diff --git a/devel/automake17/files/patch-automake.texi b/devel/automake17/files/patch-automake.texi
deleted file mode 100644
index 6c6ae2664622..000000000000
--- a/devel/automake17/files/patch-automake.texi
+++ /dev/null
@@ -1,20 +0,0 @@
---- automake.texi.orig	Sun Nov  9 10:57:13 2003
-+++ automake.texi	Thu May 13 13:26:47 2004
-@@ -2,4 +2,5 @@
- @c %**start of header
--@setfilename automake.info
--@settitle automake
-+@setfilename automake17.info
-+@dircategory Programming & development tools
-+@settitle Automake17
- @setchapternewpage off
-@@ -11,3 +12,3 @@
- @direntry
--* automake: (automake).		Making Makefile.in's.
-+* Automake17: (automake17).		Making Makefile.in's.
- @end direntry
-@@ -16,3 +17,3 @@
- @direntry
--* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-+* Aclocal17: (automake17)Invoking aclocal.          Generating aclocal.m4.
- @end direntry
diff --git a/devel/automake17/files/patch-configure b/devel/automake17/files/patch-configure
deleted file mode 100644
index 0e40d3c05ac7..000000000000
--- a/devel/automake17/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Sun May 18 07:22:17 2003
-+++ configure	Sun Jun 29 03:35:27 2003
-@@ -275,3 +275,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 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 AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN 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 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 AWK SET_MAKE am__leading_dot APIPVERSION APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-@@ -1622,2 +1622,3 @@
- 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/'`
- 
-@@ -1625,3 +1626,3 @@
- # A versioned directory, defined here for convenience.
--pkgvdatadir="\${datadir}/automake-${APIVERSION}"
-+pkgvdatadir="\${datadir}/automake${APIPVERSION}"
- 
-@@ -2460,2 +2461,3 @@
- s,@APIVERSION@,$APIVERSION,;t t
-+s,@APIPVERSION@,$APIPVERSION,;t t
- s,@pkgvdatadir@,$pkgvdatadir,;t t
diff --git a/devel/automake17/files/patch-m4-Makefile.in b/devel/automake17/files/patch-m4-Makefile.in
deleted file mode 100644
index 4c336333e5e1..000000000000
--- a/devel/automake17/files/patch-m4-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- m4/Makefile.in.orig	Wed Oct 16 20:14:23 2002
-+++ m4/Makefile.in	Thu Feb 13 13:14:39 2003
-@@ -38,6 +38,7 @@
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- APIVERSION = @APIVERSION@
-+APIPVERSION = @APIPVERSION@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-@@ -92,7 +93,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- 
--m4datadir = $(datadir)/aclocal-$(APIVERSION)
-+m4datadir = $(datadir)/aclocal$(APIPVERSION)
- 
- dist_m4data_DATA = \
- as.m4 \
diff --git a/devel/automake17/pkg-descr b/devel/automake17/pkg-descr
deleted file mode 100644
index c0c2845eff43..000000000000
--- a/devel/automake17/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/automake17/pkg-plist b/devel/automake17/pkg-plist
deleted file mode 100644
index 9fab62ef8edd..000000000000
--- a/devel/automake17/pkg-plist
+++ /dev/null
@@ -1,100 +0,0 @@
-bin/aclocal%%BUILD_VERSION%%
-bin/automake%%BUILD_VERSION%%
-@unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir
-info/automake%%BUILD_VERSION%%.info
-@exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir
-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%%/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/Channels.pm
-share/automake%%BUILD_VERSION%%/Automake/General.pm
-share/automake%%BUILD_VERSION%%/Automake/Struct.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%%
diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile
index 76b9ef3030b6..abfca1ced425 100644
--- a/devel/glademm/Makefile
+++ b/devel/glademm/Makefile
@@ -27,10 +27,10 @@ USE_GETOPT_LONG=	yes
 post-patch:
 	${RM} -f ${WRKSRC}/src/getopt.*
 	@${REINPLACE_CMD} \
-		-e 's|automake-1.7|automake17|g' \
+		-e 's|automake-1.7|automake18|g' \
 		-e 's|automake-1.5|automake15|g' \
 		-e 's|automake-1.4|automake14|g' \
-		-e 's|autoconf2.50|autoconf257|g' \
+		-e 's|autoconf2.50|autoconf259|g' \
 		-e 's|autoconf2.13|autoconf213|g' \
 		${WRKSRC}/src/glade--.cc
 
diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index b86ef97dde69..ebae39062f05 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	libtool
 PORTVERSION=	1.5.6
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
diff --git a/devel/gnu-libtool/files/patch-ad b/devel/gnu-libtool/files/patch-ad
index c04c4dd4a24c..e69de29bb2d1 100644
--- a/devel/gnu-libtool/files/patch-ad
+++ b/devel/gnu-libtool/files/patch-ad
@@ -1,50 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Mon Sep 10 22:33:26 2001
-+++ ltmain.sh	Wed Jan 23 16:39:22 2002
-@@ -1062,6 +1062,12 @@
- 
-       -module)
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
- 	;;
- 
-@@ -2444,6 +2450,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	  ;;
-+	*-*-freebsd*)
-+	  # FreeBSD doesn't need this...
-+	  ;;
- 	*)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4210,10 +4219,17 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	  ;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	  ;;
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/gnu-libtool/files/patch-ltmain.sh b/devel/gnu-libtool/files/patch-ltmain.sh
index 2a30a0c9ef22..62eb47a4d9ca 100644
--- a/devel/gnu-libtool/files/patch-ltmain.sh
+++ b/devel/gnu-libtool/files/patch-ltmain.sh
@@ -1,7 +1,44 @@
---- ltmain.sh.orig	Wed Jul  2 16:56:39 2003
-+++ ltmain.sh	Wed Jul  2 16:58:03 2003
-@@ -1279,3 +1279,3 @@
+--- ltmain.sh.orig	Sun Apr 11 05:44:45 2004
++++ ltmain.sh	Wed Jun  9 18:21:15 2004
+@@ -1358,3 +1358,3 @@
  	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
  	   # Do not include libc_r directly, use -pthread flag.
+@@ -1375,2 +1375,8 @@
+ 	module=yes
++	case $host in
++	*-*-freebsd*)
++	  # Do not build the useless static library
++	  build_old_libs=no
++	  ;;
++	esac
+ 	continue
+@@ -1858,2 +1864,3 @@
+ 	    deplibs="$deplib $deplibs"
++	    test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	  fi
+@@ -4409,2 +4416,5 @@
+ 	  ;;
++	*-*-freebsd*)
++	  # FreeBSD doesn't need this...
++	  ;;
+ 	*)
+@@ -5549,6 +5559,13 @@
+ 	# Install the pseudo-library for information purposes.
+-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-	instname="$dir/$name"i
+-	$show "$install_prog $instname $destdir/$name"
+-	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	case $host in
++	*-*-freebsd*)
++	  # Do not install the useless pseudo-library
++	  ;;
++	*)
++	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  instname="$dir/$name"i
++	  $show "$install_prog $instname $destdir/$name"
++	  $run eval "$install_prog $instname $destdir/$name" || exit $?
++	  ;;
++	esac
+ 
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 54f3ceb17fc5..59a54f860a67 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -30,9 +30,9 @@ RUN_DEPENDS+=	kiconedit:${PORTSDIR}/graphics/kdegraphics3 \
 
 # KDE_DISTNAME=		${PORTNAME}-${PORTVERSION}_for_KDE_3.1
 
-WANT_AUTOMAKE_VER=	17
+WANT_AUTOMAKE_VER=	18
 WANT_AUTOMAKE_RUN=	yes
-WANT_AUTOCONF_VER=	257
+WANT_AUTOCONF_VER=	259
 WANT_AUTOCONF_RUN=	yes
 USE_KDELIBS_VER=3
 USE_BZIP2=	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 b87cf3d715b5..823d3319c07c 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
@@ -4,8 +4,8 @@
      AUTOCONF="`$WHICH autoconf-2.5x`"
    elif test -x "`$WHICH autoconf-2.57 2>/dev/null`" ; then
      AUTOCONF="`$WHICH autoconf-2.57`"
-+  elif test -x "`$WHICH autoconf257 2>/dev/null`" ; then
-+    AUTOCONF="`$WHICH autoconf257`"
++  elif test -x "`$WHICH autoconf259 2>/dev/null`" ; then
++    AUTOCONF="`$WHICH autoconf295`"
    elif test -x "`$WHICH autoconf-2.56 2>/dev/null`" ; then
      AUTOCONF="`$WHICH autoconf-2.56`"
    elif test -x "`$WHICH autoconf-2.55 2>/dev/null`" ; then
@@ -13,9 +13,9 @@
    elif test -x "`$WHICH autoheader-2.57 2>/dev/null`" ; then
      AUTOHEADER="`$WHICH autoheader-2.57`"
      AUTOM4TE="`$WHICH autom4te-2.57`"
-+  elif test -x "`$WHICH autoheader257 2>/dev/null`" ; then
-+    AUTOHEADER="`$WHICH autoheader257`"
-+    AUTOM4TE="`$WHICH autom4te257`"
++  elif test -x "`$WHICH autoheader259 2>/dev/null`" ; then
++    AUTOHEADER="`$WHICH autoheader259`"
++    AUTOM4TE="`$WHICH autom4te259`"
    elif test -x "`$WHICH autoheader-2.56 2>/dev/null`" ; then
      AUTOHEADER="`$WHICH autoheader-2.56`"
      AUTOM4TE="`$WHICH autom4te-2.56`"
@@ -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 automake17 2>/dev/null`" ; then
-+    AUTOMAKE="`$WHICH automake17`"
-+    ACLOCAL="`$WHICH aclocal17`"
++  elif test -x "`$WHICH automake18 2>/dev/null`" ; then
++    AUTOMAKE="`$WHICH automake18`"
++    ACLOCAL="`$WHICH aclocal18`"
    fi
    if test -n "$UNSERMAKE"; then 
       AUTOMAKE="$UNSERMAKE"
diff --git a/devel/libtool14/Makefile b/devel/libtool14/Makefile
deleted file mode 100644
index 6db9317a7806..000000000000
--- a/devel/libtool14/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# New ports collection makefile for:	libtool
-# Date created:		6 May 1998
-# Whom:			Motoyuki Kasahara <m-kasahr@sra.co.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME?=	libtool
-PORTVERSION=	1.4.3
-PORTREVISION?=	3
-CATEGORIES=	devel
-#MASTER_SITES=	${MASTER_SITE_GNU}
-#MASTER_SITE_SUBDIR=	libtool
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ade/gnu
-DISTNAME=	libtool-${PORTVERSION}
-
-MAINTAINER=	ade@FreeBSD.org
-COMMENT?=	Generic shared library support script (version 1.4)
-
-DEPRECATED=	Please use devel/libtool15 instead
-EXPIRATION_DATE=1st June 2004
-
-BUILD_VERSION=	14
-LATEST_LINK?=	libtool${BUILD_VERSION}
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-GNU_CONFIGURE=	 yes
-CONFIGURE_ARGS?= --disable-ltdl-install
-CONFIGURE_ARGS+= --program-suffix=${BUILD_VERSION}
-CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_REINPLACE=	yes
-
-.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
-pre-everything::
-	@${ECHO} ===========================================================
-	@${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables"
-	@${ECHO} "defined either in environment or in make(1) arguments."
-	@${ECHO} "Please undefine them and try again."
-	@${ECHO} ===========================================================
-	@${FALSE}
-.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
-
-post-patch:
-	@(cd ${WRKSRC}/doc && \
-		${RM} -f *.info* && \
-		${MV} libtool.texi libtool${BUILD_VERSION}.texi && \
-		${REINPLACE_CMD} -E 's,(libtool|libtoolize)\),\1${BUILDVERSION}\),g' libtool${BUILD_VERSION}.texi)
-	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool${BUILD_VERSION}.m4
-	@${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl${BUILD_VERSION}.m4
-	@${REINPLACE_CMD} -e 's|libtool.m4|libtool${BUILD_VERSION}.m4|g' \
-			  -e 's|ltdl.m4|ltdl${BUILD_VERSION}.m4|g' ${WRKSRC}/Makefile.in
-
-post-install:
-	@-${RM} -fr ${PREFIX}/libexec/libtool${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/libexec/libtool${BUILD_VERSION}
-.for i in libtool libtoolize
-	${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} ${PREFIX}/libexec/libtool${BUILD_VERSION}/${i}
-.endfor
-.for i in config.guess config.sub
-	${MV} ${PREFIX}/share/libtool${BUILD_VERSION}/${i}${BUILD_VERSION} ${PREFIX}/share/libtool${BUILD_VERSION}/${i}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/devel/libtool14/distinfo b/devel/libtool14/distinfo
deleted file mode 100644
index 942cf3599b93..000000000000
--- a/devel/libtool14/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (libtool-1.4.3.tar.gz) = d11a3c835449d7fa50a025dc9c01ad81
-SIZE (libtool-1.4.3.tar.gz) = 1164463
diff --git a/devel/libtool14/files/patch-aa b/devel/libtool14/files/patch-aa
deleted file mode 100644
index 17a1e04b525e..000000000000
--- a/devel/libtool14/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/libtool.texi.orig	Mon Jan 14 19:04:40 2002
-+++ doc/libtool.texi	Wed Jul  2 18:11:10 2003
-@@ -2,4 +2,4 @@
- @c %**start of header
--@setfilename libtool.info
--@settitle Libtool
-+@setfilename libtool14.info
-+@settitle Libtool14
- @c For double-sided printing, uncomment:
-@@ -15,3 +15,3 @@
- @direntry
--* Libtool: (libtool).           Generic shared library support script.
-+* Libtool14: (libtool14).           Generic shared library support script.
- @end direntry
-@@ -20,3 +20,3 @@
- @direntry
--* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
-+* libtoolize14: (libtool14)Invoking libtoolize.     Adding libtool support.
- @end direntry
diff --git a/devel/libtool14/files/patch-ab b/devel/libtool14/files/patch-ab
deleted file mode 100644
index 384c86a0bd18..000000000000
--- a/devel/libtool14/files/patch-ab
+++ /dev/null
@@ -1,50 +0,0 @@
---- doc/Makefile.in.orig	Wed Oct 23 02:51:04 2002
-+++ doc/Makefile.in	Mon Feb 17 02:01:16 2003
-@@ -72,3 +72,3 @@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
-@@ -85,4 +85,4 @@
- AUTOMAKE_OPTIONS = gnits
--info_TEXINFOS = libtool.texi
--libtool_TEXINFOS = PLATFORMS fdl.texi
-+info_TEXINFOS = libtool14.texi
-+libtool14_TEXINFOS = PLATFORMS fdl.texi
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -90,6 +90,6 @@
- TEXI2DVI = texi2dvi
--INFO_DEPS = libtool.info
--DVIS = libtool.dvi
--TEXINFOS = libtool.texi
--DIST_COMMON =  $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \
-+INFO_DEPS = libtool14.info
-+DVIS = libtool14.dvi
-+TEXINFOS = libtool14.texi
-+DIST_COMMON =  $(libtool14_TEXINFOS) Makefile.am Makefile.in mdate-sh \
- stamp-vti texinfo.tex version.texi
-@@ -115,4 +115,4 @@
- 
--$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in
--	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp
-+$(srcdir)/stamp-vti: libtool14.texi $(top_srcdir)/configure.in
-+	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool14.texi`" > vti.tmp
- 	@echo "@set EDITION $(VERSION)" >> vti.tmp
-@@ -135,4 +135,4 @@
- 
--libtool.info: libtool.texi version.texi $(libtool_TEXINFOS)
--libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS)
-+libtool14.info: libtool14.texi version.texi $(libtool14_TEXINFOS)
-+libtool14.dvi: libtool14.texi version.texi $(libtool14_TEXINFOS)
- 
-@@ -235,6 +235,6 @@
- mostlyclean-aminfo:
--	-rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \
--	  libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \
--	  libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \
--	  libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn
-+	-rm -f libtool14.aux libtool14.cp libtool14.cps libtool14.dvi libtool14.fn \
-+	  libtool14.fns libtool14.ky libtool14.kys libtool14.ps libtool14.log \
-+	  libtool14.pg libtool14.toc libtool14.tp libtool14.tps libtool14.vr \
-+	  libtool14.vrs libtool14.op libtool14.tr libtool14.cv libtool14.cn
- 
diff --git a/devel/libtool14/files/patch-ad b/devel/libtool14/files/patch-ad
deleted file mode 100644
index 3229e3caf103..000000000000
--- a/devel/libtool14/files/patch-ad
+++ /dev/null
@@ -1,64 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Mon Sep 10 22:33:26 2001
-+++ ltmain.sh	Fri Feb 13 14:41:25 2004
-@@ -1062,6 +1062,12 @@
- 
-       -module)
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
- 	;;
- 
-@@ -2444,6 +2450,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	  ;;
-+	*-*-freebsd*)
-+	  # FreeBSD doesn't need this...
-+	  ;;
- 	*)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4210,10 +4219,17 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	  ;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	  ;;
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-@@ -4414,8 +4414,12 @@
- 	      tmpdir="/tmp"
- 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
- 	      tmpdir="$tmpdir/libtool-$$"
--	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
-+	      save_umask=`umask`
-+	      umask 0077
-+	      if $mkdir "$tmpdir"; then
-+		umask $save_umask
- 	      else
-+		umask $save_umask
- 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
- 		continue
- 	      fi
diff --git a/devel/libtool14/files/patch-ae b/devel/libtool14/files/patch-ae
deleted file mode 100644
index 62aeecd4ae60..000000000000
--- a/devel/libtool14/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Wed Oct 23 02:26:05 2002
-+++ configure	Mon Feb 17 02:04:57 2003
-@@ -865,3 +865,3 @@
- 
--PACKAGE=libtool
-+PACKAGE=libtool14
- 
-@@ -6089,6 +6089,2 @@
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
- 
diff --git a/devel/libtool14/files/patch-af b/devel/libtool14/files/patch-af
deleted file mode 100644
index 1298dce981e1..000000000000
--- a/devel/libtool14/files/patch-af
+++ /dev/null
@@ -1,37 +0,0 @@
---- libltdl/Makefile.in.orig	Wed Oct 23 02:26:07 2002
-+++ libltdl/Makefile.in	Mon Feb 17 02:06:58 2003
-@@ -342,3 +342,3 @@
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
-+	-chmod 555 $(distdir)
- 	@for file in $(DISTFILES); do \
-@@ -346,9 +346,8 @@
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    echo no copy dir $$d/$$file; \
- 	  else \
--	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \
- 	  fi; \
- 	done
-+	-chmod a+x $(distdir)/configure
- info-am:
-@@ -452,4 +451,4 @@
- local-install-files: $(DISTFILES)
--	-rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
--	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
-+	-rm -rf $(DESTDIR)$(datadir)/libtool14/libltdl
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool14/libltdl
- 	@for file in $(DISTFILES); do \
-@@ -457,6 +456,6 @@
- 	  if test -d $$d/$$file; then \
--	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
-+	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file; \
- 	  else \
--	    test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
--	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
-+	    test -f $(DESTDIR)$(datadir)/libtool14/libltdl/$$file \
-+	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file || :; \
- 	  fi; \
diff --git a/devel/libtool14/files/patch-libtoolize.in b/devel/libtool14/files/patch-libtoolize.in
deleted file mode 100644
index b92bbeb9d8e9..000000000000
--- a/devel/libtool14/files/patch-libtoolize.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- libtoolize.in.orig	Sun Oct 13 16:21:38 2002
-+++ libtoolize.in	Mon Feb 17 01:56:19 2003
-@@ -39,4 +39,4 @@
- 
--libtool_m4="$aclocaldir/libtool.m4"
--ltdl_m4="$aclocaldir/ltdl.m4"
-+libtool_m4="$aclocaldir/libtool14.m4"
-+ltdl_m4="$aclocaldir/ltdl14.m4"
- 
diff --git a/devel/libtool14/files/patch-ltmain.sh b/devel/libtool14/files/patch-ltmain.sh
deleted file mode 100644
index eb77e13cf2c0..000000000000
--- a/devel/libtool14/files/patch-ltmain.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ltmain.sh.orig	Fri Jun 27 19:46:40 2003
-+++ ltmain.sh	Fri Jun 27 19:46:52 2003
-@@ -1061,7 +1061,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
diff --git a/devel/libtool14/pkg-descr b/devel/libtool14/pkg-descr
deleted file mode 100644
index 1dea88bf6d51..000000000000
--- a/devel/libtool14/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This is GNU Libtool, a generic library support script.  Libtool hides
-the complexity of using shared libraries behind a consistent, portable
-interface.
-
-To use libtool, add the new generic library building commands to your
-Makefile, Makefile.in, or Makefile.am.
-
-WWW: http://www.gnu.org/software/libtool/
diff --git a/devel/libtool14/pkg-plist b/devel/libtool14/pkg-plist
deleted file mode 100644
index 68516f0dab46..000000000000
--- a/devel/libtool14/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $FreeBSD$
-bin/libtool%%BUILD_VERSION%%
-bin/libtoolize%%BUILD_VERSION%%
-libexec/libtool%%BUILD_VERSION%%/libtool
-libexec/libtool%%BUILD_VERSION%%/libtoolize
-@unexec install-info --delete %D/info/libtool%%BUILD_VERSION%%.info %D/info/dir
-info/libtool%%BUILD_VERSION%%.info
-@exec install-info %D/info/libtool%%BUILD_VERSION%%.info %D/info/dir
-share/aclocal/libtool%%BUILD_VERSION%%.m4
-share/aclocal/ltdl%%BUILD_VERSION%%.m4
-share/libtool%%BUILD_VERSION%%/config.guess
-share/libtool%%BUILD_VERSION%%/config.sub
-share/libtool%%BUILD_VERSION%%/libltdl/COPYING.LIB
-share/libtool%%BUILD_VERSION%%/libltdl/Makefile.am
-share/libtool%%BUILD_VERSION%%/libltdl/Makefile.in
-share/libtool%%BUILD_VERSION%%/libltdl/README
-share/libtool%%BUILD_VERSION%%/libltdl/acinclude.m4
-share/libtool%%BUILD_VERSION%%/libltdl/aclocal.m4
-share/libtool%%BUILD_VERSION%%/libltdl/config-h.in
-share/libtool%%BUILD_VERSION%%/libltdl/configure
-share/libtool%%BUILD_VERSION%%/libltdl/configure.in
-share/libtool%%BUILD_VERSION%%/libltdl/ltdl.c
-share/libtool%%BUILD_VERSION%%/libltdl/ltdl.h
-share/libtool%%BUILD_VERSION%%/libltdl/stamp-h.in
-share/libtool%%BUILD_VERSION%%/ltmain.sh
-@dirrm share/libtool%%BUILD_VERSION%%/libltdl
-@dirrm share/libtool%%BUILD_VERSION%%
-@dirrm libexec/libtool%%BUILD_VERSION%%
diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index b86ef97dde69..ebae39062f05 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	libtool
 PORTVERSION=	1.5.6
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
diff --git a/devel/libtool15/files/patch-ad b/devel/libtool15/files/patch-ad
index c04c4dd4a24c..e69de29bb2d1 100644
--- a/devel/libtool15/files/patch-ad
+++ b/devel/libtool15/files/patch-ad
@@ -1,50 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Mon Sep 10 22:33:26 2001
-+++ ltmain.sh	Wed Jan 23 16:39:22 2002
-@@ -1062,6 +1062,12 @@
- 
-       -module)
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
- 	;;
- 
-@@ -2444,6 +2450,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	  ;;
-+	*-*-freebsd*)
-+	  # FreeBSD doesn't need this...
-+	  ;;
- 	*)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4210,10 +4219,17 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	  ;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	  ;;
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/libtool15/files/patch-ltmain.sh b/devel/libtool15/files/patch-ltmain.sh
index 2a30a0c9ef22..62eb47a4d9ca 100644
--- a/devel/libtool15/files/patch-ltmain.sh
+++ b/devel/libtool15/files/patch-ltmain.sh
@@ -1,7 +1,44 @@
---- ltmain.sh.orig	Wed Jul  2 16:56:39 2003
-+++ ltmain.sh	Wed Jul  2 16:58:03 2003
-@@ -1279,3 +1279,3 @@
+--- ltmain.sh.orig	Sun Apr 11 05:44:45 2004
++++ ltmain.sh	Wed Jun  9 18:21:15 2004
+@@ -1358,3 +1358,3 @@
  	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
  	   # Do not include libc_r directly, use -pthread flag.
+@@ -1375,2 +1375,8 @@
+ 	module=yes
++	case $host in
++	*-*-freebsd*)
++	  # Do not build the useless static library
++	  build_old_libs=no
++	  ;;
++	esac
+ 	continue
+@@ -1858,2 +1864,3 @@
+ 	    deplibs="$deplib $deplibs"
++	    test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	  fi
+@@ -4409,2 +4416,5 @@
+ 	  ;;
++	*-*-freebsd*)
++	  # FreeBSD doesn't need this...
++	  ;;
+ 	*)
+@@ -5549,6 +5559,13 @@
+ 	# Install the pseudo-library for information purposes.
+-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-	instname="$dir/$name"i
+-	$show "$install_prog $instname $destdir/$name"
+-	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	case $host in
++	*-*-freebsd*)
++	  # Do not install the useless pseudo-library
++	  ;;
++	*)
++	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  instname="$dir/$name"i
++	  $show "$install_prog $instname $destdir/$name"
++	  $run eval "$install_prog $instname $destdir/$name" || exit $?
++	  ;;
++	esac
+ 
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 5e13902ab10b..1e0dbfd74d47 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -19,8 +19,7 @@ COMMENT=	Perl Compatible Regular Expressions library
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	\
-		14
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 4203a8c0ef7c..53051e4c8dc8 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -40,15 +40,15 @@ CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTCONFIG%%|${LTCONFIG}|g' \
 		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
-		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTCONFIG%%|${LTCONFIG}|g' \
 		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/libobjc/configure
 	@${REINPLACE_CMD} \
-		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTCONFIG%%|${LTCONFIG}|g' \
 		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/avcall/configure
 
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 965aecb42442..feecf4406571 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -20,7 +20,7 @@ USE_QT_VER=	3
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-qt-moc=${QT_PREFIX}/bin \
 		--with-qt-libs=${QT_PREFIX}/lib
diff --git a/games/scorched3d-devel/Makefile b/games/scorched3d-devel/Makefile
index 5df4f456de82..7060bfacbf7d 100644
--- a/games/scorched3d-devel/Makefile
+++ b/games/scorched3d-devel/Makefile
@@ -28,7 +28,7 @@ GNU_CONFIGURE=		yes
 USE_GL=			yes
 USE_GMAKE=		yes
 USE_AUTOMAKE_VER=	15
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 
 AUTOMAKE_ARGS=		--foreign
 CONFIGURE_ARGS=		--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
@@ -48,7 +48,7 @@ BROKEN=			"Does not compile on !i386 and !amd64"
 
 pre-configure:
 	@cd ${WRKSRC}/scripts && ${PERL} createAMMakefile.pl
-	@cd ${WRKSRC} && aclocal
+	@cd ${WRKSRC} && ${ACLOCAL}
 
 pre-install:
 	@mkdir -p ${PREFIX}/games/scorched3d
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 5df4f456de82..7060bfacbf7d 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -28,7 +28,7 @@ GNU_CONFIGURE=		yes
 USE_GL=			yes
 USE_GMAKE=		yes
 USE_AUTOMAKE_VER=	15
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 
 AUTOMAKE_ARGS=		--foreign
 CONFIGURE_ARGS=		--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
@@ -48,7 +48,7 @@ BROKEN=			"Does not compile on !i386 and !amd64"
 
 pre-configure:
 	@cd ${WRKSRC}/scripts && ${PERL} createAMMakefile.pl
-	@cd ${WRKSRC} && aclocal
+	@cd ${WRKSRC} && ${ACLOCAL}
 
 pre-install:
 	@mkdir -p ${PREFIX}/games/scorched3d
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 089167e1fd25..f0180f89d3d1 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 8e33aa7ab8b1..b4773fac0e9a 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -162,8 +162,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
 		${FILESDIR}/extra-patch-configure.in
-USE_AUTOCONF_VER=257
-USE_AUTOHEADER_VER=257
+USE_AUTOCONF_VER=259
+USE_AUTOHEADER_VER=259
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 8e33aa7ab8b1..b4773fac0e9a 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -162,8 +162,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
 		${FILESDIR}/extra-patch-configure.in
-USE_AUTOCONF_VER=257
-USE_AUTOHEADER_VER=257
+USE_AUTOCONF_VER=259
+USE_AUTOHEADER_VER=259
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 8e33aa7ab8b1..b4773fac0e9a 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -162,8 +162,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
 		${FILESDIR}/extra-patch-configure.in
-USE_AUTOCONF_VER=257
-USE_AUTOHEADER_VER=257
+USE_AUTOCONF_VER=259
+USE_AUTOHEADER_VER=259
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/misc/skyutils/Makefile b/misc/skyutils/Makefile
index f02b29f66159..d671a8dbf224 100644
--- a/misc/skyutils/Makefile
+++ b/misc/skyutils/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://zekiller.skytech.org/fichiers/
 MAINTAINER=	machiel_mastenbroek@hotmail.com
 COMMENT=	A library required by smssend (same author)
 
-USE_AUTOCONF_VER?=257
+USE_AUTOCONF_VER?=259
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 429a559568b4..f3acdbe84735 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -30,10 +30,10 @@ post-patch:
 		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
 		 s|-L/usr/local/lib|-L${LOCALBASE}/lib|g ; \
 		 s|-I/usr/local/include|-I${LOCALBASE}/include|g ; \
-		 s|aclocal-1.7|aclocal17|g ; \
-		 s|automake-1.7|automake17|g ; \
-		 s|autoconf|autoconf257|g ; \
-		 s|autoheader|autoheader257|g' ${WRKSRC}/configure \
+		 s|aclocal-1.7|${TRUE}|g ; \
+		 s|automake-1.7|${TRUE}|g ; \
+		 s|autoconf|${TRUE}|g ; \
+		 s|autoheader|${TRUE}|g' ${WRKSRC}/configure \
 		 ${WRKSRC}/missing ${WRKSRC}/aclocal.m4 ${WRKSRC}/autogen.sh
 		
 .include <bsd.port.mk>
diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index 46cba806f275..48dcab190324 100644
--- a/multimedia/okle/Makefile
+++ b/multimedia/okle/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A KDE frontend to the Ogle DVD player
 BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
 RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 90e937b4056c..03f01fcdba8a 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -91,8 +91,8 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
-		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
+		-e 's|%%LTCONFIG%%|${LTCONFIG}|g' \
+		-e 's|%%LTMAIN%%|${LTMAIN}|g' \
 		${WRKSRC}/aclocal.m4
 
 post-install:
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index ebf565b6a131..cb6dcbb7dfdc 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -21,8 +21,8 @@ CONFLICTS=	zebra-devel-* zebra-0*
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SUBMAKE=	yes
-WANT_AUTOCONF_VER=	257
-WANT_AUTOMAKE_VER=	17
+WANT_AUTOCONF_VER=	259
+WANT_AUTOMAKE_VER=	18
 AUTOMAKE_ARGS=	-a -i
 
 MAN1=		vtysh.1
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index 888d210815d6..869e7ddd44c9 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	atlas:${PORTSDIR}/math/atlas
 
 USE_BISON=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=257
+USE_AUTOCONF_VER=259
 
 CONFIGURE_ARGS=	--with-cc=${CC} \
 		--with-cxx=${CXX} \
diff --git a/science/psi3/Makefile b/science/psi3/Makefile
index 4af8132226d5..12e1e7519855 100644
--- a/science/psi3/Makefile
+++ b/science/psi3/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=257
+USE_AUTOCONF_VER=259
 
 CONFIGURE_ARGS=	--with-cc=${CC} \
 		--with-cxx=${CXX} \
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index c4a3aea630d3..9ee56949f7a5 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -23,7 +23,7 @@ COMMENT=	Replacement for crypt(1)
 LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt/ \
 		mhash.2:${PORTSDIR}/security/mhash/
 
-WANT_AUTOCONF_VER=	257
+WANT_AUTOCONF_VER=	259
 USE_GETTEXT=		yes
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--enable-static --with-catgets
diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index ab8f60d03bf3..35827c60ec36 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	esn@x123.info
 COMMENT=	Apache RealTime log stats
 
-WANT_AUTOCONF_VER=257
+WANT_AUTOCONF_VER=259
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 1f2841c93479..f43382245676 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -13,9 +13,8 @@ MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 MAINTAINER=	sem@ciam.ru
 COMMENT=	GRand Unified Bootloader
 
-USE_AUTOMAKE_VER=	17
-AUTOMAKE_ENV=		AUTOCONF=${AUTOCONF}
-USE_AUTOCONF_VER=	257
+USE_AUTOMAKE_VER=	18
+USE_AUTOCONF_VER=	259
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-freebsd-freebsd${OSREL}
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index bc49c1096203..4c7b58b4a71e 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -46,7 +46,12 @@ SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			AUTOHEADER=${AUTOHEADER}
 
 USE_ICONV=		yes
-USE_AUTOCONF_VER=	259
+SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
+			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
+			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
+			AUTOHEADER=${AUTOHEADER}
+
+USE_AUTOCONF_VER=	257
 USE_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_RC_SUBR=		yes
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index bc49c1096203..4c7b58b4a71e 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -46,7 +46,12 @@ SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			AUTOHEADER=${AUTOHEADER}
 
 USE_ICONV=		yes
-USE_AUTOCONF_VER=	259
+SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
+			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
+			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
+			AUTOHEADER=${AUTOHEADER}
+
+USE_AUTOCONF_VER=	257
 USE_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_RC_SUBR=		yes
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index 5be3bd3978e0..7f8e34f29ec6 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -65,8 +65,8 @@ patch-autotools:
 	@(cd ${PATCH_WRKSRC};			\
 	for file in ${LIBTOOLFILES}; do		\
 		${CP} $$file $$file.tmp;	\
-		${SED} -e "s^\$$ac_aux_dir/ltconfig^${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}^g" \
-			-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LIBTOOL_SHAREDIR}/ltmain.sh^g" \
+		${SED} -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
+			-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
 			$$file.tmp > $$file;	\
 	 done);
 .endif
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 05c21c1f9a6d..754d53a9d6fb 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -16,8 +16,8 @@ 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=	15
-USE_AUTOCONF_VER=	257
+WANT_AUTOMAKE_VER=	18
+USE_AUTOCONF_VER=	259
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=	13
@@ -76,6 +76,8 @@ post-install:
 	${RM} -f ${PREFIX}/lib/libMrm.la
 	${RM} -f ${PREFIX}/lib/libDtPrint.la
 	${RM} -f ${PREFIX}/lib/libUil.la
+	${INSTALL_DATA} ${WRKSRC}/scripts/autoconf/ac_find_motif.m4 \
+		${LOCALBASE}/share/aclocal
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 01f7dbec50f8..f567caa4a8d8 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -19,7 +19,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	--enable-shaped-decorations \
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index 89446da194c6..85d9fd128ee0 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -22,7 +22,7 @@ PLIST_FILES+=	share/doc/vdesk/${ii}
 .endfor
 .endif
 USE_X_PREFIX=		yes
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 
 post-extract:
 # Avoid having to read this lengthy file.
author	Ade Lovett <ade@FreeBSD.org>	2004-07-01 17:06:41 +0000
committer	Ade Lovett <ade@FreeBSD.org>	2004-07-01 17:06:41 +0000
commit	328b757bf2b6c173ce65d3872ea462f25a5d5f9b (patch)
tree	9a761809da3b45684b09bc2f0d6091132e77c78a
parent	ab98d6018836ec7c6f81c02805fae5314c044f04 (diff)
download	ports-328b757bf2b6c173ce65d3872ea462f25a5d5f9b.tar.gz ports-328b757bf2b6c173ce65d3872ea462f25a5d5f9b.zip