Sync to final (for now) bsd.autotools.mk

svn path=/head/; revision=266737
2010-12-22 20:05:49 +00:00 · 2010-12-22 20:05:49 +00:00 · 843f8123d4 · 2021-03-31 03:12:20 +00:00
parent 55d09a7758
commit 843f8123d4
61 changed files with 155 additions and 101 deletions
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -3749,8 +3749,8 @@ do-patch:
 	fi
 .endif

-.if !target(patch-autotools)
-patch-autotools:
+.if !target(configure-autotools)
+configure-autotools:
 	@${DO_NADA}
 .endif

@ -4418,10 +4418,10 @@ _EXTRACT_SEQ=	check-build-conflicts extract-message checksum extract-depends \
 				post-extract post-extract-script
 _PATCH_DEP=		extract
 _PATCH_SEQ=		ask-license patch-message patch-depends patch-dos2unix pre-patch \
-				pre-patch-script do-patch patch-autotools post-patch post-patch-script
+				pre-patch-script do-patch post-patch post-patch-script
 _CONFIGURE_DEP=	patch
 _CONFIGURE_SEQ=	build-depends lib-depends configure-message \
-				pre-configure pre-configure-script \
+				configure-autotools pre-configure pre-configure-script \
 				run-autotools do-configure post-configure post-configure-script
 _BUILD_DEP=		configure
 _BUILD_SEQ=		build-message pre-build pre-build-script do-build \
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@ -23,6 +23,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
--- a/chinese/iiimf-le-newpy/files/patch-Makefile
+++ b/chinese/iiimf-le-newpy/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/chinese/iiimf-le-ude/Makefile
+++ b/chinese/iiimf-le-ude/Makefile
@ -23,6 +23,7 @@ ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
--- a/chinese/iiimf-le-ude/files/patch-Makefile
+++ b/chinese/iiimf-le-ude/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@ -27,9 +27,12 @@ USE_GMAKE=	yes
 PLIST_FILES=	bin/aldo
 MAN1=	aldo.1

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|1.10|1.11.1|g' ${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|1.10|%%AUTOMAKE_APIVER%%|g' \
+			  -e 's|2.61|%%AUTOCONF_VERSION%%|g' \
+			  ${WRKSRC}/aclocal.m4

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/aldo ${PREFIX}/bin
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@ -55,8 +55,10 @@ CONFIGURE_ARGS=	--with-boost-include-dir="${LOCALBASE}/include/" \
 LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
 .endif

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.61|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4
 	@${REINPLACE_CMD} -e 's|^GR_FORTRAN||g' ${WRKSRC}/configure.ac
 	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
 		-n 10 ${REINPLACE_CMD} -E -e \
--- a/comms/unixcw/Makefile
+++ b/comms/unixcw/Makefile
@ -35,6 +35,7 @@ MANCOMPRESSED=	yes
 USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+AUTOTOOLSFILES=	configure.ac

 pre-extract:
 .if !defined(WITH_XCWCP)
--- a/comms/unixcw/files/patch-configure.ac
+++ b/comms/unixcw/files/patch-configure.ac
@ -5,7 +5,7 @@
 
 # General initializations.
 -AC_PREREQ(2.57)
-+AC_PREREQ(2.68)
+AC_PREREQ(%%AUTOCONF_VERSION%%)
 AC_INIT([UnixCW], 2.3, [simon_baldwin@yahoo.com])
 -
 # Specify a configuration header.
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@ -36,6 +36,7 @@ USE_LDCONFIG=	${PREFIX}/lib/mysql-workbench
 SUBDIRS=	ext/yassl/taocrypt ext/yassl .
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*ext/yassl/.*(Makefile.am|configure.in)
+AUTOTOOLSFILES=	configure.in

 USE_GL=		gl glu
 USE_GNOME=	libglade2 intltool libgnome gtk20 pango orbit2
--- a/databases/mysql-workbench51/files/patch-configure.in
+++ b/databases/mysql-workbench51/files/patch-configure.in
@ -5,7 +5,7 @@
 (
   cd ./ext/ctemplate/ctemplate-src &&
 -  autoreconf -i -s; 
-+  autoreconf-2.68 -i; 
+  %%AUTORECONF%% -i; 
   ./configure --prefix=$prefix --libdir=$libdir/mysql-workbench --disable-dependency-tracking
 )    
 
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@ -31,6 +31,7 @@ MAN8=		cvsbug.8
 INFO=		cvs cvsclient
 USE_AUTOTOOLS=	automake14:env autoconf:env
 MAKE_JOBS_UNSAFE=	yes
+AUTOTOOLSFILES=	make_configure

 .include <bsd.port.pre.mk>

--- a/devel/gcvs/files/patch-make_configure
+++ b/devel/gcvs/files/patch-make_configure
@ -13,7 +13,7 @@
 -done
 -
 -autoconf 
-+cd cvsunix && autoreconf-2.68
+cd cvsunix && %%AUTORECONF%%
 +cd ..
 
 ./configure $*
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@ -18,6 +18,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake autoconf libtool
+AUTOTOOLSFILES=	autogen.sh
 MAKE_JOBS_UNSAFE=	yes

 ALL_TARGET=	all check
@ -27,7 +28,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.11,' -e 's,259,-2.68,' \
+	@${REINPLACE_CMD} -e 's,15,-%%AUTOMAKE_VERSION%%,' -e 's,259,-%%AUTOCONF_VERSION%%,' \
 		${WRKSRC}/autogen.sh

 pre-configure:
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@ -39,6 +39,7 @@ CONFIGURE_ARGS=	--with-apr-config=apr-1-config \

 USE_LDCONFIG=	yes
 MAN1=		rapidsvn.1
+AUTOTOOLSFILES=	aclocal.m4

 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile -print | \
--- a/devel/rapidsvn/files/patch-aclocal.m4
+++ b/devel/rapidsvn/files/patch-aclocal.m4
@ -3,10 +3,10 @@
@@ -7985,3 +7985,3 @@
 # generated from the m4 files accompanying Automake X.Y.
 -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="%%AUTOMAKE_VERSION%%"])
 
@@ -7992,3 +7992,3 @@
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 -	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+	 [AM_AUTOMAKE_VERSION([1.11.1])])
+	 [AM_AUTOMAKE_VERSION([%%AUTOMAKE_APIVER%%])])
 
--- a/dns/dnswall/Makefile
+++ b/dns/dnswall/Makefile
@ -15,7 +15,7 @@ MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A daemon that filters out private IP addresses in DNS responses

 PROJECTHOST=	google-dnswall
-USE_AUTOTOOLS=	automake
+USE_AUTOTOOLS=	automake autoconf:env
 USE_DOS2UNIX=	yes
 MAKE_JOBS_SAFE=	yes

@ -26,9 +26,12 @@ AUTOFILES=	depcomp install-sh missing
 PORTDOCS=	README
 PLIST_FILES=	bin/dnswall

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|1.10|1.11.1|g' ${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|1.10|%%AUTOMAKE_APIVER%%|g' \
+			  -e 's|2.61|%%AUTOCONF_VERSION%%|g' \
+			  ${WRKSRC}/aclocal.m4
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/^dist_doc_DATA/d' ${WRKSRC}/Makefile.am
 .endif
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@ -18,6 +18,7 @@ COMMENT=	NSS module implementing multicast DNS name resolution
 USE_AUTOTOOLS=	autoconf automake libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+AUTOTOOLSFILES=	aclocal.m4

 LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app

--- a/dns/nss_mdns/files/patch-aclocal.m4
+++ b/dns/nss_mdns/files/patch-aclocal.m4
@ -3,10 +3,10 @@
@@ -6392,3 +6392,3 @@
 # generated from the m4 files accompanying Automake X.Y.
 -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="%%AUTOMAKE_VERSION%%"])
 
@@ -6399,3 +6399,3 @@
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 -	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+	 [AM_AUTOMAKE_VERSION([1.11.1])])
+	 [AM_AUTOMAKE_VERSION([%%AUTOMAKE_APIVER%%])])
 
--- a/games/kmastermind/Makefile
+++ b/games/kmastermind/Makefile
@ -30,7 +30,7 @@ pre-configure:
 		`cd ${PORTSDIR}/x11/kdelibs3 && ${MAKE} -V WRKSRC`/admin \
 		${WRKSRC}/admin
 	${TOUCH} ${WRKSRC}/NEWS
-	@${REINPLACE_CMD} -e 's|1.10|1.11|' ${WRKSRC}/admin/cvs.sh
+	@${REINPLACE_CMD} -e 's|1.10|${AUTOMAKE_VERSION}|' ${WRKSRC}/admin/cvs.sh
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} -f admin/Makefile.common cvs

 .include <bsd.port.mk>
--- a/games/spacejunk/Makefile
+++ b/games/spacejunk/Makefile
@ -40,12 +40,16 @@ DESKTOP_ENTRIES=	"Spacejunk" \
 BROKEN=		Doesn't compile on sparc64"
 .endif

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/gem-uta.c \
 		${WRKSRC}/libinfo/gem-uta.c
 	@${REINPLACE_CMD} -e 's|data/|${DATADIR}/&|' ${WRKSRC}/src/*.c*
 	@${RM} -f ${WRKSRC}/config.guess
-	@${REINPLACE_CMD} -e 's|1.10.1|1.11.1|' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|1.10.1|%%AUTOMAKE_APIVER%%|g' \
+			  -e 's|1.10|%%AUTOMAKE_VERSION%%|g' \
+			  ${WRKSRC}/aclocal.m4

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/spacejunk ${PREFIX}/libexec/
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@ -21,6 +21,7 @@ USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake autoheader libtool
 USE_LDCONFIG=	yes
+AUTOTOOLSFILES=	aclocal.m4

 MAN1=	cal3d_converter.1

--- a/graphics/cal3d/files/patch-aclocal.m4
+++ b/graphics/cal3d/files/patch-aclocal.m4
@ -3,10 +3,10 @@
@@ -6392,3 +6392,3 @@
 # generated from the m4 files accompanying Automake X.Y.
 -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="%%AUTOMAKE_VERSION%%"])
 
@@ -6399,3 +6399,3 @@
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 -	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+	 [AM_AUTOMAKE_VERSION([1.11.1])])
+	 [AM_AUTOMAKE_VERSION([%%AUTOMAKE_APIVER%%])])
 
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@ -27,6 +27,7 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
--- a/japanese/iiimf-le-canna/files/patch-Makefile
+++ b/japanese/iiimf-le-canna/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/japanese/iiimf-le-freewnn/Makefile
+++ b/japanese/iiimf-le-freewnn/Makefile
@ -27,6 +27,7 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
--- a/japanese/iiimf-le-freewnn/files/patch-Makefile
+++ b/japanese/iiimf-le-freewnn/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/korean/iiimf-le-hangul/Makefile
+++ b/korean/iiimf-le-hangul/Makefile
@ -24,6 +24,7 @@ USE_XORG=	x11
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
--- a/korean/iiimf-le-hangul/files/patch-Makefile
+++ b/korean/iiimf-le-hangul/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@ -39,6 +39,8 @@ INFO=		goops guile-tut guile r5rs

 .include <bsd.port.pre.mk>

+AUTOTOOLSFILES=	aclocal.m4
+
 post-extract:
 	cd ${WRKSRC}; ${CHMOD} u+w ${REINPLACE_FILES}
 	@${FIND} ${WRKSRC}/doc -name "*.info*" -delete
@ -46,6 +48,6 @@ post-extract:
 post-patch:
 	@cd ${WRKSRC} ; \
 	  ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES}
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.63|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4

 .include <bsd.port.post.mk>
--- a/lang/php52/Makefile
+++ b/lang/php52/Makefile
@ -21,6 +21,7 @@ USE_BZIP2=	yes
 MAKE_JOBS_SAFE=	yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
+AUTOTOOLSFILES=	scripts/phpize.in

 CONFIGURE_ARGS=	\
 		--with-layout=GNU \
--- a/lang/php52/files/patch-scripts::phpize.in
+++ b/lang/php52/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.68
-+  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.68
+  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=%%AUTOCONF%%
+  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=%%AUTOHEADER%%
   
   if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
     cat <<EOF
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@ -33,7 +33,9 @@ PLIST_FILES=	lib/claws-mail/plugins/synce_plugin.a \
 	lib/claws-mail/plugins/synce_plugin.la \
 	lib/claws-mail/plugins/synce_plugin.so

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.63|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4

 .include <bsd.port.mk>
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@ -47,7 +47,9 @@ CONFIGURE_ARGS+=	--disable-ipv6
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.61|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4

 .include <bsd.port.mk>
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@ -152,8 +152,10 @@ CONFIGURE_ARGS+=	--without-schroedinger

 .endif

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.64|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4
 	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
 		${WRKSRC}/plugins/audiocodec/* \
 		${WRKSRC}/plugins/videocodec/*
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@ -24,6 +24,7 @@ USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	automake autoconf libtool
+AUTOTOOLSFILES=	aclocal.m4
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
--- a/multimedia/xmms/files/patch-aclocal.m4
+++ b/multimedia/xmms/files/patch-aclocal.m4
@ -3,10 +3,10 @@
@@ -3872,3 +3872,3 @@
 # generated from the m4 files accompanying Automake X.Y.
 -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="%%AUTOMAKE_VERSION%%"])
 
@@ -3879,3 +3879,3 @@
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 -	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+	 [AM_AUTOMAKE_VERSION([1.11.1])])
+	 [AM_AUTOMAKE_VERSION([%%AUTOMAKE_APIVER%%])])
 
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@ -21,6 +21,7 @@ USE_GETTEXT=	yes
 USE_XORG=	xext
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
+AUTOTOOLSFILES=	aclocal.m4

 USE_KDELIBS_VER=3
 USE_QT_VER=	3
--- a/net-mgmt/tork/files/patch-aclocal.m4
+++ b/net-mgmt/tork/files/patch-aclocal.m4
@ -3,10 +3,10 @@
@@ -23,3 +23,3 @@
 # generated from the m4 files accompanying Automake X.Y.
 -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="%%AUTOMAKE_VERSION%%"])
 
@@ -30,3 +30,3 @@
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 -	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+	 [AM_AUTOMAKE_VERSION([1.11.1])])
+	 [AM_AUTOMAKE_VERSION([%%AUTOMAKE_APIVER%%])])
 
--- a/net/gsambad/Makefile
+++ b/net/gsambad/Makefile
@ -28,8 +28,10 @@ PORTDOCS=	AUTHORS README ChangeLog COPYING
 post-extract:
 	@${CP} ${FILESDIR}/crypt.h ${WRKSRC}/src/

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.61|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4

 post-configure:
 	@${REINPLACE_CMD} -e "s:\<crypt.h\>:\"crypt.h\":" ${WRKSRC}/src/functions.c
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@ -36,8 +36,10 @@ MAKE_JOBS_SAFE=	yes

 MAN1=		affcat.1

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.61|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4
 	@${REINPLACE_CMD} -e 's|(libdir)|(libdir)/lib|' \
 		 ${WRKSRC}/lib/Makefile.in
 	@${REINPLACE_CMD} -e 's|(libdir)|(libdir)/libdata|' \
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@ -25,6 +25,7 @@ USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimcf
--- a/textproc/iiimf-client-lib/files/patch-Makefile
+++ b/textproc/iiimf-client-lib/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@ -23,6 +23,7 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/CSConv
--- a/textproc/iiimf-csconv/files/patch-Makefile
+++ b/textproc/iiimf-csconv/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@ -28,6 +28,7 @@ USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_XORG=	x11
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/leif
--- a/textproc/iiimf-le-unit/files/patch-Makefile
+++ b/textproc/iiimf-le-unit/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@ -22,6 +22,7 @@ USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/lib/iiimp
--- a/textproc/iiimf-protocol-lib/files/patch-Makefile
+++ b/textproc/iiimf-protocol-lib/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@ -27,6 +27,7 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig libxml2
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimsf
--- a/textproc/iiimf-server/files/patch-Makefile
+++ b/textproc/iiimf-server/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@ -28,6 +28,7 @@ USE_GMAKE=	yes
 USE_MOTIF=	yes
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/xiiimp.so
--- a/textproc/iiimf-x-lib/files/patch-Makefile
+++ b/textproc/iiimf-x-lib/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@ -26,6 +26,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 ice xt
 USE_AUTOTOOLS=	automake:env autoconf:env libtool:env
+AUTOTOOLSFILES=	Makefile

 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 BUILDDIR=	${WRKSRC}/iiimxcf/htt_xbe
--- a/textproc/iiimf-x/files/patch-Makefile
+++ b/textproc/iiimf-x/files/patch-Makefile
@ -7,11 +7,11 @@
 -#LIBTOOLIZE = libtoolize --force --copy
 -#AUTOHEADER = autoheader
 -#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.11
-+AUTOMAKE = automake-1.11 --add-missing --copy
+ACLOCAL = %%ACLOCAL%%
+AUTOMAKE = %%AUTOMAKE%% --add-missing --copy
 +LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.68
-+AUTOCONF = autoconf-2.68
+AUTOHEADER = %%AUTOHEADER%%
+AUTOCONF = %%AUTOCONF%%
 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
 #             $(LIBTOOLIZE) && \
 #             $(AUTOHEADER) && \
@ -19,7 +19,7 @@
 #             $(AUTOCONF)
 
 -AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.68
+AUTORECONF = %%AUTORECONF%%
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
--- a/www/asterisk-gui/Makefile
+++ b/www/asterisk-gui/Makefile
@ -19,6 +19,7 @@ RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk14 \

 PROJECTHOST=	asterisk-bsd
 USE_AUTOTOOLS=	autoconf automake
+AUTOTOOLSFILES=	bootstrap.sh
 USE_GMAKE=	yes
 SUB_FILES=	pkg-message

--- a/www/asterisk-gui/files/patch-bootstrap.sh
+++ b/www/asterisk-gui/files/patch-bootstrap.sh
@ -6,8 +6,8 @@
 if [ $? = 0 ] ; then	# FreeBSD case
 -	MY_AC_VER=259
 -	MY_AM_VER=19
-+	MY_AC_VER=-2.68
-+	MY_AM_VER=-1.11
+	MY_AC_VER=-%%AUTOCONF_VERSION%%
+	MY_AM_VER=-%%AUTOMAKE_VERSION%%
 else	# linux case
 	MY_AC_VER=
 	MY_AM_VER=
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@ -39,9 +39,13 @@ CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}

 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e 's|1.10.1|1.11.1|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.61|%%AUTOCONF_VERSION%%|g' \
+			  -e 's|1.10.1|%%AUTOMAKE_APIVER%%|g' \
+			  -e 's|1.10|%%AUTOMAKE_VERSION%%|g' \
+			  ${WRKSRC}/aclocal.m4
 	@${CHMOD} 755 ${WRKSRC}/config/install-sh

 post-install:
--- a/x11-themes/kdmtheme/Makefile
+++ b/x11-themes/kdmtheme/Makefile
@ -20,6 +20,7 @@ USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
 USE_AUTOTOOLS=	automake:env autoconf:env libtool autoheader:env
 USE_GMAKE=	yes
+AUTOTOOLSFILES=	admin/detect-autoconf.sh

 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist)
--- a/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
+++ b/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
@ -4,6 +4,6 @@
 # separator if one is present, e.g. -1.2 where - is the separator.
 -KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
 -KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
-+KDE_AUTOCONF_VERS="-2.68"
-+KDE_AUTOMAKE_VERS="-1.11"
+KDE_AUTOCONF_VERS="-%%AUTOCONF_VERSION%%"
+KDE_AUTOMAKE_VERS="-%%AUTOMAKE_VERSION%%"
 
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@ -31,8 +31,10 @@ CONFIGURE_ARGS=	--disable-auto-respawn

 .include <bsd.port.pre.mk>

+AUTOTOOLSFILES=	aclocal.m4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|2.61|2.68|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.63|%%AUTOCONF_VERSION%%|g' ${WRKSRC}/aclocal.m4
 	@${REINPLACE_CMD} -e 's|<machine/soundcard\.h>|<sys/soundcard.h>|g' \
 		${WRKSRC}/epplets/Emix.c
 	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' \