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

10 files changed, 16 insertions, 9 deletions

diff --git a/security/barnyard/Makefile b/security/barnyard/Makefile
index 41c1db22edb4..cf140d4e21dc 100644
--- a/security/barnyard/Makefile
+++ b/security/barnyard/Makefile
@@ -22,7 +22,7 @@ OPTIONS=	MYSQL "Enable MySQL support" on \
 DEPRECATED=	Use security/barnyard2 instead
 EXPIRATION=	2010-12-31
 
-USE_AUTOTOOLS=	autoheader:267 aclocal:19
+USE_AUTOTOOLS=	autoheader:267 aclocal:111
 USE_RC_SUBR=	barnyard.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 28a8a112a97c..160a42d3bcb6 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -48,7 +48,7 @@ QTDIR?=		${QT_PREFIX}
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:267 aclocal:110 libtool:22
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 libtool:22
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 0ae52ca0b728..0b35a394fa3f 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -47,7 +47,7 @@ QTDIR?=		${QT_PREFIX}
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:267 aclocal:110 libtool:22
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 libtool:22
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 93a6876296a3..303dc35ab12e 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS+=   gpgv:${PORTSDIR}/security/gnupg1
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:267
+USE_AUTOTOOLS=	automake:111 aclocal:111 autoconf:267
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 5c7a1f63e5d5..3cc34b5122a6 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -27,7 +27,7 @@ USE_GNOME=	pkgconfig
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 
-USE_AUTOTOOLS=	libtool:22 aclocal:19
+USE_AUTOTOOLS=	libtool:22 aclocal:111
 LIBTOOLFILES=	acinclude.m4 configure
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS} -lintl -L${PREFIX}/lib"
 CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \
diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile
index d8079a331a42..5d60587746a8 100644
--- a/security/kovpn/Makefile
+++ b/security/kovpn/Makefile
@@ -27,7 +27,7 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:267:env automake:19:env libtool:22
+USE_AUTOTOOLS=	autoconf:267:env automake:111:env libtool:22
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/kovpn/files/patch-admin-cvs.sh b/security/kovpn/files/patch-admin-cvs.sh
new file mode 100644
index 000000000000..e8b9f5e70eba
--- /dev/null
+++ b/security/kovpn/files/patch-admin-cvs.sh
@@ -0,0 +1,7 @@
+--- admin/cvs.sh.orig	2008-07-07 15:38:56.000000000 -0500
++++ admin/cvs.sh	2010-10-02 14:54:47.000000000 -0500
+@@ -70,3 +70,3 @@
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* )
+     echo "*** $AUTOMAKE_STRING found."
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index f2818a646bc1..0bb25f3ce5c3 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -50,7 +50,7 @@ QTDIR?=		${QT_PREFIX}
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:267 aclocal:110 libtool:22
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 libtool:22
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index a1988a022ed1..c060bad24b55 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -47,7 +47,7 @@ QTDIR?=		${QT_PREFIX}
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:267 aclocal:110 libtool:22
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 libtool:22
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile
index 2360257cb236..20716ccc8be8 100644
--- a/security/shibboleth2-sp/Makefile
+++ b/security/shibboleth2-sp/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	shibboleth-sp
-USE_AUTOTOOLS=	autoconf:267 automake:110:env libtool:22:env
+USE_AUTOTOOLS=	autoconf:267 automake:111:env libtool:22:env
 WRKSRC=		${WRKDIR}/shibboleth-${PORTVERSION}
 
 LATEST_LINK=	shibboleth2-sp