Index: Mk/Uses/autoreconf.mk
===================================================================
--- Mk/Uses/autoreconf.mk
+++ Mk/Uses/autoreconf.mk
@@ -65,6 +65,7 @@
 .endif
 
 AUTORECONF?=	${LOCALBASE}/bin/autoreconf
+AUTORECONF_WRKSRC?=	${WRKSRC}
 
 .endif
 
@@ -76,16 +77,16 @@
 do-autoreconf:
 .for f in AUTHORS ChangeLog INSTALL NEWS README
 # Don't modify time stamps if the files already exist
-	@test -e ${CONFIGURE_WRKSRC}/${f} || ${TOUCH} ${CONFIGURE_WRKSRC}/${f}
+	@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
 .endfor
 .if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
-	@(cd ${CONFIGURE_WRKSRC} && \
+	@(cd ${AUTORECONF_WRKSRC} && \
 		if test -f configure.ac; then configure=configure.ac; \
 		else configure=configure.in; fi && \
 		if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
 		then ${LOCALBASE}/bin/intltoolize -f -c; fi)
 .endif
-	@(cd ${CONFIGURE_WRKSRC} && ${AUTORECONF} -f -i)
+	@(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i)
 .endif
 
 .endif
Index: graphics/p5-ming/Makefile
===================================================================
--- graphics/p5-ming/Makefile
+++ graphics/p5-ming/Makefile
@@ -11,8 +11,8 @@
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2=	${WRKSRC}/../LICENSE_GPL2
-LICENSE_FILE_LGPL21=	${WRKSRC}/../LICENSE
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE_GPL2
+LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libgif.so:${PORTSDIR}/graphics/giflib \
@@ -27,8 +27,9 @@
 
 PORTEXAMPLES=	*
 
-CONFIGURE_WRKSRC=	${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/perl_ext
+PATCH_WRKSRC=	${BUILD_WRKSRC}
+BUILD_WRKSRC=	${WRKSRC}/perl_ext
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lib${PORTNAME}
@@ -36,10 +37,14 @@
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION:S|.|_|g}
 
 post-patch:
-	@${REINPLACE_CMD} -e '/ming_is_compiled()/ s|^|#|; /LIBS/d' ${WRKSRC}/Makefile.PL
-	@${REINPLACE_CMD} -e 's|\.3pm|.3|g' ${WRKSRC}/Makefile.PL ${WRKSRC}/mkdoc
-	@${REINPLACE_CMD} -e 's|GvCV(\(.*\)) = \(.*\);|GvCV_set(\1, \2);|' ${WRKSRC}/Exports.c
-	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/examples/*.cgi
+	@${REINPLACE_CMD} -e '/ming_is_compiled()/ s|^|#|; /LIBS/d' \
+		${PATCH_WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e 's|\.3pm|.3|g' \
+		${PATCH_WRKSRC}/Makefile.PL ${PATCH_WRKSRC}/mkdoc
+	@${REINPLACE_CMD} -e 's|GvCV(\(.*\)) = \(.*\);|GvCV_set(\1, \2);|' \
+		${PATCH_WRKSRC}/Exports.c
+	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' \
+		${PATCH_WRKSRC}/examples/*.cgi
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SWF/SWF.so
Index: graphics/py-ming/Makefile
===================================================================
--- graphics/py-ming/Makefile
+++ graphics/py-ming/Makefile
@@ -11,8 +11,8 @@
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2=	${WRKSRC}/../LICENSE_GPL2
-LICENSE_FILE_LGPL21=	${WRKSRC}/../LICENSE
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE_GPL2
+LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libgif.so:${PORTSDIR}/graphics/giflib \
@@ -25,8 +25,9 @@
 USE_PYTHON=	autoplist concurrent distutils
 USES=		autoreconf libtool localbase python
 
-CONFIGURE_WRKSRC=	${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/py_ext
+PATCH_WRKSRC=	${BUILD_WRKSRC}
+BUILD_WRKSRC=	${WRKSRC}/py_ext
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lib${PORTNAME}
@@ -34,9 +35,10 @@
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION:S|.|_|g}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's| --root ".*"||' ${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/setup.py.in
-	@${LN} -fs ${LOCALBASE}/include/ming ${WRKSRC}/../src
+	@${REINPLACE_CMD} -e 's| --root ".*"||' ${PATCH_WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
+		${PATCH_WRKSRC}/setup.py.in
+	@${LN} -fs ${LOCALBASE}/include/ming ${WRKSRC}/src
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_mingc.so