26 files changed, 43 insertions, 27 deletions

diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 07ed4f365eac..86ecd33219f2 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -33,7 +33,7 @@ APU_VERSION=	0.9.17
 NO_LATEST_LINK=	yes
 
 USE_ICONV=		yes
-USE_AUTOTOOLS=	automake:19 autoconf:267 libtool:22:env
+USE_AUTOTOOLS=	automake:111 autoconf:267 libtool:22:env
 USE_PERL5_BUILD=	yes
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index cf4fc44ebc45..7fd75a4e7798 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -34,7 +34,7 @@ APR_VERSION=	1.4.2
 APU_VERSION=	1.3.9
 
 USE_ICONV=		yes
-USE_AUTOTOOLS=	automake:19 autoconf:267 libtool:22:env
+USE_AUTOTOOLS=	automake:111 autoconf:267 libtool:22:env
 USE_PERL5_BUILD=	yes
 USE_PYTHON_BUILD=	-2.7
 USE_LDCONFIG=		yes
diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile
index 2fcb25897be8..74bfee84810f 100644
--- a/devel/argp-standalone/Makefile
+++ b/devel/argp-standalone/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Standalone version of arguments parsing functions from GLIBC
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal:110 autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS=	aclocal:111 autoconf:267 automake:111 libtool:22
 AUTOMAKE_ARGS=	-c -a
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 USE_LDCONFIG=	yes
diff --git a/devel/autoconf-archive/Makefile b/devel/autoconf-archive/Makefile
index 7359088a446a..e5b78a3a6ac1 100644
--- a/devel/autoconf-archive/Makefile
+++ b/devel/autoconf-archive/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A set of useful GNU Autoconf macros
 
 DISTDATE=	2009-04-19
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	autoconf:267:env automake:110:env
+USE_AUTOTOOLS=	autoconf:267:env automake:111:env
 GNU_CONFIGURE=	yes
 
 PLIST_SUB=	MACRODIR=share/aclocal
diff --git a/devel/avra/Makefile b/devel/avra/Makefile
index 3aa0ac839df2..2984aefb7fda 100644
--- a/devel/avra/Makefile
+++ b/devel/avra/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	wes@FreeBSD.org
 COMMENT=	Macro Assembler for Atmel AVR microcontrollers
 
 WRKSRC=		${WRKDIR}
-USE_AUTOTOOLS=	aclocal:110 autoconf:267 automake:110
+USE_AUTOTOOLS=	aclocal:111 autoconf:267 automake:111
 AUTOMAKE_ARGS=	-a
 
 PORTDOCS=	README
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index 65164e89f2f5..7d49343d41b9 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	libtoolize:${PORTSDIR}/devel/libtool22
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS=	aclocal:111 automake:111 autoconf:267 libtool:22
 AUTOMAKE_ARGS=	-c -a
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index fb565134a4db..088417867ca8 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A file alteration monitor
 
 CFLAGS+=	-Wno-deprecated
 
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS=	aclocal:111 automake:111 autoconf:267 libtool:22
 AUTOMAKE_ARGS=	-c -a
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index bf521e6675c7..95f8edfa73db 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -24,7 +24,7 @@ AUTOMAKE_ARGS=	-a
 CONFIGURE_ARGS=	PY_PREFIX="${PREFIX}"
 PLIST_SUB+=	PYTHON_VERSION_SHORTNAME="${PYTHON_VERSION_SHORTNAME}"
 PYTHON_VERSION_SHORTNAME=	${PYTHON_VERSION:S/thon//}
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:267
+USE_AUTOTOOLS=	aclocal:111 automake:111 autoconf:267
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_RUN=	yes
diff --git a/devel/git-merge-changelog/Makefile b/devel/git-merge-changelog/Makefile
index 3a8b09ca85f0..f24cd2b3bf66 100644
--- a/devel/git-merge-changelog/Makefile
+++ b/devel/git-merge-changelog/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Git "merge" driver for GNU style ChangeLog files
 
 EXTRACT_DEPENDS=	${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR}	\
-			automake-1.10:${PORTSDIR}/devel/automake110		\
+			automake-1.11:${PORTSDIR}/devel/automake111		\
 			autoconf-2.67:${PORTSDIR}/devel/autoconf267
 
 GNU_CONFIGURE=	yes
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index cd19a623db37..ff5f330ca385 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -23,7 +23,7 @@ PORTDOCS=	USAGE
 PLIST_FILES=	lib/gtk-2.0/modules/libgtkparasite.a \
 		lib/gtk-2.0/modules/libgtkparasite.la \
 		lib/gtk-2.0/modules/libgtkparasite.so
-USE_AUTOTOOLS=	autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS=	autoconf:267 automake:111 libtool:22
 
 pre-configure:
 	cd ${WRKSRC} && ${REINPLACE_CMD} -e '/.\/configure/d' ./autogen.sh \
diff --git a/devel/kBuild-devel/Makefile b/devel/kBuild-devel/Makefile
index d0796ae173d0..21e673b479e1 100644
--- a/devel/kBuild-devel/Makefile
+++ b/devel/kBuild-devel/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Makefile framework
 
-USE_AUTOTOOLS=	automake:19 autoconf:267
+USE_AUTOTOOLS=	automake:111 autoconf:267
 USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index d0796ae173d0..21e673b479e1 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Makefile framework
 
-USE_AUTOTOOLS=	automake:19 autoconf:267
+USE_AUTOTOOLS=	automake:111 autoconf:267
 USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile
index f8560d1c70ec..1dac896815d6 100644
--- a/devel/libbegemot/Makefile
+++ b/devel/libbegemot/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A function library for begemot tools
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:267:env libltdl:22 libtool:22
+USE_AUTOTOOLS=	automake:111:env autoconf:267:env libltdl:22 libtool:22
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index e5f00eb0cc49..caea5c86fdbc 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A library (using libusb) to talk to FTDI chips
 
 OPTIONS=	BOOST	"Build with boost"	off
 
-USE_AUTOTOOLS=		autoconf:267 libtool:22 automake:110
+USE_AUTOTOOLS=		autoconf:267 libtool:22 automake:111
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 USE_LDCONFIG=		yes
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index faad6b1b4e44..911be6bfae28 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Thai language support library
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS=	automake:111 autoconf:267 libtool:22
 MAKE_JOBS_UNSAFE=	yes
 
 ALL_TARGET=	all check
@@ -27,7 +27,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.9,' -e 's,259,-2.67,' \
+	@${REINPLACE_CMD} -e 's,15,-1.11,' -e 's,259,-2.67,' \
 		${WRKSRC}/autogen.sh
 
 pre-configure:
diff --git a/devel/libunwind/Makefile b/devel/libunwind/Makefile
index dd4ed5a5b447..5ff0a25848d2 100644
--- a/devel/libunwind/Makefile
+++ b/devel/libunwind/Makefile
@@ -19,7 +19,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	aclocal:110 autoheader:267 automake:110 autoconf:267 \
+USE_AUTOTOOLS=	aclocal:111 autoheader:267 automake:111 autoconf:267 \
 		libtoolize libtool:22
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-c -a
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index f04cfff545c2..0e53363455a4 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -34,7 +34,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost-lib
 .endif
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:267:env libtool:22:env
+USE_AUTOTOOLS=	automake:111:env autoconf:267:env libtool:22:env
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/ois/Makefile b/devel/ois/Makefile
index 5c079110eb03..3aff47189412 100644
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Object Oriented Input System
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
-USE_AUTOTOOLS=	libtool:22:env aclocal:19:env autoheader:267:env automake:19:env autoconf:267:env
+USE_AUTOTOOLS=	libtool:22:env aclocal:111:env autoheader:267:env automake:111:env autoconf:267:env
 USE_XORG=	x11 xaw
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index f7dafa6fe41f..cff88ad1a2b9 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	patch
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	GNU patch utility
 
-USE_AUTOTOOLS=	autoconf:267 aclocal:110
+USE_AUTOTOOLS=	autoconf:267 aclocal:111
 CONFIGURE_ARGS=	--program-prefix=g
 USE_GMAKE=	yes
 USE_XZ=		yes
diff --git a/devel/php-java-bridge/Makefile b/devel/php-java-bridge/Makefile
index 2cbe7906a356..f13455950c2a 100644
--- a/devel/php-java-bridge/Makefile
+++ b/devel/php-java-bridge/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP module wich connects the PHP object with the Java/ECMA 335 object
 
-USE_AUTOTOOLS=	autoconf:267:env automake:19:env libtool:22:env
+USE_AUTOTOOLS=	autoconf:267:env automake:111:env libtool:22:env
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_JAVA=	yes
diff --git a/devel/psptoolchain-pspsdk-stage1/Makefile b/devel/psptoolchain-pspsdk-stage1/Makefile
index 2c5adbe00f8b..6115ac320bee 100644
--- a/devel/psptoolchain-pspsdk-stage1/Makefile
+++ b/devel/psptoolchain-pspsdk-stage1/Makefile
@@ -18,7 +18,7 @@ COMMENT=		PlayStation Portable development toolchain ${PORTNAME}
 
 PSP_SDK_STAGE_PREFIX=	psp/stage1
 
-USE_AUTOTOOLS=		libtool:22:env aclocal:19:env autoheader:267:env automake:19:env autoconf:267:env
+USE_AUTOTOOLS=		libtool:22:env aclocal:111:env autoheader:267:env automake:111:env autoconf:267:env
 USE_GMAKE=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--prefix=${PREFIX}/${PSP_SDK_STAGE_PREFIX} --with-pspdev="${PREFIX}/${PSP_SDK_STAGE_PREFIX}"
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index d1f92626b591..e219789ef0a3 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Networking API that provides reliable UDP primarily for online games
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	aclocal:110 autoheader:267 autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS=	aclocal:111 autoheader:267 autoconf:267 automake:111 libtool:22
 AUTOMAKE_ARGS=	--add-missing
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} \
 	-I ${LOCALBASE}/share/aclocal \
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 6568e209cbe9..331b4d0b7385 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -25,7 +25,7 @@ WX_CONF_ARGS=	absolute
 
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-USE_AUTOTOOLS=	autoconf:267 libtool:22 automake:19
+USE_AUTOTOOLS=	autoconf:267 libtool:22 automake:111
 CONFIGURE_TARGET=
 CONFIGURE_ARGS=	--with-apr-config=apr-1-config \
 	--with-apu-config=apu-1-config \
@@ -40,6 +40,10 @@ CONFIGURE_ARGS=	--with-apr-config=apr-1-config \
 USE_LDCONFIG=	yes
 MAN1=		rapidsvn.1
 
+post-configure:
+	@${FIND} ${WRKSRC} -name Makefile -print | \
+		${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|'
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/manpage/rapidsvn.1 ${MAN1PREFIX}/man/man1/
 
diff --git a/devel/rapidsvn/files/patch-aclocal.m4 b/devel/rapidsvn/files/patch-aclocal.m4
new file mode 100644
index 000000000000..4aa6c69323f8
--- /dev/null
+++ b/devel/rapidsvn/files/patch-aclocal.m4
@@ -0,0 +1,12 @@
+--- aclocal.m4.orig	2009-10-20 02:01:36.000000000 -0500
++++ aclocal.m4	2010-09-29 14:49:41.000000000 -0500
+@@ -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"])
+ 
+@@ -7992,3 +7992,3 @@
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-	 [AM_AUTOMAKE_VERSION([1.9.6])])
++	 [AM_AUTOMAKE_VERSION([1.11.1])])
+ 
diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile
index 5e69dbadbe7b..9eaea71b8839 100644
--- a/devel/sysconftool/Makefile
+++ b/devel/sysconftool/Makefile
@@ -19,7 +19,7 @@ USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
-USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:267
+USE_AUTOTOOLS=	automake:111 aclocal:111 autoconf:267
 
 MAN1=	sysconftool.1 sysconftoolcheck.1
 MAN7=	sysconftool.7
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 150dbf6be45a..6d2df4638fa9 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -20,8 +20,8 @@ COMMENT=	Framework for scalable cross-language services development
 LIB_DEPENDS=	boost_iostreams:${PORTSDIR}/devel/boost-libs \
 		event-1.4:${PORTSDIR}/devel/libevent
 
-USE_AUTOTOOLS=	autoconf:267:env autoheader:267:env aclocal:19:env \
-		automake:19:env libtool:22:env
+USE_AUTOTOOLS=	autoconf:267:env autoheader:267:env aclocal:111:env \
+		automake:111:env libtool:22:env
 USE_GNOME=	pkgconfig
 USE_GCC=	4.2+
 GNU_CONFIGURE=	yes