Index: CHANGES
===================================================================
--- CHANGES
+++ CHANGES
@@ -10,6 +10,17 @@
 
 All ports committers are allowed to commit to this file.
 
+XXX:
+AUTHOR: rakuco@FreeBSD.org
+
+  It is now possible to specify multiple directories in the CONFIGURE_WRKSRC,
+  BUILD_WRKSRC, INSTALL_WRKSRC and TEST_WRKSRC variables. If more than one
+  directory is specified, they will be processed sequentially, not in parallel.
+
+  Doing so should avoid the proliferation of post-build and post-install
+  targets that were only used to build or install additional targets or
+  directories.
+
 20161218:
 AUTHOR: tcberner@FreeBSD.org
 
Index: Mk/Uses/cmake.mk
===================================================================
--- Mk/Uses/cmake.mk
+++ Mk/Uses/cmake.mk
@@ -108,9 +108,11 @@
 
 .if !target(do-configure)
 do-configure:
+.for _CONFIGURE_DIR in ${CONFIGURE_WRKSRC}
 	@${ECHO_MSG} ${_CMAKE_MSG}
-	${MKDIR} ${CONFIGURE_WRKSRC}
-	@cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
+	${MKDIR} ${_CONFIGURE_DIR}
+	@cd ${_CONFIGURE_DIR}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
+.endfor
 .endif
 
 .endif #!defined(_INCLUDE_USES_CMAKE_MK)
Index: Mk/Uses/imake.mk
===================================================================
--- Mk/Uses/imake.mk
+++ Mk/Uses/imake.mk
@@ -38,7 +38,9 @@
 .if ! ${imake_ARGS:Menv}
 .if !target(do-configure)
 do-configure:
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS})
+.for _CONFIGURE_DIR in ${CONFIGURE_WRKSRC}
+	@(cd ${_CONFIGURE_DIR} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS})
+.endfor
 .endif
 
 .if ! ${imake_ARGS:Mnoman}
Index: Mk/Uses/mate.mk
===================================================================
--- Mk/Uses/mate.mk
+++ Mk/Uses/mate.mk
@@ -210,7 +210,9 @@
 _USES_configure+=	295:mate-pre-configure
 
 mate-pre-configure:
-	@(cd ${CONFIGURE_WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
+.for _CONFIGURE_DIR in ${CONFIGURE_WRKSRC}
+	@(cd ${_CONFIGURE_DIR} ; ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
+.endfor
 .endif
 
 .if defined(MATE_PRE_PATCH)
Index: Mk/Uses/perl5.mk
===================================================================
--- Mk/Uses/perl5.mk
+++ Mk/Uses/perl5.mk
@@ -260,12 +260,14 @@
 		cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
 		${SCRIPTDIR}/configure; \
 	fi
-	@cd ${CONFIGURE_WRKSRC} && \
+.for _CONFIGURE_DIR in ${CONFIGURE_WRKSRC}
+	@cd ${_CONFIGURE_DIR} && \
 		${SETENV} ${CONFIGURE_ENV} \
 		${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
 .if !${_USE_PERL5:Mmodbuild*}
-	@cd ${CONFIGURE_WRKSRC} && \
+	@cd ${_CONFIGURE_DIR} && \
 		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
+.endfor
 .endif # ! modbuild
 .endif # !target(do-configure)
 .endif # configure
@@ -273,13 +275,17 @@
 .if ${_USE_PERL5:Mmodbuild*}
 .if !target(do-build)
 do-build:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${ALL_TARGET} ${MAKE_ARGS})
+.for _BUILD_DIR in ${BUILD_WRKSRC}
+	@(cd ${_BUILD_DIR}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${ALL_TARGET} ${MAKE_ARGS})
+.endfor
 .endif # !target(do-build)
 
 .if !${USES:Mgmake}
 .if !target(do-install)
 do-install:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${INSTALL_TARGET} ${MAKE_ARGS})
+.for _BUILD_DIR in ${BUILD_WRKSRC}
+	@(cd ${_BUILD_DIR}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${INSTALL_TARGET} ${MAKE_ARGS})
+.endfor
 .endif # !target(do-install)
 .endif # ! USES=gmake
 .endif # modbuild
@@ -320,10 +326,12 @@
 TEST_TARGET?=	test
 TEST_WRKSRC?=	${BUILD_WRKSRC}
 do-test:
+.for _TEST_DIR in ${TEST_WRKSRC}
 .if ${USE_PERL5:Mmodbuild*}
-	cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS}
+	cd ${_TEST_DIR}/ && ${SETENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS}
 .elif ${USE_PERL5:Mconfigure}
-	cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET}
+	cd ${_TEST_DIR}/ && ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET}
 .endif # USE_PERL5:Mmodbuild*
+.endfor
 .endif # do-test
 .endif # defined(_POSTMKINCLUDED)
Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -612,17 +612,23 @@
 
 .if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE)
 do-configure:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS})
+.for _BUILD_DIR in ${BUILD_WRKSRC}
+	@(cd ${_BUILD_DIR}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS})
+.endfor
 .endif
 
 .if !target(do-build)
 do-build:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS})
+.for _BUILD_DIR in ${BUILD_WRKSRC}
+	@(cd ${_BUILD_DIR}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS})
+.endfor
 .endif
 
 .if !target(do-install)
 do-install:
-	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
+.for _INSTALL_DIR in ${INSTALL_WRKSRC}
+	@(cd ${_INSTALL_DIR}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
+.endfor
 .endif
 .endif # defined(_PYTHON_FEATURE_DISTUTILS)
 .endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PYTHON_POST_MK)
Index: Mk/Uses/qmake.mk
===================================================================
--- Mk/Uses/qmake.mk
+++ Mk/Uses/qmake.mk
@@ -100,12 +100,20 @@
 DESTDIRNAME=	INSTALL_ROOT
 .endif
 
+_USES_POST+=	qmake
+.endif # !defined(_INCLUDE_USES_QMAKE_MK)
+
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_QMAKE_POST_MK)
+_INCLUDE_USES_QMAKE_POST_MK=	yes
+
 # Define a custom target to make it usable by bsd.qt.mk for internal Qt
 # configuration.
 qmake-configure:
-	@${MKDIR} ${_QMAKE_WRKSRC}
-	@cd ${_QMAKE_WRKSRC} && \
+.for _CONFIGURE_DIR in ${_QMAKE_WRKSRC}
+	${MKDIR} ${_CONFIGURE_DIR}
+	cd ${_CONFIGURE_DIR} && \
 		${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}
+.endfor
 
 .if !target(do-configure) && ! ${qmake_ARGS:M_env}
 _USES_configure+=	450:qmake-configure
Index: Mk/bsd.autotools.mk
===================================================================
--- Mk/bsd.autotools.mk
+++ Mk/bsd.autotools.mk
@@ -195,24 +195,32 @@
 
 .if defined(_AUTOTOOL_rule_aclocal) && !target(run-autotools-aclocal)
 run-autotools-aclocal:
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
+.for _CONFIGURE_DIR in ${CONFIGURE_WRKSRC}
+	@(cd ${_CONFIGURE_DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
 		${ACLOCAL_ARGS})
+.endfor
 .endif
 
 .if defined(_AUTOTOOL_rule_autoconf) && !target(run-autotools-autoconf)
 run-autotools-autoconf:
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
+.for _CONFIGURE_DIR in ${CONFIGURE_WRKSRC}
+	@(cd ${_CONFIGURE_DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
 		${AUTOCONF_ARGS})
+.endfor
 .endif
 
 .if defined(_AUTOTOOL_rule_automake) && !target(run-autotools-automake)
 run-autotools-automake:
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
+.for _CONFIGURE_DIR in ${CONFIGURE_WRKSRC}
+	@(cd ${_CONFIGURE_DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
 		${AUTOMAKE_ARGS})
+.endfor
 .endif
 
 .if defined(_AUTOTOOL_rule_autoheader) && !target(run-autotools-autoheader)
 run-autotools-autoheader:
-	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
+.for _CONFIGURE_DIR in ${CONFIGURE_WRKSRC}
+	@(cd ${_CONFIGURE_DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
 		${AUTOHEADER_ARGS})
+.endfor
 .endif
Index: Mk/bsd.java.mk
===================================================================
--- Mk/bsd.java.mk
+++ Mk/bsd.java.mk
@@ -390,8 +390,10 @@
 ALL_TARGET?=
 .			if !target(do-build)
 do-build:
-					@(cd ${BUILD_WRKSRC}; \
+.				for _BUILD_DIR in ${BUILD_WRKSRC}
+					@(cd ${_BUILD_DIR}; \
 						${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET})
+.				endfor
 .			endif
 .		endif
 
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -763,6 +763,8 @@
 # CONFIGURE_WRKSRC
 #				- Directory to run configure in.
 #				  Default: ${WRKSRC}
+#				  If multiple directories are specified, they are processed
+#				  sequentially.
 # CONFIGURE_SCRIPT
 #				- Name of configure script, relative to ${CONFIGURE_WRKSRC}.
 #				  Default: "Makefile.PL" if USES=perl5 and USE_PERL5=configure
@@ -805,6 +807,8 @@
 # ALL_TARGET	- Default target for sub-make in build stage.
 #				  Default: all
 # BUILD_WRKSRC	- Directory to do build in (default: ${WRKSRC}).
+#				  If multiple directories are specified, they are processed
+#				  sequentially.
 # MAKE_ENV		- Additional environment vars passed to sub-make in build
 #				  and install stages.
 #				  Default: see below
@@ -837,6 +841,8 @@
 #				  no default test target is provided.
 #				  Default: (none)
 # TEST_WRKSRC	- Directory to do test in (default: ${WRKSRC}).
+#				  If multiple directories are specified, they are processed
+#				  sequentially.
 # TEST_ENV		- Additional environment vars passed to sub-make in test
 #				  stage
 #				  Default: ${MAKE_ENV}
@@ -851,6 +857,8 @@
 # INSTALL_WRKSRC
 #				- Directory to install from
 #				  Default: ${WRKSRC}
+#				  If multiple directories are specified, they are processed
+#				  sequentially.
 # NO_MTREE		- If set, will not invoke mtree from bsd.port.mk from
 #				  the "install" target.
 # MTREE_FILE	- The name of the mtree file.
@@ -3191,8 +3199,9 @@
 	done
 .endif
 .if defined(HAS_CONFIGURE)
-	@${MKDIR} ${CONFIGURE_WRKSRC}
-	@(cd ${CONFIGURE_WRKSRC} && \
+.for _CONFIGURE_DIR in ${CONFIGURE_WRKSRC}
+	@${MKDIR} ${_CONFIGURE_DIR}
+	@(cd ${_CONFIGURE_DIR} && \
 	    ${SET_LATE_CONFIGURE_ARGS} \
 		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
@@ -3207,6 +3216,7 @@
 			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
 			 ${FALSE}; \
 		fi)
+.endfor
 .endif
 .endif
 
@@ -3215,13 +3225,15 @@
 DO_MAKE_BUILD?=	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}
 .if !target(do-build)
 do-build:
-	@(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \
+.for _BUILD_DIR in ${BUILD_WRKSRC}
+	@(cd ${_BUILD_DIR}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \
 		if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
 			${ECHO_MSG} "===> Compilation failed unexpectedly."; \
 			(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \
 			fi; \
 		${FALSE}; \
 		fi)
+.endfor
 .endif
 
 # Check conflicts
@@ -3326,7 +3338,9 @@
 
 .if !target(do-install) && !defined(NO_INSTALL)
 do-install:
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.for _INSTALL_DIR in ${INSTALL_WRKSRC}
+	@(cd ${_INSTALL_DIR} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endfor
 .endif
 
 # Test
@@ -3334,13 +3348,15 @@
 .if !target(do-test) && defined(TEST_TARGET)
 DO_MAKE_TEST?=	${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS:C,^${DESTDIRNAME}=.*,,g}
 do-test:
-	@(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \
+.for _TEST_DIR in ${TEST_WRKSRC}
+	@(cd ${_TEST_DIR}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \
 		if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \
 			${ECHO_MSG} "===> Tests failed unexpectedly."; \
 			(${ECHO_CMD} "${TEST_FAIL_MESSAGE}") | ${FMT} 75 79 ; \
 			fi; \
 		${FALSE}; \
 		fi)
+.endfor
 .elif !target(do-test)
 do-test:
 	@${DO_NADA}
Index: audio/last.fm/Makefile
===================================================================
--- audio/last.fm/Makefile
+++ audio/last.fm/Makefile
@@ -19,6 +19,8 @@
 		libsamplerate.so:audio/libsamplerate \
 		libfftw3f.so:math/fftw3-float
 
+CONFIGURE_WRKSRC=	${WRKSRC} ${WRKSRC}/src/output/RtAudio
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
 WRKSRC=		${WRKDIR}/last.fm-${PORTVERSION}
 
 USES=		cpe dos2unix qmake:norecursive tar:bzip2
@@ -27,11 +29,15 @@
 USE_QT4=	moc_build rcc_build uic_build \
 		gui network sql xml imageformats_run
 LDFLAGS+=	-lz -L${LOCALBASE}/lib -lX11
-QMAKE_SOURCE_PATH=	${WRKSRC}/LastFM.pro
 USE_LDCONFIG=	yes
 
 SUB_FILES=	pkg-install pkg-deinstall
 
+# Rename the .pro file so we can call qmake and invoke it without passing a
+# specific .pro file.
+pre-configure:
+	${MV} ${WRKSRC}/LastFM.pro ${WRKSRC}/${WRKSRC:T}.pro
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|linux\*|unix|g' ${WRKSRC}/src/src.pro
@@ -51,9 +57,6 @@
 	@${MKDIR} ${WRKSRC}/build/fplib/release
 
 post-build:
-	@(cd ${WRKSRC}/src/output/RtAudio \
-		&& ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS} \
-		&& ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS})
 	@${SED} -e 's|/usr/local/share/|${PREFIX}/lib/|' \
 		${FILESDIR}/last.fm.desktop > ${WRKDIR}/last.fm.desktop
 
Index: databases/dbf/Makefile
===================================================================
--- databases/dbf/Makefile
+++ databases/dbf/Makefile
@@ -15,6 +15,8 @@
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
+BUILD_WRKSRC=	${WRKSRC} ${WRKDIR}/${PORTNAME}-core
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 WRKSRC=		${WRKDIR}/lib${PORTNAME}
 
 USES=		libtool pathfix zip
@@ -54,15 +56,7 @@
 		ac_cv_lib_dbf_dbf_Open=yes \
 		./configure --prefix=${PREFIX})
 
-post-build:
-	@(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \
-		${ALL_TARGET})
-
 post-install:
-	@(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \
-		${INSTALL_TARGET})
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdbf.so.0
 
 .include <bsd.port.mk>
Index: databases/pgpool-II-22/Makefile
===================================================================
--- databases/pgpool-II-22/Makefile
+++ databases/pgpool-II-22/Makefile
@@ -28,18 +28,17 @@
 
 OPTIONS_DEFINE=	DOCS
 
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/sql/pgpool-recovery
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's| pg_config| ${LOCALBASE}/bin/pg_config|g' \
 	${WRKSRC}/sql/pgpool-recovery/Makefile
 
-post-build:
-	@cd ${WRKSRC}/sql/pgpool-recovery && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
-
 pre-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
 
 post-install:
-	@cd ${WRKSRC}/sql/pgpool-recovery && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} ${INSTALL_TARGET}
 	${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${STAGEDIR}${DATADIR}
 .for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start
Index: databases/pgpool-II-23/Makefile
===================================================================
--- databases/pgpool-II-23/Makefile
+++ databases/pgpool-II-23/Makefile
@@ -28,18 +28,17 @@
 
 OPTIONS_DEFINE=	DOCS
 
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/sql/pgpool-recovery
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's| pg_config| ${LOCALBASE}/bin/pg_config|g' \
 	${WRKSRC}/sql/pgpool-recovery/Makefile
 
-post-build:
-	@cd ${WRKSRC}/sql/pgpool-recovery && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
-
 pre-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
 
 post-install:
-	@cd ${WRKSRC}/sql/pgpool-recovery && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} ${INSTALL_TARGET}
 	${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${STAGEDIR}${DATADIR}
 .for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start
Index: databases/pgpool-II-30/Makefile
===================================================================
--- databases/pgpool-II-30/Makefile
+++ databases/pgpool-II-30/Makefile
@@ -28,18 +28,17 @@
 
 OPTIONS_DEFINE=	DOCS
 
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/sql/pgpool-recovery
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's| pg_config| ${LOCALBASE}/bin/pg_config|g' \
 	${WRKSRC}/sql/pgpool-recovery/Makefile
 
-post-build:
-	@cd ${WRKSRC}/sql/pgpool-recovery && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
-
 post-install:
 	echo "--- ==="
 	-cat `pg_config --pgxs`
 	echo "--- ==="
-	@cd ${WRKSRC}/sql/pgpool-recovery && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} ${INSTALL_TARGET}
 	${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
Index: databases/pgpool-II-33/Makefile
===================================================================
--- databases/pgpool-II-33/Makefile
+++ databases/pgpool-II-33/Makefile
@@ -57,10 +57,7 @@
 FUNC_LIB=		pgpool-recovery/pgpool-recovery.so \
 			pgpool-regclass/pgpool-regclass.so
 
-post-build:
-.for f in ${FUNCTIONS}
-	cd ${WRKSRC}/sql/${f} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
-.endfor
+BUILD_WRKSRC=	${WRKSRC} ${FUNCTIONS:S,^,${WRKSRC}/sql/,}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${FUNC_CONTRIB_DIR}
Index: databases/pgpool-II/Makefile
===================================================================
--- databases/pgpool-II/Makefile
+++ databases/pgpool-II/Makefile
@@ -45,19 +45,14 @@
 PLIST_SUB=	PGSQL9="@comment "
 .endif
 
+BUILD_WRKSRC=	${WRKSRC} ${FUNCTIONS:S,^,${WRKSRC}/sql/,}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's| pg_config| ${LOCALBASE}/bin/pg_config|g' \
 	${WRKSRC}/sql/pgpool-recovery/Makefile
 
-post-build:
-.for f in ${FUNCTIONS}
-	@cd ${WRKSRC}/sql/${f} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
-.endfor
-
 post-install:
-.for f in ${FUNCTIONS}
-	@cd ${WRKSRC}/sql/${f} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR}  ${INSTALL_TARGET}
-.endfor
 	${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
Index: databases/sqlitestudio/Makefile
===================================================================
--- databases/sqlitestudio/Makefile
+++ databases/sqlitestudio/Makefile
@@ -69,23 +69,14 @@
 PLUGIN_SQL_FORMATTER_SIMPLE_VARS=	PLUGIN_DIRS+=SqlFormatterSimple
 PLUGIN_XML_EXPORT_VARS=			PLUGIN_DIRS+=XmlExport
 
+
+CONFIGURE_WRKSRC=	${WRKSRC} ${PLUGIN_DIRS:S,^,${WRKDIR}/Plugins/,}
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
+
 post-configure:
 	# Fix for a suspected bug in qmake: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210418
 	@${REINPLACE_CMD} -E 's|SUBLIBS) -L[^ ]+|SUBLIBS) |' ${WRKSRC}/sqlitestudio/Makefile
 	@${REINPLACE_CMD} -E 's|LIBS)$$|LIBS) -L${PREFIX}/lib|' ${WRKSRC}/sqlitestudio/Makefile
-	@for plugin in ${PLUGIN_DIRS}; do \
-	  cd ${WRKDIR}/Plugins/$$plugin && \
-	  ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}; \
-	done;
-post-build:
-	@for plugin in ${PLUGIN_DIRS}; do \
-	  cd ${WRKDIR}/Plugins/$$plugin && \
-	  ${DO_MAKE_BUILD} ${ALL_TARGET}; \
-	done;
-post-install:
-	@for plugin in ${PLUGIN_DIRS}; do \
-	  cd ${WRKDIR}/Plugins/$$plugin && \
-	  ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; \
-	done;
 
 .include <bsd.port.mk>
Index: devel/dbus-qt5/Makefile
===================================================================
--- devel/dbus-qt5/Makefile
+++ devel/dbus-qt5/Makefile
@@ -16,32 +16,12 @@
 CONFIGURE_ARGS=	-no-gui -no-xcb
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME} \
+		${WRKSRC}/src/tools/qdbuscpp2xml \
+		${WRKSRC}/src/tools/qdbusxml2cpp
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-TOOLS=		qdbuscpp2xml qdbusxml2cpp
-
 QT_DEFINES=	DBUS
 QT_CONFIG=	dbus
 
-post-configure:
-.for t in ${TOOLS}
-	@cd ${WRKSRC}/src/tools/${t} && \
-		${SETENV} ${QMAKE_ENV} ${WRKSRC}/bin/qmake ${QMAKE_ARGS}
-.endfor
-
-post-build:
-.for t in ${TOOLS}
-	@cd ${WRKSRC}/src/tools/${t} && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
-.endfor
-
-post-install:
-.for t in ${TOOLS}
-	@cd ${WRKSRC}/src/tools/${t} && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} ${INSTALL_TARGET}
-.endfor
-
 .include <bsd.port.mk>
Index: devel/qt5-buildtools/Makefile
===================================================================
--- devel/qt5-buildtools/Makefile
+++ devel/qt5-buildtools/Makefile
@@ -15,31 +15,12 @@
 CONFIGURE_ARGS=	-no-gui -no-xcb
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-BUILD_WRKSRC=	${WRKSRC}/src/tools/bootstrap
+BUILD_WRKSRC=	${WRKSRC}/src/tools/bootstrap \
+		${WRKSRC}/src/tools/moc \
+		${WRKSRC}/src/tools/rcc
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-MORE_WRKSRCS=	src/tools/moc \
-		src/tools/rcc
-
-post-configure:
-.for d in ${MORE_WRKSRCS}
-	@cd ${WRKSRC}/${d} && \
-		${SETENV} ${QMAKE_ENV} ${WRKSRC}/bin/qmake ${QMAKE_ARGS}
-.endfor
-
-post-build:
-.for d in ${MORE_WRKSRCS}
-	@cd ${WRKSRC}/${d} && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
-.endfor
-
 post-install:
-.for d in ${MORE_WRKSRCS}
-	@cd ${WRKSRC}/${d} && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} ${INSTALL_TARGET}
-.endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/syncqt.pl \
 		${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}/syncqt.pl
 
Index: emulators/dboxfe/Makefile
===================================================================
--- emulators/dboxfe/Makefile
+++ emulators/dboxfe/Makefile
@@ -21,6 +21,9 @@
 		bin/dboxfetray \
 		share/pixmaps/dboxfe.png
 
+CONFIGURE_WRKSRC=	${WRKSRC} ${WRKSRC}/dboxfetray
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
+
 DESKTOP_ENTRIES="DBoxFE" "DOSBox configuration manager" \
 		"${PREFIX}/share/pixmaps/dboxfe.png" \
 		"dboxfe" "Utility;Qt;" true \
@@ -28,11 +31,6 @@
 		"${PREFIX}/share/pixmaps/dboxfe.png" \
 		"dboxfetray" "Utility;Qt;TrayIcon;" true
 
-post-build:
-	@(cd ${WRKSRC}/dboxfetray && \
-		${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} && \
-		${SETENV} ${MAKE_ENV} ${MAKE})
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/dboxfe ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/dboxfetray ${STAGEDIR}${PREFIX}/bin
Index: emulators/open-vm-tools/Makefile
===================================================================
--- emulators/open-vm-tools/Makefile
+++ emulators/open-vm-tools/Makefile
@@ -41,6 +41,7 @@
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 
 WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
+BUILD_WRKSRC=		${WRKSRC} ${WRKSRC}/modules
 GNU_CONFIGURE=		yes
 USES=			pathfix pkgconfig kmod libtool
 USE_GNOME=		glib20
@@ -71,9 +72,6 @@
 
 .include <bsd.port.pre.mk>
 
-post-build:
-	cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
-
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input
Index: graphics/qslim/Makefile
===================================================================
--- graphics/qslim/Makefile
+++ graphics/qslim/Makefile
@@ -17,7 +17,8 @@
 		libgfx.so:graphics/libgfx
 
 CONFIGURE_WRKSRC=	${WRKSRC}/mixkit
-BUILD_WRKSRC=		${WRKSRC}/mixkit/src
+BUILD_WRKSRC=		${WRKSRC}/mixkit/src \
+			${WRKSRC}/tools/qslim
 
 USES=		gmake
 USE_GL=		glu
@@ -40,17 +41,13 @@
 	@${REINPLACE_CMD} -e '/gfx-config/d' ${CONFIGURE_WRKSRC}/mix-config.in
 	@${REINPLACE_CMD} -e 's/\.\..*mix\.a//' ${WRKSRC}/tools/qslim/Makefile
 	@${REINPLACE_CMD} -e '/gfx-config/d;s/\.a/.so/g;s/[(]AR[)] cru/(CXX) \
-		$$(CXXFLAGS) -shared -o/;/RANLIB/d' ${BUILD_WRKSRC}/${MAKEFILE}
+		$$(CXXFLAGS) -shared -o/;/RANLIB/d' ${WRKSRC}/mixkit/src/${MAKEFILE}
 .for i in mixkit/src/Makefile tools/qslim/Makefile
 	@${ECHO_CMD} '.SUFFIXES: .fl .c .cc .cxx .o' >> ${WRKSRC}/${i}
 	@${ECHO_CMD} '.cxx.o:' >> ${WRKSRC}/${i}
 	@${ECHO_CMD} '	$$(CXX) -c $$(CXXFLAGS) $$<' >> ${WRKSRC}/${i}
 .endfor
 
-post-build:
-	@(cd ${BUILD_WRKSRC}/../../tools/qslim && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET})
-
 do-install:
 .for i in qslim qvis
 	(cd ${WRKSRC}/tools/qslim && ${INSTALL_PROGRAM} ${i} \
Index: graphics/sdump/Makefile
===================================================================
--- graphics/sdump/Makefile
+++ graphics/sdump/Makefile
@@ -20,6 +20,7 @@
 
 PLIST_FILES=	bin/sdump libexec/w3m/yaimg-sixel
 
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/yaimg-sixel
 USES=		jpeg
 MAKEFILE=	makefile
 
@@ -29,9 +30,6 @@
 
 PORTDOCS=	README.markdown
 
-post-build:
-	@cd ${WRKSRC}/yaimg-sixel && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sdump ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/w3m/
Index: irc/ircd-ratbox-devel/Makefile
===================================================================
--- irc/ircd-ratbox-devel/Makefile
+++ irc/ircd-ratbox-devel/Makefile
@@ -33,6 +33,8 @@
 PLIST_SUB=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR}
 SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR}
 
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/contrib
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/${PORTNAME}		\
 		--with-logdir=/var/log/${PORTNAME}			\
@@ -152,12 +154,9 @@
 	${PERL} ${WRKSRC}/contrib/ircd-shortcut.pl
 
 post-build:
-	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
-
 # ----- Need to build the m_rsshortcut.so module for ircd-shortcut.pl ----
 	@${ECHO_MSG} "Building m_rsshortcut.la for ircd-shortcuts."
-	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
+	@cd ${WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} m_rsshortcut.la
 
 pre-install:
@@ -171,8 +170,6 @@
 	${MKDIR} ${STAGEDIR}${LOGDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
 	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.motd.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample
Index: irc/ircd-ratbox/Makefile
===================================================================
--- irc/ircd-ratbox/Makefile
+++ irc/ircd-ratbox/Makefile
@@ -35,6 +35,8 @@
 PLIST_SUB=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR}
 SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR}
 
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/contrib
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/${PORTNAME}		\
 		--with-logdir=/var/log/${PORTNAME}			\
@@ -142,13 +144,10 @@
 .endif
 
 post-build:
-	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
-
 # ----- Need to build the m_rsshortcut.so module for ircd-shortcut.pl ----
 .if ${PORT_OPTIONS:MSHORTCUTS}
 	@${ECHO_MSG} "Building m_rsshortcut.la for ircd-shortcuts."
-	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+	@cd ${WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} m_rsshortcut.la
 .endif
 
@@ -164,8 +163,6 @@
 	${MKDIR} ${STAGEDIR}${LOGDIR}
 
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-	cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
 	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.motd.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample
Index: japanese/kdrill/Makefile
===================================================================
--- japanese/kdrill/Makefile
+++ japanese/kdrill/Makefile
@@ -12,14 +12,12 @@
 
 RUN_DEPENDS=	xjdic:japanese/edict
 
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/makedic
 USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 DATADIR=	${PREFIX}/share/dict/kdrill
 
-post-build:
-	@(cd ${WRKSRC}/makedic && ${DO_MAKE_BUILD} ${ALL_TARGET})
-
 post-install:
 .for i in makedic makeedict
 	(cd ${WRKSRC}/makedic && ${INSTALL_PROGRAM} ${i} \
Index: misc/magicpoint/Makefile
===================================================================
--- misc/magicpoint/Makefile
+++ misc/magicpoint/Makefile
@@ -27,6 +27,7 @@
 CONFIGURE_ENV=	mgp_cv_path_perl=${PERL}
 CPPFLAGS+=	-I..
 LATE_INSTALL_ARGS=	install.man
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/contrib/xmindpath
 
 PORTDOCS=	${DOCS} sample emacs-lisp scripts
 DOCS=		COPYRIGHT COPYRIGHT.jp FAQ README README.fonts \
@@ -72,10 +73,6 @@
 	${REINPLACE_CMD} -e 's|freetype1/freetype|freetype1|g' \
 		${WRKSRC}/Makefile ${WRKSRC}/image/Makefile
 
-post-build:
-	cd ${WRKSRC}/contrib/xmindpath && \
-		${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/contrib/xmindpath/xmindpath.1 \
 		${STAGEDIR}${PREFIX}/man/man1/
Index: misc/qt4-qtdemo/Makefile
===================================================================
--- misc/qt4-qtdemo/Makefile
+++ misc/qt4-qtdemo/Makefile
@@ -39,12 +39,12 @@
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-BUILD_WRKSRC=	${WRKSRC}/demos
+BUILD_WRKSRC=	${WRKSRC}/demos ${WRKSRC}/examples
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} -e '/app +=/s|"assistant"|"assistant${_QT_BINSUFX}"|' \
-		${BUILD_WRKSRC}/${PORTNAME}/menumanager.cpp \
+		${WRKSRC}/demos/${PORTNAME}/menumanager.cpp \
 		${WRKSRC}/examples/help/remotecontrol/remotecontrol.cpp \
 		${WRKSRC}/examples/help/simpletextviewer/assistant.cpp
 
@@ -55,15 +55,7 @@
 	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
 	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc
 
-post-build:
-	cd ${WRKSRC}/examples && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${MAKEFILE} \
-		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
-
 post-install:
-	cd ${WRKSRC}/examples && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} ${INSTALL_TARGET}
 	${FIND} -E ${STAGEDIR}${PREFIX}/share/examples/qt4/examples/declarative/cppextensions -regex ".*\.(moc|obj|pch|rcc)" -type d | ${XARGS} ${RM} -r
 
 .include <bsd.port.mk>
Index: net/avahi-gtk/Makefile
===================================================================
--- net/avahi-gtk/Makefile
+++ net/avahi-gtk/Makefile
@@ -12,7 +12,7 @@
 RUN_DEPENDS=	avahi-header>=0.6:net/avahi-header
 
 MASTERDIR=	${.CURDIR}/../avahi-app
-BUILD_WRKSRC=	${WRKSRC}/avahi-ui
+BUILD_WRKSRC=	${WRKSRC}/avahi-ui ${WRKSRC}/avahi-discover-standalone
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
@@ -24,13 +24,7 @@
 
 USE_GNOME+=	libglade2
 
-post-build:
-	@(cd ${WRKSRC}/avahi-discover-standalone && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-
 post-install:
-	@(cd ${WRKSRC}/avahi-discover-standalone && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 	${LN} -sf bssh.1 ${STAGEDIR}${MANPREFIX}/man/man1/bvnc.1
 	${LN} -sf bssh.1 ${STAGEDIR}${MANPREFIX}/man/man1/bshell.1
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui.so.0
Index: net/py-avahi/Makefile
===================================================================
--- net/py-avahi/Makefile
+++ net/py-avahi/Makefile
@@ -17,7 +17,7 @@
 		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
 
 MASTERDIR=	${.CURDIR}/../avahi-app
-BUILD_WRKSRC=	${WRKSRC}/avahi-python
+BUILD_WRKSRC=	${WRKSRC}/avahi-python ${WRKSRC}/service-type-database
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
@@ -33,16 +33,10 @@
 		${WRKSRC}/avahi-python/avahi/ServiceTypeDatabase.py.in
 
 pre-build:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		Makefile ${MAKE_ARGS} clean
 
-post-build:
-	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET}
-
 post-install:
-	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} Makefile ${MAKE_ARGS} install
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
Index: net/qt5-network/Makefile
===================================================================
--- net/qt5-network/Makefile
+++ net/qt5-network/Makefile
@@ -18,7 +18,8 @@
 CONFIGURE_ARGS=	-no-gui -no-xcb
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME} \
+		${WRKSRC}/src/plugins/bearer/generic
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 QT_DEFINES=	LIBPROXY OPENSSL SSL
@@ -26,21 +27,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp \
-		${BUILD_WRKSRC}/ssl/qsslsocket_openssl_symbols.cpp
-
-post-configure:
-	@cd ${WRKSRC}/src/plugins/bearer/generic && \
-		${SETENV} ${QMAKE_ENV} ${WRKSRC}/bin/qmake ${QMAKE_ARGS}
-
-post-build:
-	@cd ${WRKSRC}/src/plugins/bearer/generic && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
-
-post-install:
-	@cd ${WRKSRC}/src/plugins/bearer/generic && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} ${INSTALL_TARGET}
+		${PATCH_WRKSRC}/src/${PORTNAME}/ssl/qsslsocket_openssl.cpp \
+		${PATCH_WRKSRC}/src/${PORTNAME}/ssl/qsslsocket_openssl_symbols.cpp
 
 .include <bsd.port.mk>
Index: palm/jpilot/Makefile
===================================================================
--- palm/jpilot/Makefile
+++ palm/jpilot/Makefile
@@ -25,6 +25,7 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-pilot-prefix=${LOCALBASE}
 USE_GNOME+=	gtk20 intltool
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/docs
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS NLS
@@ -34,9 +35,6 @@
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES_OFF=		gettext-tools
 
-post-build:
-	cd ${WRKSRC}/docs && ${MAKE_CMD}
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-dial.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-dump.1 ${STAGEDIR}${PREFIX}/man/man1
Index: print/qt5-printsupport/Makefile
===================================================================
--- print/qt5-printsupport/Makefile
+++ print/qt5-printsupport/Makefile
@@ -27,6 +27,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCUPS}
+BUILD_WRKSRC+=	${WRKSRC}/src/plugins/${PORTNAME}/cups
 QT_DEFINES+=	CUPS
 QT_CONFIG+=	cups
 .else
@@ -34,24 +35,4 @@
 QT_CONFIG+=	-cups
 .endif
 
-post-configure:
-.if ${PORT_OPTIONS:MCUPS}
-	@cd ${WRKSRC}/src/plugins/${PORTNAME}/cups && \
-		${SETENV} ${QMAKE_ENV} ${WRKSRC}/bin/qmake ${QMAKE_ARGS}
-.endif
-
-post-build:
-.if ${PORT_OPTIONS:MCUPS}
-	@cd ${WRKSRC}/src/plugins/${PORTNAME}/cups && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
-.endif
-
-post-install:
-.if ${PORT_OPTIONS:MCUPS}
-	@cd ${WRKSRC}/src/plugins/${PORTNAME}/cups && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} ${INSTALL_TARGET}
-.endif
-
 .include <bsd.port.mk>
Index: shells/44bsd-csh/Makefile
===================================================================
--- shells/44bsd-csh/Makefile
+++ shells/44bsd-csh/Makefile
@@ -15,6 +15,7 @@
 BROKEN_aarch64=	Fails to link: missing sbrk
 
 USES=		tar:bzip2
+BUILD_WRKSRC=	${WRKSRC} ${WRKSRC}/USD.doc
 NO_WRKSUBDIR=	yes
 PORTDOCS=	paper.ascii.gz
 
@@ -22,9 +23,6 @@
 	cd ${WRKSRC} ; co RCS/*,v; chmod u+w *
 	cd ${WRKSRC}/USD.doc ; co RCS/*,v
 
-post-build:
-	cd ${WRKSRC}/USD.doc ; ${MAKE}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/csh ${STAGEDIR}${PREFIX}/bin/44bsd-csh
 	${INSTALL_MAN} ${WRKSRC}/csh.1 ${STAGEDIR}${PREFIX}/man/man1/44bsd-csh.1
Index: x11-toolkits/qt5-gui/Makefile
===================================================================
--- x11-toolkits/qt5-gui/Makefile
+++ x11-toolkits/qt5-gui/Makefile
@@ -42,18 +42,18 @@
 # they depend on QtGui itself, so they can't be added as dependencies.
 # QtPlatformSupport doesn't need to be installed (it's a static
 # library), but might be needed by people porting Qt on new platforms.
-MORE_WRKSRCS=	src/platformheaders \
-		src/platformsupport \
-		src/plugins/platforms \
-		src/plugins/generic
+BUILD_WRKSRC+=	${WRKSRC}/src/platformheaders \
+		${WRKSRC}/src/platformsupport \
+		${WRKSRC}/src/plugins/platforms \
+		${WRKSRC}/src/plugins/generic
 
 # Image formats are split through different tarballs, these are the
 # main ones; input contexts require no additional dependency.
-MORE_WRKSRCS+=	src/plugins/imageformats \
-		src/plugins/platforminputcontexts
+BUILD_WRKSRC+=	${WRKSRC}/src/plugins/imageformats \
+		${WRKSRC}/src/plugins/platforminputcontexts
 
 # openglextensions is the static library to use for further things like qtcanvas3d
-MORE_WRKSRCS+=	src/openglextensions
+BUILD_WRKSRC+=	${WRKSRC}/src/openglextensions
 
 QT_DEFINES=	ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \
 		IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER
@@ -87,18 +87,4 @@
 EXTRA_PATCHES+=  ${FILESDIR}/extrapatch-src_gui_painting_qcolor.cpp
 .endif
 
-post-build:
-.for d in ${MORE_WRKSRCS}
-	@cd ${WRKSRC}/${d} && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
-.endfor
-
-post-install:
-.for d in ${MORE_WRKSRCS}
-	@cd ${WRKSRC}/${d} && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} ${INSTALL_TARGET}
-.endfor
-
 .include <bsd.port.post.mk>