68 files changed, 69 insertions, 83 deletions

diff --git a/security/barnyard/Makefile b/security/barnyard/Makefile
index b4551b9c4d7e..164adf21acb2 100644
--- a/security/barnyard/Makefile
+++ b/security/barnyard/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
 OPTIONS=	MYSQL "Enable MySQL support" off \
 		POSTGRESQL "Enable PostgreSQL support" off
 
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
+USE_AUTOTOOLS=	autoheader:259 autoconf:259
 USE_REINPLACE=	yes
 USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 82c2389f401e..fd867863a720 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -17,7 +17,7 @@ COMMENT=	BeeCrypt is an open source cryptography library
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index 0c3c1129e227..e8366c253ad6 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	yes
 INSTALL_TARGET=		install certificate
 .endif
 
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 CFLAGS+=	-I${OPENSSLINC}/openssl
 CONFIGURE_ARGS=	--with-ssltop=${OPENSSLBASE} --with-ssllib=${OPENSSLLIB}
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
diff --git a/security/borzoi/Makefile b/security/borzoi/Makefile
index 8c3cb00abbeb..e8b96d6ed794 100644
--- a/security/borzoi/Makefile
+++ b/security/borzoi/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An Elliptic Curve Cryptography Library
 BUILD_DEPENDS=	${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
 RUN_DEPENDS=	${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl
 
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index ad63dcd670e4..f6e83251e9f0 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -30,9 +30,7 @@ OPTIONS=	MILTER "Compile the milter interface" Off \
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER=259
-USE_AUTOMAKE_VER=19
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	automake:19 autoconf:259 libtool:15
 LIBTOOLFILES=	acinclude.m4
 INSTALLS_SHLIB=	yes
 USE_RC_SUBR=	yes
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 52dc643291ba..83192b317328 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -26,7 +26,7 @@ OPTIONS=	MILTER "Compile the milter interface" Off \
 		LIBUNRAR "Support for external Unrar library" Off
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_RC_SUBR=	yes
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 0a00887598c8..35cb8df14f04 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -37,8 +37,7 @@ OPTIONS+=	GDBM	"Use gdbm instead of system bdb"	off
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_LIBLTDL=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15 libltdl:15
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_SUBMAKE=	yes
diff --git a/security/courierpassd/Makefile b/security/courierpassd/Makefile
index f784a5f2adb5..eb45b34e6afc 100644
--- a/security/courierpassd/Makefile
+++ b/security/courierpassd/Makefile
@@ -19,7 +19,7 @@ USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_GETTEXT=	YES
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS}' LDFLAGS='${LDFLAGS}'
diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile
index da978a9a5bfa..4c65fc3ccef5 100644
--- a/security/cryptplug/Makefile
+++ b/security/cryptplug/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A collection of plug-ins to cryptographic engines
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgpgme03.so.9:${PORTSDIR}/security/gpgme03 \
 		gpg-agent:${PORTSDIR}/security/gnupg-devel
 
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 850c3dbaa997..4716af79efda 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -48,9 +48,7 @@ MAN8=		sasldblistusers.8 saslpasswd.8 saslauthd1.8
 
 USE_RC_SUBR=	YES
 
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	automake:14 autoconf:213 libtool:13:inc
 AUTOMAKE_ARGS=	--add-missing --include-deps
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index a9901b9cbe33..ba0f3e064537 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt \
 USE_BZIP2=	yes
 USE_OPENLDAP=	yes
 USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_GMAKE=	yes
 INFO=		dirmngr
 
diff --git a/security/distcache-devel/Makefile b/security/distcache-devel/Makefile
index 511f0f240c07..3e7094363668 100644
--- a/security/distcache-devel/Makefile
+++ b/security/distcache-devel/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	distcache-1.4*
 
 USE_BZIP2=	yes
 USE_RC_SUBR=	dc_server.sh
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 LIBTOOLFILES=	configure ssl/configure
diff --git a/security/distcache/Makefile b/security/distcache/Makefile
index ac804306c5d8..aab88e3053ad 100644
--- a/security/distcache/Makefile
+++ b/security/distcache/Makefile
@@ -19,7 +19,7 @@ CONFLICTS=	distcache-devel-*
 
 USE_BZIP2=	yes
 USE_RC_SUBR=	dc_server.sh
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
diff --git a/security/fakeroot/Makefile b/security/fakeroot/Makefile
index 71289954f5d6..3b362d29df79 100644
--- a/security/fakeroot/Makefile
+++ b/security/fakeroot/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	Meno.Abels@Adviser.com
 COMMENT=	Simulate the root user behaviour
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/security/gaim-encryption/Makefile b/security/gaim-encryption/Makefile
index 1d6b3c5acaec..4914c63d7dc8 100644
--- a/security/gaim-encryption/Makefile
+++ b/security/gaim-encryption/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-nspr-includes=${LOCALBASE}/include/nspr \
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 2ad71a50ac96..ada08bfd048a 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnomekeyring/Makefile b/security/gnomekeyring/Makefile
index 2ad71a50ac96..ada08bfd048a 100644
--- a/security/gnomekeyring/Makefile
+++ b/security/gnomekeyring/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gtk20
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index cf0248a18744..a3b9fa7073e1 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -37,7 +37,7 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	pkgconfig
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 INSTALLS_SHLIB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 06b5c4553e92..f0fa2bb08277 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		gpgsm:${PORTSDIR}/security/gnupg-devel
 LIB_DEPENDS=	gpg-error:${PORTSDIR}/security/libgpg-error
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 7c99911c4275..428c7b545153 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -20,9 +20,8 @@ LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
 LATEST_LINK=	gpgme03
 
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	autoconf:259 libtool:13:inc
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	YES
 
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 2d15e73528e5..64ff93e20b96 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	heimdal-*
 USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-kerberos5
 INSTALLS_SHLIB=	yes
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 287d1fe4c23e..bf03eb485407 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -21,8 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-USE_ACLOCAL_VER=	14
-USE_AUTOMAKE_VER=	14
+USE_AUTOTOOLS=	automake:14 aclocal:14
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 695a176314c8..b70d30217b9e 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-debug --enable-dpd --enable-natt=kernel \
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index 33a9b2d62600..2e78ad891f15 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS?=	--enable-shared --enable-static
 CONFIGURE_ARGS+=	--disable-thread-support
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index 33a9b2d62600..2e78ad891f15 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS?=	--enable-shared --enable-static
 CONFIGURE_ARGS+=	--disable-thread-support
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 33a9b2d62600..2e78ad891f15 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS?=	--enable-shared --enable-static
 CONFIGURE_ARGS+=	--disable-thread-support
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 33a9b2d62600..2e78ad891f15 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -27,7 +27,7 @@ USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS?=	--enable-shared --enable-static
 CONFIGURE_ARGS+=	--disable-thread-support
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 0d90c8cd79ae..67f9d6eca024 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -16,7 +16,7 @@ COMMENT=	"General purpose crypto library based on code used in GnuPG"
 LIB_DEPENDS=	gpg-error.1:${PORTSDIR}/security/libgpg-error
 
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index 58927650597b..da51c20d8293 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Library and frontend for running commands as root
 
 USE_X_PREFIX=	yes
 USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 CONFIGURE_ARGS+=--disable-install-pam
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 513d6a373dbb..6f62e94ae11a 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Common error values for all GnuPG components
 
 USE_GPG=		yes
 SIG_SUFFIX=		.sig
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15:inc
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index 5f79bf6cd450..aca38909f63b 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt \
 		mhash.2:${PORTSDIR}/security/mhash
 
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	yes
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS+=	--with-pkg-config-files=${PREFIX}/libdata/pkgconfig
diff --git a/security/libident/Makefile b/security/libident/Makefile
index ab99ab6a0e6d..008d3dfbde2d 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small library to interface the ident protocol server (rfc1413)
 
 USE_GNOME=	gnometarget lthack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 MAN3=		ident.3
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 98206a1996f5..7042e203c150 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15:inc
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index 2325de2d57de..fe9e9703751c 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME:S/lib//}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-cipher cryptographic library (used in PHP)
 
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-static
diff --git a/security/libntlm/Makefile b/security/libntlm/Makefile
index 60b914fe46d1..94be87f45b1c 100644
--- a/security/libntlm/Makefile
+++ b/security/libntlm/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library that implement Microsoft's NTLM authentication
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/security/libotr/Makefile b/security/libotr/Makefile
index 09f13cc3016a..666cf7155d4c 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -18,8 +18,7 @@ COMMENT=	The portable OTR Messaging Library and toolkit
 LIB_DEPENDS=	gpg-error:${PORTSDIR}/security/libgpg-error \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
-USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 INSTALLS_SHLIB=	yes
 
 MAN1=		otr_toolkit.1
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index f336e82480c7..19281d83be29 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -20,7 +20,7 @@ COMMENT=	ASN.1 structure parser library
 USE_GPG=	yes
 SIG_SUFFIX=	.sig
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 36fd5e19bef1..7835f9b3a5f0 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -23,7 +23,7 @@ COMMENT=	Replacement for crypt(1)
 LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt/ \
 		mhash.2:${PORTSDIR}/security/mhash/
 
-WANT_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259:env
 USE_GETTEXT=		yes
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--enable-static --with-catgets
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index e80c48e3b504..28037b786f36 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	roam@FreeBSD.org
 COMMENT=	An easy-to-use library for strong hashes such as MD5 and SHA1
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_PERL5_BUILD=yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-LDFLAGS="${PTHREAD_LIBS}" --enable-static \
diff --git a/security/ncrypt/Makefile b/security/ncrypt/Makefile
index 2d7d0a8ff59c..3092ed16dc83 100644
--- a/security/ncrypt/Makefile
+++ b/security/ncrypt/Makefile
@@ -17,9 +17,7 @@ COMMENT=	Advanced AES file encryption tool
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOMAKE_VER=	19
-USE_ACLOCAL_VER=	19
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:259
 
 PLIST_FILES=	bin/ncrypt bin/nrm
 
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 8275e65f186d..1364d3962ad1 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -32,7 +32,7 @@ WRKSRC=		${WRKDIR}/nessus-core
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall.sh
 
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	YES
 USE_RC_SUBR=	YES
 WANT_GNOME=	yes
diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index daf751bfc88a..8493593d1830 100644
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -26,7 +26,7 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
 
 USE_BISON=	YES
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	YES
 
 MAN1=		nasl.1 nasl-config.1
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index ea4e6640cff8..7da455563a06 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -26,7 +26,7 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
 
 USE_BISON=	YES
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	YES
 
 MAN1=		nasl.1 nasl-config.1
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index cc3c2aa612c3..3442e9b7cc05 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -27,8 +27,7 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
 
 USE_BISON=	YES
-USE_AUTOCONF_VER=	213
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	autoconf:213 libtool:13
 CONFIGURE_ARGS=	--enable-cipher
 .if defined(WITH_NESSUS_BPF_SHARE)
 CONFIGURE_ARGS+=	--enable-bpf-sharing
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index ea96d582b360..5dc37bc6249a 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -27,7 +27,7 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
 
 USE_BISON=	YES
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ARGS=	--enable-cipher
 .if defined(WITH_NESSUS_BPF_SHARE)
 CONFIGURE_ARGS+=	--enable-bpf-sharing
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 6b1533bd4b12..ebd35e0ff30f 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -32,7 +32,7 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall.sh
 
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 USE_REINPLACE=	YES
 USE_RC_SUBR=	YES
 WANT_GNOME=	yes
diff --git a/security/newpki-client/Makefile b/security/newpki-client/Makefile
index 4c3a0455699f..c75f70c0ce3e 100644
--- a/security/newpki-client/Makefile
+++ b/security/newpki-client/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	newpki.2:${PORTSDIR}/security/newpki-lib \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.0.0
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	yes
 WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
 USE_GNOME=	gnometarget
diff --git a/security/newpki-lib/Makefile b/security/newpki-lib/Makefile
index f66716f274bf..e376e556df75 100644
--- a/security/newpki-lib/Makefile
+++ b/security/newpki-lib/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--with-libintl-prefix=${LOCALBASE}
 
 .if ${OSVERSION} < 500000
 USE_GCC=	3.4
-USE_INC_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 
 patch-autotools:
 	@(cd ${PATCH_WRKSRC}; \
@@ -49,7 +49,7 @@ patch-autotools:
 	done);
 
 .else
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 .endif
 
 pre-patch:
diff --git a/security/newpki-server/Makefile b/security/newpki-server/Makefile
index f91ec2aed742..f26ac45a6b88 100644
--- a/security/newpki-server/Makefile
+++ b/security/newpki-server/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	newpki.2:${PORTSDIR}/security/newpki-lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.0.0
 
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 8807af6bf2c4..ebbdd485876f 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt
 USE_GPG=	yes
 SIG_SUFFIX=	.sig.asc
 USE_BZIP2=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libgcrypt-prefix=${LOCALBASE}
diff --git a/security/openct/Makefile b/security/openct/Makefile
index a16f382b72c5..be20afdf5f92 100644
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://www.opensc.org/files/ \
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	A middleware framework for smart card terminals
 
-USE_LIBTOOL_VER=	15
-USE_LIBLTDL=	yes
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 INSTALLS_SHLIB=	yes
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index d8fcde5f2822..2e0832079692 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -17,7 +17,7 @@ USE_GNOME=	pkgconfig
 INSTALLS_SHLIB=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
diff --git a/security/openscep/Makefile b/security/openscep/Makefile
index 33752073dbe4..6d4cf28a6d9f 100644
--- a/security/openscep/Makefile
+++ b/security/openscep/Makefile
@@ -17,7 +17,7 @@ USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 USE_OPENLDAP=	yes
 USE_APACHE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index c05e9680043f..c216f7d299d9 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -20,7 +20,7 @@ OPTIONS=	OSIRISMD "Enable to build the management daemon" off \
 		CLI "Enable to build the management CLI" off
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_RC_SUBR=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 1d6b3c5acaec..4914c63d7dc8 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	nss3:${PORTSDIR}/security/nss
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-nspr-includes=${LOCALBASE}/include/nspr \
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 784ddf4111f1..dc2fb33d57b3 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -23,7 +23,7 @@ CONFLICTS?=	pinentry-[a-z]*-[0.9]*
 USE_GETOPT_LONG=yes
 USE_ICONV=	yes
 WANT_GNOME=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/security/poc/Makefile b/security/poc/Makefile
index 31b8ebc72524..ba69f56fc710 100644
--- a/security/poc/Makefile
+++ b/security/poc/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	towitoko.2:${PORTSDIR}/devel/towitoko
 PLIST_FILES=	bin/poc
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/security/prelude-nids/Makefile b/security/prelude-nids/Makefile
index 9d558708f4b4..3846e6557f0c 100644
--- a/security/prelude-nids/Makefile
+++ b/security/prelude-nids/Makefile
@@ -20,7 +20,7 @@ EXPIRATION_DATE=	2005-11-21
 LIB_DEPENDS=	prelude.1:${PORTSDIR}/security/libprelude
 
 USE_GMAKE=		yes
-USE_LIBTOOL_VER=	13
+USE_AUTOTOOLS=	libtool:13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--with-html-dir=${PREFIX}/share/doc
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 32d3521ab626..cd203c67172f 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -22,7 +22,7 @@ BROKEN=		"Kerberos5 is required in the system"
 USE_RC_SUBR=	YES
 USE_OPENSSL=	YES
 
-USE_AUTOCONF_VER=259
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_TARGET=
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 764574ce76ec..52602cffac46 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 74e9e3bbac23..ad49282d8d41 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -21,7 +21,7 @@ INFO=		sfs
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-sfsuser=sfs \
 		--with-sfsgroup=sfs \
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index f6261e77f5d7..bc31287c1df5 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -22,7 +22,7 @@ USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_ICONV=	yes
 USE_GETOPT_LONG=	yes
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--disable-starttls \
diff --git a/security/srm/Makefile b/security/srm/Makefile
index c4233df5c940..1bccf0c465bb 100644
--- a/security/srm/Makefile
+++ b/security/srm/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Secure rm, a utility which destroys file contents before unlinking
 
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 
 MAN1=		srm.1
 PLIST_FILES=	bin/srm
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index aeb75ecc6be1..f7ec753d8882 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Secure shell client and server (remote login program)
 
 CONFLICTS=	openssh-* openssh-portable-* openssh-gssapi-* ssh2-3.*
 NO_LATEST_LINK=	YES
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 GNU_CONFIGURE=	YES
 USE_PERL5=	YES
 CONFIGURE_ENV+=	PERL=${PERL5}
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 177711344081..4a3916b74938 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt \
 
 USE_GETTEXT=	yes
 USE_PERL5=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 GNU_CONFIGURE=	yes
 USE_GCC=	3.4
 CONFIGURE_TARGET=
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 5216ddbfd81b..ae286e2899ac 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -18,7 +18,7 @@ COMMENT=	SSL encryption wrapper for standard network daemons
 
 USE_OPENSSL=	YES
 USE_REINPLACE=	YES
-USE_LIBTOOL_VER=	15
+USE_AUTOTOOLS=	libtool:15
 USE_RC_SUBR=	YES
 
 GNU_CONFIGURE=	yes
diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile
index 06f868d773a6..dfa7fb6999ed 100644
--- a/security/xmlsec/Makefile
+++ b/security/xmlsec/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_OPENSSL=	yes
 USE_GNOME=	gnomehack libxslt
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 19d8c9934d3f..3b2a42746bd3 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 USE_OPENSSL=	yes
 USE_GNOME=	gnomehack lthack libxslt gnometarget
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 PLIST_FILES=	bin/xmlsec1 bin/xmlsec1-config etc/xmlsec1Conf.sh