9 files changed, 9 insertions, 11 deletions

diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 320d5c288b38..af8b197984c5 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An open source, completely automatic on-line backup system for UNIX
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf:267 aclocal:19 autoheader:267
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 autoheader:267
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
index 320d5c288b38..af8b197984c5 100644
--- a/sysutils/boxbackup/Makefile
+++ b/sysutils/boxbackup/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An open source, completely automatic on-line backup system for UNIX
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_AUTOTOOLS=	autoconf:267 aclocal:19 autoheader:267
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 autoheader:267
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index 5e11db382fca..75c4cfa3ce0f 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	puzzle.1:${PORTSDIR}/graphics/libpuzzle \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:267 aclocal:110 automake:110 autoheader:267
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 automake:111 autoheader:267
 CONFIGURE_ARGS+=	--with-puzzle=${LOCALBASE}
 PLIST_FILES=	bin/ftwin
 
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 34a7a29fe0aa..6fde6a531328 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		xml2:${PORTSDIR}/textproc/libxml2
 PATCH_DEPENDS=	${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool22
 
-USE_AUTOTOOLS=	autoconf:267 autoheader:267 automake:110 aclocal:110 \
+USE_AUTOTOOLS=	autoconf:267 autoheader:267 automake:111 aclocal:111 \
 		libtool:22 libltdl:22
 AUTOMAKE_ARGS+=	--add-missing --include-deps --copy
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 5cffe3ab6097..73661ff191b7 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -20,7 +20,7 @@ NOT_FOR_ARCHS=	sparc64
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-proc=/compat/linux/proc --enable-unicode
-USE_AUTOTOOLS=	autoconf:267 aclocal:19 automake:19 libtool:22
+USE_AUTOTOOLS=	autoconf:267 aclocal:111 automake:111 libtool:22
 ACLOCAL_ARGS=	-I ${ACLOCAL_DIR}
 
 USE_PYTHON_BUILD=	yes
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index 33eeee83de76..7326ed6bf3af 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -17,11 +17,9 @@ COMMENT=	A visual client for UPS system NUT
 
 MAKE_JOBS_UNSAFE=	yes
 
-BUILD_DEPENDS=	automake>=0:${PORTSDIR}/devel/automake19
-
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool:22 automake:111:env aclocal:111:env
 CONFIGURE_ARGS=	--disable-fast-perl --enable-mt --program-transform-name=''
 
 post-patch:
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 583c0cb8dc09..c6909415dbc8 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A client/server suite for LCD devices
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_AUTOTOOLS=	autoconf:267 automake:19 aclocal:19
+USE_AUTOTOOLS=	autoconf:267 automake:111 aclocal:111
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
 USE_RC_SUBR=	LCDd lcdproc lcdexec
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index 999dcbf2218f..3fdf505fc977 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	autoconf:267 autoheader:267 automake:110 aclocal:110 libtool:22
+USE_AUTOTOOLS=	autoconf:267 autoheader:267 automake:111 aclocal:111 libtool:22
 
 AUTOMAKE_ARGS+=	--add-missing --copy --foreign
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
index 59dad1c550e8..f282d88ca30f 100644
--- a/sysutils/uptimed/Makefile
+++ b/sysutils/uptimed/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22 aclocal:110
+USE_AUTOTOOLS=	libtool:22 aclocal:111
 ACLOCAL_ARGS=	# empty
 
 MAN1=		uprecords.1