Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1562,6 +1562,15 @@
 WRKSRC:=		${WRKSRC}/${WRKSRC_SUBDIR}
 .endif
 
+.if (defined(HAS_CONFIGURE) && ${HAS_CONFIGURE:Moutsource} ) || \
+	(defined(GNU_CONFIGURE) && ${GNU_CONFIGURE:Moutsource} )
+CONFIGURE_CMD?=		${WRKSRC}/${CONFIGURE_SCRIPT}
+CONFIGURE_WRKSRC?=	${WRKDIR}/.build
+BUILD_WRKSRC?=		${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC?=	${CONFIGURE_WRKSRC}
+TEST_WRKSRC?=		${CONFIGURE_WRKSRC}
+.endif
+
 PATCH_WRKSRC?=	${WRKSRC}
 CONFIGURE_WRKSRC?=	${WRKSRC}
 BUILD_WRKSRC?=	${WRKSRC}
@@ -2612,7 +2621,7 @@
 CONFIGURE_ARGS+=	--host=${X_BUILD_FOR}
 .endif
 CONFIGURE_ENV+=		CONFIG_SITE=${CONFIG_SITE} lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
-HAS_CONFIGURE=		yes
+HAS_CONFIGURE=		${GNU_CONFIGURE}
 
 SET_LATE_CONFIGURE_ARGS= \
      _LATE_CONFIGURE_ARGS="" ; \
@@ -3348,6 +3357,7 @@
 	done
 .endif
 .if defined(HAS_CONFIGURE)
+	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@(cd ${CONFIGURE_WRKSRC} && \
 	    ${SET_LATE_CONFIGURE_ARGS} \
 		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
Index: devel/fb-adb/Makefile
===================================================================
--- devel/fb-adb/Makefile
+++ devel/fb-adb/Makefile
@@ -20,10 +20,10 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
-USES=		autoreconf:outsource gmake ncurses perl5 python:3,build
+USES=		autoreconf gmake ncurses perl5 python:3,build
 USE_PERL5=	build # pod2man
 BASH_CMD?=	bash # can be zsh
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=	outsource
 CONFIGURE_ENV=	PYTHON3="${PYTHON_CMD}"
 INSTALL_TARGET=	install-strip
 PLIST_FILES=	bin/${PORTNAME} \
@@ -88,25 +88,6 @@
 	@${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-androideabi/aux-&/' \
 		${WRKSRC}/stub-*/configure
 
-# XXX Similar to USES=qmake:outsource, merge into Mk/Uses/autoreconf.mk
-.if defined(USES) && ${USES:Mautoreconf\:outsource}
-USES:=			autoreconf:build ${USES:Nautoreconf*}
-CONFIGURE_CMD=		${AUTORECONF_WRKSRC}/${CONFIGURE_SCRIPT}
-CONFIGURE_WRKSRC=	${WRKDIR}/.build
-BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
-AUTORECONF_WRKSRC?=	${WRKSRC}
-
-_USES_configure+=	470:do-autoreconf
-do-autoreconf:
-.for f in AUTHORS ChangeLog INSTALL NEWS README
-# Don't modify time stamps if the files already exist
-	@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
-.endfor
-	@(cd ${AUTORECONF_WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i)
-	@${MKDIR} ${CONFIGURE_WRKSRC}
-.endif
-
 .include <bsd.port.options.mk>
 
 # Extract :p7zip files with 7z(1) if libarchive cannot handle x86_64 sfx
Index: multimedia/ffmpeg/Makefile
===================================================================
--- multimedia/ffmpeg/Makefile
+++ multimedia/ffmpeg/Makefile
@@ -17,7 +17,7 @@
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 
-HAS_CONFIGURE=	yes
+HAS_CONFIGURE=	outsource
 CONFIGURE_LOG=	config.err
 USES=		compiler cpe gmake perl5 pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
@@ -438,18 +438,18 @@
 		-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g; \
 		s|gsm/gsm.h|gsm.h|g" \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|-ldl||' \
 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
 		-e 's|freetype/freetype.h|freetype.h|g' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
 		${WRKSRC}/doc/texi2pod.pl
 
 post-patch-SDL-on:
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} ${WRKSRC} -type f | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -E \
 		-e 's|#include <SDL|#include <SDL/SDL|'
@@ -457,7 +457,7 @@
 post-configure-THEORA-off:
 	@${REINPLACE_CMD} -E \
 		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
-		${WRKSRC}/config.mak
+		${CONFIGURE_WRKSRC}/config.mak
 
 post-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
Index: sysutils/fusefs-simple-mtpfs/Makefile
===================================================================
--- sysutils/fusefs-simple-mtpfs/Makefile
+++ sysutils/fusefs-simple-mtpfs/Makefile
@@ -17,7 +17,7 @@
 GH_ACCOUNT=	phatina
 
 USES=		autoreconf compiler:c++11-lib fuse localbase pkgconfig
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=	outsource
 CONFIGURE_ARGS=	--disable-silent-rules
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-strip