summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2005-11-15 06:52:12 +0000
committerAde Lovett <ade@FreeBSD.org>2005-11-15 06:52:12 +0000
commit54a0b86543e9ffa811825f0afecea56e89aac2a5 (patch)
treef56fb969c6a70f5e63287a4f791d035ab1ef0ddc /net
parentRemove full path in patch (diff)
Mass-conversion to the USE_AUTOTOOLS New World Order. The code present
in bsd.autotools.mk essentially makes this a no-op given that all the old variables set a USE_AUTOTOOLS_COMPAT variable, which is parsed in exactly the same way as USE_AUTOTOOLS itself. Moreover, USE_AUTOTOOLS has already been extensively tested by the GNOME team -- all GNOME 2.12.x ports use it. Preliminary documentation can be found at: http://people.FreeBSD.org/~ade/autotools.txt which is in the process of being SGMLized before introduction into the Porters Handbook. Light blue touch-paper. Run.
Notes
Notes: svn path=/head/; revision=148323
Diffstat (limited to 'net')
-rw-r--r--net/6tunnel/Makefile2
-rw-r--r--net/apollon/Makefile2
-rw-r--r--net/arla/Makefile2
-rw-r--r--net/atmsupport/Makefile2
-rw-r--r--net/beacon/Makefile2
-rw-r--r--net/blam/Makefile2
-rw-r--r--net/boinc-client/Makefile5
-rw-r--r--net/cdonkey/Makefile2
-rw-r--r--net/crescendo/Makefile2
-rw-r--r--net/cyphesis/Makefile2
-rw-r--r--net/dcd/Makefile2
-rw-r--r--net/dclib/Makefile2
-rw-r--r--net/dhcp-agent/Makefile2
-rw-r--r--net/dictd/Makefile2
-rw-r--r--net/dosdetector/Makefile2
-rw-r--r--net/ethereal/Makefile2
-rw-r--r--net/fcptools/Makefile2
-rw-r--r--net/freeradius/Makefile3
-rw-r--r--net/freeradius2/Makefile3
-rw-r--r--net/gatekeeper/Makefile2
-rw-r--r--net/gift/Makefile2
-rw-r--r--net/gkrellm-gift/Makefile2
-rw-r--r--net/gmdns/Makefile2
-rw-r--r--net/gnet-glib2/Makefile2
-rw-r--r--net/gnet/Makefile2
-rw-r--r--net/gnet2/Makefile2
-rw-r--r--net/gnoemoe/Makefile2
-rw-r--r--net/gnometelnet/Makefile3
-rw-r--r--net/gnu-radius/Makefile3
-rw-r--r--net/gnunet/Makefile3
-rw-r--r--net/gsk/Makefile2
-rw-r--r--net/howl/Makefile2
-rw-r--r--net/libdnet/Makefile2
-rw-r--r--net/libfreenet/Makefile2
-rw-r--r--net/libgnetwork/Makefile2
-rw-r--r--net/libmms/Makefile2
-rw-r--r--net/libnet10/Makefile2
-rw-r--r--net/libnetdude/Makefile2
-rw-r--r--net/libnss-mysql/Makefile2
-rw-r--r--net/libosip/Makefile2
-rw-r--r--net/libosip2/Makefile2
-rw-r--r--net/libpcapnav/Makefile2
-rw-r--r--net/libsocket++/Makefile4
-rw-r--r--net/libtorrent/Makefile2
-rw-r--r--net/liferea/Makefile2
-rw-r--r--net/linc/Makefile2
-rw-r--r--net/linphone-base/Makefile2
-rw-r--r--net/mldonkey-devel/Makefile2
-rw-r--r--net/mldonkey/Makefile2
-rw-r--r--net/mrt/Makefile2
-rw-r--r--net/net6/Makefile2
-rw-r--r--net/netatalk/Makefile2
-rw-r--r--net/netdude/Makefile3
-rw-r--r--net/netspeed_applet/Makefile2
-rw-r--r--net/ntop/Makefile2
-rw-r--r--net/opal/Makefile2
-rw-r--r--net/opal3/Makefile2
-rw-r--r--net/openh323-112/Makefile2
-rw-r--r--net/openh323/Makefile2
-rw-r--r--net/openldap22-server/Makefile3
-rw-r--r--net/openldap23-server/Makefile4
-rw-r--r--net/openldap24-server/Makefile4
-rw-r--r--net/openmpi/Makefile2
-rw-r--r--net/openslp/Makefile2
-rw-r--r--net/ortp/Makefile2
-rw-r--r--net/ossp-sa/Makefile2
-rw-r--r--net/ppxp/Makefile2
-rw-r--r--net/proxy-suite/Makefile2
-rw-r--r--net/proxychains/Makefile3
-rw-r--r--net/pvm++/Makefile2
-rw-r--r--net/quagga/Makefile2
-rw-r--r--net/rrdtool/Makefile2
-rw-r--r--net/rrdtool10/Makefile2
-rw-r--r--net/rtorrent/Makefile2
-rw-r--r--net/samba/Makefile3
-rw-r--r--net/samba3/Makefile3
-rw-r--r--net/sdl_net/Makefile2
-rw-r--r--net/serveez/Makefile2
-rw-r--r--net/tcpdump/Makefile2
-rw-r--r--net/tn5250/Makefile2
-rw-r--r--net/tramp/Makefile2
-rw-r--r--net/unfs3/Makefile2
-rw-r--r--net/verlihub-plugins/Makefile2
-rw-r--r--net/verlihub/Makefile2
-rw-r--r--net/vtun/Makefile2
-rw-r--r--net/wireshark/Makefile2
-rw-r--r--net/xmlrpc-c-devel/Makefile2
-rw-r--r--net/xmlrpc-c/Makefile2
88 files changed, 90 insertions, 105 deletions
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index c85777b56a6f..5d443039bdca 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}rc2
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
ALL_TARGET= default
MAN1= 6tunnel.1
diff --git a/net/apollon/Makefile b/net/apollon/Makefile
index bce6f1c95924..fd4b9d195342 100644
--- a/net/apollon/Makefile
+++ b/net/apollon/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.include <bsd.port.pre.mk>
diff --git a/net/arla/Makefile b/net/arla/Makefile
index 4a7701316100..fc19598bcb29 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -15,7 +15,7 @@ COMMENT= A free AFS client implementation
USE_XLIB= yes
USE_RC_SUBR= arla.sh
-USE_INC_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
diff --git a/net/atmsupport/Makefile b/net/atmsupport/Makefile
index 7fe3c910d265..7aafc2887a88 100644
--- a/net/atmsupport/Makefile
+++ b/net/atmsupport/Makefile
@@ -18,7 +18,7 @@ COMMENT= Tools for testing the ATM subsystem
LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84
USE_GMAKE= yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13
CONFIGURE_ARGS+= --with-tcldir=${LOCALBASE}
INSTALLS_SHLIB= yes
diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index d8479c948f32..63e572828bd4 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
WWW_DIR?= ${PREFIX}/www/
PLIST_SUB+= VERSION=${PORTVERSION}
USE_PERL5= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS= --bindir=${WWW_DIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/net/blam/Makefile b/net/blam/Makefile
index 989ef0aa58fb..d8b07504cb9d 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -35,7 +35,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack intltool libgnomeui
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-mozilla=${MOZILLA}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index b2e7c70a8c96..ea5ace5e0c23 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -32,10 +32,7 @@ LIB_DEPENDS+= iconv:${PORTSDIR}/converters/libiconv \
USE_XLIBS= yes
.endif
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-USE_AUTOHEADER_VER= 259
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoheader:259 autoconf:259 libtool:15
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/net/cdonkey/Makefile b/net/cdonkey/Makefile
index d806d330287f..7d09fa56279a 100644
--- a/net/cdonkey/Makefile
+++ b/net/cdonkey/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES= bin/cDonkey
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib"
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/cDonkey-${PORTVERSION}
diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index a8be9b74b797..06c40b5b0291 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= tf:${PORTSDIR}/net/tinyfugue
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS+= --enable-compile-warnings=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile
index 61ddbe655f86..f177a92b0d68 100644
--- a/net/cyphesis/Makefile
+++ b/net/cyphesis/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \
CONFIGURE_ARGS= --with-python=${LOCALBASE}
USE_REINPLACE= YES
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= YES
INSTALLS_SHLIB= YES
USE_GCC= 3.4
diff --git a/net/dcd/Makefile b/net/dcd/Makefile
index 90b507259478..702f14b8f1d2 100644
--- a/net/dcd/Makefile
+++ b/net/dcd/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= mraleks@bk.ru
COMMENT= Direct Connect Hub clone for Unix
USE_BZIP2= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
diff --git a/net/dclib/Makefile b/net/dclib/Makefile
index 77729151784a..8858c847be8e 100644
--- a/net/dclib/Makefile
+++ b/net/dclib/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
USE_REINPLACE= yes
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/net/dhcp-agent/Makefile b/net/dhcp-agent/Makefile
index aa6bb89ad999..aee69ac99c6f 100644
--- a/net/dhcp-agent/Makefile
+++ b/net/dhcp-agent/Makefile
@@ -18,7 +18,7 @@ COMMENT= A portable UNIX Dynamic Host Configuration suite
BUILD_DEPENDS= ${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet
LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index f6726a217fd3..50c8d3649dc8 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -22,7 +22,7 @@ MAN8= dictd.8
USE_RC_SUBR= yes
USE_REINPLACE= yes
USE_BISON= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
--without-local-zlib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/dosdetector/Makefile b/net/dosdetector/Makefile
index e1653ae2dbf9..40bb3737ac53 100644
--- a/net/dosdetector/Makefile
+++ b/net/dosdetector/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= msciciel@darkzone.ma.cx
COMMENT= Detect suspicious network traffic
HAS_CONFIGURE= yes
-USE_AUTOHEADER_VER= 259
+USE_AUTOTOOLS= autoheader:259
PLIST_FILES= bin/dosdetector
MAN1= dosdetector.1
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index bff1bba761a7..4561e1504209 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --enable-ethereal=no \
--disable-gtk2
.endif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure wiretap/configure
PLIST_SUB+= PORTVERSION=${PORTVERSION}
diff --git a/net/fcptools/Makefile b/net/fcptools/Makefile
index 492bc06d754f..8c02412aa76b 100644
--- a/net/fcptools/Makefile
+++ b/net/fcptools/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
COMMENT= FreeNet client library and command-line tools for shell scripting
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME:L}
INSTALLS_SHLIB= yes
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 641b3f5e772a..64bcfca11d57 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -21,11 +21,10 @@ LOGDIR?= /var/log
CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
USE_RC_SUBR= yes
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13
USE_GMAKE= yes
USE_PERL5= yes
USE_OPENSSL= yes
-USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
--localstatedir=/var \
--disable-ltdl-install \
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 641b3f5e772a..64bcfca11d57 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -21,11 +21,10 @@ LOGDIR?= /var/log
CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
USE_RC_SUBR= yes
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13
USE_GMAKE= yes
USE_PERL5= yes
USE_OPENSSL= yes
-USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
--localstatedir=/var \
--disable-ltdl-install \
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index b2fa412e02ea..ea99215e83e7 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
USE_RC_SUBR= yes
RC_DIR= ${PREFIX}/etc/rc.d
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ENV= ${MAKE_ENV}
NOCLEANDEPENDS= yes
diff --git a/net/gift/Makefile b/net/gift/Makefile
index 9c3a1ccef895..b58adea5b45a 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -18,7 +18,7 @@ COMMENT= An OpenFT, Gnutella and FastTrack p2p network client
LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/net/gkrellm-gift/Makefile b/net/gkrellm-gift/Makefile
index 2239f2bc1dc7..cdf37db41d9a 100644
--- a/net/gkrellm-gift/Makefile
+++ b/net/gkrellm-gift/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_X_PREFIX= yes
PLIST_FILES= libexec/gkrellm2/plugins/gift.so
diff --git a/net/gmdns/Makefile b/net/gmdns/Makefile
index e1640af13756..40656c2b52c8 100644
--- a/net/gmdns/Makefile
+++ b/net/gmdns/Makefile
@@ -19,7 +19,7 @@ COMMENT= A GNU implementation of multicast DNS, part of Zeroconf
USE_BZIP2= yes
USE_GNOME= gnomehack glib20
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile
index 13a2e30f60a6..1a116c39b94e 100644
--- a/net/gnet-glib2/Makefile
+++ b/net/gnet-glib2/Makefile
@@ -17,7 +17,7 @@ COMMENT= A simple network library built upon Glib-2
USE_REINPLACE= yes
USE_GNOME= gnomehack glib20
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-glib2
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index f0a744a6fba7..f17b32888528 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -15,7 +15,7 @@ COMMENT= A simple network library built upon Glib
USE_REINPLACE= yes
USE_GNOME= gnomehack glib12
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN1= gnet-config.1
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 2292f23bdba7..60358e48fa5e 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -18,7 +18,7 @@ COMMENT= A simple network library built upon Glib-2
USE_GNOME= gnomehack glib20
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.if !defined(NOPORTDOCS)
CONFIGURE_ARGS+= --with-html-dir=${DOCSDIR}
diff --git a/net/gnoemoe/Makefile b/net/gnoemoe/Makefile
index 3ab68f5270b8..3ff8f0eab50e 100644
--- a/net/gnoemoe/Makefile
+++ b/net/gnoemoe/Makefile
@@ -21,7 +21,7 @@ USE_GNOME= gnomeprefix gtksourceview libglade2 libgnomeui vte
USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
post-patch:
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index 6987034ead33..b15b68be8526 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -15,12 +15,11 @@ DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A nice frontend to the telnet, ssh, and rlogin clients for GNOME
-WANT_AUTOMAKE_VER=15
+USE_AUTOTOOLS= automake:15:env libtool:15
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 23f2c8c6790b..cdc42e127cd9 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -20,10 +20,9 @@ USE_RC_SUBR= yes
USE_SUBMAKE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libltdl:15 libtool:13
INSTALLS_SHLIB= yes
USE_GETTEXT= yes
-USE_LIBLTDL= yes
CONFIGURE_TARGET= # empty
PLIST_SUB= PORTVERSION=${PORTVERSION}
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index aee271e4031c..77d34182b123 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -20,13 +20,12 @@ COMMENT= An anonymous, distributed, reputation-based network
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13:inc
USE_BZIP2= yes
USE_GETOPT_LONG= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 lthack
-USE_INC_LIBTOOL_VER=13
USE_OPENSSL= yes
USE_REINPLACE= yes
diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index a95f58c8570e..63a429ea7351 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -19,7 +19,7 @@ COMMENT= A C library for writing servers
USE_GNOME= glib20 gnomehack gnometarget
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-gtk-doc
INSTALLS_SHLIB= yes
diff --git a/net/howl/Makefile b/net/howl/Makefile
index e560cad1cdc6..5ad80ec1e425 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -15,7 +15,7 @@ COMMENT= Zeroconf/Bonjour(tm) implementation
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
USE_GETOPT_LONG=yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_RC_SUBR= yes
CPPFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 43f5ac4c5306..4ba9177d92ed 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -17,7 +17,7 @@ COMMENT= A simple interface to low level networking routines
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
.if defined(WITH_PYTHON)
USE_PYTHON= yes
diff --git a/net/libfreenet/Makefile b/net/libfreenet/Makefile
index dc23fadbf3f5..4128446f84fc 100644
--- a/net/libfreenet/Makefile
+++ b/net/libfreenet/Makefile
@@ -18,7 +18,7 @@ COMMENT= Freenet library written in C
USE_REINPLACE= yes
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --includedir=${PREFIX}/include/libfreenet
INSTALLS_SHLIB= yes
diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile
index 6ad8577034f1..ebf96c926374 100644
--- a/net/libgnetwork/Makefile
+++ b/net/libgnetwork/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/libmms/Makefile b/net/libmms/Makefile
index fe0458d1a9d1..f67ee4701e47 100644
--- a/net/libmms/Makefile
+++ b/net/libmms/Makefile
@@ -18,7 +18,7 @@ COMMENT= Library for parsing mms:// and mmsh:// type network streams
USE_REINPLACE= yes
USE_GNOME= gnomehack gnometarget pkgconfig glib20
GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
pre-configure:
diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 155dd6cfaa68..175ccfeca713 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -19,7 +19,7 @@ COMMENT= A C library for creating IP packets
CONFLICTS= libnet-devel-1.1.*\
libnet-1.1.*
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
WRKSRC= ${WRKDIR}/Libnet-${PORTVERSION}
MAN3= libnet.3
diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile
index ed1b19a3c7ac..37f4e61e1dc0 100644
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@@ -16,7 +16,7 @@ COMMENT= A library for manipulating libpcap/tcpdump trace files
LIB_DEPENDS= pcapnav.0:${PORTSDIR}/net/libpcapnav
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
USE_GNOME= glib12
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index 4759868ad8f8..99a4357f815d 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-mysql=${LOCALBASE}
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_MYSQL= yes
.include <bsd.port.pre.mk>
diff --git a/net/libosip/Makefile b/net/libosip/Makefile
index 97402a95fe1b..cf510b6c239f 100644
--- a/net/libosip/Makefile
+++ b/net/libosip/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A low layer of SIP implementation
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
#LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/net/libosip2/Makefile b/net/libosip2/Makefile
index cce36b2c30cb..e23012ee6fab 100644
--- a/net/libosip2/Makefile
+++ b/net/libosip2/Makefile
@@ -17,7 +17,7 @@ COMMENT= A low layer of SIP implementation
USE_GNOME= gnomehack gnometarget pkgconfig
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-debug --disable-trace
INSTALLS_SHLIB= yes
diff --git a/net/libpcapnav/Makefile b/net/libpcapnav/Makefile
index e20a1d17a59d..bdfa38753d1e 100644
--- a/net/libpcapnav/Makefile
+++ b/net/libpcapnav/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= yb@bashibuzuk.net
COMMENT= A libpcap wrapper library
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 914f78abfff6..21a3b8f4fbd9 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -17,9 +17,7 @@ COMMENT= A C++ wrapper library to the sockets
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_AUTOMAKE_VER= 19
-USE_AUTOCONF_VER= 259
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:inc
SCRIPTS_ENV+= ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/"
INFO= socket++
diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 2e8ffe170236..49771d90035f 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -19,7 +19,7 @@ USE_GCC= 3.4
USE_GNOME= pkgconfig gnomehack
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --disable-debug
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 8b9d6ad55c61..b339aeb85f91 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgtkhtml
USE_GMAKE= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 182515c26b85..4be2d9753ec7 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
INSTALLS_SHLIB= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index a2434222a32b..5346c9267caa 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \
USE_GNOME= glib20 gnomehack gnometarget intlhack pkgconfig
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure oRTP/configure
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile
index f89ad3d606cc..6a13bc815a29 100644
--- a/net/mldonkey-devel/Makefile
+++ b/net/mldonkey-devel/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= mldonkey-[0-9]*
USE_BZIP2= yes
USE_ICONV= yes
USE_RC_SUBR= yes
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env
USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 94243bb28bda..1c93695909a1 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
CONFLICTS= mldonkey-devel-[0-9]*
USE_BZIP2= yes
-WANT_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259:env
USE_REINPLACE= yes
USE_OPENSSL= yes
USE_ICONV= yes
diff --git a/net/mrt/Makefile b/net/mrt/Makefile
index f118a93fb6fb..8611d45dd55f 100644
--- a/net/mrt/Makefile
+++ b/net/mrt/Makefile
@@ -16,7 +16,7 @@ COMMENT= Multi-threaded Routing Toolkit
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
MAN8= mrtd.8
diff --git a/net/net6/Makefile b/net/net6/Makefile
index 06a30d69dc00..7e01e6f5f54e 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -16,7 +16,7 @@ COMMENT= Network access framework for IPv4/IPv6
LIB_DEPENDS= sigc++-2.0.0:${PORTSDIR}/devel/libsigc++20
INSTALLS_SHLIB= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack
.if !defined(WITHOUT_NLS)
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index ebf599762301..556ddee20519 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -45,7 +45,7 @@ PLIST_SUB+= TIMELORD=""
.else
PLIST_SUB+= TIMELORD="@comment "
.endif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 187be2235455..116a2986e136 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -17,10 +17,9 @@ COMMENT= NETwork DUmp data Displayer and Editor for tcpdump tracefiles
LIB_DEPENDS= netdude.0:${PORTSDIR}/net/libnetdude
-USE_LIBLTDL= yes
+USE_AUTOTOOLS= libltdl:15 libtool:13:inc
USE_ICONV= yes
USE_GETTEXT= yes
-USE_INC_LIBTOOL_VER= 13
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lltdl"
USE_GMAKE= yes
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 4a996b68a546..d2c1ca4e0632 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= gnomehier intlhack gnomeprefix gnomehack gnomepanel
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-libgtop
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index a4962552962a..2d67c39c8de3 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -26,7 +26,7 @@ USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_OPENSSL= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
PLIST_SUB+= DBDIR=${DBDIR} \
SHLIB=${PORTVERSION:S/.p/pre/}
diff --git a/net/opal/Makefile b/net/opal/Makefile
index 52ec78d313d4..ba920630b005 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -38,7 +38,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 52ec78d313d4..ba920630b005 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -38,7 +38,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile
index 52ec78d313d4..ba920630b005 100644
--- a/net/openh323-112/Makefile
+++ b/net/openh323-112/Makefile
@@ -38,7 +38,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 52ec78d313d4..ba920630b005 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -38,7 +38,7 @@ USE_BISON= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib && make -V WRKSRC
CONFIGURE_ENV= PWLIBDIR=${PWLIBDIR} OPENH323DIR=${WRKSRC}
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 07925a934eaf..414b5e818b55 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -86,7 +86,7 @@ BROKEN= Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}
USE_OPENSSL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -143,7 +143,6 @@ USE_RC_SUBR= yes
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
.if defined(WITH_MODULES) || defined(WITH_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_LIBLTDL= yes
CONFIGURE_ARGS+= --enable-modules
PLIST_SUB+= MODULES=""
.else
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 84db959a34cb..53c9fdacc23e 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -98,7 +98,7 @@ CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
USE_OPENSSL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -156,7 +156,7 @@ USE_RC_SUBR= yes
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_LIBLTDL= yes
+USE_AUTOTOOLS+= libltdl:15
CONFIGURE_ARGS+= --enable-modules
PLIST_SUB+= MODULES=""
.else
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 84db959a34cb..53c9fdacc23e 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -98,7 +98,7 @@ CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
USE_OPENSSL= yes
USE_REINPLACE= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
@@ -156,7 +156,7 @@ USE_RC_SUBR= yes
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI)
-USE_LIBLTDL= yes
+USE_AUTOTOOLS+= libltdl:15
CONFIGURE_ARGS+= --enable-modules
PLIST_SUB+= MODULES=""
.else
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index e6f8b8781ad2..f77e9275b939 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -24,7 +24,7 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
# Can't use until does not imply GNU_CONFIGURE or there's a sane way
# to change the prefix for configure.
-#USE_LIBTOOL_VER=15
+#USE_AUTOTOOLS= libtool:15
MPIBASE?= mpi
MPIDIR?= ${MPIBASE}/${UNIQUENAME}
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 1048b4bb74d0..052b95cdb96b 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= openslp
MAINTAINER= marcus@FreeBSD.org
COMMENT= Open-source implementation of the Service Location Protocol
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/openslp \
diff --git a/net/ortp/Makefile b/net/ortp/Makefile
index 3f15c0f6e7eb..32e48527cdf0 100644
--- a/net/ortp/Makefile
+++ b/net/ortp/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= A Real-time Transport Protocol (RTP) stack
USE_GNOME= glib20
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
INSTALLS_SHLIB= yes
diff --git a/net/ossp-sa/Makefile b/net/ossp-sa/Makefile
index f6de793f6a18..4652837207ed 100644
--- a/net/ossp-sa/Makefile
+++ b/net/ossp-sa/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-ex=${LOCALBASE}
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
MAN3+= sa.3
diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile
index ff99706137b9..ebb92ccd0ff6 100644
--- a/net/ppxp/Makefile
+++ b/net/ppxp/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 \
USE_PERL5_BUILD=yes
USE_XPM= yes
USE_GMAKE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
.if defined(WITH_TCLJP)
CONFIGURE_ARGS+= --with-tclsh=${PREFIX}/bin/tclsh8.0jp \
--with-wish=${PREFIX}/bin/wish8.0jp \
diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
index bb8c96ccd424..1d9cc5a693aa 100644
--- a/net/proxy-suite/Makefile
+++ b/net/proxy-suite/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.suse.com/pub/projects/proxy-suite/src/ \
MAINTAINER= thomas@cuivre.fr.eu.org
COMMENT= The SuSE Proxy-Suite, a set of programs to enhance firewall security
-USE_AUTOCONF_VER= 253
+USE_AUTOTOOLS= autoconf:253
USE_GMAKE= yes
USE_BZIP2= yes
diff --git a/net/proxychains/Makefile b/net/proxychains/Makefile
index 103b398a7075..71005a04ae1c 100644
--- a/net/proxychains/Makefile
+++ b/net/proxychains/Makefile
@@ -14,8 +14,7 @@ COMMENT= Multi-proxifier
USE_REINPLACE= yes
-USE_AUTOCONF_VER= 213
-USE_AUTOMAKE_VER= 14
+USE_AUTOTOOLS= automake:14 autoconf:213
INSTALLS_SHLIB= yes
diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile
index 1c4b024df995..cf3c558f4fc6 100644
--- a/net/pvm++/Makefile
+++ b/net/pvm++/Makefile
@@ -19,7 +19,7 @@ COMMENT= A C++-Library for PVM
BUILD_DEPENDS= ${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-pvm-incs=${LOCALBASE}/include \
--with-pvm-libs=${LOCALBASE}/lib
INSTALLS_SHLIB= yes
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index b3bbf02b2e25..a1c1fda46e32 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_PERL5_BUILD= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure
MAN1= vtysh.1
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index f223c213a236..7fe718f8c598 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= cgi.1:${PORTSDIR}/devel/cgilib \
png.5:${PORTSDIR}/graphics/png
USE_PERL5= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-perl-site-install --disable-python
diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
index 79efec6da00c..5175b663b3a7 100644
--- a/net/rrdtool10/Makefile
+++ b/net/rrdtool10/Makefile
@@ -19,7 +19,7 @@ MAKE_ENV= PERL=${PERL}
CONFLICTS= rrdtool-1.2*
LATEST_LINK= rrdtool10
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index c49825599c58..1e678dbeaa93 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -23,7 +23,7 @@ USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-USE_INC_LIBTOOL_VER= 13
+USE_AUTOTOOLS= libtool:13:inc
SUB_FILES= pkg-message
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 32e2d4d41abf..9ffe0130c0ef 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -32,8 +32,7 @@ COMMENT= A free SMB and CIFS client and server for UNIX
CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.*
USE_SUBMAKE= YES
USE_GMAKE= YES
-USE_LIBTOOL_VER=15
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213 libtool:15
# directories
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 0e3e1ae311f3..7f4f031df443 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -21,8 +21,7 @@ CONFLICTS?= ja-samba-2.* ja-samba-3.* samba-2.* sharity-light-1.*
USE_ICONV= yes
GNU_CONFIGURE= yes
-#USE_AUTOHEADER_VER= 259
-#USE_AUTOCONF_VER= 259
+#USE_AUTOTOOLS= autoconf:259 autoheader:259
LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index b301b0088268..03f4a9269835 100644
--- a/net/sdl_net/Makefile
+++ b/net/sdl_net/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= GUI.0:${PORTSDIR}/graphics/guilib
USE_SDL= sdl
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS= libtool:13:inc
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index 4da12a502ff7..393f546612ec 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -22,7 +22,7 @@ GUILE_CONFIG?= ${LOCALBASE}/bin/guile-config
USE_GETOPT_LONG= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INSTALLS_SHLIB= yes
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index b54a34c735d8..70548add5aeb 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -68,7 +68,7 @@ PLIST_SUB+= NOTBASE=""
CONFIGURE_ARGS+= --without-crypto
.else
USE_OPENSSL= defined
-USE_AUTOCONF_VER?= 253
+USE_AUTOTOOLS= autoconf:253
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl-configure.in
.endif
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index 148d668169e0..5aac398cc616 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -17,7 +17,7 @@ COMMENT= 5250 Telnet protocol and Terminal
USE_GNOME= gnomehack gnometarget pkgconfig
USE_OPENSSL= yes
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-os-dir=no --with-ssl=${OPENSSLBASE}
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index 6b277baad62a..8a099b084be4 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -18,7 +18,7 @@ COMMENT= Transparent remote file access tool for emacsen
EMACS_PORT_NAME?= emacs21
USE_GMAKE= yes
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
TRAMP_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
PLIST_SUB+= TRAMP_LISPDIR=${TRAMP_LISPDIR}
diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile
index 8ab84c83dffc..235d72362940 100644
--- a/net/unfs3/Makefile
+++ b/net/unfs3/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= clement@FreeBSD.org
COMMENT= A user-space implementation of the NFSv3 server specification
-USE_AUTOCONF_VER= 259
+USE_AUTOTOOLS= autoconf:259
USE_BISON= YES
MAN7= tags.7
diff --git a/net/verlihub-plugins/Makefile b/net/verlihub-plugins/Makefile
index d97da078109b..08def04562d9 100644
--- a/net/verlihub-plugins/Makefile
+++ b/net/verlihub-plugins/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
WRKSRC= ${WRKDIR}/vh_plugins-0.1
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/include/verlihub
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/verlihub -I${LOCALBASE}/include/mysql"
diff --git a/net/verlihub/Makefile b/net/verlihub/Makefile
index 071d57db9bf6..33a204d8a2c5 100644
--- a/net/verlihub/Makefile
+++ b/net/verlihub/Makefile
@@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/verlihub-0.9.8c
USE_MYSQL= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_INC_LIBTOOL_VER= 15
+USE_AUTOTOOLS= libtool:15:inc
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index bf83bb6bbc6d..214407cc1a64 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -22,7 +22,7 @@ MAN8= vtund.8
MLINKS= vtund.8 vtun.8
USE_OPENSSL= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOTOOLS= autoconf:213
CONFIGURE_ARGS= --localstatedir=/var \
--with-ssl-headers=${OPENSSLBASE}/include/openssl \
--with-ssl-lib=${OPENSSLBASE}/lib \
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index bff1bba761a7..4561e1504209 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --enable-ethereal=no \
--disable-gtk2
.endif
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
LIBTOOLFILES= configure wiretap/configure
PLIST_SUB+= PORTVERSION=${PORTVERSION}
diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile
index 432215d2f1d5..c0cbd262649b 100644
--- a/net/xmlrpc-c-devel/Makefile
+++ b/net/xmlrpc-c-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww
RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 432215d2f1d5..c0cbd262649b 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww
RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC
USE_GMAKE= yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_REINPLACE= yes