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.

19 files changed, 19 insertions, 30 deletions

diff --git a/net-mgmt/NeTraMet/Makefile b/net-mgmt/NeTraMet/Makefile
index eaf9e3aa59a8..243c74a46aee 100644
--- a/net-mgmt/NeTraMet/Makefile
+++ b/net-mgmt/NeTraMet/Makefile
@@ -25,7 +25,7 @@ NETRAMET_DOCS=	usguide.pdf srlguide.pdf ntmref.pdf nm_rc.pdf \
 WRKSRC=		${WRKDIR}/NeTraMet${PORTVERSION:S/.//}
 
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	autoconf:213
 USE_GMAKE=	yes
 
 .if defined(WITH_MOTIF)
diff --git a/net-mgmt/arts++/Makefile b/net-mgmt/arts++/Makefile
index b0889ea75e4a..e20b649cc70f 100644
--- a/net-mgmt/arts++/Makefile
+++ b/net-mgmt/arts++/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13:inc
 USE_GCC=	2.95
 
 MANL=		artsportagg.l artsports.l artsprotos.l artsnets.l artsdump.l \
diff --git a/net-mgmt/bsnmpd/Makefile b/net-mgmt/bsnmpd/Makefile
index 9a712fcc3d58..333a93c5e6e9 100644
--- a/net-mgmt/bsnmpd/Makefile
+++ b/net-mgmt/bsnmpd/Makefile
@@ -22,8 +22,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libbegemot=${LOCALBASE}
 
-USE_AUTOCONF_VER=	259
-USE_AUTOMAKE_VER=	19
+USE_AUTOTOOLS=	automake:19 autoconf:259
 INSTALLS_SHLIB=		yes
 
 USE_GCC=	3.2+
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index 0f83ea8cbf62..04620a17c076 100644
--- a/net-mgmt/cflowd/Makefile
+++ b/net-mgmt/cflowd/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_GCC=	2.95
 
 CONFIGURE_ARGS=	--enable-shared --with-artspp=${LOCALBASE}
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 6eb1e01b5bdf..8ab7a617992d 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A graphical network traffic visualization tool for gnome
 USE_GETTEXT=	yes
 USE_GNOME=	libglade2 libgnomeui
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index e65a4083f800..96194a6525d6 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -28,7 +28,7 @@ OPTIONS=	GTK	"Build with GTK2+ GUI"	on \
 
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_REINPLACE=	yes
 
 MAN5=		etter.conf.5
@@ -72,7 +72,6 @@ CONFIGURE_ARGS+=	--without-libpcre
 .endif
 
 .if !defined(WITHOUT_PLUGINS)
-USE_LIBLTDL=		yes
 MAN8+=			ettercap_plugins.8
 DOCS+=			doc/plugins
 CONFIGURE_ARGS+=	--enable-plugins
diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 5dce7893f565..3cf5864d1ca3 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Convert, change and calculate with IPv6 addresses
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_AUTOTOOLS=	libtool:13
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/ipv6calc/ipv6calc ${PREFIX}/bin
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 31835543f117..f27a0c640bbe 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -107,8 +107,7 @@ PLIST_SUB+=	SUB_LDAP="@comment "
 
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} LDFLAGS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include"
-USE_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	automake:19 autoconf:259
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
diff --git a/net-mgmt/nagios-snmp-plugins/Makefile b/net-mgmt/nagios-snmp-plugins/Makefile
index 3bbefa3475d9..c5eb9820046f 100644
--- a/net-mgmt/nagios-snmp-plugins/Makefile
+++ b/net-mgmt/nagios-snmp-plugins/Makefile
@@ -17,9 +17,7 @@ COMMENT=	Additional SNMP plugins for Nagios
 LIB_DEPENDS=    netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp
 
 GNU_CONFIGURE=		yes
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
-USE_AUTOHEADER_VER=	213
+USE_AUTOTOOLS=	automake:14 autoheader:213 autoconf:213
 USE_GETOPT_LONG=	yes
 USE_GMAKE=		yes
 USE_PERL5=		yes
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index fff394f04ec2..c5de86caf4d6 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
 
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_RC_SUBR=	yes
 USE_PERL5_BUILD=yes
 
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index fff394f04ec2..c5de86caf4d6 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
 
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
+USE_AUTOTOOLS=	autoconf:259
 USE_RC_SUBR=	yes
 USE_PERL5_BUILD=yes
 
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index 4c6aa6fd14e7..24274a90ad2d 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE} --disable-html
 USE_OPENSSL=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 
 MAN1=		nefu.1
 MAN4=		nefu.conf.4
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index f62c8c92e326..c612bcd62cd9 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -26,8 +26,7 @@ RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_RC_SUBR=	yes
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index f62c8c92e326..c612bcd62cd9 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -26,8 +26,7 @@ RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_RC_SUBR=	yes
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 3c634c4ee04d..355953a2b902 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR=	net-snmp
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
 
-USE_AUTOCONF_VER=213
+USE_AUTOTOOLS=	autoconf:213 libtool:13:inc
 USE_REINPLACE=	yes
 USE_PERL5=	yes
-USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CFLAGS+=	-fPIC
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index f62c8c92e326..c612bcd62cd9 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -26,8 +26,7 @@ RUN_DEPEND=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 PATCH_DEPENDS=	${LIBTOOL_DEPENDS}
 
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=259
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_RC_SUBR=	yes
 USE_OPENSSL=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net-mgmt/netsaint-plugins/Makefile b/net-mgmt/netsaint-plugins/Makefile
index b5707049ffd3..cb105aca8572 100644
--- a/net-mgmt/netsaint-plugins/Makefile
+++ b/net-mgmt/netsaint-plugins/Makefile
@@ -27,8 +27,7 @@ CONFIGURE_ARGS=	--sbindir=${PREFIX}/share/netsaint/sbin \
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		MKDIR="${MKDIR}"
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
+USE_AUTOTOOLS=	automake:14 autoconf:213
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index d2960e01692d..38a3cdd50378 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -23,8 +23,7 @@ CFLAGS+=	`${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines`
 CFLAGS+=	-I${LOCALBASE}/include
 LIBS=		`${LIBNET_CONFIG} --libs`
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	253
-USE_AUTOMAKE_VER=	15
+USE_AUTOTOOLS=	automake:15 autoconf:253
 AUTOMAKE_ARGS=	--add-missing
 
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${LIBS}" CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile
index 0d79437ed899..9ce47ca02206 100644
--- a/net-mgmt/py-yapsnmp/Makefile
+++ b/net-mgmt/py-yapsnmp/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"