diff options
42 files changed, 71 insertions, 93 deletions
diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index cb9aacfe2466..df961ad2804c 100644 --- a/chinese/iiimf-le-newpy/Makefile +++ b/chinese/iiimf-le-newpy/Makefile @@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 f1251610c789..132e1fa33b29 100644 --- a/chinese/iiimf-le-newpy/files/patch-Makefile +++ b/chinese/iiimf-le-newpy/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile index e9489ee223ae..e18981cd98cc 100644 --- a/chinese/iiimf-le-ude/Makefile +++ b/chinese/iiimf-le-ude/Makefile @@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 f1251610c789..132e1fa33b29 100644 --- a/chinese/iiimf-le-ude/files/patch-Makefile +++ b/chinese/iiimf-le-ude/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/databases/mysql-gui-tools/Makefile b/databases/mysql-gui-tools/Makefile index f77a25597ae4..77249a39f47d 100644 --- a/databases/mysql-gui-tools/Makefile +++ b/databases/mysql-gui-tools/Makefile @@ -25,7 +25,7 @@ BROKEN= does not build OPTIONS= QUERY_BROWSER "Build the MySQL Query Browser" on \ ADMINISTRATOR "Build the MySQL Administrator" on -USE_AUTOTOOLS= autoconf:267 libtool:22 automake:110 +USE_AUTOTOOLS= autoconf:267 libtool:22 automake:111 USE_GNOME= libgnome libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview USE_GL= gl glut USE_GMAKE= yes diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile index 52ee3c86f295..af7845a22d8b 100644 --- a/deskutils/kmatrix3d/Makefile +++ b/deskutils/kmatrix3d/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GL= glut GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:22 automake:19:env autoheader:267:env +USE_AUTOTOOLS= libtool:22 automake:111:env autoheader:267:env USE_KDELIBS_VER= 3 USE_BZIP2= yes USE_PERL5_BUILD= yes diff --git a/deskutils/kmatrix3d/files/patch-admin__cvs.sh b/deskutils/kmatrix3d/files/patch-admin__cvs.sh new file mode 100644 index 000000000000..0846008c3eb0 --- /dev/null +++ b/deskutils/kmatrix3d/files/patch-admin__cvs.sh @@ -0,0 +1,7 @@ +--- admin/cvs.sh.orig 2007-01-27 02:25:03.000000000 -0600 ++++ admin/cvs.sh 2010-10-07 09:17:32.000000000 -0500 +@@ -70,3 +70,3 @@ + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.11* ) + echo "*** $AUTOMAKE_STRING found." diff --git a/devel/jzmq/Makefile b/devel/jzmq/Makefile index c2e5611a267c..1767b3bc13e7 100644 --- a/devel/jzmq/Makefile +++ b/devel/jzmq/Makefile @@ -16,7 +16,7 @@ COMMENT= Java bindings for ZeroMQ LIB_DEPENDS= zmq.0:${PORTSDIR}/devel/zmq -USE_AUTOTOOLS= autoconf:267 libtool:22 automake:110 +USE_AUTOTOOLS= autoconf:267 libtool:22 automake:111 USE_GMAKE= yes USE_GNOME= pkgconfig USE_JAVA= 1.4+ diff --git a/games/antrix/Makefile b/games/antrix/Makefile index 2028c5c60331..a3ed7b0f1d40 100644 --- a/games/antrix/Makefile +++ b/games/antrix/Makefile @@ -18,7 +18,7 @@ COMMENT= Free stable dedicated-server for World of Warcraft BUILD_DEPENDS= svn:${PORTSDIR}/devel/subversion -USE_AUTOTOOLS= aclocal:19 libtoolize autoconf:267 autoheader:267 automake:19 libtool:22 +USE_AUTOTOOLS= aclocal:111 libtoolize autoconf:267 autoheader:267 automake:111 libtool:22 ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= -a USE_MYSQL= yes diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile index 65e8260f0464..d53854ba7ea3 100644 --- a/japanese/iiimf-le-canna/Makefile +++ b/japanese/iiimf-le-canna/Makefile @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes USE_GNOME= gtk20 -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 f1251610c789..132e1fa33b29 100644 --- a/japanese/iiimf-le-canna/files/patch-Makefile +++ b/japanese/iiimf-le-canna/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile index 5c540ddd2cc3..d702428e53f0 100644 --- a/japanese/iiimf-le-freewnn/Makefile +++ b/japanese/iiimf-le-freewnn/Makefile @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 f1251610c789..132e1fa33b29 100644 --- a/japanese/iiimf-le-freewnn/files/patch-Makefile +++ b/japanese/iiimf-le-freewnn/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile index 44c1c158fd4d..d80a9dd325bc 100644 --- a/korean/iiimf-le-hangul/Makefile +++ b/korean/iiimf-le-hangul/Makefile @@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= i386 USE_XORG= x11 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 f1251610c789..132e1fa33b29 100644 --- a/korean/iiimf-le-hangul/files/patch-Makefile +++ b/korean/iiimf-le-hangul/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/lang/kroc/Makefile b/lang/kroc/Makefile index 1dc9e6f98dfb..f2beb1a149ee 100644 --- a/lang/kroc/Makefile +++ b/lang/kroc/Makefile @@ -29,7 +29,7 @@ USE_MYSQL= yes USE_PYTHON= yes USE_SDL= sdl sound USE_GNOME= libxslt -USE_AUTOTOOLS= autoconf:267:env automake:110:env +USE_AUTOTOOLS= autoconf:267:env automake:111:env USE_XORG= xmu xi GNU_CONFIGURE= yes diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 7aa0207f63bf..0f4894d4a1e9 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -38,7 +38,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:22 aclocal:110 +USE_AUTOTOOLS= libtool:22 aclocal:111 LIBTOOLFILES= ${WRKSRC}/configure diff --git a/net-mgmt/coovachilli/Makefile b/net-mgmt/coovachilli/Makefile index 45dd0b6044db..c801589b762f 100644 --- a/net-mgmt/coovachilli/Makefile +++ b/net-mgmt/coovachilli/Makefile @@ -25,9 +25,9 @@ MAN8= chilli.8 CONFIGURE_ARGS=-localstatedir=/var GNU_CONFIGURE= yes +USE_PERL5_BUILD=yes # for manual page building USE_LDCONFIG= yes USE_RC_SUBR= coovachilli -USE_AUTOTOOLS= automake:19 post-install: .if !defined(NOPORTEXAMPLES) diff --git a/net-mgmt/coovachilli/files/patch-conf_Makefile.am b/net-mgmt/coovachilli/files/patch-conf_Makefile.am deleted file mode 100644 index 1d743f6b775e..000000000000 --- a/net-mgmt/coovachilli/files/patch-conf_Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ ---- conf/Makefile.am.orig 2007-08-20 15:05:54.000000000 +0100 -+++ conf/Makefile.am 2008-06-18 01:17:58.000000000 +0100 -@@ -6,15 +6,11 @@ - chilli_SCRIPTS = functions up.sh down.sh - chilli_DATA = defaults - --initdir = $(sysconfdir)/init.d --init_SCRIPTS = chilli -- --EXTRA_DIST = $(init_SCRIPTS:=.in) \ -+EXTRA_DIST = \ - $(chilli_SCRIPTS:=.in) chilli.conf.in defaults.in - - edit = sed \ - -e 's,@SBINDIR\@,$(sbindir),g' \ -- -e 's,@INITDIR\@,$(initrddir),g' \ - -e 's,@VARRUN\@,$(localstatedir)/run,g' \ - -e 's,@ETCCHILLI\@,$(sysconfdir)/chilli,g' \ - -e 's,@SYSCONFDIR\@,$(sysconfdir),g' \ -@@ -35,12 +31,6 @@ - $(edit) down.sh.in >down.sh.tmp - mv down.sh.tmp down.sh - --chilli: Makefile chilli.in -- rm -f chilli chilli.tmp -- $(edit) chilli.in >chilli.tmp -- chmod +x chilli.tmp -- mv chilli.tmp chilli -- - chilli.conf: Makefile chilli.conf.in - rm -f chilli.conf chilli.conf.tmp - $(edit) chilli.conf.in >chilli.conf.tmp diff --git a/net-mgmt/coovachilli/files/patch-www_Makefile.am b/net-mgmt/coovachilli/files/patch-www_Makefile.am deleted file mode 100644 index 6cbfd9970d29..000000000000 --- a/net-mgmt/coovachilli/files/patch-www_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- www/Makefile.am.orig 2008-06-29 17:44:26.000000000 +0000 -+++ www/Makefile.am 2008-06-29 17:44:48.000000000 +0000 -@@ -3,7 +3,7 @@ - chillidir = $(sysconfdir)/chilli - chilli_SCRIPTS = wwwsh - --wwwdir = $(chillidir)/www -+wwwdir = $(prefix)/www/chilli - - wwwDATAFILES = \ - chillijs.chi chillijs.chi.sh chilliform.chi chilliform.chi.sh \ diff --git a/net-mgmt/coovachilli/files/patch-www_Makefile.in b/net-mgmt/coovachilli/files/patch-www_Makefile.in new file mode 100644 index 000000000000..f5714fd1df1b --- /dev/null +++ b/net-mgmt/coovachilli/files/patch-www_Makefile.in @@ -0,0 +1,7 @@ +--- www/Makefile.in.orig 2008-06-07 23:49:10.000000000 -0500 ++++ www/Makefile.in 2010-10-07 09:08:25.000000000 -0500 +@@ -160,3 +160,3 @@ + chilli_SCRIPTS = wwwsh +-wwwdir = $(chillidir)/www ++wwwdir = $(prefix)/www/chilli + wwwDATAFILES = \ diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile index 8ad395202b6c..dec9ae482882 100644 --- a/net-mgmt/tork/Makefile +++ b/net-mgmt/tork/Makefile @@ -16,7 +16,7 @@ COMMENT= TorK is an Anonymity Manager for the KDE Desktop USE_GMAKE= yes USE_GNOME= pkgconfig -USE_AUTOTOOLS= libtool:22 aclocal:110:env +USE_AUTOTOOLS= libtool:22 aclocal:111:env USE_GETTEXT= yes USE_XORG= xext USE_LDCONFIG= yes diff --git a/net-mgmt/tork/files/patch-aclocal.m4 b/net-mgmt/tork/files/patch-aclocal.m4 index 9722a1a5a221..f97b697f37e3 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.10"]) ++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"]) @@ -30,3 +30,3 @@ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) -+ [AM_AUTOMAKE_VERSION([1.10.3])]) ++ [AM_AUTOMAKE_VERSION([1.11.1])]) diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile index f24ff5b630c9..5cc53f8ff7c9 100644 --- a/net-p2p/libtorrent-rasterbar-14/Makefile +++ b/net-p2p/libtorrent-rasterbar-14/Makefile @@ -24,7 +24,7 @@ CONFLICTS= libtorrent-rasterbar-0.15.* USE_GNOME= gnomehack USE_OPENSSL= yes -USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:267 libtool:22 +USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267 libtool:22 ACLOCAL_ARGS= -I m4 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-debug \ diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile index 88e4b4d45622..f458a4497186 100644 --- a/net/isc-dhcp41-server/Makefile +++ b/net/isc-dhcp41-server/Makefile @@ -106,7 +106,7 @@ LDAP_SCRIPT= ${WRKDIR}/${LDAPPATCHDIST}/dhcpd-conf-to-ldap LDAP_SCHEMA= ${WRKDIR}/${LDAPPATCHDIST}/dhcp.schema USE_PERL5_RUN= yes USE_OPENLDAP= yes -USE_AUTOTOOLS= aclocal:110 libtoolize:226 autoconf:267 autoheader:267 automake:110 +USE_AUTOTOOLS= aclocal:111 libtoolize:226 autoconf:267 autoheader:267 automake:111 LIBTOOLIZE_ARG= --copy --force AUTOMAKE_ARGS= --foreign --add-missing --copy CFLAGS+= -I${PREFIX}/include -L${PREFIX}/lib diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index b42f315f8a20..ca792c24cab6 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:267 +USE_AUTOTOOLS= automake:111 autoconf:267 GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-freebsd-freebsd${OSREL} diff --git a/sysutils/grub/files/patch-configure.ac b/sysutils/grub/files/patch-configure.ac new file mode 100644 index 000000000000..2e9ba8479931 --- /dev/null +++ b/sysutils/grub/files/patch-configure.ac @@ -0,0 +1,6 @@ +--- configure.ac.orig 2005-05-07 21:36:03.000000000 -0500 ++++ configure.ac 2010-10-07 08:37:11.000000000 -0500 +@@ -58,2 +58,3 @@ + AC_PROG_CC ++AM_PROG_AS + # We need this for older versions of Autoconf. diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile index c6ccb4e5bcc5..4897ab9eb252 100644 --- a/textproc/iiimf-client-lib/Makefile +++ b/textproc/iiimf-client-lib/Makefile @@ -24,7 +24,7 @@ ONLY_FOR_ARCHS= i386 USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 df78cedf4624..8beb5818e454 100644 --- a/textproc/iiimf-client-lib/files/patch-Makefile +++ b/textproc/iiimf-client-lib/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile index 66582218fc97..807002ef548d 100644 --- a/textproc/iiimf-csconv/Makefile +++ b/textproc/iiimf-csconv/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_ICONV= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/lib/CSConv @@ -42,6 +42,7 @@ post-patch: ${BUILDDIR}/csconv.h do-configure: + @${TOUCH} ${BUILDDIR}/config.rpath @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig @${REINPLACE_CMD} -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ diff --git a/textproc/iiimf-csconv/files/patch-Makefile b/textproc/iiimf-csconv/files/patch-Makefile index 5b829ed4d387..b2b47e4b29a7 100644 --- a/textproc/iiimf-csconv/files/patch-Makefile +++ b/textproc/iiimf-csconv/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile index da135d7632e1..35b97ff2a9aa 100644 --- a/textproc/iiimf-le-unit/Makefile +++ b/textproc/iiimf-le-unit/Makefile @@ -27,7 +27,7 @@ USE_ICONV= yes USE_GMAKE= yes USE_GNOME= libxml2 USE_XORG= x11 -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 7db3edd23da2..1c096be8065b 100644 --- a/textproc/iiimf-le-unit/files/patch-Makefile +++ b/textproc/iiimf-le-unit/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile index f8f34fa58f36..f357bc3f2240 100644 --- a/textproc/iiimf-protocol-lib/Makefile +++ b/textproc/iiimf-protocol-lib/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386 USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 fea16b218127..47c0812e6f76 100644 --- a/textproc/iiimf-protocol-lib/files/patch-Makefile +++ b/textproc/iiimf-protocol-lib/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile index ba656b65db4d..8dd4ca77d66b 100644 --- a/textproc/iiimf-server/Makefile +++ b/textproc/iiimf-server/Makefile @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= pkgconfig libxml2 USE_OPENSSL= yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 8c7de3468087..cb19b1d9edff 100644 --- a/textproc/iiimf-server/files/patch-Makefile +++ b/textproc/iiimf-server/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile index f7b3c5182072..e2d7bad3d097 100644 --- a/textproc/iiimf-x-lib/Makefile +++ b/textproc/iiimf-x-lib/Makefile @@ -27,7 +27,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_MOTIF= yes USE_OPENSSL= yes -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 fde056fb6489..7c28d1fcdba0 100644 --- a/textproc/iiimf-x-lib/files/patch-Makefile +++ b/textproc/iiimf-x-lib/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile index 116a1ab398bd..a0f487d442e1 100644 --- a/textproc/iiimf-x/Makefile +++ b/textproc/iiimf-x/Makefile @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_GMAKE= yes USE_XORG= x11 ice xt -USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env +USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22: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 05a2f9ee72ef..512904206400 100644 --- a/textproc/iiimf-x/files/patch-Makefile +++ b/textproc/iiimf-x/files/patch-Makefile @@ -7,8 +7,8 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal-1.9 -+AUTOMAKE = automake-1.9 --add-missing --copy ++ACLOCAL = aclocal-1.11 ++AUTOMAKE = automake-1.11 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy +AUTOHEADER = autoheader-2.67 +AUTOCONF = autoconf-2.67 diff --git a/textproc/xaira/Makefile b/textproc/xaira/Makefile index 2951cd30d2e5..4816fef4f8ae 100644 --- a/textproc/xaira/Makefile +++ b/textproc/xaira/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= xerces-c:${PORTSDIR}/textproc/xerces-c2 \ icuio:${PORTSDIR}/devel/icu GNU_CONFIGURE= yes -USE_AUTOTOOLS= aclocal:19 autoconf:267 libtool:22 +USE_AUTOTOOLS= aclocal:111 autoconf:267 libtool:22 ACLOCAL_ARGS= -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal -I . USE_GMAKE= yes USE_LDCONFIG= yes |