Replace all known incantations of WANT_{AUTOMAKE,AUTOCONF,LIBTOOL}* with

the USE_<x> equivalents.  In the current scheme of things, the WANT_
variables in this case are synonymous with the USE_ ones, and thus need
to be exterminated.

First in a series of major autotools cleanups.

10 files changed, 10 insertions, 19 deletions

diff --git a/devel/ac-archive/Makefile b/devel/ac-archive/Makefile
index 22155e42d5d4..0304032ea75f 100644
--- a/devel/ac-archive/Makefile
+++ b/devel/ac-archive/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A set of useful GNU autoconf macros
 
-WANT_AUTOCONF_VER=253
-
+USE_AUTOCONF_VER=253
 USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 2c741b21aa36..ef1262fbe9e4 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -29,8 +29,7 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
-WANT_AUTOCONF_VER=	253
-
+USE_AUTOCONF_VER=	253
 USE_PERL5=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL_VER=	14
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 2c741b21aa36..ef1262fbe9e4 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -29,8 +29,7 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
-WANT_AUTOCONF_VER=	253
-
+USE_AUTOCONF_VER=	253
 USE_PERL5=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL_VER=	14
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 2c741b21aa36..ef1262fbe9e4 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -29,8 +29,7 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
-WANT_AUTOCONF_VER=	253
-
+USE_AUTOCONF_VER=	253
 USE_PERL5=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL_VER=	14
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 2c741b21aa36..ef1262fbe9e4 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -29,8 +29,7 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
-WANT_AUTOCONF_VER=	253
-
+USE_AUTOCONF_VER=	253
 USE_PERL5=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL_VER=	14
diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile
index 2e28cbc10efc..f4e84fe0b747 100644
--- a/devel/libticalcs/Makefile
+++ b/devel/libticalcs/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	ticables.10:${PORTSDIR}/comms/libticables \
 
 USE_GETTEXT=	yes
 USE_GNOME=	glib20
-WANT_AUTOMAKE_VER=	15
+USE_AUTOMAKE_VER=	15
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile
index 5a48830431ac..03b9579afbe1 100644
--- a/devel/libtifiles/Makefile
+++ b/devel/libtifiles/Makefile
@@ -18,7 +18,7 @@ COMMENT=	TI calculator file types library
 BUILD_DEPENDS=  pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=    pkg-config:${PORTSDIR}/devel/pkgconfig
 
-WANT_AUTOMAKE_VER=	15
+USE_AUTOMAKE_VER=	15
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index f6d6608c1c85..5749f6b8a9e4 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -24,11 +24,9 @@ LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BISON=	yes
-
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 USE_OPENLDAP=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 CONFIGURE_ENV=	OSRELEASE=${OSVERSION}
 ALL_TARGET=	optnoshared
 MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib
diff --git a/devel/pwlib152/Makefile b/devel/pwlib152/Makefile
index f6d6608c1c85..5749f6b8a9e4 100644
--- a/devel/pwlib152/Makefile
+++ b/devel/pwlib152/Makefile
@@ -24,11 +24,9 @@ LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BISON=	yes
-
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 USE_OPENLDAP=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 CONFIGURE_ENV=	OSRELEASE=${OSVERSION}
 ALL_TARGET=	optnoshared
 MAKE_ENV=	PWLIBDIR=${WRKDIR}/pwlib
diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile
index d1bb75624bab..649cc2c46ea5 100644
--- a/devel/sysconftool/Makefile
+++ b/devel/sysconftool/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Helps to install application configuration files
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
-WANT_AUTOMAKE_VER=	15
+USE_AUTOMAKE_VER=	15
 
 MAN1=		sysconftool.1 sysconftoolcheck.1
 MAN7=		sysconftool.7