Index: devel/djgpp-binutils/Makefile
===================================================================
--- devel/djgpp-binutils/Makefile
+++ devel/djgpp-binutils/Makefile
@@ -14,13 +14,9 @@
 
 TARGET=		i586-pc-msdosdjgpp
 
-PATCH_WRKSRC=	${SRCDIR}
-CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
-
 USES=		gmake makeinfo tar:bzip2
 GNU_CONFIGURE=	yes
-SRCDIR=		${WRKDIR}/binutils-${PORTVERSION}
-WRKSRC=		${WRKDIR}/build
+CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS=	--target=${TARGET} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
 		--disable-nls --disable-shared --disable-werror
@@ -31,9 +27,6 @@
 BINARIES=	addr2line ar as c++filt ld nm objcopy objdump ranlib \
 		readelf size strings strip
 
-pre-configure:
-	@${MKDIR} ${CONFIGURE_WRKSRC}
-
 post-install:
 .for F in ${BINARIES}
 	@${LN} -f ${STAGEDIR}${PREFIX}/bin/${TARGET}-$F ${STAGEDIR}${PREFIX}/${TARGET}/bin/$F
Index: devel/powerpc64-gcc/Makefile
===================================================================
--- devel/powerpc64-gcc/Makefile
+++ devel/powerpc64-gcc/Makefile
@@ -24,9 +24,6 @@
 BUILD_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 RUN_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 
-PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WRKSRC=	${WRKDIR}/build-gcc
-
 .if empty(GCC_TARGET)
 # We are building for a FreeBSD target
 GCC_TARGET?=	${PKGNAMEPREFIX}portbld-${OPSYS:tl}${OSREL}
@@ -42,6 +39,7 @@
 CONFIGURE_ENV=	LC_ALL=C
 MAKE_ENV=	LC_ALL=C
 GNU_CONFIGURE=	yes
+CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
@@ -50,8 +48,6 @@
 		--with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \
 		--with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld
 
-CONFIGURE_SCRIPT=	../${PORTNAME}-${PORTVERSION}/configure
-
 ALL_TARGET?=	all-gcc
 INSTALL_TARGET?=	install-gcc
 BROKEN_FreeBSD9=	plist is different on 9.x that on other arches
@@ -64,9 +60,6 @@
 CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
 .endif
 
-post-extract:
-	@${MKDIR} ${WRKSRC}
-
 post-install:
 	@if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \
 		mv ${STAGEDIR}${PREFIX}/bin/cpp  \
Index: devel/psptoolchain-gcc-stage1/Makefile
===================================================================
--- devel/psptoolchain-gcc-stage1/Makefile
+++ devel/psptoolchain-gcc-stage1/Makefile
@@ -35,14 +35,10 @@
 			psp-strip:${PORTSDIR}/devel/psptoolchain-binutils
 
 USES=			gmake libtool tar:bzip2
-PATCH_WRKSRC=		${SRCDIR}
-CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
-
-SRCDIR=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WRKSRC=			${WRKDIR}/build
 
 MAKE_ENV+=		PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin:${PREFIX}/bin:${PATH}
 HAS_CONFIGURE=		yes
+CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS?=	--prefix=${PREFIX}/${PSP_GCC_STAGE_PREFIX} \
 			--target="psp" \
 			--enable-languages="c" \
@@ -64,15 +60,15 @@
 # Disable installation of .info files and libiberty for both stages.
 post-patch:
 	@${REINPLACE_CMD} -E "s/^(install-data-am:)(.*)install-info-am(.*)/\1 \2 \3/" \
-		${SRCDIR}/libquadmath/Makefile.in
-	@${REINPLACE_CMD} -E "s/^(install:)(.*)/\1#\2/" ${SRCDIR}/libiberty/Makefile.in
+		${WRKSRC}/libquadmath/Makefile.in
+	@${REINPLACE_CMD} -E "s/^(install:)(.*)/\1#\2/" ${WRKSRC}/libiberty/Makefile.in
 	@${REINPLACE_CMD} -E \
 		-e "/^	\\$$\(mkinstalldirs\) \\$$\(DESTDIR\)\\$$\((infodir|man7dir)\)/d" \
 		-e "s/^(install-info:)(.*)/\1#\2/" \
 		-e "/^	\\$$\(DESTDIR\)\\$$\(man7dir\)\/(fsf-funding|gfdl|gpl)\\$$\(man7ext\)/d" \
-		${SRCDIR}/gcc/Makefile.in
+		${WRKSRC}/gcc/Makefile.in
 .if ${PKGNAMESUFFIX} == "-stage1"
-	@${REINPLACE_CMD} -E "s/^(install-man:)(.*)/\1#\2/" ${SRCDIR}/gcc/Makefile.in
+	@${REINPLACE_CMD} -E "s/^(install-man:)(.*)/\1#\2/" ${WRKSRC}/gcc/Makefile.in
 .endif
 
 PLIST_SUB+=		PSP_GCC_STAGE_PREFIX=${PSP_GCC_STAGE_PREFIX}