22 files changed, 43 insertions, 21 deletions

diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index 36fc8e23e336..8d572e31024e 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -24,10 +24,13 @@ USE_ICONV =	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
-USE_AUTOTOOLS=	autoconf:261
+USE_AUTOTOOLS=	autoconf:262
 CONFIGURE_ARGS=	--enable-s3=yes
 CONFIGURE_ENV=	CPPFLAGS='-DFUSE_USE_VERSION=26' \
 		LDFLAGS='${PTHREAD_LIBS}'
 CFLAGS+=	${PTHREAD_LIBS}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|2.61|2.62|g' ${WRKSRC}/aclocal.m4
+
 .include <bsd.port.mk>
diff --git a/sysutils/aimage/Makefile b/sysutils/aimage/Makefile
index c66a5dce9902..bb9d25f77334 100644
--- a/sysutils/aimage/Makefile
+++ b/sysutils/aimage/Makefile
@@ -18,8 +18,11 @@ LIB_DEPENDS=	afflib:${PORTSDIR}/sysutils/afflib
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:261
+USE_AUTOTOOLS=	autoconf:262
 
 PLIST_FILES=	bin/aimage
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|2.61|2.62|g' ${WRKSRC}/aclocal.m4
+
 .include <bsd.port.mk>
diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index ce4ac9bd2462..c978b613b228 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.webta.org/apachetop/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache RealTime log stats
 
-USE_AUTOTOOLS=	autoconf:261:env
+USE_AUTOTOOLS=	autoconf:262:env
 GNU_CONFIGURE=	yes
 
 MAN1=		apachetop.1
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 1c79ffefc5d1..0fcf74483429 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -19,7 +19,7 @@ COMMENT=	An open source, completely automatic on-line backup system for UNIX
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf:261 aclocal:19 autoheader:261
+USE_AUTOTOOLS=	autoconf:262 aclocal:19 autoheader:262
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
index 1c79ffefc5d1..0fcf74483429 100644
--- a/sysutils/boxbackup/Makefile
+++ b/sysutils/boxbackup/Makefile
@@ -19,7 +19,7 @@ COMMENT=	An open source, completely automatic on-line backup system for UNIX
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf:261 aclocal:19 autoheader:261
+USE_AUTOTOOLS=	autoconf:262 aclocal:19 autoheader:262
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
index 50a64193dd78..a51bb6b30021 100644
--- a/sysutils/condor/Makefile
+++ b/sysutils/condor/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/condor_src-${PORTVERSION}/src/
 OPTIONS=	SUBMIT_NODE "Configure system to be able to submit jobs" On \
 		EXECUTE_NODE "Configure system to execute jobs in pool" On \
 		MANAGER_NODE "Configure system as central manager node" On
-USE_AUTOTOOLS=	autoconf:261:env
+USE_AUTOTOOLS=	autoconf:262:env
 USE_BISON=	build
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/condor/files/patch-src_aclocal_m4 b/sysutils/condor/files/patch-src_aclocal_m4
new file mode 100644
index 000000000000..4b95db5b806b
--- /dev/null
+++ b/sysutils/condor/files/patch-src_aclocal_m4
@@ -0,0 +1,16 @@
+--- ./aclocal.m4.orig	2007-09-19 18:47:25.000000000 +0000
++++ ./aclocal.m4	2008-08-04 13:46:17.000000000 +0000
+@@ -436,6 +436,6 @@
+ [
+- if test "x$[ac_condor_analyze_[$1]]" = "x"; then
++ if test "x$[ac_condor_analyze_$1]" = "x"; then
+    if test ! "x$ac_condor_analyze" = "x" ; then
+      AC_MSG_WARN([no condor_analyze.$1 found, using $ac_condor_analyze])
+-     AC_SUBST([condor_analyze_[$1]],$ac_condor_analyze)
++     AC_SUBST([condor_analyze_$1],$ac_condor_analyze)
+    else
+@@ -448,3 +448,3 @@
+  else 
+-   AC_SUBST([condor_analyze_[$1]],$[ac_condor_analyze_[$1]])
++   AC_SUBST([condor_analyze_$1],$[ac_condor_analyze_$1])
+  fi
diff --git a/sysutils/cronolog/Makefile b/sysutils/cronolog/Makefile
index d503639c76c4..509fb6af41eb 100644
--- a/sysutils/cronolog/Makefile
+++ b/sysutils/cronolog/Makefile
@@ -18,7 +18,7 @@ INFO=		cronolog
 MAN1=		cronolog.1m cronosplit.1m
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:196 aclocal:19 autoconf:261
+USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:262
 AUTOMAKE_ARGS+=	--add-missing
 
 OPTIONS=	SETUID_PATCH "Build with setuid functionality" On
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index 91a51b1762e6..a5d9da51c7e7 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	puzzle.1:${PORTSDIR}/graphics/libpuzzle \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:261 aclocal:110 automake:110 autoheader:261
+USE_AUTOTOOLS=	autoconf:262 aclocal:110 automake:110 autoheader:262
 CONFIGURE_ARGS+=	--with-check=${LOCALBASE} --with-puzzle=${LOCALBASE}
 PLIST_FILES=	bin/ftwin
 
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index f77bfd77e97f..4fabb3ff92cd 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Shows package dependencies in tree views
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	automake:15 autoconf:261
+USE_AUTOTOOLS=	automake:15 autoconf:262
 AUTOMAKE_ARGS=	--add-missing
 USE_GMAKE=	yes
 PLIST_FILES=	bin/gpkgdep
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index ea01be141e48..b5e4dc5ab134 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	GRand Unified Bootloader
 
-USE_AUTOTOOLS=	automake:19 autoconf:261
+USE_AUTOTOOLS=	automake:19 autoconf:262
 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 fb530d9d26ef..d44ba93229dd 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS=	autoconf:261
+USE_AUTOTOOLS=	autoconf:262
 
 MAN1=		hdup.1
 MAN5=		hdup.conf.5
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 9102c08eb645..ce381914b854 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -17,7 +17,7 @@ NOT_FOR_ARCHS=	sparc64
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-proc=/compat/linux/proc --enable-unicode
-USE_AUTOTOOLS=	autoconf:261 aclocal:19 automake:19 libtool:15
+USE_AUTOTOOLS=	autoconf:262 aclocal:19 automake:19 libtool:15
 ACLOCAL_ARGS=	-I ${ACLOCAL_DIR}
 
 USE_PYTHON_BUILD=	yes
diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index 81da45af86ff..ad462d179a4a 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--disable-intf-open
 		!defined(WITHOUT_FREEIPMI))
 # Support for FreeIPMI 0.4.x and 0.5.x API
 EXTRA_PATCHES+=	${FILESDIR}/freeipmi-support.patch
-USE_AUTOTOOLS+=	autoconf:261 libtool:15 aclocal:19 automake:19
+USE_AUTOTOOLS+=	autoconf:262 libtool:15 aclocal:19 automake:19
 # libtool15 installs it's aclocal macros into ${LOCALBASE}/share/aclocal
 ACLOCAL_ARGS+=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 # Make automake quiet about missing NEWS and ChangeLog files
diff --git a/sysutils/jfbterm/Makefile b/sysutils/jfbterm/Makefile
index 51e00a7297b9..86b45021eac5 100644
--- a/sysutils/jfbterm/Makefile
+++ b/sysutils/jfbterm/Makefile
@@ -24,7 +24,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:261 automake:14
+USE_AUTOTOOLS=	autoconf:262 automake:14
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		--mandir="${LOCALBASE}/man"
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 0c41796a4934..10b114c0adb1 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A client/server suite for LCD devices
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_AUTOTOOLS=	autoconf:261 automake:19 aclocal:19
+USE_AUTOTOOLS=	autoconf:262 automake:19 aclocal:19
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	LCDd lcdproc
 
diff --git a/sysutils/nctop/Makefile b/sysutils/nctop/Makefile
index f8f872ce0f37..ba6be2f28d76 100644
--- a/sysutils/nctop/Makefile
+++ b/sysutils/nctop/Makefile
@@ -14,7 +14,7 @@ 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:261:env
+USE_AUTOTOOLS=	autoconf:262:env
 USE_BZIP2=	YES
 
 HAS_CONFIGURE=	yes
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 4ed8fb4198e3..80e9cb5c82b1 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT=	Network UPS Tools
 
-USE_AUTOTOOLS=	autoconf:261
+USE_AUTOTOOLS=	autoconf:262
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 4ed8fb4198e3..80e9cb5c82b1 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	Joerg.Pulz@frm2.tum.de
 COMMENT=	Network UPS Tools
 
-USE_AUTOTOOLS=	autoconf:261
+USE_AUTOTOOLS=	autoconf:262
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/wmupmon/Makefile b/sysutils/wmupmon/Makefile
index 2aa18ae4ffe3..df3fb30390fe 100644
--- a/sysutils/wmupmon/Makefile
+++ b/sysutils/wmupmon/Makefile
@@ -16,7 +16,7 @@ COMMENT=	An uptime showing dockapp with a similar look to wmcpuload
 
 USE_BZIP2=	yes
 USE_XORG=	xpm
-USE_AUTOTOOLS=	automake:15 autoheader:261
+USE_AUTOTOOLS=	automake:15 autoheader:262
 CONFIGURE_ARGS=	--program-prefix=""
 
 MAN1=		wmupmon.1
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 5d496f5ac467..343f5ee3813f 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A set of utilities and library to manipulate an xfs filesystem
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	autoconf:261 libtool:15:env
+USE_AUTOTOOLS=	autoconf:262 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 55ff5204dc8f..5cb160ea08e4 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/sysutils/zisofs-tools/Makefile
@@ -15,7 +15,7 @@ COMMENT=	User utilities for zisofs
 
 PORTDOCS=	CHANGES COPYING INSTALL MRULES README
 
-USE_AUTOTOOLS=	autoconf:261
+USE_AUTOTOOLS=	autoconf:262
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes