Round one migration of ports from automake{19,110} to automake111

8 files changed, 12 insertions, 17 deletions

diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 0c07c15e02ba..dd751477f63d 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -22,7 +22,7 @@ USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:267 aclocal:19 libtool:22
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 libtool:22
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
 		-I ${WRKSRC}/m4
 MAKE_JOBS_UNSAFE=	yes
diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile
index 06e9d13ef1bf..7e172bc89fcc 100644
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@@ -23,7 +23,6 @@ JAVA_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:19
 
 PLIST_FILES=	%%JAVAJARDIR%%/jrrd.jar \
 		lib/libjrrd.la \
diff --git a/databases/jrrd/files/patch-Makefile.am b/databases/jrrd/files/patch-Makefile.am
deleted file mode 100644
index f1326755df75..000000000000
--- a/databases/jrrd/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2008-06-25 15:15:08.000000000 +0000
-+++ Makefile.am	2008-06-25 15:15:15.000000000 +0000
-@@ -26,7 +26,7 @@
- 	cd $(classdir) && \
- 	$(JAR) cvf ../$@ *
- 
--jardir=$(datadir)/java
-+jardir=$(datadir)/java/classes
- jar_DATA = jrrd.jar
- 
- deploy:
diff --git a/databases/jrrd/files/patch-Makefile.in b/databases/jrrd/files/patch-Makefile.in
new file mode 100644
index 000000000000..0969f9b001af
--- /dev/null
+++ b/databases/jrrd/files/patch-Makefile.in
@@ -0,0 +1,7 @@
+--- Makefile.in.orig	2008-05-06 10:54:40.000000000 -0500
++++ Makefile.in	2010-10-02 18:06:58.000000000 -0500
+@@ -224,3 +224,3 @@
+ CLEANFILES = org_opennms_netmgt_rrd_rrdtool_Interface.h jrrd.jar
+-jardir = $(datadir)/java
++jardir = $(datadir)/java/classes
+ jar_DATA = jrrd.jar
diff --git a/databases/kumofs/Makefile b/databases/kumofs/Makefile
index 9d56c3e40e2f..6fde94d546fb 100644
--- a/databases/kumofs/Makefile
+++ b/databases/kumofs/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	msgpack:${PORTSDIR}/devel/msgpack \
 RUN_DEPENDS=	rubygem-msgpack>0:${PORTSDIR}/devel/rubygem-msgpack
 
 LICENSE=	ASL
-USE_AUTOTOOLS=	libtool:22 autoheader:267 autoconf:267 automake:110 aclocal:110
+USE_AUTOTOOLS=	libtool:22 autoheader:267 autoconf:267 automake:111 aclocal:111
 ACLOCAL_ARGS=	# empty
 AUTOMAKE_ARGS=	--add-missing --copy
 CONFIGURE_ARGS=	--with-msgpack=${LOCALBASE} --with-tokyocabinet=${LOCALBASE}
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index ea56c75e3fdd..7a48691d574a 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
 CONFLICTS=	memcached-1.2*
 
-USE_AUTOTOOLS=	autoconf:267 aclocal:110 automake:110
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 automake:111
 AUTOMAKE_ARGS+=	--add-missing
 USE_RC_SUBR=	memcached
 GNU_CONFIGURE=	YES
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index 9fbb2a04fe42..48af09a5b8ee 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS=	PYTHON	"Enable Python scripting and modules" off
 
-USE_AUTOTOOLS=	autoheader:267 autoconf:267 automake:110 aclocal:110 libtool:22
+USE_AUTOTOOLS=	autoheader:267 autoconf:267 automake:111 aclocal:111 libtool:22
 AUTOMAKE_ARGS=	--add-missing --foreign
 ACLOCAL_ARGS=
 AUTOCONF_ARGS=
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index ca65d18ff54e..98af42ff484d 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -23,7 +23,7 @@ OPTIONS=	ORACLE "Build with Oracle support (i386 only)" off \
 		PGSQL  "Build with PostgreSQL support" on \
 		MYSQL  "Build with MySQL support" on
 
-USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:267 autoheader:267 libtool:22
+USE_AUTOTOOLS=	aclocal:111 automake:111 autoconf:267 autoheader:267 libtool:22
 USE_QT_VER=	4
 QT_COMPONENTS=	gui corelib sql xml network linguist moc_build uic_build rcc_build
 USE_GMAKE=	yes