Whoa there, boy, that's a mighty big commit y'all have there...

Begin autotools sanitization sequence by requiring ports to explicitly
specify which version of {libtool,autoconf,automake} they need, erasing
the concept of a "system default".

For ports-in-waiting:

	USE_LIBTOOL=YES		->	USE_LIBTOOL_VER=13
	USE_AUTOCONF=YES	->	USE_AUTOCONF_VER=213
	USE_AUTOMAKE=YES	->	USE_AUTOMAKE_VER=14

Ports attempting to use the old style system after June 1st 2004 will be
sorely disappointed.

49 files changed, 49 insertions, 49 deletions

diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 84d68cadfc58..f12784867802 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -19,7 +19,7 @@ COMMENT=	BeeCrypt is an open source cryptography library
 USE_SIZE=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index 298e42ccaa11..a6d0f6f3a278 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -21,7 +21,7 @@ USE_PERL5=	yes
 INSTALL_TARGET=		install certificate
 .endif
 
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	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 29cf0280a273..f84a398e174b 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index f5b7fe312020..5fe6dca7c31d 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_AUTOCONF_VER=257
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ARGS=	--with-dbdir=${DATADIR} \
diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile
index ba16c3dd3c82..cfa2a08880c1 100644
--- a/security/cryptplug/Makefile
+++ b/security/cryptplug/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A collection of plug-ins to cryptographic engines
 BUILD_DEPENDS=	gpgme-config:${PORTSDIR}/security/gpgme \
 		gpg-agent:${PORTSDIR}/security/newpg
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 4a0b1ec9b368..9b0780dfc78b 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -49,7 +49,7 @@ MAN8=		sasldblistusers.8 saslpasswd.8 saslauthd1.8
 USE_RC_SUBR=	YES
 
 USE_AUTOMAKE_VER=14
-USE_LIBTOOL=	YES
+USE_LIBTOOL_VER=13
 AUTOMAKE_ARGS=	--add-missing --include-deps
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 9ce989370dfa..e9af4effc172 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
 USE_OPENLDAP=	yes
 USE_GETOPT_LONG=yes
 USE_AUTOMAKE_VER=	15
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 35edc55bcde2..1e3e43dffa43 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 
 USE_GNOME=	glib12 gtk12
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 35edc55bcde2..1e3e43dffa43 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 
 USE_GNOME=	glib12 gtk12
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index 35edc55bcde2..1e3e43dffa43 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 
 USE_GNOME=	glib12 gtk12
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 7343f49297ba..e316e0b5ec9e 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		dirmngr:${PORTSDIR}/security/dirmngr
 		
 USE_AUTOCONF_VER=253
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 07b474860ce2..49bc1e8f7558 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -27,7 +27,7 @@ CONFLICTS=	gnutls-[0-9]*
 
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 8f8c576c9d71..a9f0e8e3735b 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -28,7 +28,7 @@ CONFLICTS=	gnutls-devel-*
 SIG_SUFFIX=	.sig.asc
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 535ddb0c63f5..ec9c8dbfd652 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A library to make access to GnuPG easier
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 535ddb0c63f5..ec9c8dbfd652 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A library to make access to GnuPG easier
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index f56e9c7e81d1..a2be63690f36 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
 .endif
 
-USE_LIBTOOL=		yes
+USE_LIBTOOL_VER=13
 USE_OPENSSL=		yes
 GNU_CONFIGURE=		yes
 INSTALLS_SHLIB=		yes
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index 3a2d2e2a5ffa..4e9ef56c2143 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 USE_GNOME=	glib12
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 3a2d2e2a5ffa..4e9ef56c2143 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 USE_GNOME=	glib12
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/libfwbuilder2/Makefile b/security/libfwbuilder2/Makefile
index 3a2d2e2a5ffa..4e9ef56c2143 100644
--- a/security/libfwbuilder2/Makefile
+++ b/security/libfwbuilder2/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 USE_GNOME=	glib12
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/libgcrypt-devel/Makefile b/security/libgcrypt-devel/Makefile
index bd8e3084263d..b021d44f903b 100644
--- a/security/libgcrypt-devel/Makefile
+++ b/security/libgcrypt-devel/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	libgcrypt-1.1*
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_GNOME=	lthack
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split" \
 		CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include/pth" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib/pth"
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index d788372a09e2..ccb001a68ff0 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -18,7 +18,7 @@ COMMENT=	"General purpose crypto library based on code used in GnuPG"
 CONFLICTS=	libgcrypt-1.1.9*
 USE_REINPLACE=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 81ae55dd6441..3881e86f0bf4 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Common error values for all GnuPG components
 
 USE_GPG=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 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 37a86bbc3e6c..5f79bf6cd450 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=	yes
+USE_LIBTOOL_VER=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 b2ed029caab9..f8fc1ce5d091 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN3=		ident.3
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 66097f0ada37..d25f69d6d61b 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	"KSBA is an X.509 Library"
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/libntlm/Makefile b/security/libntlm/Makefile
index 3160b50b3537..cd75d34c5cb1 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
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 15187322af65..014f6e751529 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Prelude Network Intrusion Detection System librairies
 
 USE_REINPLACE=		yes
 USE_GMAKE=		yes
-USE_LIBTOOL=		yes
+USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=		yes
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc \
 			--program-prefix="" --localstatedir=/var
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index e9e3b62e8008..3c7a310c0cfe 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR=	alpha/gnutls/libtasn1
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	ASN.1 structure parser library
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 USE_GETOPT_LONG=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 9d1a3ceb5a61..93b5c20ea12a 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	roam@FreeBSD.org
 COMMENT=	"Library provides an easy way to access strong hashes such as MD5 and SHA1"
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-LDFLAGS="${PTHREAD_LIBS}" --enable-static \
 			--with-gnu-ld
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index bc7fbc8d23ce..3eed2734ce6b 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	nasl.2:${PORTSDIR}/security/nessus-libnasl-devel
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index c2ba873159a1..7e9e95e47963 100644
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -23,7 +23,7 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
 
 USE_BISON=	YES
-USE_LIBTOOL=	YES
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	YES
 
 MAN1=		nasl.1 nasl-config.1
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index af3d0c6be80c..4b6ed06445c9 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=	YES
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--sharedstatedir=${PREFIX}/etc/nessus/com \
 		--localstatedir=${PREFIX}/etc/nessus/var
 
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index 9a27abe41ec2..f31f5e7367a8 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -24,7 +24,7 @@ DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
 
 USE_BISON=	YES
-USE_LIBTOOL=	YES
+USE_LIBTOOL_VER=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 9ed738b438b7..294565adef39 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=	YES
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--enable-cipher --sharedstatedir=${PREFIX}/etc/nessus/com \
 		--localstatedir=${PREFIX}/etc/nessus/var
 .if defined(WITH_NESSUS_BPF_SHARE)
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 1e0ae59d1c45..e582c5cc1457 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	nasl.2:${PORTSDIR}/security/nessus-libnasl
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/security/newpg/Makefile b/security/newpg/Makefile
index 7343f49297ba..e316e0b5ec9e 100644
--- a/security/newpg/Makefile
+++ b/security/newpg/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		dirmngr:${PORTSDIR}/security/dirmngr
 		
 USE_AUTOCONF_VER=253
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 62b4d10e45b6..64f00a34ffe1 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Open Crypto Development Kit
 
 LIB_DEPENDS=	gcrypt.10:${PORTSDIR}/security/libgcrypt-devel
 
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-libgcrypt-prefix=${LOCALBASE}
diff --git a/security/opensc-esteid/Makefile b/security/opensc-esteid/Makefile
index 179d9e8b0e31..2c9226fa2229 100644
--- a/security/opensc-esteid/Makefile
+++ b/security/opensc-esteid/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	pcsclite.0:${PORTSDIR}/devel/pcsc-lite
 USE_OPENLDAP_VER=	20
 INSTALLS_SHLIB=	yes
 USE_OPENSSL=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcsclite=${LOCALBASE}    \
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index 3df095ce13db..028fa300bdd1 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--with-gdbm=${LOCALBASE} \
 NO_CDROM=	This software can not be sold.
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index ea9578710dff..f157e45e1c7a 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt \
 USE_GETOPT_LONG=yes
 USE_AUTOMAKE_VER=	15
 WANT_GNOME=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/security/poc/Makefile b/security/poc/Makefile
index e69622f56782..46a81ddb3c87 100644
--- a/security/poc/Makefile
+++ b/security/poc/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	towitoko.2:${PORTSDIR}/devel/towitoko
 PLIST_FILES=	bin/poc
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=	14
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 3b88bb075aab..6159154ea8c9 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS+=	prelude.1:${PORTSDIR}/security/libprelude \
 		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GMAKE=		yes
-USE_LIBTOOL=		yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc \
 			--program-prefix=""
 
diff --git a/security/prelude-nids/Makefile b/security/prelude-nids/Makefile
index ededf6bb7898..1d3d7f0d4683 100644
--- a/security/prelude-nids/Makefile
+++ b/security/prelude-nids/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Prelude Network Intrusion Detection System sensor
 LIB_DEPENDS=	prelude.1:${PORTSDIR}/security/libprelude
 
 USE_GMAKE=		yes
-USE_LIBTOOL=		yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--with-html-dir=${PREFIX}/share/doc \
 			--program-prefix=""
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 44fde7d6350d..642a137b38db 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix eel2
-USE_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/security/srm/Makefile b/security/srm/Makefile
index 3e49b85b3f92..cf7d6e94f511 100644
--- a/security/srm/Makefile
+++ b/security/srm/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	srm
 MAINTAINER=	kjones@antihackertoolkit.com
 COMMENT=	Secure rm, a utility which destroys file contents before unlinking
 
-USE_LIBTOOL=	YES
+USE_LIBTOOL_VER=13
 
 MAN1=		srm.1
 PLIST_FILES=	bin/srm
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 594fefaf6fe7..97b5713687e5 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Secure shell client and server (remote login program)
 
 CONFLICTS=	openssh-* openssh-portable-* openssh-gssapi-* ssh2-3.*
-USE_AUTOCONF=	YES
+USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=	YES
 USE_PERL5=	YES
 CONFIGURE_ENV+= PERL=${PERL5}
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 357b8f8a2eb6..0ff8e42c836d 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=	yes
+USE_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
 USE_GCC=	3.3
 CONFIGURE_TARGET=
diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile
index 04267d80faa0..208c51c2a1db 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_LIBTOOL=	yes
+USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 91b073c3a999..654b5cf54784 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=	yes
+USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 PLIST_FILES=	bin/xmlsec1 bin/xmlsec1-config etc/xmlsec1Conf.sh