Index: Mk/Uses/autoreconf.mk
===================================================================
--- Mk/Uses/autoreconf.mk
+++ Mk/Uses/autoreconf.mk
@@ -1,12 +1,11 @@
 # $FreeBSD$
 #
-# Run autoreconf in CONFIGURE_WRKSRC to update configure, Makefile.in and
+# Run autoreconf in AUTORECONF_WRKSRC to update configure, Makefile.in and
 # other build scripts.
 #
-# Autoreconf encapsulates the following commands.  Each command applies to a
-# single configure.ac or configure.in (old name).  If configure.ac defines
-# subdirectories with their own configure.ac (using AC_CONFIG_SUBDIRS),
-# autoreconf will recursively update those as well.
+# Autoreconf command applies to a single configure.ac or configure.in (old
+# name).  If configure.ac defines subdirectories with their own configure.ac
+# (using AC_CONFIG_SUBDIRS), autoreconf will recursively update those as well.
 #
 # aclocal	Looks up definitions of m4 macros used in configure.ac that are
 #		not provided by autoconf and copies them from their source *.m4
@@ -72,7 +71,7 @@
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK)
 _INCLUDE_USES_AUTORECONF_POST_MK=	yes
 
-.if ! ${autoreconf_ARGS:Mbuild}
+.if empty(autoreconf_ARGS)
 _USES_configure+=	470:do-autoreconf
 do-autoreconf:
 .for f in AUTHORS ChangeLog INSTALL NEWS README
@@ -87,6 +86,8 @@
 		then ${LOCALBASE}/bin/intltoolize -f -c; fi)
 .endif
 	@(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i)
+.elif ! ${autoreconf_ARGS:Mbuild}
+IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]'
 .endif
 
 .endif
Index: devel/dmake/Makefile
===================================================================
--- devel/dmake/Makefile
+++ devel/dmake/Makefile
@@ -15,7 +15,7 @@
 GH_ACCOUNT=	mohawk2
 GH_TAGNAME=	e5588b0
 
-USES=		autoreconf:autoconf
+USES=		autoreconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--datarootdir=${DATADIR}
 
Index: devel/papilio-loader/Makefile
===================================================================
--- devel/papilio-loader/Makefile
+++ devel/papilio-loader/Makefile
@@ -19,7 +19,7 @@
 GH_TAGNAME=	dd111c4
 WRKSRC_SUBDIR=	papilio-prog
 
-USES=		autoreconf:autoconf pkgconfig gmake
+USES=		autoreconf pkgconfig gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	libftdi1_CFLAGS="-I ${LOCALBASE}/include/libftdi1"
 CONFIGURE_ENV+=	libftdi1_LIBS="-L ${LOCALBASE}/lib -lftdi1"
Index: editors/openoffice-4/Makefile
===================================================================
--- editors/openoffice-4/Makefile
+++ editors/openoffice-4/Makefile
@@ -119,7 +119,7 @@
 XDGREL=			../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
 EXECBASE?=		openoffice-${AOOSUFFIX}
 
-USES=		autoreconf:autoconf bison compiler:c++11-lib cpe \
+USES=		autoreconf bison compiler:c++11-lib cpe \
 		desktop-file-utils \
 		gettext-runtime gmake iconv jpeg perl5 pkgconfig python \
 		shared-mime-info ssl tar:bzip2
Index: editors/openoffice-devel/Makefile
===================================================================
--- editors/openoffice-devel/Makefile
+++ editors/openoffice-devel/Makefile
@@ -131,7 +131,7 @@
 XDGREL=			../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg
 EXECBASE?=		openoffice-${AOOSUFFIX}
 
-USES=		autoreconf:autoconf bison compiler:c++11-lib cpe \
+USES=		autoreconf bison compiler:c++11-lib cpe \
 		desktop-file-utils \
 		gettext-runtime gmake iconv jpeg perl5 pkgconfig python \
 		shared-mime-info ssl tar:${TARTYPE}
Index: emulators/open-vm-tools/Makefile
===================================================================
--- emulators/open-vm-tools/Makefile
+++ emulators/open-vm-tools/Makefile
@@ -42,7 +42,7 @@
 WRKSRC_SUBDIR=		open-vm-tools
 
 GNU_CONFIGURE=		yes
-USES=			autoreconf:-iv fuse gettext-runtime kmod libtool localbase pathfix pkgconfig
+USES=			autoreconf fuse gettext-runtime kmod libtool localbase pathfix pkgconfig
 USE_GNOME=		glib20
 
 USE_GITHUB=		yes
Index: net/mosh/Makefile
===================================================================
--- net/mosh/Makefile
+++ net/mosh/Makefile
@@ -23,7 +23,7 @@
 CONFIGURE_ENV+=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		TINFO_CFLAGS="-I/usr/include"
 INSTALL_TARGET=	install-strip
-USES=		autoreconf:autoconf ncurses perl5 pkgconfig ssl
+USES=		autoreconf ncurses perl5 pkgconfig ssl
 
 CONFLICTS_INSTALL=	mosh-0.[2-9].*
 
Index: security/sshpass/Makefile
===================================================================
--- security/sshpass/Makefile
+++ security/sshpass/Makefile
@@ -12,7 +12,7 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf:env
+USES=		autoreconf
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/sshpass \
Index: sysutils/flock/Makefile
===================================================================
--- sysutils/flock/Makefile
+++ sysutils/flock/Makefile
@@ -20,7 +20,7 @@
 OPTIONS_DEFINE=	NLS
 
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	autoreconf:autopoint gettext
+NLS_USES=	autoreconf gettext
 
 PLIST_FILES=	bin/flock man/man1/flock.1.gz \
 		etc/bash_completion.d/flock
Index: www/mod_auth_openidc/Makefile
===================================================================
--- www/mod_auth_openidc/Makefile
+++ www/mod_auth_openidc/Makefile
@@ -18,7 +18,7 @@
 		libjansson.so:devel/jansson \
 		libpcre.so:devel/pcre
 
-USES=		autoreconf:autoconf cpe gmake libtool pkgconfig ssl
+USES=		autoreconf cpe gmake libtool pkgconfig ssl
 USE_APACHE=	22+
 USE_GITHUB=	yes
 GH_ACCOUNT=	pingidentity