diff options
61 files changed, 155 insertions, 101 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 210b6780cd9b..62b8100bb12e 100644 --- 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 \ diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index be97c7b6b751..1a340c7c3f0f 100644 --- 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 diff --git a/chinese/iiimf-le-newpy/files/patch-Makefile b/chinese/iiimf-le-newpy/files/patch-Makefile index 20f35ea632a6..a8946b2a35b4 100644 --- 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 diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile index f3ce2a55a031..6fa9caf730ee 100644 --- 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 diff --git a/chinese/iiimf-le-ude/files/patch-Makefile b/chinese/iiimf-le-ude/files/patch-Makefile index 20f35ea632a6..a8946b2a35b4 100644 --- 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 diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile index a2e8214fdf4f..3a62eaa4b8a1 100644 --- 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 diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 9d450aaea1de..d37198d77c56 100644 --- 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 \ diff --git a/comms/unixcw/Makefile b/comms/unixcw/Makefile index 2d87e2d81354..3b013705d556 100644 --- 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) diff --git a/comms/unixcw/files/patch-configure.ac b/comms/unixcw/files/patch-configure.ac index 8a2c74e76f0b..a362169195e6 100644 --- 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. diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile index 2292052d2047..e6d8ca0d45c3 100644 --- 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 diff --git a/databases/mysql-workbench51/files/patch-configure.in b/databases/mysql-workbench51/files/patch-configure.in index 74c56757dbaa..74e96697a61c 100644 --- 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 ) diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index f66ba11efcce..997ec4552bf5 100644 --- 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> diff --git a/devel/gcvs/files/patch-make_configure b/devel/gcvs/files/patch-make_configure index 4adf271200f6..d089a0675101 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.68 ++cd cvsunix && %%AUTORECONF%% +cd .. ./configure $* diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile index c44c8601a2c0..8f82f0127790 100644 --- 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: diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile index 81bad46baa11..655acc23e393 100644 --- 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 | \ diff --git a/devel/rapidsvn/files/patch-aclocal.m4 b/devel/rapidsvn/files/patch-aclocal.m4 index 4aa6c69323f8..f4b515dfb36c 100644 --- 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%%])]) diff --git a/dns/dnswall/Makefile b/dns/dnswall/Makefile index 6ac97cb27240..703028b86e13 100644 --- 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 diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile index 0d4665ae874b..8b11c2e934d1 100644 --- 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 diff --git a/dns/nss_mdns/files/patch-aclocal.m4 b/dns/nss_mdns/files/patch-aclocal.m4 index 08516a72e6c8..dde3af35c180 100644 --- 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%%])]) diff --git a/games/kmastermind/Makefile b/games/kmastermind/Makefile index a6c0ab065099..f2756cb6533e 100644 --- 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> diff --git a/games/spacejunk/Makefile b/games/spacejunk/Makefile index 4325be8475b2..fd5e2e5a530a 100644 --- 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/ diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile index 45a44bb8c598..8d370eff3996 100644 --- 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 diff --git a/graphics/cal3d/files/patch-aclocal.m4 b/graphics/cal3d/files/patch-aclocal.m4 index d3ff6efe4588..15e61076f5f8 100644 --- 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%%])]) diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile index 8e63e89dca9f..a99852a42c9d 100644 --- 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 diff --git a/japanese/iiimf-le-canna/files/patch-Makefile b/japanese/iiimf-le-canna/files/patch-Makefile index 20f35ea632a6..a8946b2a35b4 100644 --- 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 diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile index 954d2bda376f..5fd2b4716e38 100644 --- 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 diff --git a/japanese/iiimf-le-freewnn/files/patch-Makefile b/japanese/iiimf-le-freewnn/files/patch-Makefile index 20f35ea632a6..a8946b2a35b4 100644 --- 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 diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile index ac61258b0055..33babfdd3e60 100644 --- 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 diff --git a/korean/iiimf-le-hangul/files/patch-Makefile b/korean/iiimf-le-hangul/files/patch-Makefile index 20f35ea632a6..a8946b2a35b4 100644 --- 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 diff --git a/lang/guile/Makefile b/lang/guile/Makefile index d62245c2db6e..cbef7dcf04a1 100644 --- 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> diff --git a/lang/php52/Makefile b/lang/php52/Makefile index 836f9a94cf2e..69b6794f172e 100644 --- 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 \ diff --git a/lang/php52/files/patch-scripts::phpize.in b/lang/php52/files/patch-scripts::phpize.in index 7ad9a4e404d7..532c098674ae 100644 --- 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 diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile index 033ae47a2b4b..781532658d43 100644 --- 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> diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile index eb3459196eb3..1bb0c6baf094 100644 --- 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> diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index f1bdc4a70883..5538cfd9da50 100644 --- 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/* diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index d8199a1b270e..13ee36933eb6 100644 --- 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" \ diff --git a/multimedia/xmms/files/patch-aclocal.m4 b/multimedia/xmms/files/patch-aclocal.m4 index 2178ed9fd5ed..2466d0d246fb 100644 --- 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%%])]) diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile index bc8ef6ef6cf3..62473f48a9f9 100644 --- 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 diff --git a/net-mgmt/tork/files/patch-aclocal.m4 b/net-mgmt/tork/files/patch-aclocal.m4 index f97b697f37e3..3cfabdaee68c 100644 --- 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%%])]) diff --git a/net/gsambad/Makefile b/net/gsambad/Makefile index 229e52e7f304..5d9d8b7a5d4b 100644 --- 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 diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile index 1c6e28e539d9..c79b9f3b331f 100644 --- 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|' \ diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile index f65cf0a7a4fa..ee125a022e88 100644 --- 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 diff --git a/textproc/iiimf-client-lib/files/patch-Makefile b/textproc/iiimf-client-lib/files/patch-Makefile index 3bd79856c364..012734d12f7a 100644 --- 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 diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile index 2e5e12ad0ad3..0dc4e0492247 100644 --- 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 diff --git a/textproc/iiimf-csconv/files/patch-Makefile b/textproc/iiimf-csconv/files/patch-Makefile index 41b2a38540ae..a19ba2659948 100644 --- 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 diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile index 4288129149b8..c9cd7cf43249 100644 --- 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 diff --git a/textproc/iiimf-le-unit/files/patch-Makefile b/textproc/iiimf-le-unit/files/patch-Makefile index b028be2d3908..9238835cb26c 100644 --- 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 diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile index 2973700757b6..1f4395d45aef 100644 --- 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 diff --git a/textproc/iiimf-protocol-lib/files/patch-Makefile b/textproc/iiimf-protocol-lib/files/patch-Makefile index f63f348b070b..58996f917ae8 100644 --- 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 diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile index 308313756080..b93b0b67c674 100644 --- 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 diff --git a/textproc/iiimf-server/files/patch-Makefile b/textproc/iiimf-server/files/patch-Makefile index 36a075a8e5c8..fc4918e58e0e 100644 --- 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 diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile index a33c115d8c08..24bcdd4c0554 100644 --- 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 diff --git a/textproc/iiimf-x-lib/files/patch-Makefile b/textproc/iiimf-x-lib/files/patch-Makefile index a860ad68e1a3..61895d8a2c5e 100644 --- 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 diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile index 7751529cdcd4..c45b02071cb4 100644 --- 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 diff --git a/textproc/iiimf-x/files/patch-Makefile b/textproc/iiimf-x/files/patch-Makefile index 7f054a63f920..2f3e381eab57 100644 --- 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 diff --git a/www/asterisk-gui/Makefile b/www/asterisk-gui/Makefile index afd0e11d87ef..43cb12ceae36 100644 --- 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 diff --git a/www/asterisk-gui/files/patch-bootstrap.sh b/www/asterisk-gui/files/patch-bootstrap.sh index 135b911192a4..b6fe53bdba47 100644 --- 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= diff --git a/www/suphp/Makefile b/www/suphp/Makefile index d975f11109b1..754e16bb9f2d 100644 --- 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: diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile index c0d93f772eca..a2c1570ff28a 100644 --- 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) diff --git a/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh b/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh index 232353c7c63e..02eabb98958a 100644 --- 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%%" diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile index e9f9e1b671a9..e99137229469 100644 --- 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' \ |