Switch autoconf dependencies from 2.53 or 2.59 to 2.61.

PR: ports/116639 Submitted by: aDe
author: Mark Linimon <linimon@FreeBSD.org> 2007-09-30 04:47:36 +0000
committer: Mark Linimon <linimon@FreeBSD.org> 2007-09-30 04:47:36 +0000
commit: 48420a5ebd9fbd0e15cf0fa5b62dd93ae9cd2531 (patch)
tree: eedd43e6e7c3a96d77549de85690d46016e9cc7e
parent: af4658fb56c22ab36db1f30588a3964e1d47d634 (diff)
download: ports-48420a5ebd9fbd0e15cf0fa5b62dd93ae9cd2531.tar.gz
ports-48420a5ebd9fbd0e15cf0fa5b62dd93ae9cd2531.zip
320 files changed, 692 insertions, 671 deletions
diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk
index 8f72d60ea83c..69058afa84e0 100644
--- a/Mk/bsd.php.mk
+++ b/Mk/bsd.php.mk
@@ -148,7 +148,7 @@ SUB_LIST+=	PHP_EXT_DIR=${PHP_EXT_DIR}
 .if defined(USE_PHPIZE) || defined(USE_PHPEXT)
 BUILD_DEPENDS+=	phpize:${PHP_PORT}
 GNU_CONFIGURE=	YES
-USE_AUTOTOOLS+=	autoconf:259:env
+USE_AUTOTOOLS+=	autoconf:261:env
 CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config
 
 configure-message: phpize-message do-phpize
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 646b9df90a42..d7f751b64d1a 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	arj
 PORTVERSION=	3.10.22
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Open-source ARJ
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GMAKE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_WRKSRC=	${WRKSRC}/gnu
diff --git a/archivers/torrentzip/Makefile b/archivers/torrentzip/Makefile
index 1178060bd29a..62d72f09770a 100644
--- a/archivers/torrentzip/Makefile
+++ b/archivers/torrentzip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	torrentzip
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	trrntzip
@@ -16,7 +16,7 @@ DISTNAME=	trrntzip_v${PORTVERSION:S/.//}_src
 MAINTAINER=	swhetzel@gmail.com
 COMMENT=	Efficient way to prepare zipfiles for BitTorrent
 
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoheader:259
+USE_AUTOTOOLS=	aclocal:19 automake:19 autoheader:261
 AUTOMAKE_ARGS=		-a
 
 WRKSRC=		${WRKDIR}/trrntzip
diff --git a/audio/bmp-faad/Makefile b/audio/bmp-faad/Makefile
index b4e842aa1e2c..61fe0f6856cb 100644
--- a/audio/bmp-faad/Makefile
+++ b/audio/bmp-faad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	faad2
 PORTVERSION=	2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	faac
@@ -24,7 +24,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_AUTOTOOLS=	automake:15 autoheader:253 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:15 autoheader:261 autoconf:261 libtool:15
 AUTOMAKE_ARGS=		--add-missing
 USE_X_PREFIX=		yes
 USE_GMAKE=		yes
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 6a96b3117095..95b88a1b3162 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mac
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	CENKES
 PKGNAMEPREFIX=	bmp-
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 PLUGDIR=	lib/bmp/Input
 PLUGFILE=	lib${PKGNAMEPREFIX}${PORTNAME}.so
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index 5a3186225711..b76c3ec91732 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -6,8 +6,7 @@
 
 PORTNAME=	musepack
 PORTVERSION=	1.2
-PORTREVISION=	1
-PORTREIVIOSN=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://files.musepack.net/linux/plugins/
 PKGNAMEPREFIX=	bmp-
@@ -26,7 +25,7 @@ USE_GMAKE=	yes
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 PLUGDIR=	lib/bmp/Input
 PLUGFILE=	libbmp-mpc.so
 PLIST_FILES=	${PLUGDIR}/${PLUGFILE}
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 9f41acaacad3..8c012e3cac14 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	faac
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	faac
@@ -21,7 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_DOS2UNIX=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:15 autoheader:259 libtool:15
+USE_AUTOTOOLS=	automake:15 autoheader:261 libtool:15
 AUTOMAKE_ARGS=	--add-missing
 USE_GMAKE=	yes
 USE_DOS2UNIX=	yes
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 205a85ea7c80..e9e93c981825 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	faad2
 PORTVERSION=	2.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -19,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_CDROM=	Restrictive copyright (do not sell for profit)
 
 USE_DOS2UNIX=	yes
-USE_AUTOTOOLS=	automake:15 autoheader:259 libtool:15
+USE_AUTOTOOLS=	automake:15 autoheader:261 libtool:15
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index cbde8eb16ae0..13963299f131 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libtremor
 PORTVERSION=	1.0.2.${SNAP_DATE}
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://members.chello.nl/~g.mast/distfiles/
 DISTNAME=	tremor_snapshot_${SNAP_DATE}
@@ -17,7 +18,7 @@ COMMENT=	Integer-only fully Ogg Vorbis compliant decoder library
 
 SNAP_DATE=	02132004
 WRKSRC=		${WRKDIR}/Tremor
-USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:15 autoconf:261 libtool:15
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 7ea13636339b..bae9d9fd6a80 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lmms
 PORTVERSION=	20061204
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jylefort
@@ -28,7 +28,7 @@ USE_QT_VER=	3
 USE_SDL=	sdl sound
 USE_GMAKE=	yes
 
-USE_AUTOTOOLS=	autoconf:259 autoheader:259 automake:19 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:261 autoheader:261 automake:19 aclocal:19 libtool:15
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-a
 CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile
index 195d1c8b475c..9482883f9fdd 100644
--- a/audio/mt-daapd/Makefile
+++ b/audio/mt-daapd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mt-daapd
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +26,7 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-id3tag=${PREFIX} --with-gdbm-includes=${LOCALBASE}/include
 
-USE_AUTOTOOLS=	autoheader:259 autoconf:259:env
+USE_AUTOTOOLS=	autoheader:261 autoconf:261:env
 
 DAAPD_USER?=	daapd
 DAAPD_GROUP?=	daapd
diff --git a/audio/oggsplit/Makefile b/audio/oggsplit/Makefile
index da1c8e1f7d86..da99370881e8 100644
--- a/audio/oggsplit/Makefile
+++ b/audio/oggsplit/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	oggsplit
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://homepage.ntlworld.com/jfe1205/OggVorbis/
 
@@ -16,7 +17,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:15 autoconf:259
+USE_AUTOTOOLS=	automake:15 autoconf:261
 AUTOMAKE_ARGS=	--add-missing
 
 MAN1=		oggsplit.1
diff --git a/audio/orpheus/Makefile b/audio/orpheus/Makefile
index 0d353f26fb0d..c5769bd578b3 100644
--- a/audio/orpheus/Makefile
+++ b/audio/orpheus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	orpheus
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://thekonst.net/download/
 
@@ -19,7 +19,7 @@ RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 6d8c1773a60c..8f43e72c5c3d 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	pd
 DISTVERSION=	0.40-2
 DISTVERSIONSUFFIX=	.src
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www-crca.ucsd.edu/~msp/Software/
 
@@ -25,7 +25,7 @@ MAN1=		pd.1 pdreceive.1 pdsend.1
 PATCH_WRKSRC=	${WRKSRC}/..
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_TCL=	yes
 USE_TK=		yes
 USE_TCL_BUILD=	yes
diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile
index 3e1a784a9e80..b2818970b1bc 100644
--- a/audio/soundtouch/Makefile
+++ b/audio/soundtouch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	soundtouch
 DISTVERSION=	1.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.surina.net/soundtouch/
 
@@ -15,7 +15,7 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An open-source audio processing library
 
 CONFIGURE_ARGS=	--enable-shared=yes
-USE_AUTOTOOLS=	autoconf:259 automake:19:env libtool:15
+USE_AUTOTOOLS=	autoconf:261 automake:19:env libtool:15
 USE_LDCONFIG=	yes
 
 pre-configure:
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 603beefe5a22..2bfd4e7ac082 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vorbis-tools
 PORTVERSION=	1.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
@@ -25,7 +25,7 @@ LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		speex.1:${PORTSDIR}/audio/speex \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 
-USE_AUTOTOOLS=	aclocal:19 autoconf:259 automake:19 libtool:15
+USE_AUTOTOOLS=	aclocal:19 autoconf:261 automake:19 libtool:15
 USE_GETTEXT=	yes
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 42360527ded4..dcc046d6cd45 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	faad2
 PORTVERSION=	2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	faac
@@ -25,7 +25,7 @@ PATCH_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_AUTOTOOLS=	automake:15 autoheader:253 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:15 autoheader:261 autoconf:261 libtool:15
 AUTOMAKE_ARGS=		--add-missing
 USE_X_PREFIX=		yes
 USE_GNOME=		gtk12
diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index 1c7c8b9956a8..23f941b62457 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imms
 PORTVERSION=	1.2a
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,7 +28,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoheader:259 autoconf:259
+USE_AUTOTOOLS=	autoheader:261 autoconf:261
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -44,6 +44,6 @@ BROKEN=		Does not compile
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/vars.mk.in
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/vars.mk.in
 
 .include <bsd.port.post.mk>
diff --git a/audio/xmms-imms/files/patch-configure.ac b/audio/xmms-imms/files/patch-configure.ac
index 5300a499f6ec..51038664c582 100644
--- a/audio/xmms-imms/files/patch-configure.ac
+++ b/audio/xmms-imms/files/patch-configure.ac
@@ -1,38 +1,24 @@
---- configure.ac.orig	Wed Aug 18 01:56:28 2004
-+++ configure.ac	Tue Aug 31 16:19:40 2004
-@@ -31,8 +31,8 @@
- AC_ARG_ENABLE(debug,
-             AC_HELP_STRING([--enable-debug],
+--- configure.ac.orig	2004-08-17 22:56:28.000000000 -0700
++++ configure.ac	2007-09-22 21:50:52.000000000 -0700
+@@ -33,4 +33,4 @@
                             [Extra debug output]),
 -            [enable_debug='yes' XCPPFLAGS="-ggdb -O0 -DDEBUG"],
 -            [enable_debug='no' XCPPFLAGS="-O3"])
 +            [enable_debug='yes' XCPPFLAGS="-g -DDEBUG"],
 +            [enable_debug='no' XCPPFLAGS=""])
  
- AC_PROG_CXX
- AC_PROG_CC
-@@ -119,6 +119,7 @@
- 
-     saved_libs="$LIBS"
+@@ -121,2 +121,3 @@
      LIBS="$LIBS-ltag"
 +    saved_cppflags="$CPPFLAGS"
      CPPFLAGS=`taglib-config --cflags`
- 
-     AC_TRY_LINK([#include <tag.h>
-@@ -127,6 +128,7 @@
-         [XCPPFLAGS="$XCPPFLAGS `taglib-config --cflags`" 
+@@ -128,3 +129,4 @@
                                              AC_MSG_RESULT(yes)],
-         [LIBS=$saved_libs AC_MSG_RESULT(no)])
+-        [LIBS=$saved_libs AC_MSG_RESULT(no)])
++        [LIBS="$saved_libs"; AC_MSG_RESULT(no)])
 +    CPPFLAGS="$saved_cppflags"
  fi
- 
- if test "$with_taglib" = "yes"; then
-@@ -165,7 +167,7 @@
- 
- 
+@@ -167,3 +169,3 @@
  if test "$with_screensaver" != "no"; then
 -    LDFLAGS="-shared -L/usr/X11R6/lib"
 +    LDFLAGS="-L/usr/X11R6/lib"
      AC_CHECK_LIB(Xext, XextFindDisplay,, [with_screensaver=no])
-     AC_CHECK_LIB(Xss, XScreenSaverQueryInfo,, [with_screensaver=no])
-     AC_CHECK_HEADERS(X11/extensions/scrnsaver.h,,
diff --git a/audio/xmms-mac/Makefile b/audio/xmms-mac/Makefile
index 0327f11992d8..6ec624919dba 100644
--- a/audio/xmms-mac/Makefile
+++ b/audio/xmms-mac/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mac
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	CENKES
 PKGNAMEPREFIX=	xmms-
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 USE_LDCONFIG=	yes
 
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index e5b24ded6cbe..9c425abbf713 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yammi
 PORTVERSION=	1.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ OPTIONS=	XMMS "XMMS backend support" off
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env libtool:15:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gstreamer
 
diff --git a/benchmarks/dkftpbench/Makefile b/benchmarks/dkftpbench/Makefile
index 7c99404250b6..aab03a1bf7fe 100644
--- a/benchmarks/dkftpbench/Makefile
+++ b/benchmarks/dkftpbench/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dkftpbench
 PORTVERSION=	0.45
+PORTREVISION=	1
 CATEGORIES=	benchmarks ftp
 MASTER_SITES=	http://www.kegel.com/dkftpbench/
 
@@ -18,6 +19,6 @@ PLIST_FILES=	bin/dkftpbench
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-USE_AUTOTOOLS=	automake:14 autoconf:259
+USE_AUTOTOOLS=	automake:14 autoconf:261
 
 .include <bsd.port.mk>
diff --git a/cad/tclspice/Makefile b/cad/tclspice/Makefile
index a5d7376659e1..8b443e7e2666 100644
--- a/cad/tclspice/Makefile
+++ b/cad/tclspice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tclspice
 PORTVERSION=	0.2.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tclspice
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	bltwish:${PORTSDIR}/x11-toolkits/blt \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:259 libtool:15
+USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:261 libtool:15
 AUTOMAKE_ARGS=	-c -a
 USE_GMAKE=	yes
 ALL_TARGET=	tcl
diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile
index f0213673881a..53d765700952 100644
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-newpy
 PORTVERSION=	12.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS=	i386
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/chinese/iiimf-le-newpy/files/patch-Makefile b/chinese/iiimf-le-newpy/files/patch-Makefile
index a72a0f768306..f8060d2ab6a7 100644
--- a/chinese/iiimf-le-newpy/files/patch-Makefile
+++ b/chinese/iiimf-le-newpy/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile
index 57372b63f19e..02a171eb07e5 100644
--- a/chinese/iiimf-le-ude/Makefile
+++ b/chinese/iiimf-le-ude/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-ude
 PORTVERSION=	12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -22,7 +22,7 @@ ONLY_FOR_ARCHS=	i386
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/chinese/iiimf-le-ude/files/patch-Makefile b/chinese/iiimf-le-ude/files/patch-Makefile
index a72a0f768306..f8060d2ab6a7 100644
--- a/chinese/iiimf-le-ude/files/patch-Makefile
+++ b/chinese/iiimf-le-ude/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile
index aabf15abcb3b..3c5673c3030e 100644
--- a/chinese/iiimf-le-xcin/Makefile
+++ b/chinese/iiimf-le-xcin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iiimf-le-xcin
 PORTVERSION=	0.1.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://people.redhat.com/llch/iiimf-xcin/${PORTVERSION}/
 EXTRACT_SUFX=	-11.src.rpm
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/iiimf-xcin
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GNOME=	libxml2
-USE_AUTOTOOLS=	automake:19 autoheader:259 autoconf:259 libtool:15
+USE_AUTOTOOLS=	automake:19 autoheader:261 autoconf:261 libtool:15
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 0a5b279c1adc..fc3897bea412 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnuradio
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gnuradio
@@ -32,7 +33,7 @@ USE_PYTHON=	2.4+
 USE_WX=		2.6
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 59e766a1d482..737026c1d0c5 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hamlib
 PORTVERSION=	1.2.6.1
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +22,7 @@ USE_GNOME=	pkgconfig gnomehack
 USE_GETOPT_LONG=	yes
 USE_PERL5=	yes
 USE_PYTHON=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-perl-binding --with-python=${PYTHON_CMD}
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index 16aacaa6f5c5..073acd836c12 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openobex
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	comms net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	mad@madpilot.net
 COMMENT=	Open source implementation of the OBEX protocol
 
-USE_AUTOTOOLS=	automake:14:env autoheader:259 autoconf:259 libtool:15
+USE_AUTOTOOLS=	automake:14:env autoheader:261 autoconf:261 libtool:15
 USE_GMAKE=		yes
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile
index 809bb4bd1319..d0c5145520a4 100644
--- a/comms/tlf/Makefile
+++ b/comms/tlf/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Amateur Radio curses based logging program
 
-USE_AUTOTOOLS=	autoconf:259 libtool:15 aclocal:19 automake:19
+USE_AUTOTOOLS=	autoconf:261 libtool:15 aclocal:19 automake:19
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib"
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index 334b0cdf1e99..a6a94437d946 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	dbconnect
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ COMMENT=	Use C++ object API to allow applications to connect to databases
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index 08fca9703896..fe5000d25f1e 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	firebird
 PORTVERSION=	1.5.4
+PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=firebird
@@ -22,7 +23,7 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:261 aclocal:19 libtool:15
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 USE_GCC=	3.4
 
diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile
index 76f51bb45acf..c3802ad7cf6e 100644
--- a/databases/firebird2-server/Makefile
+++ b/databases/firebird2-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	firebird
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=firebird
@@ -22,7 +23,7 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:261 aclocal:19 libtool:15
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
 		-I ${WRKSRC}/m4
 USE_GCC=	3.4+
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 76f51bb45acf..c3802ad7cf6e 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	firebird
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=firebird
@@ -22,7 +23,7 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:261 aclocal:19 libtool:15
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
 		-I ${WRKSRC}/m4
 USE_GCC=	3.4+
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 767bd35fe7ec..ed2a306f7b23 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	freetds
 PORTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds/stable
@@ -18,7 +19,7 @@ TDS_VER?=	5.0
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259:env libtool:15
+USE_AUTOTOOLS=	autoconf:261:env libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 767bd35fe7ec..ed2a306f7b23 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	freetds
 PORTVERSION=	0.64
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds/stable
@@ -18,7 +19,7 @@ TDS_VER?=	5.0
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259:env libtool:15
+USE_AUTOTOOLS=	autoconf:261:env libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
diff --git a/databases/mird/Makefile b/databases/mird/Makefile
index 15b48c25f302..04d00811088f 100644
--- a/databases/mird/Makefile
+++ b/databases/mird/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mird
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.oav.net/pkg_freebsd/distfiles/ \
 		http://grendel.firewall.com/caudium-pkg/ \
@@ -19,7 +19,7 @@ COMMENT=	A free database library with transaction support
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_AUTOTOOLS=	autoconf:253:env
+USE_AUTOTOOLS=	autoconf:261:env
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-debug
diff --git a/databases/mysql-query-browser/Makefile b/databases/mysql-query-browser/Makefile
index 513bd9cc586f..9d8f68db4b0c 100644
--- a/databases/mysql-query-browser/Makefile
+++ b/databases/mysql-query-browser/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mysql-query-browser
 PORTVERSION=	1.1.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQLAdministrationSuite
@@ -24,7 +24,7 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env
 CONFIGURE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 USE_ICONV=	yes
diff --git a/databases/pgcluster/Makefile b/databases/pgcluster/Makefile
index afff15ed1ae4..2af356ce39e1 100644
--- a/databases/pgcluster/Makefile
+++ b/databases/pgcluster/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	pgcluster
 PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/OLD/v${BASEPGSQL}
@@ -25,7 +25,7 @@ RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
 WRKSRC?=	${WRKDIR}/postgresql-${BASEPGSQL}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 MAKE_FLAGS=	# empty
 MAKEFILE=	# empty
 CONFLICTS=	postgresql-*
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 964074a6932d..62f873d31b4c 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.0.14
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -112,7 +112,7 @@ USE_BISON=	yes
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index ae2ad8dc8a7e..315b4657cedf 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PORTVERSION?=	8.1.10
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -113,7 +113,7 @@ USE_BISON=	yes
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 3f89db360767..524b7f091346 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sqlrelay
@@ -18,7 +18,7 @@ COMMENT=	A persistent DB connection pooling/proxying/load balancing system
 LIB_DEPENDS=	rudiments.1:${PORTSDIR}/devel/rudiments
 
 USE_GMAKE=		yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 CONFIGURE_ENV=		${SQLRELAY_CONFIGURE_ENV} \
 			CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index d194d8b6a40d..53ac7645be81 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kmatrix3d
 PORTVERSION=		0.1
-PORTREVISION=	1
+PORTREVISION=		2
 CATEGORIES=		deskutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +24,7 @@ WRKSRC=			${WRKDIR}/${PORTNAME}
 USE_GL=			yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15 automake:19:env autoheader:259:env
+USE_AUTOTOOLS=		libtool:15 automake:19:env autoheader:261:env
 USE_KDELIBS_VER=	3
 USE_BZIP2=		yes
 
diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile
index fa9f0bae3862..a95addc856b9 100644
--- a/deskutils/kooldock/Makefile
+++ b/deskutils/kooldock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		kooldock
 PORTVERSION=		0.4.6
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		deskutils
 MASTER_SITES=		http://www.kde-apps.org/CONTENT/content-files/ \
 			http://www.kde-look.org/CONTENT/content-files/ \
@@ -25,7 +25,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15 automake:19:env autoconf:259:env
+USE_AUTOTOOLS=		libtool:15 automake:19:env autoconf:261:env
 INSTALLS_ICONS=		yes
 USE_GETTEXT=		yes
 USE_KDELIBS_VER=	3
diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile
index 85d4c500be84..6989f023081f 100644
--- a/deskutils/ksmoothdock/Makefile
+++ b/deskutils/ksmoothdock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ksmoothdock
 PORTVERSION=	4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}_automake-1.9
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env libtool:15:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
 GNU_CONFIGURE=	yes
 
 pre-configure:
diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index eba6f7c09174..19b0e137fca4 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	taskjuggler
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.taskjuggler.org/download/
 
@@ -29,7 +30,7 @@ USE_QT_VER=	3
 USE_GNOME=	gnometarget
 USE_PERL5_RUN=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env libtool:15:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"
diff --git a/devel/Makefile b/devel/Makefile
index a0209f5e8d6d..8d0f8b5001f0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -64,8 +64,6 @@
     SUBDIR += autoconf-archive
     SUBDIR += autoconf-wrapper
     SUBDIR += autoconf213
-    SUBDIR += autoconf253
-    SUBDIR += autoconf259
     SUBDIR += autoconf261
     SUBDIR += autodia
     SUBDIR += autodist
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 6cdffb696f20..de3fccea25ec 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	allegro
 DISTVERSION=	4.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
@@ -16,7 +16,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	A cross-platform library for games and multimedia programming
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_XLIB=	yes
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index a9e8b7d344e5..35f7d2d1a3d3 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	allegro
 DISTVERSION=	4.2.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	alleg
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	alleg
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	A cross-platform library for games and multimedia programming
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_XLIB=	yes
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index fb1f61389014..ef9c29c8230f 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	apr
 PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -28,7 +28,7 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOTOOLS=	automake:19 autoconf:259 libtool:15:env
+USE_AUTOTOOLS=	automake:19 autoconf:261 libtool:15:env
 USE_PERL5=		yes
 USE_GMAKE=		yes
 USE_PYTHON_BUILD=	yes
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index fb1f61389014..ef9c29c8230f 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	apr
 PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -28,7 +28,7 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOTOOLS=	automake:19 autoconf:259 libtool:15:env
+USE_AUTOTOOLS=	automake:19 autoconf:261 libtool:15:env
 USE_PERL5=		yes
 USE_GMAKE=		yes
 USE_PYTHON_BUILD=	yes
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index fb1f61389014..ef9c29c8230f 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	apr
 PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -28,7 +28,7 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOTOOLS=	automake:19 autoconf:259 libtool:15:env
+USE_AUTOTOOLS=	automake:19 autoconf:261 libtool:15:env
 USE_PERL5=		yes
 USE_GMAKE=		yes
 USE_PYTHON_BUILD=	yes
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index fb1f61389014..ef9c29c8230f 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	apr
 PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	apr
@@ -28,7 +28,7 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=		yes
-USE_AUTOTOOLS=	automake:19 autoconf:259 libtool:15:env
+USE_AUTOTOOLS=	automake:19 autoconf:261 libtool:15:env
 USE_PERL5=		yes
 USE_GMAKE=		yes
 USE_PYTHON_BUILD=	yes
diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile
index 748ec7da18c7..11cb1a7320c3 100644
--- a/devel/autotools/Makefile
+++ b/devel/autotools/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	autotools
-PORTVERSION=	20070417
+PORTVERSION=	20070905
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -19,7 +19,7 @@ PLIST_FILES=	share/${PORTNAME}
 NO_BUILD=	yes
 NO_FETCH=	yes
 
-AVAIL_AUTOCONF=	2.13 2.53 2.59 2.61
+AVAIL_AUTOCONF=	2.13 2.61
 AVAIL_AUTOMAKE=	1.4 1.5 1.6 1.7 1.8 1.9 1.10
 
 .for VER in ${AVAIL_AUTOCONF}
diff --git a/devel/cunit/Makefile b/devel/cunit/Makefile
index 0dc795feb818..b1f90993c9a3 100644
--- a/devel/cunit/Makefile
+++ b/devel/cunit/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	cunit
 DISTVERSION=	2.1-0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +20,7 @@ DOCSDIR=	${PREFIX}/share/doc/CUnit
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoheader:259	# 2.58 or higher is required
+USE_AUTOTOOLS=	autoheader:261
 USE_LDCONFIG=	yes
 
 MAN3=	CUnit.3
diff --git a/devel/djgpp-gcc/Makefile b/devel/djgpp-gcc/Makefile
index 8ac75e7c430e..dafe49368afd 100644
--- a/devel/djgpp-gcc/Makefile
+++ b/devel/djgpp-gcc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/:djsource \
 		ftp://ftp.mirror.ac.uk/sites/www.delorie.com/current/v2gnu/:djsource \
@@ -29,7 +29,7 @@ COMMENT=	FSF gcc-4.1 for DJGPP cross-development
 BUILD_DEPENDS=	${TARGET}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${LOCALBASE}/${TARGET}/bin/stubify:${PORTSDIR}/devel/${PKGNAMEPREFIX}crx \
 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
-		autoconf-2.59:${PORTSDIR}/devel/autoconf259 \
+		autoconf-2.61:${PORTSDIR}/devel/autoconf261 \
 		aclocal-1.9:${PORTSDIR}/devel/automake19
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
diff --git a/devel/djgpp-gcc/scripts/pre-configure b/devel/djgpp-gcc/scripts/pre-configure
index 9aa1256537a9..6a141bec51c6 100644
--- a/devel/djgpp-gcc/scripts/pre-configure
+++ b/devel/djgpp-gcc/scripts/pre-configure
@@ -2,8 +2,8 @@
 
 AUTOCONF_OLD=autoconf-2.13
 AUTOHEADER_OLD=autoheader-2.13
-AUTOCONF=autoconf-2.59
-AUTOHEADER=autoheader-2.59
+AUTOCONF=autoconf-2.61
+AUTOHEADER=autoheader-2.61
 ACLOCAL=aclocal-1.9
 AUTOMAKE=automake-1.9
 
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index 3d4dc9acd711..b1daec524b9d 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	elfio
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	libtoolize:${PORTSDIR}/devel/libtool15
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:259 libtool:15
+USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:261 libtool:15
 AUTOMAKE_ARGS=	-c -a
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 
diff --git a/devel/epm/Makefile b/devel/epm/Makefile
index 35b861faa36c..86591a7d5721 100644
--- a/devel/epm/Makefile
+++ b/devel/epm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	epm
 PORTVERSION=	3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=     maho/openoffice.org
@@ -25,7 +25,7 @@ PATCH_SITES+=   http://installation.openoffice.org/
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 MAN1=		epm.1 epminstall.1 mkepmlist.1 setup.1
 MAN5=		epm.list.5 setup.types.5
 
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index bd671dc72375..b4762c1ddda5 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fam
 PORTVERSION=	2.6.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://oss.sgi.com/projects/fam/download/
 DIST_SUBDIR=	${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT=	A file alteration monitor
 
 CFLAGS+=	-Wno-deprecated
 
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:259 libtool:15
+USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:261 libtool:15
 AUTOMAKE_ARGS=	-c -a
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 9e130e76deab..c96450c15a2b 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcvs
 PORTVERSION=	1.0
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	devel tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -31,7 +31,7 @@ MAN1=		cvs.1
 MAN5=		cvs.5
 MAN8=		cvsbug.8
 INFO=		cvs cvsclient
-USE_AUTOTOOLS=	automake:15:env autoconf:259:env
+USE_AUTOTOOLS=	automake:15:env autoconf:261:env
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/gcvs/files/patch-make_configure b/devel/gcvs/files/patch-make_configure
index 25031599ecc1..5e5b24a5f0e9 100644
--- a/devel/gcvs/files/patch-make_configure
+++ b/devel/gcvs/files/patch-make_configure
@@ -13,7 +13,7 @@
 -done
 -
 -autoconf 
-+cd cvsunix && autoreconf-2.59
++cd cvsunix && autoreconf-2.61
 +cd ..
  
  ./configure $*
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 57b4e2da995a..905cc5f0a353 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	alex
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/alex/dist/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -21,7 +21,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook
 .endif
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env
+USE_AUTOTOOLS=	autoconf:261:env
 CONFIGURE_ARGS=	--ghc --prefix=${PREFIX}
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index e12273414fe2..0eb93aff04de 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	haddock
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/haddock/
 PKGNAMEPREFIX=	hs-
@@ -30,7 +30,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textpr
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env
+USE_AUTOTOOLS=	autoconf:261:env
 
 PLIST_SUB+=	HADDOCK_VERSION=${PORTVERSION}
 PORTDOCS=	*
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index a4f62ce8a15f..61acb21929f9 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	happy
 PORTVERSION=	1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/happy/dist/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -27,7 +27,7 @@ PLIST_SUB=	HAPPY_VERSION=${PORTVERSION}
 PORTDOCS=	*
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env
+USE_AUTOTOOLS=	autoconf:261:env
 CONFIGURE_ARGS=	--ghc --prefix=${PREFIX}
 
 post-patch:
diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile
index 8a54865f021b..a2e1a49df560 100644
--- a/devel/libbegemot/Makefile
+++ b/devel/libbegemot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libbegemot
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://people.freebsd.org/~harti/libbegemot/
 DISTNAME=	libbegemot-${PORTVERSION}
@@ -16,7 +17,7 @@ COMMENT=	A function library for begemot tools
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libltdl:15 libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libltdl:15 libtool:15:env
 INSTALLS_SHLIB=	yes
 
 
diff --git a/devel/libcfg/Makefile b/devel/libcfg/Makefile
index c1204a671b5a..abc6b1382aaf 100644
--- a/devel/libcfg/Makefile
+++ b/devel/libcfg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libcfg
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://platon.sk/upload/_projects/00003/
 DISTNAME=	${PORTNAME}+-${DISTVERSION}
@@ -14,7 +15,7 @@ DISTNAME=	${PORTNAME}+-${DISTVERSION}
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Library for command line and configuration file parsing
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index c34f3a80a8dd..4ba88a3179d6 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libthai
 PORTVERSION=	0.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.usablelabs.com/download/
 
@@ -17,7 +17,7 @@ COMMENT=	Thai language support library
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:15 autoconf:259 libtool:15
+USE_AUTOTOOLS=	automake:15 autoconf:261 libtool:15
 
 ALL_TARGET=	all check
 
@@ -26,7 +26,7 @@ MAN3=	libthai.3 thctype.3 wtt.3
 post-patch:
 	@${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,' \
 		${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's,15,-1.5,' -e 's,259,-2.59,' \
+	@${REINPLACE_CMD} -e 's,15,-1.5,' -e 's,259,-2.61,' \
 		${WRKSRC}/autogen.sh
 
 pre-configure:
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index 9cf2b47ad36e..362e4fccbf27 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	log4cxx
 PORTVERSION=	0.9.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	logging/${PORTNAME}
@@ -28,7 +29,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost
 CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 .endif
 
-USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:15 autoconf:261 libtool:15
 AUTOMAKE_ARGS=	--add-missing
 LIBTOOL_VARS=	--force --automake
 
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index f6d31c939d46..8dd9adcc2700 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mico
 PORTVERSION=	2.3.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.mico.org/
 
@@ -22,7 +22,7 @@ WRKSRC=			${WRKDIR}/${PORTNAME}
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_AUTOTOOLS=		autoconf:259
+USE_AUTOTOOLS=		autoconf:261
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=		EGREP=`which egrep`
 
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index dee7886a0989..f5c9f6f9cc2c 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pwlib
 PORTVERSION=	1.10.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.voxgratia.org/releases/
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GNOME=	gnometarget
 WANT_GNOME=	yes
 WANT_SDL=	yes
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index bb4c62f57e30..bdb3ffadad31 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rapidsvn
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.rapidsvn.org/download/release/${PORTVERSION}/
@@ -26,7 +26,7 @@ WX_CONF_ARGS=	absolute
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15 automake:19
+USE_AUTOTOOLS=	autoconf:261 libtool:15 automake:19
 CONFIGURE_ARGS=	--with-apr-config=apr-1-config \
 	--with-apu-config=apu-1-config \
 	--with-neon-config=neon-config \
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 288a5e489368..5a653e678fb9 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	swig
 PORTVERSION=	1.3.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Simplified Wrapper and Interface Generator
 
-USE_AUTOTOOLS=	autoconf:253:env libtool:15
+USE_AUTOTOOLS=	autoconf:261:env libtool:15
 
 VER=		${PORTVERSION:R}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 288a5e489368..5a653e678fb9 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	swig
 PORTVERSION=	1.3.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Simplified Wrapper and Interface Generator
 
-USE_AUTOTOOLS=	autoconf:253:env libtool:15
+USE_AUTOTOOLS=	autoconf:261:env libtool:15
 
 VER=		${PORTVERSION:R}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile
index e14d932e3934..1af10c672dcf 100644
--- a/devel/sysconftool/Makefile
+++ b/devel/sysconftool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sysconftool
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 
-USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:261
 
 MAN1=	sysconftool.1 sysconftoolcheck.1
 MAN7=	sysconftool.7
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 03b539de666b..3b1e13cb900c 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tclcl
 PORTVERSION=	1.19
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	devel tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,7 @@ LIB_DEPENDS=	otcl:${PORTSDIR}/lang/otcl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 
 .if !defined(NOPORTDOCS)
diff --git a/devel/valgrind-snapshot/Makefile b/devel/valgrind-snapshot/Makefile
index 15a76f9e4d2c..3b2e00347937 100644
--- a/devel/valgrind-snapshot/Makefile
+++ b/devel/valgrind-snapshot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	valgrind
 PORTVERSION=	352
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.rabson.org/
 PKGNAMESUFFIX=	-snapshot
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS+=	autoconf:259 aclocal:19 automake:19
+USE_AUTOTOOLS+=	autoconf:261 aclocal:19 automake:19
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 3c7c32bae887..5a74afb3e3a3 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	valgrind
 PORTVERSION=	352
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.rabson.org/
 DISTNAME=	${PORTNAME}-stable-${PORTVERSION}
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS+=	autoconf:259 aclocal:19 automake:19
+USE_AUTOTOOLS+=	autoconf:261 aclocal:19 automake:19
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--enable-maintainer-mode
 USE_PERL5_BUILD=yes
diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile
index d62955f731d4..6a1d2d5bd048 100644
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nss_mdns
 PORTVERSION=	0.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://0pointer.de/lennart/projects/nss-mdns/
 DISTNAME=	nss-mdns-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	nss-mdns-${PORTVERSION}
 MAINTAINER=	bms@FreeBSD.org
 COMMENT=	NSS module implementing multicast DNS name resolution
 
-USE_AUTOTOOLS=	autoconf:259 automake:19 libtool:15
+USE_AUTOTOOLS=	autoconf:261 automake:19 libtool:15
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile
index 909188738add..d8825a117368 100644
--- a/dns/posadis/Makefile
+++ b/dns/posadis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	posadis
 PORTVERSION=	0.60.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT=	Domain Name Server (DNS) implementation
 
 LIB_DEPENDS=	poslib.0:${PORTSDIR}/devel/poslib
 
-USE_AUTOTOOLS=	autoconf:259 libltdl:15 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libltdl:15 libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 4d58377b04d9..d41b5771aedd 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mlview
 PORTVERSION=	0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT=	A tree oriented XML editor for Gnome
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_GNOME=	eel2 gnomehack gnomeprefix gtksourceview
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index 5d74cfd65620..4710a400ffb7 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -5,6 +5,7 @@
 
 PORTNAME=	ooo-build
 PORTVERSION=	${OOOBUILD_VERSION}
+PORTREVISION=	1
 MASTER_SITES+=	http://www.go-ooo.org/packages/OOF680/ \
 		http://www.go-ooo.org/packages/SRC680/ \
 		http://www.openclipart.org/downloads/0.18/:openclipart \
@@ -42,7 +43,7 @@ OOO_LIBWPG=		libwpg-0.1.0~cvs20070608.tar.gz
 OOO_PATCHDIR=src680
 
 MD5_FILE=      ${.CURDIR}/distinfo
-USE_AUTOTOOLS=  autoconf:259
+USE_AUTOTOOLS=  autoconf:261
 
 CONFIGURE_ARGS+=	--enable-cairo
 CONFIGURE_ARGS+=	--with-system-xrender-headers
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 440785188053..9ad88398d8fa 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	1.0.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/:moz,ru,src,help \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/:moz,ru,src,help \
@@ -106,7 +106,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		Xvfb:${X_VFBSERVER_PORT} \
 		${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT}
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=  autoconf:253
+USE_AUTOTOOLS=  autoconf:261
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 85be090b9de2..728e11760ee6 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -54,7 +54,7 @@ XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=--build=${XEMACS_ARCH}
 
 CONFIGURE_ARGS+=	--enable-mule \
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index c858c33564fc..d2d4f04ad9c1 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
@@ -41,7 +41,7 @@ XEMACS_ARCH=		${CONFIGURE_TARGET}
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
 
 CONFIGURE_ARGS?=--enable-clash-detection \
diff --git a/editors/yui/Makefile b/editors/yui/Makefile
index a1703754de24..d587a42fa4be 100644
--- a/editors/yui/Makefile
+++ b/editors/yui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yui
 PORTVERSION=	3.2.03
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.askd.ru/~shelton/fileZ/
 
@@ -14,7 +15,7 @@ MAINTAINER=	achilov-rn@askd.ru
 COMMENT=	Rich-featured multi-windows console text editor
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 MAN1=		y.1
 
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index 0b1faa239d1d..4d10eb08d48a 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnuboy
 PORTVERSION=	1.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators games
 MASTER_SITES=	http://gnuboy.unix-fu.org/src/ \
 		http://brightrain.aerifal.cx/~laguna/src/
@@ -20,7 +20,7 @@ LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
 
 USE_SDL=	sdl
 USE_XLIB=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--with-sdl
diff --git a/emulators/mupen64-sdlinput/Makefile b/emulators/mupen64-sdlinput/Makefile
index 7448873bdde9..dd0d78a961f3 100644
--- a/emulators/mupen64-sdlinput/Makefile
+++ b/emulators/mupen64-sdlinput/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64
 PORTVERSION=	0.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	emulators
 MASTER_SITES=	http://mupen64.emulation64.com/files/0.4/
 PKGNAMESUFFIX=	-sdlinput
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
 USE_GCC=	3.4
-USE_AUTOTOOLS=	autoheader:259
+USE_AUTOTOOLS=	autoheader:261
 ONLY_FOR_ARCHS=	i386
 
 PLUGIN_NAME=	blight_input
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 6def14113e92..948736d4cd72 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uae
 PORTVERSION=	0.8.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/ \
 		http://www.electronghost.co.uk/~bernds/
@@ -19,7 +19,7 @@ CONFLICTS=	e-uae-[0-9]*
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ARGS=	--enable-sound --enable-vidmode --enable-dga
 USE_XLIB=	yes
 USE_GNOME=	gtk20
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index da5ab81f59dd..79009a38cb0c 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xsystem35
 PORTVERSION=	1.7.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	http://8ne.sakura.ne.jp:20008/chika/unitbase/xsys35/down/
 
@@ -17,7 +17,7 @@ COMMENT=	AliceSoft System 3.5/3.6/3.8/3.9 on X Window System
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 2f9cbd50f19b..be7dfc5791f8 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yabause
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
@@ -19,7 +20,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	yes
 USE_GCC=	3.4+
-USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:261
 USE_XLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index ba5283774ded..b053eeed801d 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	khacc
 PORTVERSION=	3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	qhacc
@@ -20,7 +20,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 USE_KDELIBS_VER=3
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-qhacc-config=${X11BASE}/bin
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/french/med/Makefile b/french/med/Makefile
index 7db4c097602d..2e2e07b97893 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	med
 PORTVERSION=	2.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french science
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 
@@ -31,7 +31,7 @@ CONFIGURE_ENV+=	HDF5HOME=${LOCALBASE} CPPFLAGS="${PTHREAD_CFLAGS}"	\
 		--with-f90=${FC}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_LDCONFIG=	yes
 
 DOC2FIX=	. gif html jpg png tests
diff --git a/ftp/moftpd/Makefile b/ftp/moftpd/Makefile
index 729665a8fb66..6a64a1205a5d 100644
--- a/ftp/moftpd/Makefile
+++ b/ftp/moftpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moftpd
 PORTVERSION=	1.2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.morth.org/moftpd/ \
 		${MASTER_SITE_LOCAL}
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	clement
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	A powerful FTP server supporting IPv6, TLS, and much more
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GMAKE=	yes
 USE_RC_SUBR=	yes
 USE_PERL5_BUILD=yes
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index f76c3dd241c3..0e4ab1401aa7 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.1rc3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -43,7 +43,7 @@ PORTEXAMPLES=	ASCII.html CreateHome.html Filters.html SQL.html Umask.html \
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 
 USE_RC_SUBR=	proftpd.sh
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index f76c3dd241c3..0e4ab1401aa7 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.1rc3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -43,7 +43,7 @@ PORTEXAMPLES=	ASCII.html CreateHome.html Filters.html SQL.html Umask.html \
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 
 USE_RC_SUBR=	proftpd.sh
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index f7ad993ad489..e3928f4821ee 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atr3d
 PORTVERSION=	0.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/
 DISTNAME=	${PORTNAME}_source_${PORTVERSION}
@@ -33,7 +33,7 @@ CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-sound
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		SDL_CONFIG="${SDL_CONFIG}"
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 
 CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index d5a15ff7e83b..31611dbd76d6 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cgoban
 PORTVERSION=	1.9.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cgoban1
@@ -17,16 +17,14 @@ COMMENT=	Internet Go Server client and game editor
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:253
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
-		AUTOHEADER="${TRUE}"
+GNU_CONFIGURE=	yes
 
 MAN6=		cgoban.6
 PLIST_FILES=	bin/cgoban
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/bin/gnugo|${LOCALBASE}/bin/gnugo|' ${WRKSRC}/src/cgoban.c
+	@${REINPLACE_CMD} -e 's|/usr/bin/gnugo|${LOCALBASE}/bin/gnugo|' ${WRKSRC}/src/cgoban.c
+	@${REINPLACE_CMD} -e 's|linux/soundcard.h|sys/soundcard.h|' ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cgoban ${PREFIX}/bin
diff --git a/games/cgoban/files/patch-configure.in b/games/cgoban/files/patch-configure.in
index d903bef34c64..e69de29bb2d1 100644
--- a/games/cgoban/files/patch-configure.in
+++ b/games/cgoban/files/patch-configure.in
@@ -1,19 +0,0 @@
---- configure.in.orig	Tue Jan  7 04:31:33 2003
-+++ configure.in	Mon Nov 17 21:22:54 2003
-@@ -168,7 +158,6 @@
- AC_MINIX
- AC_PROG_CPP
- AC_EXEEXT
--WMS_GET_CFLAGS
- 
- AM_CONFIG_HEADER(configure.h)
- AC_SUBST(LIBS)dnl
-@@ -185,7 +174,7 @@
- AC_TIME_WITH_SYS_TIME
- AC_CHECK_HEADER(sun/audioio.h, AC_DEFINE(SUN_SOUND))
- if test $ac_cv_header_sun_audioio_h = no; then
--  AC_CHECK_HEADER(linux/soundcard.h, AC_DEFINE(LINUX_SOUND))
-+  AC_CHECK_HEADER(sys/soundcard.h, AC_DEFINE(LINUX_SOUND))
- fi
- WMS_CHECK_H_ERRNO
- WMS_CHECK_SOCKETS
diff --git a/games/glest/Makefile b/games/glest/Makefile
index e46db8d9b686..8c677c27cfd0 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glest
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +25,7 @@ BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 RUN_DEPENDS=	${DATADIR}/configuration.xml:${PORTSDIR}/games/glest-data
 
 USE_XLIB=	yes
-USE_AUTOTOOLS=	automake:15:env autoconf:259:env
+USE_AUTOTOOLS=	automake:15:env autoconf:261:env
 USE_ZIP=	yes
 USE_DOS2UNIX=	yes
 USE_GCC=	3.2+
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index 75dd9f464870..42255b33c9d4 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gno3dtet
 PORTVERSION=	1.96.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	http://eseb.net/ftp/gno3dtet/
 EXTRACT_SUFX=	.tgz
@@ -20,7 +20,7 @@ EXTRACT_DEPENDS=intltoolize:${PORTSDIR}/textproc/intltool
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui librsvg2
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoheader:259 automake:19 aclocal:19 autoconf:259
+USE_AUTOTOOLS=	autoheader:261 automake:19 aclocal:19 autoconf:261
 ACLOCAL_ARGS=	-I m4 -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-a -c -f
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/kmastermind/Makefile b/games/kmastermind/Makefile
index d5b83e3c7026..685dbf358079 100644
--- a/games/kmastermind/Makefile
+++ b/games/kmastermind/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kmastermind
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games kde
 MASTER_SITES=	http://www.kde-apps.org/CONTENT/content-files/
 DISTNAME=	20292-${PORTNAME}-${PORTVERSION}
@@ -16,7 +16,7 @@ COMMENT=	Mastermind game designed for K Desktop Environment
 
 BUILD_DEPENDS=		${NONEXISTENT}:${PORTSDIR}/x11/kdelibs3:extract
 
-USE_AUTOTOOLS=		automake:19:env autoconf:259:env libtool:15
+USE_AUTOTOOLS=		automake:19:env autoconf:261:env libtool:15
 USE_PERL5_BUILD=	yes
 USE_KDELIBS_VER=	3
 USE_BZIP2=		yes
diff --git a/games/moon-buggy/Makefile b/games/moon-buggy/Makefile
index 02e6cf591257..532e59c5e8c9 100644
--- a/games/moon-buggy/Makefile
+++ b/games/moon-buggy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	moon-buggy
 PORTVERSION=	1.0.51
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://seehuhn.de/media/programs/
 .if defined (WITH_ESOUND)
@@ -23,7 +24,7 @@ COMMENT=	Drive a buggy across the moons surface
 LIB_DEPENDS=	esd:${PORTSDIR}/audio/esound:install
 .endif
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--sharedstatedir=/var/games\
 		--with-setgid=games
diff --git a/games/planeshift/Makefile b/games/planeshift/Makefile
index 6438fec10d8c..f5a0ff66b0ea 100644
--- a/games/planeshift/Makefile
+++ b/games/planeshift/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	planeshift
 PORTVERSION=	0.3.017
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://alex.foxybanana.com/freebsd/
 
@@ -23,7 +23,7 @@ LIB_DEPENDS=	cal3d.12:${PORTSDIR}/graphics/cal3d \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:15:env autoconf:259:env
+USE_AUTOTOOLS=	automake:15:env autoconf:261:env
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_LIBS}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 89288b07fbce..7434a734b087 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quake2forge
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.galgenberg.net/distfiles/
 DISTNAME=	quake2-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	quake2-${PORTVERSION}
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	First Person Shooter with many addons available
 
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_BZIP2=	yes
 
 CONFIGURE_ARGS=	--program-transform-name='s/^quake2$$/${PORTNAME}/' \
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 68c61b96094d..6c1c70cb86c9 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	agg
 PORTVERSION=	2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.antigrain.com/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -22,7 +22,7 @@ USE_GNOME=	pkgconfig gnomehack
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
-USE_AUTOTOOLS=	autoconf:259:env automake:15:env libtool:15:env
+USE_AUTOTOOLS=	autoconf:261:env automake:15:env libtool:15:env
 MAKE_ENV=	C="${CC}" CXX="${CXX}" AGGCXXFLAGS="${CXXFLAGS}"
 CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -I../include -L./
 
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 05ea8dd43977..02d3e29c8c73 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cal3d
 PORTVERSION=	20060720
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	acm/${PORTNAME}
@@ -22,7 +23,7 @@ USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 USE_GCC=	3.4+
-USE_AUTOTOOLS=	automake:19 autoheader:259 libtool:15
+USE_AUTOTOOLS=	automake:19 autoheader:261 libtool:15
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 1cc37d9072d0..4a3e511be9e5 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cal3d
 PORTVERSION=	0.11.0
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://download.gna.org/cal3d/sources/
 DIST_SUBDIR=	${PORTNAME}
@@ -18,7 +19,7 @@ CONFLICTS=	cal3d-devel-[0-9]*
 
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19 autoheader:259 libtool:15
+USE_AUTOTOOLS=	automake:19 autoheader:261 libtool:15
 USE_LDCONFIG=	yes
 USE_GCC=	3.4+
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/graphics/demeter/Makefile b/graphics/demeter/Makefile
index 6fd4e68db27b..01c339259536 100644
--- a/graphics/demeter/Makefile
+++ b/graphics/demeter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	demeter
 PORTVERSION=	3.21
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +24,7 @@ USE_GL=		yes
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 WANT_SDL=	yes
-USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:15 autoconf:261 libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index adf77d5bf131..2ee5597c5b19 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	divxcalc
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://imagef1.net.nz/divxcalc/
 
@@ -18,7 +18,7 @@ COMMENT=	DivX Calculator
 USE_BZIP2=	yes
 USE_QT_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:15:env autoconf:253:env
+USE_AUTOTOOLS=	automake:15:env autoconf:261:env
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
diff --git a/graphics/divxcalc/files/patch-admin::detect-autoconf.sh b/graphics/divxcalc/files/patch-admin::detect-autoconf.sh
index 2722804ad60a..e69de29bb2d1 100644
--- a/graphics/divxcalc/files/patch-admin::detect-autoconf.sh
+++ b/graphics/divxcalc/files/patch-admin::detect-autoconf.sh
@@ -1,15 +0,0 @@
---- admin/detect-autoconf.sh.orig	Sun May 25 13:51:54 2003
-+++ admin/detect-autoconf.sh	Wed Jul  7 05:36:58 2004
-@@ -3,7 +3,7 @@
- # Global variables...
--AUTOCONF="autoconf"
--AUTOHEADER="autoheader"
--AUTOM4TE="autom4te"
--AUTOMAKE="automake"
--ACLOCAL="aclocal"
-+AUTOCONF="autoconf-2.53"
-+AUTOHEADER="autoheader-2.53"
-+AUTOM4TE="autom4te-2.53"
-+AUTOMAKE="automake-1.5"
-+ACLOCAL="aclocal-1.5"
- 
diff --git a/graphics/gephex/Makefile b/graphics/gephex/Makefile
index d9f9e0c72ae1..6ec379b0824a 100644
--- a/graphics/gephex/Makefile
+++ b/graphics/gephex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gephex
 PORTVERSION=	0.4.3b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.gephex.org/download/src/
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
-USE_AUTOTOOLS=	autoconf:259 autoheader:259 libtool:15 aclocal:19 automake:19
+USE_AUTOTOOLS=	autoconf:261 autoheader:261 libtool:15 aclocal:19 automake:19
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-V4L --without-ASOUNDLIB --without-LINUX_JOYSTICK \
 		--without-FFMPEG --without-AVIFILE --without-MPEG3 \
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index 4e38c2803e74..3108e890f72b 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glide3
 PORTVERSION=	20020113
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.freebsd.org/~anholt/dri/files/
 DISTNAME=	Glide3-FreeBSD-${PORTVERSION}
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:14 autoconf:261 libtool:15
 AUTOMAKE_ARGS=	-a
 
 MAKEFILE=	makefile.autoconf
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index a67ee42aad8d..3fb305d8642c 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hugin
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,7 +28,7 @@ RUN_DEPENDS=	PTOptimizer:${PORTSDIR}/graphics/libpano12 \
 
 USE_BZIP2=	yes
 
-USE_AUTOTOOLS=	autoconf:259:env autoheader:259:env aclocal:19:env \
+USE_AUTOTOOLS=	autoconf:261:env autoheader:261:env aclocal:19:env \
 		automake:19:env libtool:15:env
 
 IS_INTERACTIVE=	yes
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index 1d4ca1aec1e3..868b9acc9b4b 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ivtools
 PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ARGS=	--with-tiff=${PREFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 USE_LDCONFIG=	yes
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 27660244d8f5..f13f68d0f9ae 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libexif-gtk
 PORTVERSION=	0.3.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libexif
@@ -18,7 +18,7 @@ COMMENT=	GTK+ widgets to display/edit EXIF tags
 LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
 
 USE_GNOME=	gnomehack gnometarget gtk20
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index fa8393d5af6e..63bd81295847 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	libpano12
 PORTVERSION=	2.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics java
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	panotools
@@ -27,7 +27,7 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 
 USE_GNOME=	gtk20 glib20 pango atk
 
-USE_AUTOTOOLS=	autoconf:259:env autoheader:259:env aclocal:19:env \
+USE_AUTOTOOLS=	autoconf:261:env autoheader:261:env aclocal:19:env \
 		automake:19:env libtool:15:env
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -50,9 +50,10 @@ CONFIGURE_ARGS+=	--without-java
 .endif
 
 pre-configure:
-	cd ${WRKSRC} && \
-	${SETENV} ${AUTOTOOLS_ENV} \
-	ACLOCAL="${ACLOCAL} -I ${LOCALBASE}/share/aclocal" \
-	./bootstrap
+	cd ${WRKSRC} && ./bootstrap
+#\
+#	${SETENV} ${AUTOTOOLS_ENV} \
+#	ACLOCAL="${ACLOCAL} -I ${LOCALBASE}/share/aclocal" \
+#	./bootstrap
 
 .include <bsd.port.mk>
diff --git a/graphics/libpano12/files/patch-bootstrap b/graphics/libpano12/files/patch-bootstrap
index ebd09788722c..88ee4d68f790 100644
--- a/graphics/libpano12/files/patch-bootstrap
+++ b/graphics/libpano12/files/patch-bootstrap
@@ -1,8 +1,11 @@
---- bootstrap.orig	Tue Jan 16 18:58:24 2007
-+++ bootstrap	Tue Jan 16 18:58:39 2007
-@@ -96,27 +96,3 @@
- $AUTOMAKE --add-missing --copy || exit $?
- 
+--- bootstrap.orig	2005-01-07 01:26:26.000000000 -0800
++++ bootstrap	2007-09-22 19:46:15.000000000 -0700
+@@ -44,3 +44,3 @@
+ 	case $autoconf_version in
+-	    2.5*)
++	    2.[56]*)
+ 		have_autoconf=true
+@@ -98,25 +98 @@
  $AUTOCONF || exit $?
 -
 -cd $ORIGDIR || exit $?
diff --git a/graphics/lodju/Makefile b/graphics/lodju/Makefile
index 10d610e90f92..4b7a09cacac0 100644
--- a/graphics/lodju/Makefile
+++ b/graphics/lodju/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lodju
 PORTVERSION=	1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES+=	graphics
 MASTER_SITES=	http://liw.iki.fi/liw/lodju/tarballs/
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	glade-gnome:${PORTSDIR}/x11-toolkits/rep-gtk
 MAN1=		lodju-create.1 lodju-gallery.1 lodju.1
 MANCOMPRESSED=	yes
 
-USE_AUTOTOOLS=	autoconf:253:env
+USE_AUTOTOOLS=	autoconf:261:env
 HAS_CONFIGURE=  yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk12 gdkpixbuf
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index a3d5abf2055b..490e14a55563 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pixie
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +23,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 USE_GL=		yes
 USE_X_PREFIX=	yes
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
-USE_AUTOTOOLS=	autoconf:259 aclocal:19 automake:19 libtool:15
+USE_AUTOTOOLS=	autoconf:261 aclocal:19 automake:19 libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
 		CXXFLAGS="${CXXFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index dd347465338e..ad10dd9bd9aa 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	povray
 PORTVERSION=	3.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
@@ -29,7 +29,7 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 LATEST_LINK=	${PORTNAME}36
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index dd347465338e..ad10dd9bd9aa 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	povray
 PORTVERSION=	3.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
@@ -29,7 +29,7 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 LATEST_LINK=	${PORTNAME}36
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index dd347465338e..ad10dd9bd9aa 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	povray
 PORTVERSION=	3.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
@@ -29,7 +29,7 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 LATEST_LINK=	${PORTNAME}36
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index f6beee10792d..a5d134ba3a08 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wxsvg
 DISTVERSION=	1.0b7_2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,7 @@ COMMENT=	C++ library to create, manipulate, and render SVG files
 
 AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15 automake:15 autoconf:259
+USE_AUTOTOOLS=	libtool:15 automake:15 autoconf:261
 USE_GNOME=	libartlgpl2
 USE_GMAKE=	yes
 USE_WX=		2.6
diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile
index deec15a9d741..ff1ecbcbd237 100644
--- a/graphics/xaralx/Makefile
+++ b/graphics/xaralx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XaraLX
 PORTVERSION?=	0.7r1692
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://downloads.xara.com/opensource/ \
 		${MASTER_SITE_LOCAL}
@@ -27,7 +27,7 @@ RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 LIB_DEPENDS+=	dlmalloc.2:${PORTSDIR}/devel/libdlmalloc \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOTOOLS=	autoconf:259:env aclocal:19:env automake:19:env libtool:15:env
+USE_AUTOTOOLS=	autoconf:261:env aclocal:19:env automake:19:env libtool:15:env
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--program-suffix=${PKGNAMESUFFIX}
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 79855b40d969..56ca27646383 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -26,7 +26,7 @@ LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib \
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 247f80039db6..452161ef3ae9 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	FreeWnn
 PORTVERSION=	1.1.1.a021
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	japanese
 MASTER_SITES=	ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_SOURCEFORGE_JP}
@@ -21,7 +21,7 @@ COMMENT?=	A Japanese/Chinese/Korean input method (Japanese client libraries)
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:253 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_LDCONFIG=	yes
 MAKE_ARGS=	CDEBUGFLAGS="${CFLAGS}"
 ALL_TARGET=	includes all
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index cbda97521a21..3ce5d61770bf 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aterm
 PORTVERSION=	0.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	japanese x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +25,7 @@ COMMENT=	A color vt102 terminal emulator with transparency support
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
-USE_AUTOTOOLS=	autoconf:253:env
+USE_AUTOTOOLS=	autoconf:261:env
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index efb79c7594a1..2a01cabd8b41 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebview
 PORTVERSION=	0.2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ CONFLICTS=	ja-ebview-gtk2-*
 USE_GETOPT_LONG=	yes
 USE_GNOME=	imlib
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index 663d3b732cd7..4a4afd57b2ee 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-canna
 PORTVERSION=	12.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -27,7 +27,7 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_XLIB=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/japanese/iiimf-le-canna/files/patch-Makefile b/japanese/iiimf-le-canna/files/patch-Makefile
index a72a0f768306..f8060d2ab6a7 100644
--- a/japanese/iiimf-le-canna/files/patch-Makefile
+++ b/japanese/iiimf-le-canna/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile
index 7b0c0f1b9e8f..aaf236f21b3d 100644
--- a/japanese/iiimf-le-freewnn/Makefile
+++ b/japanese/iiimf-le-freewnn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-freewnn
 PORTVERSION=	12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/japanese/iiimf-le-freewnn/files/patch-Makefile b/japanese/iiimf-le-freewnn/files/patch-Makefile
index a72a0f768306..f8060d2ab6a7 100644
--- a/japanese/iiimf-le-freewnn/files/patch-Makefile
+++ b/japanese/iiimf-le-freewnn/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/japanese/mell/Makefile b/japanese/mell/Makefile
index 7891697dfdf1..b457327a9b0d 100644
--- a/japanese/mell/Makefile
+++ b/japanese/mell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mell
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://taiyaki.org/elisp/mell/src/
 
@@ -14,7 +15,7 @@ MAINTAINER=	otsuji@users.sourceforge.jp
 COMMENT=	Emacs Lisp for taiyaki-elisp, especially for the prime
 
 GNU_CONFIGURE=		yes
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 AUTOMAKE_ARGS=		-af
 
 pre-configure:
diff --git a/japanese/prime-dict/Makefile b/japanese/prime-dict/Makefile
index 1a7eeca99acf..286b73d678e8 100644
--- a/japanese/prime-dict/Makefile
+++ b/japanese/prime-dict/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	prime
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://prime.sourceforge.jp/src/
 PKGNAMESUFFIX=	-dict
@@ -19,7 +20,7 @@ USE_RUBY=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 
 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime-el/Makefile b/japanese/prime-el/Makefile
index ebd9f8559e32..2410351e661f 100644
--- a/japanese/prime-el/Makefile
+++ b/japanese/prime-el/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prime
 PORTVERSION=	1.5.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://prime.sourceforge.jp/src/
 PKGNAMESUFFIX=	-el
@@ -21,7 +21,7 @@ RUN_DEPENDS+=	${LOCALBASE}/share/emacs/site-lisp/init-mell.el:${PORTSDIR}/japane
 		prime:${PORTSDIR}/japanese/prime
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 
 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime/Makefile b/japanese/prime/Makefile
index c0e392a001a5..a4a5958317f0 100644
--- a/japanese/prime/Makefile
+++ b/japanese/prime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prime
 DISTVERSION=	1.0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://prime.sourceforge.jp/src/
 
@@ -26,7 +26,7 @@ RUBY_WITH_PTHREAD=	yes
 USE_GNOME=		pkgconfig
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 
 PLIST_SUB=		X11BASE=${X11BASE}
 
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index 89a1ac39c07b..f5300a9e2d2b 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	samba
 PORTVERSION=	${SAMBA_VERSION}.j${SAMBA_JA_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \
 		ftp://ftp.iij.ad.jp/pub/SAMBA/samba-jp/%SUBDIR%/ \
@@ -26,7 +26,7 @@ SAMBA_JA_VERSION=	1.0beta1
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 
 # directories
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/japanese/suikyo/Makefile b/japanese/suikyo/Makefile
index 2efc04163919..c19cefcda8f8 100644
--- a/japanese/suikyo/Makefile
+++ b/japanese/suikyo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	suikyo
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://prime.sourceforge.jp/src/
 
@@ -17,7 +18,7 @@ USE_RUBY=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 
 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index 55d1ac38321b..9d4150ba2836 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sablevm
 PORTVERSION=	1.1.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=sablevm
@@ -23,7 +23,7 @@ LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt \
 		gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 
-USE_AUTOTOOLS=	autoconf:259 libltdl:15 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libltdl:15 libtool:15
 #GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile
index 4c93719d164d..c3985ab5aa23 100644
--- a/korean/iiimf-le-hangul/Makefile
+++ b/korean/iiimf-le-hangul/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-hangul
 PORTVERSION=	12.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	korean textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -23,7 +23,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/korean/iiimf-le-hangul/files/patch-Makefile b/korean/iiimf-le-hangul/files/patch-Makefile
index a72a0f768306..f8060d2ab6a7 100644
--- a/korean/iiimf-le-hangul/files/patch-Makefile
+++ b/korean/iiimf-le-hangul/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 3da86bb67f9c..9a9a8a5c46fa 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcl
 PORTVERSION=	2.6.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gcl
@@ -21,7 +21,6 @@ LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
 ONLY_FOR_ARCHS=	i386
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
 USE_GMAKE=	yes
 USE_XLIB=	yes
 CONFIGURE_ARGS=--prefix=${PREFIX} \
@@ -46,7 +45,6 @@ INFO=	gcl-si gcl-tk
 PLIST_SUB=	GCL_VER=${PORTVERSION}
 
 pre-configure:
-	${RM} -f ${WRKSRC}/configure
 	${SED} -i '' \
 		-e 's|@@CFLAGS@@|${CFLAGS} -I${LOCALBASE}/include|' \
 		-e 's|@@LOCALLIBS@@|-L${LOCALBASE}/lib -lgmp -lm -lreadline|' \
diff --git a/lang/gcl/files/patch-configure.in b/lang/gcl/files/patch-configure.in
index 1af3b22e66be..e69de29bb2d1 100644
--- a/lang/gcl/files/patch-configure.in
+++ b/lang/gcl/files/patch-configure.in
@@ -1,27 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvsroot/gcl/gcl/configure.in,v
-retrieving revision 1.112.4.1.2.2.2.47.2.3.2.1.4.2
-diff -u -d -r1.112.4.1.2.2.2.47.2.3.2.1.4.2 configure.in
---- configure.in	13 Aug 2004 16:15:26 -0000	1.112.4.1.2.2.2.47.2.3.2.1.4.2
-+++ configure.in	18 Aug 2004 16:29:18 -0000
-@@ -1657,15 +1657,15 @@
- if test -f ${TK_CONFIG_PREFIX}/../include/tk.h ; then
-   TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../include
-   else
--  if test -f /usr/include/tcl${TCL_VERSION}/tk.h ; then
--    TK_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
-+  if test -f ${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}/tk.h ; then
-+    TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}
-   fi	
- fi
- if test -f ${TCL_CONFIG_PREFIX}/../include/tcl.h ; then
-   TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../include
-   else
--  if test -f /usr/include/tcl${TCL_VERSION}/tcl.h ; then
--    TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
-+  if test -f ${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}/tcl.h ; then
-+    TCL_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}
-   fi
- fi
- AC_CHECK_LIB(lieee,main,have_ieee=1,have_ieee=0)
diff --git a/lang/gnat-glade/Makefile b/lang/gnat-glade/Makefile
index 7346a352277a..3dbfdc619feb 100644
--- a/lang/gnat-glade/Makefile
+++ b/lang/gnat-glade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnat-glade
 PORTVERSION=	2005
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTNAME=	glade-gpl-${PORTVERSION}-src
@@ -17,7 +18,7 @@ COMMENT=	GNU Ada distributed systems annex
 
 BUILD_DEPENDS=	gnatgcc:${PORTSDIR}/lang/gnat
 
-USE_AUTOTOOLS=	automake:14 autoconf:259
+USE_AUTOTOOLS=	automake:14 autoconf:261
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --program-transform-name=''
 
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index b7c813043f34..3e210d1cd69f 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnustep-base
 PORTVERSION=	1.13.1
+PORTREVISION=	1
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
@@ -18,7 +19,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-procfs
 CONFIGURE_TARGET=
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index ba639a30901f..a297c0dd9606 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gprolog
 PORTVERSION=	1.2.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_DEBIAN} ftp://ftp.inria.fr/INRIA/Projects/contraintes/gprolog/:doc
 MASTER_SITE_SUBDIR=	pool/main/g/${PORTNAME}
@@ -27,7 +27,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}.orig/src/src
 
 USE_GCC=	2.95
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-c-flags="${CFLAGS}" \
 		--with-doc-dir=none \
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index e6dc0a1e7831..3aa045909594 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	otcl
 PORTVERSION=	1.13
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	lang tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -22,7 +22,7 @@ USE_TK=		80+
 USE_TK_NO_THREADS=	yes
 USE_XORG=	xext
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_LDCONFIG=	yes
 
 .if !defined(NOPORTDOCS)
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index fccd7395cb23..2efcb9e04412 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php4
 PORTVERSION=	4.4.7
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -23,7 +23,7 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
 .if !defined(PKGNAMESUFFIX)
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GETOPT_LONG=yes
 
 CONFIGURE_ARGS=	--enable-versioning \
diff --git a/lang/php4/files/patch-scripts::phpize.in b/lang/php4/files/patch-scripts::phpize.in
index 3a885fd91475..48cf8a90d85a 100644
--- a/lang/php4/files/patch-scripts::phpize.in
+++ b/lang/php4/files/patch-scripts::phpize.in
@@ -6,8 +6,8 @@
  {
 -  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
 -  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
-+  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.59
-+  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.59
++  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.61
++  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.61
    
    if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
      cat <<EOF
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 1550c9f9ac19..94031a893fed 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -20,7 +20,7 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
 .if !defined(PKGNAMESUFFIX)
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GETOPT_LONG=yes
 
 CONFIGURE_ARGS=	\
diff --git a/lang/php5/files/patch-scripts::phpize.in b/lang/php5/files/patch-scripts::phpize.in
index 198f1b397c71..c5331abc2505 100644
--- a/lang/php5/files/patch-scripts::phpize.in
+++ b/lang/php5/files/patch-scripts::phpize.in
@@ -6,8 +6,8 @@
  {
 -  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
 -  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
-+  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.59
-+  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.59
++  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.61
++  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.61
    
    if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
      cat <<EOF
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 1550c9f9ac19..94031a893fed 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php5
 PORTVERSION=	5.2.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -20,7 +20,7 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
 .if !defined(PKGNAMESUFFIX)
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GETOPT_LONG=yes
 
 CONFIGURE_ARGS=	\
diff --git a/lang/php53/files/patch-scripts::phpize.in b/lang/php53/files/patch-scripts::phpize.in
index 198f1b397c71..c5331abc2505 100644
--- a/lang/php53/files/patch-scripts::phpize.in
+++ b/lang/php53/files/patch-scripts::phpize.in
@@ -6,8 +6,8 @@
  {
 -  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
 -  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
-+  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.59
-+  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.59
++  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.61
++  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.61
    
    if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
      cat <<EOF
diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile
index c365e346907e..cb805e85b50a 100644
--- a/lang/sdcc/Makefile
+++ b/lang/sdcc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdcc
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sdcc
@@ -37,7 +38,6 @@ OPTIONS=	MCS51   "Intel 8051 port" on \
 CONFIGURE_ARGS+=	--disable-51
 PLIST_SUB+=		MCS51DS390="@comment "
 .else
-USE_AUTOTOOLS+=		autoconf:259
 PLIST_SUB+=		MCS51DS390=""
 .endif
 
diff --git a/mail/claws-mail-etpan_privacy/Makefile b/mail/claws-mail-etpan_privacy/Makefile
index 010796a5b35e..68325b7afcb1 100644
--- a/mail/claws-mail-etpan_privacy/Makefile
+++ b/mail/claws-mail-etpan_privacy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etpan_privacy
 PORTVERSION=	0.15.5
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -21,7 +21,7 @@ RUN_DEPENDS=	claws-mail>=3.0.1:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 PLIST_FILES=	lib/claws-mail/plugins/etpan-privacy.a \
 	lib/claws-mail/plugins/etpan-privacy.la \
diff --git a/mail/claws-mail-maildir/Makefile b/mail/claws-mail-maildir/Makefile
index a9267b9e3dc4..c9d336189a29 100644
--- a/mail/claws-mail-maildir/Makefile
+++ b/mail/claws-mail-maildir/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	maildir
 PORTVERSION=	0.24.4
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -20,7 +20,7 @@ RUN_DEPENDS=	claws-mail>=3.0.1:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_BDB=	yes
 
 CONFIGURE_ENV=	CFLAGS="-I${BDB_INCLUDE_DIR}" \
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 15754a14a47a..6f80dabde167 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -38,7 +38,6 @@ USE_ICONV=	yes
 USE_XORG=	ice sm x11 xau xcursor xdmcp xext xfixes xi xinerama xrandr \
 		xrender
 USE_GNOME=	gnomehack pkgconfig gtk20 glib20 atk libartlgpl2 pango libxml2
-#USE_AUTOTOOLS=	autoconf:259 libtool:15
 GNU_CONFIGURE=	yes
 USE_GCC=	3.3+
 WANT_GNOME=	yes
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 3e491085073b..3450f2ef9105 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.2.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -102,7 +102,7 @@ EXTRA_PATCHES+=	${FILESDIR}/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::berkdb.m4 \
 		${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
 		${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS=	autoconf:259 autoheader:259
+USE_AUTOTOOLS=	autoconf:261 autoheader:261
 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 6798da5ca7e6..1023110defbe 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.9
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
 		http://ftp.andrew.cmu.edu/pub/cyrus/ \
@@ -104,7 +104,7 @@ CONFIGURE_ARGS+=--enable-netscapehack
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
 		${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS=	autoconf:259 autoheader:259
+USE_AUTOTOOLS=	autoconf:261 autoheader:261
 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 6798da5ca7e6..1023110defbe 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.9
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
 		http://ftp.andrew.cmu.edu/pub/cyrus/ \
@@ -104,7 +104,7 @@ CONFIGURE_ARGS+=--enable-netscapehack
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
 		${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS=	autoconf:259 autoheader:259
+USE_AUTOTOOLS=	autoconf:261 autoheader:261
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 83e26c30d417..54163231217f 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -13,7 +13,7 @@
 
 PORTNAME=	dspam-devel
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	# set later
@@ -97,7 +97,7 @@ OPTIONS+=	LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool:15
 .ifdef(SNAP_DATE)
-USE_AUTOTOOLS+=	autoconf:259:env automake:19
+USE_AUTOTOOLS+=	autoconf:261:env automake:19
 .endif
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index d50023b65b62..e9d5153d97f1 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -110,7 +110,7 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.5.16
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -161,7 +161,7 @@ CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
 
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 USE_OPENSSL=	yes
 
 PLIST=		${WRKDIR}/PLIST
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 4f8d8791034c..a0f27a9d1587 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.2.3
+PORTREVISION=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -80,7 +81,7 @@ DIST_SUBDIR=	mutt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 4f8d8791034c..a0f27a9d1587 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.2.3
+PORTREVISION=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -80,7 +81,7 @@ DIST_SUBDIR=	mutt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 793f833012a0..ac8752aab124 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -53,7 +53,7 @@
 
 PORTNAME=	nmh
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	nmh
@@ -63,7 +63,7 @@ COMMENT=	A cleaned up MH mailer suite
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec/nmh \
 		--sysconfdir=${PREFIX}/etc/nmh
 .ifdef NMH_EDITOR
diff --git a/mail/postfix-gps-devel/Makefile b/mail/postfix-gps-devel/Makefile
index e09eb9f7db8b..984ff7342b8a 100644
--- a/mail/postfix-gps-devel/Makefile
+++ b/mail/postfix-gps-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gps
 PORTVERSION=	1.004
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	http://mimo.gn.apc.org/gps/
 PKGNAMEPREFIX=	postfix-
@@ -23,7 +24,7 @@ SCRIPT_FILES=	gps-maintain.pl gps-db-update.pl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 USE_GCC=	3.4
 CONFIGURE_ARGS=	--bindir=${PREFIX}/libexec --includedir=${PREFIX}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"	\
diff --git a/mail/postfix-gps/Makefile b/mail/postfix-gps/Makefile
index e4afad433445..1419cc377c71 100644
--- a/mail/postfix-gps/Makefile
+++ b/mail/postfix-gps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gps
 PORTVERSION=	0.93
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail security
 MASTER_SITES=	http://mimo.gn.apc.org/gps/
 PKGNAMEPREFIX=	postfix-
@@ -24,7 +24,7 @@ SCRIPT_FILES=	gps-maintain.pl gps-db-update.pl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 USE_GCC=	3.4+
 CONFIGURE_ARGS=	--bindir=${PREFIX}/libexec --includedir=${PREFIX}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include"	\
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 295233fb6df1..5987c6c1bb72 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qpopper
 PORTVERSION=	4.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
 		http://core.ring.gr.jp/archives/net/mail/qpopper/
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	bc979@lafn.org
 COMMENT=	Berkeley POP 3 server (now maintained by Qualcomm)
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 CONFIGURE_ENV=	LIBS="-lcrypt -lmd -lutil -L${LOCALBASE}/lib" \
diff --git a/mail/quickml/Makefile b/mail/quickml/Makefile
index 075e53e8838b..1372f194c75b 100644
--- a/mail/quickml/Makefile
+++ b/mail/quickml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quickml
 PORTVERSION=	0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://0xcc.net/quickml/
 
@@ -22,7 +22,7 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 QUICKML_USER=	quickml
 QUICKML_GROUP=	quickml
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 USE_RUBY=	yes
 
diff --git a/mail/sccmilter/Makefile b/mail/sccmilter/Makefile
index 404338037346..fb58a250642b 100644
--- a/mail/sccmilter/Makefile
+++ b/mail/sccmilter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sccmilter
 PORTVERSION=	0.95.7
+PORTREVISION=	1
 CATEGORIES=	mail sysutils
 MASTER_SITES=	ftp://ftp.granch.ru/pub/kavmilter/
 
@@ -20,7 +21,7 @@ IGNORE=		requires Sendmail 8.12; upgrade the base system
 USE_BZIP2=		yes
 USE_GETOPT_LONG=	yes
 USE_RC_SUBR=		yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=/var
diff --git a/mail/smtp-gated/Makefile b/mail/smtp-gated/Makefile
index b0d07822912a..d60a49f7dde7 100644
--- a/mail/smtp-gated/Makefile
+++ b/mail/smtp-gated/Makefile
@@ -5,22 +5,22 @@
 # $FreeBSD$
 #
 
-PORTNAME=		smtp-gated
+PORTNAME=	smtp-gated
 PORTVERSION=	1.4.12.r9
-PORTREVISION=	0
-CATEGORIES=		mail
+PORTREVISION=	1
+CATEGORIES=	mail
 MASTER_SITES=	http://smtp-proxy.klolik.org/
-DISTNAME=		${PORTNAME}-1.4.12-rc9
+DISTNAME=	${PORTNAME}-1.4.12-rc9
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		This software block SMTP sessions used by e-mail worms and viruses
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	This software block SMTP sessions used by e-mail worms and viruses
 
-HAS_CONFIGURE=		yes
-USE_AUTOTOOLS=		autoheader:259
+HAS_CONFIGURE=	yes
+USE_AUTOTOOLS=	autoheader:261
 
-OPTIONS=		NAT "NAT transparent proxy code" On \
-				CHUNKING "Enable support for SMTP CHUNKING extension" Off	\
-				ECONNRESET "Be quiet about Connection reset by peer message" Off
+OPTIONS=	NAT "NAT transparent proxy code" On \
+		CHUNKING "Enable support for SMTP CHUNKING extension" Off \
+		ECONNRESET "Be quiet about Connection reset by peer message" Off
 
 .include <bsd.port.pre.mk>
 
@@ -38,8 +38,8 @@ CONFIGURE_ARGS+=    --enable-chunking
 CONFIGURE_ARGS+=    --enable-silent-econnreset
 .endif
 
-PLIST_FILES=        sbin/smtp-gated
-MAN5=				smtp-gated.conf.5
-MAN8=				smtp-gated.8
+PLIST_FILES=	sbin/smtp-gated
+MAN5=		smtp-gated.conf.5
+MAN8=		smtp-gated.8
 
 .include <bsd.port.post.mk>
diff --git a/math/algae/Makefile b/math/algae/Makefile
index 6a8d49318dfb..739f3054845c 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	algae
 PORTVERSION=	4.3.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ MAINTAINER=	laszlof@FreeBSD.org
 COMMENT=	A programming language for numerical analysis
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 ALGAE_VERSION=	${PORTVERSION}
 PLIST_SUB=	ALGAE_VERSION=${ALGAE_VERSION}
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index a1bffbe0d93a..30b0d9b7aae6 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asir
 PORTVERSION=	20070806
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.jssac.org/pub/distfiles/asir/ \
 		ftp://ftp.asir.org/pub/asir/src/ \
@@ -20,7 +21,7 @@ COMMENT=	The system Risa/Asir is a general computer algebra system
 LIB_DEPENDS=	pari.2:${PORTSDIR}/math/pari
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:15 autoconf:253
+USE_AUTOTOOLS=	automake:15 autoconf:261
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-plot --enable-fep --enable-interval --with-pari
 ASIR_SRC_VERSION=	${PORTVERSION}
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 6cbbf377c878..9b3401323960 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geg
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.infolaunch.com/~daveb/
@@ -18,7 +18,7 @@ COMMENT=	Visualise multiple 2D-functions of one variable
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
-USE_AUTOTOOLS=	automake:15 autoconf:253
+USE_AUTOTOOLS=	automake:15 autoconf:261
 AUTOMAKE_ARGS=	-a -i
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index af7768b2164e..c6b9e1be41d3 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
@@ -25,7 +25,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnometarget gtk20 libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15 autoconf:259
+USE_AUTOTOOLS=	libtool:15 autoconf:261
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
 		LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}"
 CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 9eb960157f2f..88f560a9150f 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	maxima
 PORTVERSION=	5.13.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
@@ -22,7 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/${LISPPORT} \
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--with-posix-shell=${LOCALBASE}/bin/bash \
 			--with-wish=${LOCALBASE}/bin/wish8.4 \
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index db6ca09a9acf..610187a2f57a 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	2.9.14
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/\
@@ -33,7 +34,7 @@ USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259 autoheader:259
+USE_AUTOTOOLS=	autoconf:261 autoheader:261
 
 INFO=		octave liboctave
 MAN1=		octave.1 octave-bug.1 mkoctfile.1 octave-config.1
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 3284f998f54c..5c503b4b19a6 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	4.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math cad parallel
 MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
 EXTRACT_SUFX=	-src.tar.gz
@@ -23,7 +23,7 @@ RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 WANT_GNOME=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 CONFIGURE_ARGS=	--with-tk \
 		--with-tk-library=${LOCALBASE}/lib \
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index c0d828d70c87..ef82ee4140ea 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rtpmon
 PORTVERSION=	1.0a7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mbone tk83
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
@@ -17,7 +17,7 @@ COMMENT=	A program to montior loss in multicast sessions
 
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
-USE_AUTOTOOLS=	autoconf:253:env
+USE_AUTOTOOLS=	autoconf:261:env
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_GCC=	3.2
diff --git a/misc/skyutils/Makefile b/misc/skyutils/Makefile
index 15b3aaebfe9b..e288ab1fc690 100644
--- a/misc/skyutils/Makefile
+++ b/misc/skyutils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skyutils
 PORTVERSION=	2.9
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	laszlof
@@ -16,7 +17,7 @@ COMMENT=	A library required by smssend (same author)
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index fa78159809d8..2fab141f277a 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	2.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/ \
 		${MASTER_SITE_BERLIOS}
@@ -24,7 +24,7 @@ LIB_DEPENDS=	mp3lame:${PORTSDIR}/audio/lame \
 		js:${PORTSDIR}/lang/spidermonkey \
 		xml2:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15 aclocal:19:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15 aclocal:19:env
 USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 573304ba1e14..3116e0750133 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	camserv
 PORTVERSION=	0.5.1
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -24,7 +24,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 ONLY_FOR_ARCHS=	i386 alpha
 
 USE_XLIB=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15 libltdl:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15 libltdl:15
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
diff --git a/multimedia/dvts/Makefile b/multimedia/dvts/Makefile
index 05bc11877467..d28cbcbc58c4 100644
--- a/multimedia/dvts/Makefile
+++ b/multimedia/dvts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvts
 PORTVERSION=	1.0a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.sfc.wide.ad.jp/DVTS/software/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -21,7 +21,7 @@ COMMENT=	An implementation of Digital Video Transport System
 
 CONFLICTS=	gdvrecv-[0-9]*
 
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 
 MAN1=		dvts.1 dvsend.1 dvrecv.1
 
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 1c25c66b6ac6..4ca7a962ebd8 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdvdnav
 PORTVERSION=	0.1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dvd
@@ -21,7 +21,7 @@ CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--program-transform-name=''
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15 autoconf:259 automake:16
+USE_AUTOTOOLS=	libtool:15 autoconf:261 automake:16
 
 post-patch:
 	${REINPLACE_CMD} -e \
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index b0128371fb77..c99e621da581 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,7 +29,7 @@ USE_GNOME=	gnometarget gnomehack pkgconfig
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lintl"
 CONFIGURE_ARGS=	--disable-firewire --with-x --enable-gpl
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 48220aed501f..b497d826be98 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	motion
 PORTVERSION=	3.2.8
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	motion
@@ -27,7 +28,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		motion.1
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MANCOMPRESSED=	no
diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index 71dc664e0788..7b31a2cdec31 100644
--- a/multimedia/okle/Makefile
+++ b/multimedia/okle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	okle
 PORTVERSION=	0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://okle.sourceforge.net/
 
@@ -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_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_KDELIBS_VER=3
 CONFIGURE_ARGS=	--with-ogle-dir=${LOCALBASE}/bin \
 		--with-ogle-includes=${LOCALBASE}/include \
diff --git a/multimedia/shell-fm/Makefile b/multimedia/shell-fm/Makefile
index 2b16f3f4907a..f913bc7ddcd9 100644
--- a/multimedia/shell-fm/Makefile
+++ b/multimedia/shell-fm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	shell-fm
 PORTVERSION=	20061229
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ntarmos.dyndns.org/Software/FreeBSD/
 
@@ -17,7 +17,7 @@ COMMENT=	A command-line client for Last.FM
 LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao \
 		mad:${PORTSDIR}/audio/libmad
 
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoheader:259 autoconf:259
+USE_AUTOTOOLS=	aclocal:19 automake:19 autoheader:261 autoconf:261
 AUTOMAKE_ARGS=	--add-missing --copy
 ACLOCAL_ARGS=	-I m4
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/multimedia/shell-fm/files/patch-reconfig b/multimedia/shell-fm/files/patch-reconfig
index 4e5da46e8b9f..941069702262 100644
--- a/multimedia/shell-fm/files/patch-reconfig
+++ b/multimedia/shell-fm/files/patch-reconfig
@@ -10,9 +10,9 @@ diff -urNbB src/reconfig.orig src/reconfig
 -do_cmd automake --add-missing --copy
 -do_cmd autoconf
 +do_cmd aclocal-1.9 -I m4
-+do_cmd autoheader-2.59
++do_cmd autoheader-2.61
 +do_cmd automake-1.9 --add-missing --copy
-+do_cmd autoconf-2.59
++do_cmd autoconf-2.61
  
  
  
diff --git a/multimedia/xdvshow/Makefile b/multimedia/xdvshow/Makefile
index 01133672f04f..eba5f3f9d6dc 100644
--- a/multimedia/xdvshow/Makefile
+++ b/multimedia/xdvshow/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvshow
 PORTVERSION=	00.2003.09.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.sfc.wide.ad.jp/DVTS/software/xdvshow/
 DISTNAME=	${PORTNAME}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	dv.4:${PORTSDIR}/multimedia/libdv
 
 PLIST_FILES=	bin/xdvshow
 GNU_CONFIGURE=		YES
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 USE_XLIB=	yes
 
 post-patch:
diff --git a/net-im/ari-yahoo/Makefile b/net-im/ari-yahoo/Makefile
index 843edbaea2fe..7f4d6ee34e6b 100644
--- a/net-im/ari-yahoo/Makefile
+++ b/net-im/ari-yahoo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ari-yahoo
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT=	A console Yahoo! messenger client
 
 PLIST_FILES=	bin/ari-yahoo
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 pre-configure:
diff --git a/net-mgmt/bsnmpd/Makefile b/net-mgmt/bsnmpd/Makefile
index 7f729a0479e3..a2dd8742e3bc 100644
--- a/net-mgmt/bsnmpd/Makefile
+++ b/net-mgmt/bsnmpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bsnmpd
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://people.freebsd.org/~harti/bsnmp/
 DISTNAME=	bsnmp-${PORTVERSION}
@@ -20,7 +21,7 @@ LIB_DEPENDS=	begemot.1:${PORTSDIR}/devel/libbegemot \
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libbegemot=${LOCALBASE}
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 INSTALLS_SHLIB=		yes
 
diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile
index 378d6ab85d66..6372a9019649 100644
--- a/net-mgmt/nagios-devel/Makefile
+++ b/net-mgmt/nagios-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagios
 DISTVERSION=	3.0b3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
@@ -22,7 +23,7 @@ LATEST_LINK=	nagios-devel
 USE_GETOPT_LONG=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_RC_SUBR=	nagios.sh
 
 CONFLICTS=	nagios-[12].*
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 48cc3f85e11e..ab8b847f1bc9 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios-plugins
 PORTVERSION=	1.4.9
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:259
+USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:261
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I m4 -I gl/m4
 
 OPTIONS=	QSTAT "Game server query support (check_game)" OFF \
diff --git a/net-mgmt/nagios-snmp-plugins/Makefile b/net-mgmt/nagios-snmp-plugins/Makefile
index 17d868798289..0a0c1f6ae9e2 100644
--- a/net-mgmt/nagios-snmp-plugins/Makefile
+++ b/net-mgmt/nagios-snmp-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios-snmp-plugins
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.hometree.net/pub/${PORTNAME}/
 
@@ -17,7 +17,7 @@ COMMENT=	Additional SNMP plugins for Nagios
 LIB_DEPENDS=    netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
 
 GNU_CONFIGURE=		yes
-USE_AUTOTOOLS=	automake:14 autoheader:253 autoconf:253
+USE_AUTOTOOLS=	automake:14 autoheader:261 autoconf:261
 USE_GETOPT_LONG=	yes
 USE_GMAKE=		yes
 USE_PERL5=		yes
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 1a8000bd17f9..b9e579608d99 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
 USE_GETOPT_LONG=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_RC_SUBR=	nagios.sh
 
 OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 1a8000bd17f9..b9e579608d99 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nagios
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
 USE_GETOPT_LONG=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_RC_SUBR=	nagios.sh
 
 OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 663eb9417205..c39d26fc9890 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -26,7 +26,7 @@ RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 .endif
 PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_RC_SUBR=	snmpd.sh snmptrapd.sh
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 663eb9417205..c39d26fc9890 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -26,7 +26,7 @@ RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 .endif
 PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_RC_SUBR=	snmpd.sh snmptrapd.sh
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 663eb9417205..c39d26fc9890 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
@@ -26,7 +26,7 @@ RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 .endif
 PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_RC_SUBR=	snmpd.sh snmptrapd.sh
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index fd21bcf9c904..ffb47f99050c 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	pixilate
 PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	winfingerprint
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
 
 WRKSRC=		${WRKDIR}/pixilate
 
-USE_AUTOTOOLS=	automake:15 autoconf:259
+USE_AUTOTOOLS=	automake:15 autoconf:261
 AUTOMAKE_ARGS=	--add-missing
 
 #CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${LIBS}" CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile
index 77034d96e4c7..61d8f476c910 100644
--- a/net-p2p/mldonkey-devel/Makefile
+++ b/net-p2p/mldonkey-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mldonkey
 PORTVERSION=	2.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 		${MASTER_SITE_SAVANNAH}
@@ -24,7 +24,7 @@ CONFLICTS=	mldonkey{-{core,gui},}-[0-9]*
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	autoconf:259:env
+USE_AUTOTOOLS=	autoconf:261:env
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	opt
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index ad1d3afbec68..67356167e6b6 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mldonkey
 PORTVERSION=	2.9.1
+PORTREVISION=	1
 CATEGORIES+=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 		${MASTER_SITE_SAVANNAH}
@@ -22,7 +23,7 @@ CONFLICTS=	mldonkey{-{core,gui},}-devel-[0-9]*
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	autoconf:259:env
+USE_AUTOTOOLS=	autoconf:261:env
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	opt
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index d67a66f54ab5..1cbd64544bef 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	6tunnel
 DISTVERSION=	0.11rc2
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://toxygen.net/6tunnel/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -18,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}rc2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 ALL_TARGET=	default
 
 MAN1=		6tunnel.1
diff --git a/net/adasockets/Makefile b/net/adasockets/Makefile
index 45a84d5c1f9f..d1e268378717 100644
--- a/net/adasockets/Makefile
+++ b/net/adasockets/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		adasockets
 PORTVERSION=		1.8.4.7
-PORTREVISION=	1
+PORTREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		http://www.rfc1149.net/download/adasockets/
 
@@ -17,7 +17,7 @@ COMMENT=		Sockets library for Ada
 BUILD_DEPENDS=		gnatmake:${PORTSDIR}/lang/gnat \
 			texi2dvi:${PORTSDIR}/print/teTeX
 
-USE_AUTOTOOLS=		autoconf:259
+USE_AUTOTOOLS=		autoconf:261
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-examples
 .if defined(NOPORTDOCS)
diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index 8ea42249d70f..8a69b753b63f 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	beacon
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	net perl5 mbone ipv6
 MASTER_SITES=	http://dast.nlanr.net/Projects/Beacon/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -20,7 +21,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 WWW_DIR?=	${PREFIX}/www/
 PLIST_SUB+=	VERSION=${PORTVERSION}
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .ifdef(WITHOUT_IPV6)
diff --git a/net/dosdetector/Makefile b/net/dosdetector/Makefile
index ba98bb172b97..ef31a7438855 100644
--- a/net/dosdetector/Makefile
+++ b/net/dosdetector/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	dosdetector
 PORTVERSION=	20060621
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://darkzone.ma.cx/resources/unix/dosdetector/
 
@@ -16,7 +17,7 @@ MAINTAINER=	msciciel@dark-zone.eu
 COMMENT=	Detect suspicious network traffic
 
 HAS_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoheader:259
+USE_AUTOTOOLS=	autoheader:261
 
 PLIST_FILES=	bin/dosdetector
 MAN1=		dosdetector.1
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index 47fcc793a55d..925b1d1058cd 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gatekeeper
 #PORTVERSION=	2.2.4
 DISTVERSION=	2.2.4
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openh323gk
@@ -23,7 +23,7 @@ LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
 
 USE_RC_SUBR=	gnugk.sh
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--disable-firebird
 
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 84bd9f37c0d4..27db4625f005 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libnet
 PORTVERSION=	1.0.2a
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
@@ -16,7 +16,7 @@ PKGNAMESUFFIX=	10
 MAINTAINER=	shipley@dis.org
 COMMENT=	A C library for creating IP packets
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 WRKSRC=		${WRKDIR}/Libnet-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 MAN3=		libnet${PKGNAMESUFFIX}.3
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 0654815c56a7..476d5473eb8e 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libsocket++
 PORTVERSION=	1.12.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://src.linuxhacker.at/socket++/
 DISTNAME=	socket++-${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT=	A C++ wrapper library to the sockets
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:259 libtool:15
+USE_AUTOTOOLS=	automake:19 autoconf:261 libtool:15
 SCRIPTS_ENV+=	ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/"
 
 INFO=	socket++
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index d05b97d6f9d5..4fca93c169d8 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ntop
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +24,7 @@ RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
 
 DBDIR?=		/var/db
 
-USE_AUTOTOOLS=	libtool:15 automake:19 autoconf:259
+USE_AUTOTOOLS=	libtool:15 automake:19 autoconf:261
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
diff --git a/net/opal/Makefile b/net/opal/Makefile
index a92317356286..3c2650a391d1 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opal
 PORTVERSION=	2.2.8
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/sources/ \
 		${MASTER_SITE_LOCAL}
@@ -23,7 +24,7 @@ LIB_DEPENDS=	pt_r:${PORTSDIR}/devel/pwlib
 # In opal's Makefile the default make's target is optshared
 ALL_TARGET=	optshared
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index a92317356286..3c2650a391d1 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opal
 PORTVERSION=	2.2.8
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/sources/ \
 		${MASTER_SITE_LOCAL}
@@ -23,7 +24,7 @@ LIB_DEPENDS=	pt_r:${PORTSDIR}/devel/pwlib
 # In opal's Makefile the default make's target is optshared
 ALL_TARGET=	optshared
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index cdd51bd071a9..16ef73278099 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openh323
 PORTVERSION=	1.18.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.voxgratia.org/releases/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
index e53d887510fc..93009bc8dab0 100644
--- a/net/proxy-suite/Makefile
+++ b/net/proxy-suite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	proxy-suite
 PORTVERSION=	1.9.2.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.suse.com/pub/projects/proxy-suite/src/ \
 		ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/projects/proxy-suite/src/ \
@@ -15,7 +16,7 @@ MASTER_SITES=	ftp://ftp.suse.com/pub/projects/proxy-suite/src/ \
 MAINTAINER=	thomas@cuivre.fr.eu.org
 COMMENT=	The SuSE Proxy-Suite, a set of programs to enhance firewall security
 
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 
diff --git a/net/samba-pdbsql/Makefile b/net/samba-pdbsql/Makefile
index 2f2bbdc1341f..929a31d34eca 100644
--- a/net/samba-pdbsql/Makefile
+++ b/net/samba-pdbsql/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		pdbsql
 PORTVERSION=		0.2
+PORTREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pdbsql
@@ -22,7 +23,7 @@ USE_BZIP2=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 # Add a build dependency for Samba port
-USE_AUTOTOOLS=		autoconf:259 autoheader:259
+USE_AUTOTOOLS=		autoconf:261 autoheader:261
 
 SAMBA_PORT=		net/samba3
 SAMBA_VERSION=		3.0.23
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index fd4769c8d399..96110a5fea1c 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		samba
 PORTVERSION?=		3.0.26a
-PORTREVISION?=		0
+PORTREVISION?=		1
 PORTEPOCH?=		1
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
@@ -21,7 +21,7 @@ CONFLICTS?=		ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.*
 
 USE_ICONV=		yes
 GNU_CONFIGURE=		yes
-USE_AUTOTOOLS=		autoconf:259 autoheader:259
+USE_AUTOTOOLS=		autoconf:261 autoheader:261
 AUTOHEADER_ARGS=	-I${WRKSRC} -I${WRKSRC}/lib/replace
 AUTOCONF_ARGS=		-I${WRKSRC} -I${WRKSRC}/lib/replace
 
diff --git a/net/samba4wins/Makefile b/net/samba4wins/Makefile
index 0358ce25dfe1..4b2169b6c684 100644
--- a/net/samba4wins/Makefile
+++ b/net/samba4wins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		samba4wins
 PORTVERSION=		1.0.6
+PORTREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://ftp.sernet.de/pub/samba4WINS/debian/pool/
 DISTNAME=		${PORTNAME}_${PORTVERSION}-1
@@ -19,7 +20,7 @@ CONFLICTS=		ja-samba-2.* ja-samba-4.* samba-2.* samba-4.* sharity-light-1.*
 USE_ICONV=		yes
 USE_PERL5=		yes
 GNU_CONFIGURE=		yes
-USE_AUTOTOOLS=		autoconf:259 autoheader:259
+USE_AUTOTOOLS=		autoconf:261 autoheader:261
 
 WRKSRC=			${WRKDIR}/${PORTNAME}/source
 
diff --git a/net/sipxcalllib/Makefile b/net/sipxcalllib/Makefile
index 4c33a4ff0834..c4e651d06e84 100644
--- a/net/sipxcalllib/Makefile
+++ b/net/sipxcalllib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxcalllib
 PORTVERSION=	3.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -24,7 +24,7 @@ LIB_DEPENDS=	sipXport:${PORTSDIR}/net/sipxportlib \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 LOCALSTATEDIR=	/var
diff --git a/net/sipxcommserverlib/Makefile b/net/sipxcommserverlib/Makefile
index 5c73efaee9dc..8d1d3900297a 100644
--- a/net/sipxcommserverlib/Makefile
+++ b/net/sipxcommserverlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxcommserverlib
 PORTVERSION=	3.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -28,7 +28,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5_RUN=	yes
diff --git a/net/sipxconfig/Makefile b/net/sipxconfig/Makefile
index 5bf6c71e7867..b0bba1c0f7df 100644
--- a/net/sipxconfig/Makefile
+++ b/net/sipxconfig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxconfig
 PORTVERSION=	3.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -29,7 +29,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 USE_JAVA=	1.4+
 USE_APACHE=	2.0+
 USE_RUBY=	yes
diff --git a/net/sipxmediaadapterlib/Makefile b/net/sipxmediaadapterlib/Makefile
index d42145ac63bb..410385484f3b 100644
--- a/net/sipxmediaadapterlib/Makefile
+++ b/net/sipxmediaadapterlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxmediaadapterlib
 PORTVERSION=	3.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -23,7 +23,7 @@ LIB_DEPENDS=	sipXport:${PORTSDIR}/net/sipxportlib \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 LOCALSTATEDIR=	/var
diff --git a/net/sipxmedialib/Makefile b/net/sipxmedialib/Makefile
index 2eb9795298c3..27ac9dfe84a6 100644
--- a/net/sipxmedialib/Makefile
+++ b/net/sipxmedialib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxmedialib
 PORTVERSION=	3.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -22,7 +22,7 @@ LIB_DEPENDS=	sipXport:${PORTSDIR}/net/sipxportlib \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 LOCALSTATEDIR=	/var
diff --git a/net/sipxpbx/Makefile b/net/sipxpbx/Makefile
index 3ecc1ecca39e..bb2dc58f6a0c 100644
--- a/net/sipxpbx/Makefile
+++ b/net/sipxpbx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxpbx
 PORTVERSION=	3.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -35,7 +35,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 USE_APACHE=	2.0+
 USE_PERL5_RUN=	yes
 USE_RC_SUBR=	sipxpbx
diff --git a/net/sipxportlib/Makefile b/net/sipxportlib/Makefile
index 3b2c4b3751a1..6b8a5e3ca170 100644
--- a/net/sipxportlib/Makefile
+++ b/net/sipxportlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sipxportlib
 PORTVERSION=	3.6.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -20,7 +21,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5_RUN=	yes
diff --git a/net/sipxproxy/Makefile b/net/sipxproxy/Makefile
index 585adfcfc2be..49c691416290 100644
--- a/net/sipxproxy/Makefile
+++ b/net/sipxproxy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxproxy
 PORTVERSION=	3.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -29,7 +29,7 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_RUBY=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 LOCALSTATEDIR=	/var
 CONFIGURE_ENV+=	wwwdir=${PREFIX}/www/sipX \
diff --git a/net/sipxpublisher/Makefile b/net/sipxpublisher/Makefile
index d97efb25d635..e3c1115a39bf 100644
--- a/net/sipxpublisher/Makefile
+++ b/net/sipxpublisher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxpublisher
 PORTVERSION=	3.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -23,7 +23,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 LOCALSTATEDIR=	/var
 CONFIGURE_ENV+=	wwwdir=${PREFIX}/www/sipX \
diff --git a/net/sipxregistry/Makefile b/net/sipxregistry/Makefile
index 4af3e8f28027..2f69016eb9ed 100644
--- a/net/sipxregistry/Makefile
+++ b/net/sipxregistry/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxregistry
 PORTVERSION=	3.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -24,7 +24,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 LOCALSTATEDIR=	/var
diff --git a/net/sipxtacklib/Makefile b/net/sipxtacklib/Makefile
index 0d48706c78ba..9ac90409392d 100644
--- a/net/sipxtacklib/Makefile
+++ b/net/sipxtacklib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxtacklib
 PORTVERSION=	3.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net java
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5_RUN=	yes
diff --git a/net/sipxvxml/Makefile b/net/sipxvxml/Makefile
index dbae84cea019..bd7884dee44b 100644
--- a/net/sipxvxml/Makefile
+++ b/net/sipxvxml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxvxml
 PORTVERSION=	3.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -27,7 +27,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 GNU_CONFIGURE=	yes
 LOCALSTATEDIR=	/var
 CONFIGURE_ENV+=	wwwdir=${PREFIX}/www/sipX \
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index 53b4b5fdfca4..5f66b1ae9aa5 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tramp
 PORTVERSION=	2.1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net elisp
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,7 @@ USE_EMACS=	yes
 EMACS_PORT_NAME?=	emacs21
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 TRAMP_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 PLIST_SUB+=	TRAMP_LISPDIR=${TRAMP_LISPDIR}
diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile
index a462a1a932ca..93fb06d8cabb 100644
--- a/net/unfs3/Makefile
+++ b/net/unfs3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	unfs3
 PORTVERSION=	0.9.16
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	A user-space implementation of the NFSv3 server specification
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_BISON=		YES
 
 MAN7=		tags.7
diff --git a/net/versuch/Makefile b/net/versuch/Makefile
index 5a4d7a3946bc..31c7f60fa7e5 100644
--- a/net/versuch/Makefile
+++ b/net/versuch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	versuch
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 		http://warlock.elcat.kg/
@@ -23,7 +24,7 @@ LIB_DEPENDS=	pt_r.1:${PORTSDIR}/devel/pwlib \
 WRKSRC=		${WRKDIR}/versuch
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index 49a287e0c034..5c49b32b55c0 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	newscache
 PORTVERSION=	1.2.r.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news
 MASTER_SITES=	http://src.linuxhacker.at/NewsCache/
 DISTNAME=	NewsCache-${PORTVERSION:S/.r./rc/}
@@ -17,7 +17,7 @@ COMMENT=	NewsCache is a free cache server for USENET News
 
 LIB_DEPENDS=	socket[+][+].1:${PORTSDIR}/net/libsocket++
 
-USE_AUTOTOOLS=	automake:19 autoheader:259 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoheader:261 autoconf:261
 USE_GETOPT_LONG=yes
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index 36128c1c3a9c..373cdd6532d6 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	prc-tools
 PORTVERSION=	2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/prc-tools/:S/$/:prc/} \
 		${MASTER_SITE_SOURCEWARE}
@@ -27,7 +27,7 @@ COMMENT=	Collection of tools supporting C and C++ programming for Palm OS
 # but right now it does not.
 ONLY_FOR_ARCHS=	i386
 
-USE_AUTOTOOLS=	autoconf:253:env
+USE_AUTOTOOLS=	autoconf:261:env
 USE_BZIP2=	YES
 USE_BISON=	YES
 USE_GMAKE=	YES
diff --git a/ports-mgmt/instant-tinderbox/Makefile b/ports-mgmt/instant-tinderbox/Makefile
index 97fe1f0e55f3..3ea271ced7d8 100644
--- a/ports-mgmt/instant-tinderbox/Makefile
+++ b/ports-mgmt/instant-tinderbox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	instant-tinderbox
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ports-mgmt
 DISTFILES=
 
@@ -58,7 +58,7 @@ USE_PYTHON=	yes
 USE_RUBY=	yes
 USE_LINUX=	yes
 
-.for v in 2.13 2.53 2.59 2.61
+.for v in 2.13 2.61
 RUN_DEPENDS+=	autoconf-${v}:${PORTSDIR}/devel/autoconf${v:C/\.//}
 .endfor
 .for v in 1.4 1.5 1.6 1.7 1.8 1.9 1.10
diff --git a/print/cups-magicolor/Makefile b/print/cups-magicolor/Makefile
index 1b83bd51b975..27e219c8b5f8 100644
--- a/print/cups-magicolor/Makefile
+++ b/print/cups-magicolor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cups-magicolor
 PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://printer.konicaminolta.net/drivers/linux/
 DISTNAME=	2430DL_sc_linux
@@ -23,7 +23,7 @@ RUN_DEPENDS=	espgs:${PORTSDIR}/print/cups-pstoraster
 
 WRKSRC=		${WRKDIR}/magicolor2430DL-${PORTVERSION}
 
-USE_AUTOTOOLS=	automake:19:env autoconf:259
+USE_AUTOTOOLS=	automake:19:env autoconf:261
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 89b7417ebc91..633f3d77b235 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	db
 PORTVERSION=	20070124
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL:S,$,acm/foomatic/,} \
 		http://freebsd.unixfreunde.de/sources/
@@ -22,7 +23,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	automake:15:env autoconf:259
+USE_AUTOTOOLS=	automake:15:env autoconf:261
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips
index 6b9b1245b4e3..f173823d43b4 100644
--- a/print/pips800/Makefile.pips
+++ b/print/pips800/Makefile.pips
@@ -7,6 +7,7 @@
 
 PORTNAME=	pips${PRTYPE}
 PORTVERSION?=	1.3.2
+PORTREVISION?=	1
 CATEGORIES?=	print
 MASTER_SITES=	http://lx2.avasys.jp/pips/%SUBDIR%/
 
@@ -121,7 +122,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-2.6.2-common \
     ${PRTYPE} != -spr800
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-2.6.2-ekpstm::main.c
 .endif
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf-2.53:${PORTSDIR}/devel/autoconf253
+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf-2.61:${PORTSDIR}/devel/autoconf261
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 USE_ICONV=	yes
 .endif
@@ -281,7 +282,7 @@ post-patch:
 
 pre-configure:
 .if ${PIPS_LEVEL} >= 206 && ${DIST_TYPE} != lpr && ${DIST_TYPE} != cups
-	cd ${WRKSRC}/libltdl && ${LOCALBASE}/bin/autoconf-2.53
+	cd ${WRKSRC}/libltdl && ${LOCALBASE}/bin/autoconf-2.61
 .endif
 
 post-configure:
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index 204259e294a0..bede38f2bb31 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	abinit
 PORTVERSION=	5.2.4
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/abinit|} \
 		ftp://ftp.abinit.org/pub/abinitio/ABINIT_v${PORTVERSION}/
@@ -18,7 +19,7 @@ USE_FORTRAN=	yes
 CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	GNU_HOST=${GNU_HOST}
 
@@ -38,6 +39,9 @@ BLAS=		-lblas
 LAPACK=		-llapack
 .endif
 
+pre-configure:
+	@(cd ${WRKSRC} && config/scripts/makemake)
+
 test:
 	cd ${WRKSRC}/tests ; ${GMAKE} tests
 
diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index b94261ae118e..e3467f63370e 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	chemtool
 PORTVERSION=	1.6.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 
@@ -17,7 +17,7 @@ RUN_DEPENDS=	transfig:${PORTSDIR}/print/transfig
 
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/science/elmer-fem/Makefile b/science/elmer-fem/Makefile
index a43e83e69704..79c7546ff312 100644
--- a/science/elmer-fem/Makefile
+++ b/science/elmer-fem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fem
 PORTVERSION=	5.3.2
+PORTREVISION=	1
 CATEGORIES=	science tk84
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 PKGNAMEPREFIX=	elmer-
@@ -27,7 +28,7 @@ USE_FORTRAN=	yes
 FCFLAGS+=	-O3 -ffast-math
 .endif
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=
diff --git a/science/elmer-hutiter/Makefile b/science/elmer-hutiter/Makefile
index d22df4ed2c9c..00d6bf8bbb39 100644
--- a/science/elmer-hutiter/Makefile
+++ b/science/elmer-hutiter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hutiter
 PORTVERSION=	5.3.2
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.funet.fi/pub/sci/physics/elmer/src/
 PKGNAMEPREFIX=	elmer-
@@ -38,7 +39,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|' -e 's|%%FC%%|${FC}|' ${WRKSRC}/configure.in
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ENV+=	FC=${FC} F77=${FC}
 ALL_TARGET=
 
diff --git a/science/libghemical/Makefile b/science/libghemical/Makefile
index 4fa2c85c7efe..7288f97a69d5 100644
--- a/science/libghemical/Makefile
+++ b/science/libghemical/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	libghemical
 PORTVERSION=	2.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://www.uku.fi/~thassine/projects/download/ \
 		http://bioinformatics.org/ghemical/download/
@@ -46,7 +46,7 @@ LAPACK=		-llapack
 
 CONFIGURE_ARGS+=	--enable-mopac7 --enable-mpqc --enable-openbabel --with-blas="-L${LOCALBASE}/lib ${BLAS}" -with-lapack="-L${LOCALBASE}/lib ${LAPACK}"
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 PLIST_SUB=	LIBGHEMICAL_VERSION="${PORTVERSION}"
 
 .include <bsd.port.post.mk>
diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile
index eb7b63405c7d..88f695820802 100644
--- a/science/mbdyn/Makefile
+++ b/science/mbdyn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mbdyn
 PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://mbdyn.aero.polimi.it/~masarati/Download/mbdyn/
 
@@ -17,7 +17,7 @@ COMMENT=	A MultiBody Dynamics analysis system
 LIB_DEPENDS=	umfpack:${PORTSDIR}/math/suitesparse
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--program-prefix='' --with-umfpack=yes
 CPPFLAGS+=	-I${LOCALBASE}/include/suitesparse ${PTHREAD_CFLAGS}
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index b56f7622c219..7ca8eefbcb61 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpqc
 PORTVERSION=	2.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mpqc
@@ -19,7 +19,6 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -48,7 +47,7 @@ BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 USE_FORTRAN=	yes
 
@@ -68,7 +67,8 @@ CONFIGURE_ARGS+=--with-cc=${CC} \
 		--with-coptflags="${CFLAGS}" \
 		--with-cxxoptflags="${CXXFLAGS}" \
 		--with-f77optflags="${FFLAGS}" \
-		--enable-shared
+		--enable-shared \
+		--with-sc-datadir=${PREFIX}/share/mpqc/${PORTVERSION}
 .if defined(WITH_ICC)
 CONFIGURE_ARGS+=--with-libs="-lsvml"
 .endif
diff --git a/science/psi3/Makefile b/science/psi3/Makefile
index 5db9f1ac2a19..9a1f99663c41 100644
--- a/science/psi3/Makefile
+++ b/science/psi3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	psi3
 PORTVERSION=	3.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=     psicode
@@ -38,7 +38,7 @@ LAPACK=		-llapack
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 WANT_FORTRAN=yes #dummy but future use
 BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
 FC=		gfortran42
diff --git a/security/aide/Makefile b/security/aide/Makefile
index ded4ab39fb01..e5b3a956db48 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aide
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.cs.tut.fi/~rammer/
@@ -19,7 +20,7 @@ LIB_DEPENDS=	mhash.2:${PORTSDIR}/security/mhash
 
 USE_GMAKE=	yes
 USE_BISON=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-mhash \
 		--with-zlib \
diff --git a/security/barnyard/Makefile b/security/barnyard/Makefile
index 1738a0908049..08246b8fa412 100644
--- a/security/barnyard/Makefile
+++ b/security/barnyard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	barnyard
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	barnyard
@@ -19,7 +20,7 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
 OPTIONS=	MYSQL "Enable MySQL support" off \
 		POSTGRESQL "Enable PostgreSQL support" off
 
-USE_AUTOTOOLS=	autoheader:259 aclocal:19
+USE_AUTOTOOLS=	autoheader:261 aclocal:19
 USE_RC_SUBR=	barnyard.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index f1c0e0555854..d043c6bac016 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpgme
 PORTVERSION=	0.3.16
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -20,7 +20,7 @@ LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
 LATEST_LINK=	gpgme03
 
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 47006e735bbb..5fb145b77f30 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkpasman
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:15 aclocal:15 autoconf:259
+USE_AUTOTOOLS=	automake:15 aclocal:15 autoconf:261
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/security/libotr/Makefile b/security/libotr/Makefile
index 0eb8f8e87932..5596fbaf862c 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libotr
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
@@ -19,7 +20,7 @@ COMMENT=	The portable OTR Messaging Library and toolkit
 LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_LDCONFIG=	yes
 
 MAN1=		otr_toolkit.1
diff --git a/security/ncrypt/Makefile b/security/ncrypt/Makefile
index 87da39b40e9c..33f8b82b86b7 100644
--- a/security/ncrypt/Makefile
+++ b/security/ncrypt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ncrypt
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,7 @@ MAINTAINER=	laszlof@FreeBSD.org
 COMMENT=	Advanced AES file encryption tool
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:261
 
 PLIST_FILES=	bin/ncrypt bin/nrm
 
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 44899f801518..68a6bd4a3961 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	racoon2
 PORTVERSION=	20070720a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
 EXTRACT_SUFX=	.tgz
@@ -18,7 +18,7 @@ COMMENT=	Racoon2 IPsec daemon
 USE_RC_SUBR=	YES
 USE_OPENSSL=	YES
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_TARGET=
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--sysconfdir=${LOCALBASE}/etc
diff --git a/security/samba-vscan/Makefile b/security/samba-vscan/Makefile
index 18b161055a61..7fe1852a2e52 100644
--- a/security/samba-vscan/Makefile
+++ b/security/samba-vscan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	samba-vscan
 PORTVERSION=	0.3.6c
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.openantivirus.org/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-beta4
@@ -30,7 +31,7 @@ OPTIONS=	VSCAN_ANTIVIR "for use with AntiVir" off \
 
 PORTDOCS=	AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 VSCAN_SAMBA_PORT?=	samba3
 SAMBA_WRKSRC!=	cd ${.CURDIR}/../../net/${VSCAN_SAMBA_PORT}; ${MAKE} -V WRKSRC
 HAS_CONFIGURE=	yes
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index b0131f64a066..7654fbe2850b 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fish
 PORTVERSION=	1.22.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	http://www.fishshell.org/files/1.22.3/ \
 		http://roo.no-ip.org/fish/files/1.22.3/ \
@@ -16,7 +16,7 @@ MASTER_SITES=	http://www.fishshell.org/files/1.22.3/ \
 MAINTAINER=	kaiw27@gmail.com
 COMMENT=	A user friendly command line shell
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index fb0cfe92674d..ce4ac9bd2462 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	apachetop
 PORTVERSION=	0.12.6
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webta.org/apachetop/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache RealTime log stats
 
-USE_AUTOTOOLS=	autoconf:259:env
+USE_AUTOTOOLS=	autoconf:261:env
 GNU_CONFIGURE=	yes
 
 MAN1=		apachetop.1
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 950fda6b0258..31ad43e1e9dc 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	boxbackup
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
@@ -19,7 +20,7 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_GCC=	3.2+
-USE_AUTOTOOLS=	autoconf:259 aclocal:19 autoheader:259
+USE_AUTOTOOLS=	autoconf:261 aclocal:19 autoheader:261
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
index 950fda6b0258..31ad43e1e9dc 100644
--- a/sysutils/boxbackup/Makefile
+++ b/sysutils/boxbackup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	boxbackup
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
@@ -19,7 +20,7 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_GCC=	3.2+
-USE_AUTOTOOLS=	autoconf:259 aclocal:19 autoheader:259
+USE_AUTOTOOLS=	autoconf:261 aclocal:19 autoheader:261
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index e70985c07b25..5334475d1000 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gpkgdep
 PORTVERSION=	0.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gpkgdep
@@ -16,7 +16,7 @@ COMMENT=	Shows package dependencies in tree views
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	automake:15 autoconf:253
+USE_AUTOTOOLS=	automake:15 autoconf:261
 AUTOMAKE_ARGS=	--add-missing
 USE_GMAKE=	yes
 PLIST_FILES=	bin/gpkgdep
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 1b7300139d80..74e2cf45011e 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	grub
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	GRand Unified Bootloader
 
-USE_AUTOTOOLS=	automake:19 autoconf:259
+USE_AUTOTOOLS=	automake:19 autoconf:261
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-freebsd-freebsd${OSREL}
diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile
index 0b30af03578a..7473e4c64a5c 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hdup
 PORTVERSION=	2.0.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.miek.nl/projects/hdup2/ \
 		http://www.miek.nl/projects/hdup2/previous/
@@ -29,7 +29,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 MAN1=		hdup.1
 MAN5=		hdup.conf.5
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index c427a9d0816d..ac7e27bd5880 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lcdproc
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,7 @@ COMMENT=	A client/server suite for LCD devices
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_AUTOTOOLS=	autoconf:259 automake:19 aclocal:19
+USE_AUTOTOOLS=	autoconf:261 automake:19 aclocal:19
 USE_GCC=	3.2+
 GNU_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
diff --git a/sysutils/nctop/Makefile b/sysutils/nctop/Makefile
index 273c6dafbb32..f8f872ce0f37 100644
--- a/sysutils/nctop/Makefile
+++ b/sysutils/nctop/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	nctop
 PORTVERSION=	0.23.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rz.uni-karlsruhe.de/~hj28/download.php?file=/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A remote system monitor for unix hosts
 
-USE_AUTOTOOLS=	autoconf:259:env
+USE_AUTOTOOLS=	autoconf:261:env
 USE_BZIP2=	YES
 
 HAS_CONFIGURE=	yes
diff --git a/sysutils/php5-posix/Makefile b/sysutils/php5-posix/Makefile
index baac57e2511f..1624bedf9d78 100644
--- a/sysutils/php5-posix/Makefile
+++ b/sysutils/php5-posix/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	4
 
 CATEGORIES=	sysutils
 
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index 958926ffc5a0..52fe9d7867a6 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmupmon
 PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://j-z-s.com/projects/downloads/
 
@@ -17,7 +17,7 @@ COMMENT=	An uptime showing dockapp with a similar look to wmcpuload
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_AUTOTOOLS=	automake:15 autoheader:259
+USE_AUTOTOOLS=	automake:15 autoheader:261
 CONFIGURE_ARGS=	--program-prefix=""
 
 MAN1=		wmupmon.1
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index f515e52fae2d..bcbff6534395 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfsprogs
 PORTVERSION=	2.8.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT=	A set of utilities and library to manipulate an xfs filesystem
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15:env
+USE_AUTOTOOLS=	autoconf:261 libtool:15:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}" \
 			CFLAGS="${CFLAGS}" \
diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile
index 67038847ace9..5da648a1d7f5 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zisofs-tools
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.kernel.org/pub/linux/utils/fs/zisofs/
 
@@ -15,7 +16,7 @@ COMMENT=	User utilities for zisofs
 
 PORTDOCS=	README CHANGES INSTALL
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	yes
diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index e108552d7603..a2c43b6a5986 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	client-lib
 PORTVERSION=	12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -24,7 +24,7 @@ ONLY_FOR_ARCHS=	i386
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimcf
diff --git a/textproc/iiimf-client-lib/files/patch-Makefile b/textproc/iiimf-client-lib/files/patch-Makefile
index d7f7226f91e6..0ab070a0d5cf 100644
--- a/textproc/iiimf-client-lib/files/patch-Makefile
+++ b/textproc/iiimf-client-lib/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile
index daadf77139e6..b4d68a993a62 100644
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	csconv
 PORTVERSION=	12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/CSConv
diff --git a/textproc/iiimf-csconv/files/patch-Makefile b/textproc/iiimf-csconv/files/patch-Makefile
index a610aed43a09..a48197bd9c4d 100644
--- a/textproc/iiimf-csconv/files/patch-Makefile
+++ b/textproc/iiimf-csconv/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index 3ca40c22f8c5..cc5bdae0943b 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-im-switcher
 PORTVERSION=	12.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -26,7 +26,7 @@ USE_GNOME=	intltool gconf2 libglade2 libgnomeui \
 		gnomepanel gnomeprefix gnomehack
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 GCONF_SCHEMAS=	gnome-im-properties.schemas gnome-im-switcher.schemas
 
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
index da0154fa72c1..353b699ab3e0 100644
--- a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 28f0156db7d1..4b84586e8ae6 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	12.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -27,7 +27,7 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool gtk20
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimgcf
diff --git a/textproc/iiimf-gtk/files/patch-Makefile b/textproc/iiimf-gtk/files/patch-Makefile
index d3c5ac697408..c08f74ce0002 100644
--- a/textproc/iiimf-gtk/files/patch-Makefile
+++ b/textproc/iiimf-gtk/files/patch-Makefile
@@ -10,13 +10,13 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 @@ -12,3 +12,3 @@
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
 @@ -16,12 +16,14 @@
  
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index 84037df4cb60..29055b8e40f3 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	le-unit
 PORTVERSION=	12.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -27,7 +27,7 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_XLIB=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
diff --git a/textproc/iiimf-le-unit/files/patch-Makefile b/textproc/iiimf-le-unit/files/patch-Makefile
index 001d4a5432a2..02ad5fcc8282 100644
--- a/textproc/iiimf-le-unit/files/patch-Makefile
+++ b/textproc/iiimf-le-unit/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index a62e396d7e8c..e51a0dee1d92 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	protocol-lib
 PORTVERSION=	12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=	i386
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimp
diff --git a/textproc/iiimf-protocol-lib/files/patch-Makefile b/textproc/iiimf-protocol-lib/files/patch-Makefile
index d1aae83781bb..38bc0510b020 100644
--- a/textproc/iiimf-protocol-lib/files/patch-Makefile
+++ b/textproc/iiimf-protocol-lib/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index 645d0fec4e3b..989663c5bd4a 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	server
 PORTVERSION=	12.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig libxml2
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimsf
diff --git a/textproc/iiimf-server/files/patch-Makefile b/textproc/iiimf-server/files/patch-Makefile
index f0ede4220047..0cf7a9e2694e 100644
--- a/textproc/iiimf-server/files/patch-Makefile
+++ b/textproc/iiimf-server/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index 153c6500cb48..40362b166c31 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x-lib
 PORTVERSION=	12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -27,7 +27,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_MOTIF=	yes
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/xiiimp.so
diff --git a/textproc/iiimf-x-lib/files/patch-Makefile b/textproc/iiimf-x-lib/files/patch-Makefile
index c9f378ab6ff5..835ee459d7e2 100644
--- a/textproc/iiimf-x-lib/files/patch-Makefile
+++ b/textproc/iiimf-x-lib/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index 6684a91156b1..4049b059ae9e 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x
 PORTVERSION=	12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/htt_xbe
diff --git a/textproc/iiimf-x/files/patch-Makefile b/textproc/iiimf-x/files/patch-Makefile
index 366fcede6ca2..ba5bdd8c8f23 100644
--- a/textproc/iiimf-x/files/patch-Makefile
+++ b/textproc/iiimf-x/files/patch-Makefile
@@ -10,8 +10,8 @@
 +ACLOCAL = aclocal-1.9
 +AUTOMAKE = automake-1.9 --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.59
-+AUTOCONF = autoconf-2.59
++AUTOHEADER = autoheader-2.61
++AUTOCONF = autoconf-2.61
  #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
  #             $(LIBTOOLIZE) && \
  #             $(AUTOHEADER) && \
@@ -19,7 +19,7 @@
  #             $(AUTOCONF)
  
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.59
++AUTORECONF = autoreconf-2.61
  BOOTSTRAP = $(AUTORECONF) --install --force
  INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 61744038e7c5..12073ea858e0 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmrss
 PORTVERSION=	0.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www5.autistici.org/bakunin/libmrss/ GENTOO/distfiles
 
@@ -35,7 +35,7 @@ pre-patch:
 
 .if defined(WITH_PHPMRSS)
 USE_PHP=	yes
-USE_AUTOTOOLS+=	autoconf:259:env
+USE_AUTOTOOLS+=	autoconf:261:env
 BUILD_DEPENDS+=	phpize:${PHP_PORT}
 post-install:
 		@(cd ${WRKSRC}/phpmrss; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile
index cab238e33a4b..48e4dc0cc2ea 100644
--- a/textproc/wbxml2/Makefile
+++ b/textproc/wbxml2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wbxml2
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://czauner.onlineloop.com/pub/FreeBSD/distfiles/
@@ -18,7 +19,7 @@ COMMENT=	Library & tools for converting wbxml<->xml
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_AUTOTOOLS=	aclocal:19 autoconf:259 autoheader:259 automake:19 libtool:15
+USE_AUTOTOOLS=	aclocal:19 autoconf:261 autoheader:261 automake:19 libtool:15
 AUTOMAKE_ARGS=	-acf
 INSTALLS_SHLIB=	yes
 USE_GNOME=	pkgconfig
diff --git a/textproc/xaira/Makefile b/textproc/xaira/Makefile
index 190ef6a065e3..3cc122e598dc 100644
--- a/textproc/xaira/Makefile
+++ b/textproc/xaira/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xaira
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
@@ -15,10 +16,9 @@ COMMENT=	XML Aware Indexing and Retrieval Architecture
 
 LIB_DEPENDS=	xerces-c:${PORTSDIR}/textproc/xerces-c2 \
 		icuio:${PORTSDIR}/devel/icu
-BUILD_DEPENDS=	${LIBTOOL}:${PORTSDIR}/devel/libtool15
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal:19 autoconf:259 libtool:15
+USE_AUTOTOOLS=	aclocal:19 autoconf:261 libtool:15
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index f986c7d3d8aa..b7d73fd578e8 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.61
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/$/:powerlogo/}
@@ -49,7 +49,7 @@ SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
 			AUTOHEADER=${AUTOHEADER}
 USE_ICONV=		yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_PERL5=		yes
 USE_RC_SUBR=		apache2.sh
 SUB_LIST+=		RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 8dc492cda11e..d7058e360cde 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.1.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo
@@ -37,6 +37,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 
 DEPRECATED=     No longer supported, please use www/apache22 instead
 EXPIRES=        2007-12-09
+BROKEN=		Fails with autoconf-2.61
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
@@ -46,7 +47,7 @@ SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 USE_APACHE=		common21
 USE_BZIP2=		yes
 USE_ICONV=		yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 USE_PERL5=		yes
 USE_RC_SUBR=		yes
 LIBTOOLFILES=		configure
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index fc13d8138eda..c2356d4cad1f 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
@@ -39,7 +39,7 @@ SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 USE_APACHE=		common22
 USE_BZIP2=		yes
 USE_ICONV=		yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=		autoconf:261 libtool:15
 USE_PERL5=		yes
 USE_RC_SUBR=		apache22.sh htcacheclean.sh
 SUB_LIST+=		RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
diff --git a/www/asterisk-gui/Makefile b/www/asterisk-gui/Makefile
index 8e397e10ef95..0fe3f80833f8 100644
--- a/www/asterisk-gui/Makefile
+++ b/www/asterisk-gui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk-gui
 PORTVERSION=	0.0.1r20070801
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://asterisk-bsd.googlecode.com/files/
 DISTNAME=	${PORTNAME}-snap-2007-08-01
@@ -16,7 +17,7 @@ COMMENT=	An asterisk ajax web manager
 
 RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 
-USE_AUTOTOOLS=	autoconf:259 automake:19
+USE_AUTOTOOLS=	autoconf:261 automake:19
 USE_GMAKE=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
diff --git a/www/asterisk-gui/files/patch-bootstrap.sh b/www/asterisk-gui/files/patch-bootstrap.sh
index 09e125ca7465..0bc24b636e92 100644
--- a/www/asterisk-gui/files/patch-bootstrap.sh
+++ b/www/asterisk-gui/files/patch-bootstrap.sh
@@ -6,7 +6,7 @@
  if [ $? = 0 ] ; then	# FreeBSD case
 -	MY_AC_VER=259
 -	MY_AM_VER=19
-+	MY_AC_VER=-2.59
++	MY_AC_VER=-2.61
 +	MY_AM_VER=-1.9
  else	# linux case
  	MY_AC_VER=
diff --git a/www/flood/Makefile b/www/flood/Makefile
index 18fae3d5eca3..410c8467e66e 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flood
 PORTVERSION=	0.20041105
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://dist.bsdlab.org/
 DISTNAME=	httpd-test_20041105052051
@@ -19,7 +19,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		apr-1:${PORTSDIR}/devel/apr
 
 WRKSRC=		${WRKDIR}/httpd-test/flood
-USE_AUTOTOOLS=	autoconf:253 libtool:15:env
+USE_AUTOTOOLS=	autoconf:261 libtool:15:env
 CONFIGURE_ARGS=	--disable-shared \
 	--with-apr=${LOCALBASE}/bin/apr-1-config \
 	--with-apr-util=${LOCALBASE}/bin/apu-1-config
diff --git a/www/gforge/Makefile b/www/gforge/Makefile
index 138d3da232e2..0d40e71839b3 100644
--- a/www/gforge/Makefile
+++ b/www/gforge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gforge
 PORTVERSION=	4.5.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 MASTER_SITES=	http://gforge.org/frs/download.php/236/
 
@@ -20,7 +20,7 @@ USE_BZIP2=		YES
 USE_PERL5=		YES
 HAS_CONFIGURE=		YES
 USE_APACHE=		YES
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 NO_BUILD=		YES
 USE_PHP=		pgsql session pcre
 WANT_PHP_CLI=		YES
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 40ab063b29ca..44a26ff4d395 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libapreq2
 PORTVERSION=	2.08
+PORTREVISION=	1
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
@@ -16,7 +17,7 @@ COMMENT=	Generic Apache2 Request Library
 
 USE_APACHE=	2.0+
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
 
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
diff --git a/www/libapreq2/files/patch-glue-perl-Makefile.PL b/www/libapreq2/files/patch-glue-perl-Makefile.PL
index f8515fd7ec69..f7a8b96c8ce1 100644
--- a/www/libapreq2/files/patch-glue-perl-Makefile.PL
+++ b/www/libapreq2/files/patch-glue-perl-Makefile.PL
@@ -1,13 +1,24 @@
---- glue/perl/Makefile.PL	Mon May  2 20:24:29 2005
-+++ glue/perl/Makefile.PL	Sat May 21 17:57:39 2005
-@@ -443,8 +443,8 @@
-     'NAME'      => '$class',
-     'VERSION'   => '$version',
+--- glue/perl/Makefile.PL.orig	2006-08-08 21:26:45.000000000 -0700
++++ glue/perl/Makefile.PL	2007-09-22 20:12:05.000000000 -0700
+@@ -71,2 +71,3 @@
+     $apache_includes .= " $1";
++    $apache_includes =~ s,\|\#_!!_\#\|,,g;
+ 
+@@ -84,3 +85,3 @@
+         die "Can't find apreq libname";
+-    $apreq_libname = $1;
++    $apreq_libname = $1; $apreq_libname =~ s,^\|\#_!!_\#\|,,;
+ 
+@@ -88,4 +89,3 @@
+         die "Can't find package version";
+-    $version = $1;
+-
++    $version = $1; $version =~ s,^\|\#_!!_\#\|,,;
+ }
+@@ -417,4 +417,4 @@
      'TYPEMAPS'  => [qw(@$mp2_typemaps $typemap)],
 -    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes",
 -    'LIBS'      => "$apreq_libs $apr_libs",
-+    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes -I\\\$(PREFIX)/%%APACHEINCLUDEDIR%%/modules/perl",
++    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes -I\\\$(PREFIX)/include/apache2/modules/perl",
 +    'LIBS'      => "$apreq_libs $apr_libs -L\\\$(PREFIX)/lib",
  } ;
- $txt .= "'depend'  => $deps,\n" if ($deps) ;
- $txt .= qq{    
diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile
index 7be828dcee2b..6125d9de4416 100644
--- a/www/mod_cplusplus/Makefile
+++ b/www/mod_cplusplus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_cplusplus
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	modcplusplus
@@ -15,7 +16,7 @@ MAINTAINER=	durian@shadetreesoftware.com
 COMMENT=	Apache module for loading C++ objects as handlers
 
 USE_APACHE=	2.0+
-USE_AUTOTOOLS=	autoconf:259 autoheader:259 libtool:15 automake:19 aclocal:19
+USE_AUTOTOOLS=	autoconf:261 autoheader:261 libtool:15 automake:19 aclocal:19
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS+=	-a
 GNU_CONFIGURE=	yes
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile
index 7dd02507e057..18f1ce2ed9e2 100644
--- a/www/mod_webapp/Makefile
+++ b/www/mod_webapp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_webapp
 PORTVERSION=	4.1.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://jakarta.apache.org/%SUBDIR%/
 MASTER_SITE_SUBDIR=	builds/jakarta-tomcat-4.0/release/v${TOMCAT_RELEASE}/src
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	${NONEXISTANT}:${PORTSDIR}/devel/apr:configure
 
 USE_APACHE=	yes
 USE_PYTHON_BUILD=yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/www/oops/Makefile b/www/oops/Makefile
index 9969fd5cc5f2..972c43b214c4 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oops
 PORTVERSION=	${OOPSVERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://oops-cache.org/ \
 		ftp://kucha.ru/pub/misc/oops/
@@ -21,7 +21,7 @@ BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 OOPSVERSION=	1.5.24
 
 USE_SUBMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc/oops \
 		--localstatedir=${OOPSVAR} \
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 76dc34547755..0621bd14455a 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	privoxy
 PORTVERSION=	3.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ijbswa
@@ -19,7 +19,7 @@ COMMENT=	Privoxy is a web proxy with advanced filtering capabilities
 WRKSRC=		${WRKDIR}/privoxy-${PORTVERSION}-stable
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 
 USE_RC_SUBR=	privoxy
 SUB_FILES=	pkg-message
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index a811e13343fc..96cfb4ea43cb 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -61,6 +61,7 @@
 #     together with other code that adds custom HTTP headers to the
 #     requests.
 
+PORTREVISION=	1
 PORTNAME=	squid
 PORTVERSION=	3.0.p7.${PATCHSET_DATE}
 CATEGORIES=	www
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index a811e13343fc..96cfb4ea43cb 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -61,6 +61,7 @@
 #     together with other code that adds custom HTTP headers to the
 #     requests.
 
+PORTREVISION=	1
 PORTNAME=	squid
 PORTVERSION=	3.0.p7.${PATCHSET_DATE}
 CATEGORIES=	www
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index c2f09e905f33..27d191b2e746 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	tidy
 DISTVERSION=	070813-cvs
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 #MASTER_SITES=	http://tidy.sourceforge.net/src/%SUBDIR%/	\
@@ -28,7 +29,7 @@ USE_GMAKE=	yes
 PLIST_SUB=	SHLIB="@comment " NSHLIB=""
 CONFLICTS=	tidy-20000804* tidy-lib-[0-9]*
 .else
-USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:15 autoconf:261 libtool:15
 AUTOMAKE_ARGS+=	-a -c --foreign
 CONFIGURE_TARGET=	 --target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LDCONFIG=	yes
diff --git a/www/websh/Makefile b/www/websh/Makefile
index 8062010e27bd..484bef8f5d71 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	websh
 PORTVERSION=	3.6.0b4
+PORTREVISION=	1
 CATEGORIES=	www tcl84
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=tcl/${PORTNAME}/source
@@ -21,7 +22,7 @@ OPTIONS+=	WSSTATIC "Link the objects into the module statically" off
 TCL_DVER=	${TCL_VER:S/.//}
 
 USE_TCL=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix
 CONFIGURE_ARGS+=--with-tclinclude=${TCL_INCLUDEDIR} \
 		--with-tcl=${TCL_LIBDIR}
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index c8e5c1c604d6..940a5492e6c8 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	driglide
 PORTVERSION=	0.9.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	anholt/driglide/
@@ -18,7 +18,7 @@ COMMENT=	Libraries to support 3dfx Voodoo3/4/5/Banshee with the DRI
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:14 autoconf:261 libtool:15
 AUTOMAKE_ARGS=	-a
 USE_GMAKE=	yes
 MAKE_ARGS=	PREPROCESSOR=/usr/bin/cpp
diff --git a/x11-themes/polymer/Makefile b/x11-themes/polymer/Makefile
index 779bbb078bd3..900eff4f4446 100644
--- a/x11-themes/polymer/Makefile
+++ b/x11-themes/polymer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	polymer
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://static.int.pl/~mig21/dev/releases/polymer/ \
 		${MASTER_SITE_LOCAL}
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	autoheader:259
+USE_AUTOTOOLS=	autoheader:261
 USE_QT_VER=	3
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 0c1039af9ad7..817e2c5b6c19 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lesstif
 PORTVERSION=	0.95.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -20,7 +20,7 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 CONFLICTS?=	open-motif-*
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259 libtool:15
+USE_AUTOTOOLS=	automake:19:env autoconf:261 libtool:15
 USE_X_PREFIX=	yes
 USE_LDCONFIG=	yes
 LIBTOOLFILES=	aclocal.m4 test/aclocal.m4
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 93be80f7d6c4..712a1e18d7e6 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgtkeditor
 PORTVERSION=	0.1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/lib//}
@@ -18,7 +18,7 @@ COMMENT=	A source code editor widget for GTK+
 
 LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
-USE_AUTOTOOLS=	automake:15:env autoconf:253:env libtool:15
+USE_AUTOTOOLS=	automake:15:env autoconf:261:env libtool:15
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index ffe40e662c37..9333cae05e5c 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	1.0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
@@ -15,7 +15,7 @@ MASTER_SITES=	http://gtk.php.net/distributions/ \
 MAINTAINER=	zaa@zaa.pp.ru
 COMMENT=	An extension to use gtk in PHP-applications
 
-USE_AUTOTOOLS=	automake:19:env autoconf:259 libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261 libtool:15:env
 GNU_CONFIGURE=	yes
 USE_PHP=	pcre
 USE_PHP_BUILD=	yes
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index ffe40e662c37..9333cae05e5c 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	1.0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
@@ -15,7 +15,7 @@ MASTER_SITES=	http://gtk.php.net/distributions/ \
 MAINTAINER=	zaa@zaa.pp.ru
 COMMENT=	An extension to use gtk in PHP-applications
 
-USE_AUTOTOOLS=	automake:19:env autoconf:259 libtool:15:env
+USE_AUTOTOOLS=	automake:19:env autoconf:261 libtool:15:env
 GNU_CONFIGURE=	yes
 USE_PHP=	pcre
 USE_PHP_BUILD=	yes
diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile
index 25ed9f3ff2e4..8ca82b1205ca 100644
--- a/x11-toolkits/viewkit/Makefile
+++ b/x11-toolkits/viewkit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	viewkit
 PORTVERSION=	0.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.hungry.com/pub/hungry/viewkit/ \
 		${MASTER_SITE_LOCAL}
@@ -17,7 +17,7 @@ DISTNAME=	libvk-Apr19-2243
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ViewKit workalike from Hungry Programmers
 
-USE_AUTOTOOLS=	autoconf:253:env
+USE_AUTOTOOLS=	autoconf:261:env
 MOTIFPACKAGE?=	open-motif
 USE_X_PREFIX=	yes
 USE_MOTIF=	yes
diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile
index 9466123c42dd..4000d18bf89d 100644
--- a/x11/gnome-launch-box/Makefile
+++ b/x11/gnome-launch-box/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-launch-box
 PORTVERSION=	20060112
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jylefort
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libgnomeui evolutiondataserver gnomemenus gnomedesktop
 
-USE_AUTOTOOLS=	autoconf:259 autoheader:259 automake:19 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:261 autoheader:261 automake:19 aclocal:19 libtool:15
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-a
 LIBTOOLFILES=
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index d2a7beb92876..7476b543f525 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	idesk
 PORTVERSION=	0.7.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}/
@@ -21,7 +21,7 @@ USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 CXXFLAGS+=	`imlib2-config --cflags` `freetype-config --cflags`
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index 4faf99eb2ee3..12168f223a07 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	powershell
 PORTVERSION=	0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A terminal emulator for the X11
 
 USE_GNOME=	gnomelibs gnomehier
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include  `${IMLIB_CONFIG} --cflags`" \
 		LDFLAGS="-L${LOCALBASE}/lib  `${IMLIB_CONFIG} --libs`"
 ALL_TARGET=	${PORTNAME}
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index a0fac25a14e9..0f37c098d2d1 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdesk
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://offog.org/files/
 
@@ -23,7 +23,7 @@ PLIST_FILES+=	share/doc/vdesk/${ii}
 .endfor
 .endif
 USE_X_PREFIX=		yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 
 post-extract:
 # Avoid having to read this lengthy file.
author	Mark Linimon <linimon@FreeBSD.org>	2007-09-30 04:47:36 +0000
committer	Mark Linimon <linimon@FreeBSD.org>	2007-09-30 04:47:36 +0000
commit	48420a5ebd9fbd0e15cf0fa5b62dd93ae9cd2531 (patch)
tree	eedd43e6e7c3a96d77549de85690d46016e9cc7e
parent	af4658fb56c22ab36db1f30588a3964e1d47d634 (diff)
download	ports-48420a5ebd9fbd0e15cf0fa5b62dd93ae9cd2531.tar.gz ports-48420a5ebd9fbd0e15cf0fa5b62dd93ae9cd2531.zip