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.

66 files changed, 75 insertions, 126 deletions

diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 438d83cc1feb..c081941b74e9 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -27,8 +27,7 @@ PATCH_WRKSRC=	${WRKSRC}/..
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	257
 WRKSRC=		${WRKDIR}/pd-0.37-1test1/src
 
 .include <bsd.port.pre.mk>
diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index 111ba5d959fa..0af8611be437 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -25,9 +25,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 USE_AUTOHEADER=	yes
-WANT_AUTOCONF_VER= 257
+USE_AUTOCONF_VER= 257
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index 9df731908f2c..fa992e08e36c 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -18,7 +18,7 @@ COMMENT=	TI calculator link cables 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/databases/firebird-client/Makefile b/databases/firebird-client/Makefile
index 188fe9af49c8..f3122bb35f60 100644
--- a/databases/firebird-client/Makefile
+++ b/databases/firebird-client/Makefile
@@ -19,8 +19,8 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-WANT_LIBTOOL_VER=	13
-WANT_AUTOCONF_VER=	253
+USE_LIBTOOL_VER=	13
+USE_AUTOCONF_VER=	253
 USE_GCC=	3.3
 
 # Don't use ld for linking, use gcc
diff --git a/databases/firebird-devel/Makefile b/databases/firebird-devel/Makefile
index 1d006c69ac06..8ad53d6a68e3 100644
--- a/databases/firebird-devel/Makefile
+++ b/databases/firebird-devel/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
-WANT_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	257
 USE_GCC=	3.3
 
 CONFLICTS=	firebird-1.*
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index 188fe9af49c8..f3122bb35f60 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -19,8 +19,8 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-WANT_LIBTOOL_VER=	13
-WANT_AUTOCONF_VER=	253
+USE_LIBTOOL_VER=	13
+USE_AUTOCONF_VER=	253
 USE_GCC=	3.3
 
 # Don't use ld for linking, use gcc
diff --git a/databases/firebird/Makefile b/databases/firebird/Makefile
index 188fe9af49c8..f3122bb35f60 100644
--- a/databases/firebird/Makefile
+++ b/databases/firebird/Makefile
@@ -19,8 +19,8 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-WANT_LIBTOOL_VER=	13
-WANT_AUTOCONF_VER=	253
+USE_LIBTOOL_VER=	13
+USE_AUTOCONF_VER=	253
 USE_GCC=	3.3
 
 # Don't use ld for linking, use gcc
diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile
index 188fe9af49c8..f3122bb35f60 100644
--- a/databases/firebird2-server/Makefile
+++ b/databases/firebird2-server/Makefile
@@ -19,8 +19,8 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-WANT_LIBTOOL_VER=	13
-WANT_AUTOCONF_VER=	253
+USE_LIBTOOL_VER=	13
+USE_AUTOCONF_VER=	253
 USE_GCC=	3.3
 
 # Don't use ld for linking, use gcc
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 188fe9af49c8..f3122bb35f60 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -19,8 +19,8 @@ USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-WANT_LIBTOOL_VER=	13
-WANT_AUTOCONF_VER=	253
+USE_LIBTOOL_VER=	13
+USE_AUTOCONF_VER=	253
 USE_GCC=	3.3
 
 # Don't use ld for linking, use gcc
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 6d828cd12f54..dc326d066c95 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_LIBTOOL=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=5.0
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 6d828cd12f54..dc326d066c95 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -20,7 +20,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_LIBTOOL=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=5.0
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 86132145a8e5..7159e8af6d7d 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
 
 PLIST_FILES=	bin/memcached
 USE_AUTOMAKE=YES
-WANT_AUTOCONF_VER=253
+USE_AUTOCONF_VER=	253
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE}
diff --git a/databases/mysql-administrator/Makefile b/databases/mysql-administrator/Makefile
index b501f20ff445..40678e0cf673 100644
--- a/databases/mysql-administrator/Makefile
+++ b/databases/mysql-administrator/Makefile
@@ -25,8 +25,8 @@ COMMENT=	Powerful visual administration console for MySQL environment
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-WANT_AUTOMAKE_VER=	14
-WANT_AUTOCONF_VER=	257
+USE_AUTOMAKE_VER=	14
+USE_AUTOCONF_VER=	257
 CONFIGURE_ENV+=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 
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
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 7467a396149d..e66492ab892a 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -145,8 +145,7 @@ JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 34c1c3187985..27178b64e070 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.2
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 34c1c3187985..27178b64e070 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.2
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 7467a396149d..e66492ab892a 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -145,8 +145,7 @@ JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
 JAVAVM=         ${JDK13DIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 34c1c3187985..27178b64e070 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.2
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 34c1c3187985..27178b64e070 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.2
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 18f56b523e91..31e639d82605 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -137,8 +137,7 @@ JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 434cdb201ff2..71b0d0ce5d3d 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -40,8 +40,7 @@ PORTDOCS=	${PORTDOCSdoc} ${PORTDOCScontrib}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-# WANT_AUTOCONF_VER=213
-# USE_AUTOCONF=	yes
+# USE_AUTOCONF_VER=213
 
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g'
 
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 434cdb201ff2..71b0d0ce5d3d 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -40,8 +40,7 @@ PORTDOCS=	${PORTDOCSdoc} ${PORTDOCScontrib}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-# WANT_AUTOCONF_VER=213
-# USE_AUTOCONF=	yes
+# USE_AUTOCONF_VER=213
 
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g'
 
diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index e2ca8f2c1073..21eaeab33e6c 100644
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	artsmodules.0:${PORTSDIR}/multimedia/kdemultimedia3
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-WANT_AUTOCONF_VER=	253
-USE_AUTOCONF=	yes
+USE_AUTOCONF_VER=	253
 USE_AUTOHEADER=	yes
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile
index ce5f1ce5aa62..d58b696848e5 100644
--- a/lang/mozart/Makefile
+++ b/lang/mozart/Makefile
@@ -35,7 +35,7 @@ USE_BISON=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 USE_XLIB=	yes
-WANT_AUTOCONF_VER=	213
+USE_AUTOCONF_VER=	213
 # magic wand: set INSTALL to some absurd value, or else
 # mozart's configure will not find the right install
 # when configuring as root.
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 5047e1e8d5f9..5f8928b2f5a5 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -108,8 +108,7 @@ EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
 		${FILESDIR}/extra-patch-configure.in
 USE_AUTOHEADER=	YES
-USE_AUTOCONF=	YES
-WANT_AUTOCONF_VER=257
+USE_AUTOCONF_VER=257
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 5047e1e8d5f9..5f8928b2f5a5 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -108,8 +108,7 @@ EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
 		${FILESDIR}/extra-patch-configure.in
 USE_AUTOHEADER=	YES
-USE_AUTOCONF=	YES
-WANT_AUTOCONF_VER=257
+USE_AUTOCONF_VER=257
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 5047e1e8d5f9..5f8928b2f5a5 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -108,8 +108,7 @@ EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4 \
 		${FILESDIR}/extra-patch-configure.in
 USE_AUTOHEADER=	YES
-USE_AUTOCONF=	YES
-WANT_AUTOCONF_VER=257
+USE_AUTOCONF_VER=257
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
diff --git a/net/opal/Makefile b/net/opal/Makefile
index a1c5f1f1f5bd..bb55ca399ca7 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -42,8 +42,7 @@ USE_BISON=	yes
 
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
 		OPENH323DIR=${WRKDIR}/openh323
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index a1c5f1f1f5bd..bb55ca399ca7 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -42,8 +42,7 @@ USE_BISON=	yes
 
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
 		OPENH323DIR=${WRKDIR}/openh323
diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile
index a1c5f1f1f5bd..bb55ca399ca7 100644
--- a/net/openh323-112/Makefile
+++ b/net/openh323-112/Makefile
@@ -42,8 +42,7 @@ USE_BISON=	yes
 
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
 		OPENH323DIR=${WRKDIR}/openh323
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index a1c5f1f1f5bd..bb55ca399ca7 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -42,8 +42,7 @@ USE_BISON=	yes
 
 USE_GMAKE=	yes
 USE_OPENLDAP=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \
 		OPENH323DIR=${WRKDIR}/openh323
diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
index 91a73dad75b6..51c11baec825 100644
--- a/net/proxy-suite/Makefile
+++ b/net/proxy-suite/Makefile
@@ -16,8 +16,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=	yes
-WANT_AUTOCONF_VER= 253
+USE_AUTOCONF_VER= 253
 USE_GMAKE=	yes
 
 #
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 921b877e6ad3..920b64748bef 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -22,8 +22,8 @@ CONFLICTS=	zebra-devel-* zebra-0*
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SUBMAKE=	yes
-WANT_AUTOCONF_VER=	253
-WANT_AUTOMAKE_VER=	15
+USE_AUTOCONF_VER=	253
+USE_AUTOMAKE_VER=	15
 AUTOMAKE_ARGS= -a -i
 
 MAN1=		vtysh.1
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 4ca474200520..e4689858f05a 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -43,9 +43,7 @@ USE_SIZE=	yes
 USE_RC_SUBR=	yes
 NO_LATEST_LINK=	yes
 INSTALLS_SHLIB=	yes
-#GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 
 # directories
 VARDIR=		${DESTDIR}/var
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 4ca474200520..e4689858f05a 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -43,9 +43,7 @@ USE_SIZE=	yes
 USE_RC_SUBR=	yes
 NO_LATEST_LINK=	yes
 INSTALLS_SHLIB=	yes
-#GNU_CONFIGURE=	yes
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 
 # directories
 VARDIR=		${DESTDIR}/var
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 856e475448af..f5b7fe312020 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -28,8 +28,7 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=257
+USE_AUTOCONF_VER=257
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index bdb9a9a40185..e2aa77b7b821 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -44,7 +44,7 @@ PATCHFILES+=		httpd-2.0.48-windowsupdate.patch:clement
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION}
 
-WANT_AUTOCONF_VER?=	253
+USE_AUTOCONF_VER?=	253
 USE_LIBTOOL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index bdb9a9a40185..e2aa77b7b821 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -44,7 +44,7 @@ PATCHFILES+=		httpd-2.0.48-windowsupdate.patch:clement
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION}
 
-WANT_AUTOCONF_VER?=	253
+USE_AUTOCONF_VER?=	253
 USE_LIBTOOL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
diff --git a/www/flood/Makefile b/www/flood/Makefile
index d249b516bffa..da0551da676d 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		apr-0.9:${PORTSDIR}/devel/apr
 
-USE_AUTOCONF=	yes
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 CONFIGURE_ARGS=	--disable-shared
 CONFIGURE_ENV=	LDFLAGS="-L${PREFIX}/lib"
 USE_GMAKE=	yes
diff --git a/www/gforge/Makefile b/www/gforge/Makefile
index aca324c55cf5..39032f62a4c1 100644
--- a/www/gforge/Makefile
+++ b/www/gforge/Makefile
@@ -22,9 +22,8 @@ USE_BZIP2=		YES
 USE_REINPLACE=		YES
 USE_PERL=		YES
 HAS_CONFIGURE=		YES
-USE_AUTOCONF=		YES
 USE_APACHE=		YES
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 NO_BUILD=		YES
 
 .if defined(WITH_APACHE2)
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 625b20bef0cd..063073164320 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake
 
 CONFLICTS?=	open-motif-*
 MANUAL_PACKAGE_BUILD=	do not want to install during interactive build
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index 868f333aeacc..bcc3fdf00f45 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -18,13 +18,12 @@ COMMENT=	An extension to use gtk in PHP-applications
 # Don't call autoconf directly, ./buildconf does this
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-WANT_AUTOMAKE_VER=	15
-WANT_AUTOCONF_VER=	253
+USE_AUTOMAKE_VER=	15
+USE_AUTOCONF_VER=	253
 LIBTOOLFILES=	# none
 USE_PHP=	yes
 USE_PHPIZE=	yes
 WANT_PHP_CLI=	yes
-USE_AUTOCONF=	no
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index 868f333aeacc..bcc3fdf00f45 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -18,13 +18,12 @@ COMMENT=	An extension to use gtk in PHP-applications
 # Don't call autoconf directly, ./buildconf does this
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-WANT_AUTOMAKE_VER=	15
-WANT_AUTOCONF_VER=	253
+USE_AUTOMAKE_VER=	15
+USE_AUTOCONF_VER=	253
 LIBTOOLFILES=	# none
 USE_PHP=	yes
 USE_PHPIZE=	yes
 WANT_PHP_CLI=	yes
-USE_AUTOCONF=	no
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12
diff --git a/x11-wm/badwm/Makefile b/x11-wm/badwm/Makefile
index 5e9e9f7e6349..be0984d51712 100644
--- a/x11-wm/badwm/Makefile
+++ b/x11-wm/badwm/Makefile
@@ -19,8 +19,7 @@ COMMENT=		Window manager based on eviwm
 DOCDIR=			share/doc/${PORTNAME}
 DOCS=		AUTHORS COPYING ChangeLog INSTALL LICENSE README THANKS TODO
 PLIST=			${WRKDIR}/pkg-plist
-USE_AUTOCONF=		y
-WANT_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	253
 USE_GMAKE=		y
 USE_X_PREFIX=		y
 
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index f984c64ef8eb..89446da194c6 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -21,9 +21,8 @@ PLIST_FILES=	bin/vdesk
 PLIST_FILES+=	share/doc/vdesk/${ii}
 .endfor
 .endif
-USE_AUTOCONF=		yes
 USE_X_PREFIX=		yes
-WANT_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	257
 
 post-extract:
 # Avoid having to read this lengthy file.