Add a new USES=waf to handle the waf building system, allowing to factorise code

Plug waf into MAKE_CMD and CONFIGURE_CMD so the regular defined targets can be
reused

Always define _MAKE_JOBS so that when bsd.port.mk will stop overwritting
_MAKE_JOBS when parallel jobs are disabled we can enforce -j1 (which is needed
to really disable parallelisation with waf

WAF_CMD has been created to allow one to override the location of the waf script
relatively to WRKSRC

CONFIGURE_TARGET is by default defined to "configure"
ALL_TARGET is by default defined to "build"
INSTALL_TARGET is by default defined to "install"

USES=waf is by default stagedir safe

25 files changed, 165 insertions, 587 deletions

diff --git a/Mk/Uses/waf.mk b/Mk/Uses/waf.mk
new file mode 100644
index 000000000000..3c81f462472d
--- /dev/null
+++ b/Mk/Uses/waf.mk
@@ -0,0 +1,49 @@
+# $FreeBSD$
+#
+# Provide support to use the waf building system
+#
+# Feature:		waf
+# Usage:		USES=waf
+#
+# It implies USES=python:build automatically is no USES=python has been
+# specified yet
+#
+# WAF_CMD		can be specified in the ports if the waf script is not
+# 			in WRKSRC/waf
+# CONFIGURE_TARGET	default to 'configure'
+# ALL_TARGET		default to 'build'
+# INSTALL_TARGET=	default to 'install'
+
+.if !defined(_INCLUDE_USES_WAF_MK)
+_INCLUDE_USES_WAF_MK=	yes
+
+.if !empty(waf_ARGS)
+IGNORE=	Incorrect 'USES+= waf:${waf_ARGS}' waf takes no arguments
+.endif
+
+.if !${USES:Mpython*}
+python_ARGS=	2,build
+.include "${USESDIR}/python.mk"
+.endif
+
+MAKEFILE=	#
+MAKE_FLAGS=	#
+ALL_TARGET=	#
+HAS_CONFIGURE=	yes
+WAF_CMD?=	./waf
+
+CONFIGURE_TARGET?=	configure
+ALL_TARGET?=		build
+INSTALL_TARGET?=	install
+
+CONFIGURE_CMD=	${PYTHON_CMD} ${WAF_CMD} ${CONFIGURE_TARGET}
+MAKE_CMD=	${PYTHON_CMD} ${WAF_CMD}
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+			${_MAKE_JOBS}
+
+DESTDIRNAME=	--destdir
+
+# Set a minimal job of 1
+_MAKE_JOBS=	-j${MAKE_JOBS_NUMVER}
+
+.endif
diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 0dc37f9bd10a..15679f72045a 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -15,10 +15,12 @@ LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2 \
 RUN_DEPENDS=	gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \
 		gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
 
-USES=		pkgconfig python:build tar:bzip2
+USES=		pkgconfig waf tar:bzip2
 USE_GNOME=	gtk30
 
 MAKE_ARGS=	MANDIR=${MANPREFIX}/man
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+			--mandir=${PREFIX}/man
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_DEFAULT=	NLS
@@ -34,15 +36,7 @@ post-patch:
 		-e '/recurse/s/ po//' ${WRKSRC}/wscript
 .endif
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf configure ${_MAKE_JOBS} \
-		--prefix=${PREFIX} --mandir=${PREFIX}/man
-
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf build ${_MAKE_JOBS}
-
-do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf install --destdir=${STAGEDIR}
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/audio/gmidimonitor/Makefile b/audio/gmidimonitor/Makefile
index 838e2d7106c1..7793400e5c1f 100644
--- a/audio/gmidimonitor/Makefile
+++ b/audio/gmidimonitor/Makefile
@@ -13,23 +13,14 @@ COMMENT=	GTK+ application that shows MIDI events
 LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
 		liblash.so:${PORTSDIR}/audio/lash
 
-USES=		pkgconfig tar:bzip2
+USES=		pkgconfig tar:bzip2 waf
 USE_GNOME=	gtk20 libglade2
 
+CONFIGURE_ARGS=	--alsa=no
+
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PLIST_FILES=	bin/gmidimonitor %%DATADIR%%/gmidimonitor.ui
 
-MAKE_JOBS_ARGS=	-j${MAKE_JOBS_NUMBER}
-
-do-configure:
-	@(cd ${WRKSRC} && ./waf configure --prefix=${PREFIX} --alsa=no)
-
-do-build:
-	@(cd ${WRKSRC} && ./waf ${MAKE_JOBS_ARGS})
-
-do-install:
-	@(cd ${WRKSRC} && ./waf --destdir=${STAGEDIR} install)
-
 .include <bsd.port.mk>
diff --git a/audio/lv2core/Makefile b/audio/lv2core/Makefile
index 7e2780682df4..5182413125be 100644
--- a/audio/lv2core/Makefile
+++ b/audio/lv2core/Makefile
@@ -12,16 +12,12 @@ COMMENT=	LV2 Core Package
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pkgconfig python:build tar:bzip2
-
-.include <bsd.port.pre.mk>
+USES=		pkgconfig python:build tar:bzip2 waf
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-WAF_VERBOSE=	--verbose
+MAKE_ARGS+=	--verbose
 .endif
 
-WAF_JOBS=	--jobs=${MAKE_JOBS_NUMBER}
-
 post-patch:
 	@${REINPLACE_CMD} -e '/autowaf.build_pc/s|^|#|' ${WRKSRC}/wscript
 	@(cd ${WRKSRC} && ${SED} -e \
@@ -31,15 +27,7 @@ post-patch:
 		 s|@INCLUDEDIR@|${PREFIX}/include| ; \
 		 s|@LV2CORE_VERSION@|${PORTVERSION}|' < lv2core.pc.in > lv2core.pc)
 
-do-configure:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} --prefix=${PREFIX} configure)
-
-do-build:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} ${WAF_JOBS} build)
-
-do-install:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} waf --destdir=${STAGEDIR} \
-		${WAF_VERBOSE} install)
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/lv2core.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/nekobee/Makefile b/audio/nekobee/Makefile
index 1672b911649e..a71daa3f3c00 100644
--- a/audio/nekobee/Makefile
+++ b/audio/nekobee/Makefile
@@ -21,25 +21,17 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	gordonjcp
 GH_COMMIT=	3f4737f
 
-USES=		pkgconfig
+USES=		pkgconfig waf
 USE_GNOME=	gtk20
 
 CPPFLAGS+=	-I${LOCALBASE}/include/dssi -I${LOCALBASE}/include
+LDFLAGS+=	-lm
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/LINKFLAGS/s|^|#|' ${WRKSRC}/wscript
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" LINKFLAGS="-lm" \
-		 ./waf configure --prefix=${PREFIX})
-
-do-build:
-	@(cd ${WRKSRC} && ./waf build -vvv -j${MAKE_JOBS_NUMBER})
-
-do-install:
-	@(cd ${WRKSRC} && ./waf install --destdir=${STAGEDIR})
+post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dssi/nekobee.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dssi/nekobee/nekobee_gtk
 
diff --git a/audio/patchage/Makefile b/audio/patchage/Makefile
index 53ebd8aeb102..f7a4161460ed 100644
--- a/audio/patchage/Makefile
+++ b/audio/patchage/Makefile
@@ -22,36 +22,25 @@ LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
 		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
 		libflowcanvas.so:${PORTSDIR}/x11-toolkits/flowcanvas
 
-USES=		pkgconfig python:build tar:bzip2
+USES=		pkgconfig tar:bzip2 waf
 INSTALLS_ICONS=	yes
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
+			--no-alsa \
+			--no-lash
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-.include <bsd.port.pre.mk>
-
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-WAF_VERBOSE=	--verbose
+MAKE_ARGS=	--verbose
 .endif
 
-WAF_JOBS=	--jobs=${MAKE_JOBS_NUMBER}
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		"s|$$[{]LIBDIRNAME[}]/pkgconfig|libdata/pkgconfig| ; \
 		 s|-fshow-column'|-fshow-column ${CXXFLAGS}'|" \
 			${WRKSRC}/autowaf/autowaf.py
 
-do-configure:
-	(cd ${WRKSRC} && ./waf ${WAF_VERBOSE} --prefix=${PREFIX} \
-		--mandir=${MANPREFIX}/man --no-alsa --no-lash configure)
-
-do-build:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		./waf ${WAF_VERBOSE} ${WAF_JOBS} build)
-
-do-install:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		./waf ${WAF_VERBOSE} --destdir=${STAGEDIR} install)
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/raul/Makefile b/audio/raul/Makefile
index d36ac182d757..073164d6e739 100644
--- a/audio/raul/Makefile
+++ b/audio/raul/Makefile
@@ -15,34 +15,20 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
 
-USES=		pkgconfig python:build tar:bzip2
+USES=		pkgconfig tar:bzip2 waf
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-.include <bsd.port.pre.mk>
-
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-WAF_VERBOSE=	--verbose
+MAKE_ARGS=	--verbose
 .endif
 
-WAF_JOBS=	--jobs=${MAKE_JOBS_NUMBER}
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		"s|$$[{]LIBDIRNAME[}]/pkgconfig|libdata/pkgconfig| ; \
 		 s|-fshow-column'|-fshow-column ${CXXFLAGS}'|" \
 			${WRKSRC}/autowaf/autowaf.py
 
-do-configure:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} --prefix=${PREFIX} configure)
-
-do-build:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} ${WAF_JOBS} build)
-
-do-install:
-	@(cd ${WRKSRC} && ${PYTHON_CMD} waf ${WAF_VERBOSE} \
-		--destdir=${STAGEDIR} install)
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/slv2/Makefile b/audio/slv2/Makefile
index b92a54afcf75..ae767d74bc70 100644
--- a/audio/slv2/Makefile
+++ b/audio/slv2/Makefile
@@ -16,17 +16,13 @@ BUILD_DEPENDS=	${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core
 LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
 		librdf.so:${PORTSDIR}/textproc/redland
 
-USES=		pkgconfig python:build tar:bzip2
+USES=		pkgconfig tar:bzip2 waf
 USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
-
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-WAF_VERBOSE=	--verbose
+MAKE_ARGS=	--verbose
 .endif
 
-WAF_JOBS=	--jobs=${MAKE_JOBS_NUMBER}
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/pkgconfig/s|$${LIBDIRNAME}|libdata|' ${WRKSRC}/autowaf.py
@@ -37,19 +33,9 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^#define _XOPEN_SOURCE .*||' ${WRKSRC}/src/plugin.c
 
-do-configure:
-	(cd ${WRKSRC} && ${PYTHON_CMD} \
-		waf ${WAF_VERBOSE} --prefix=${PREFIX} configure)
-
-do-build:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-		waf ${WAF_VERBOSE} ${WAF_JOBS} build)
-
-do-install:
-	(cd ${WRKSRC} && ${PYTHON_CMD} \
-		waf ${WAF_VERBOSE} --destdir=${STAGEDIR} install)
+post-install:
 .for file in lv2_inspect lv2_jack_host lv2_list lv2_simple_jack_host
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 143abec00931..be019751a5b4 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -11,7 +11,10 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
 MAINTAINER?=	madpilot@FreeBSD.org
 COMMENT?=	Rewrite of xmms as a client/server system (developer release)
 
-USES+=		pkgconfig python:build tar:bzip2
+USES+=		pkgconfig tar:bzip2 waf
+
+CONFIGURE_ARGS+=	--conf-prefix=${LOCALBASE} \
+		--mandir=${MANPREFIX}/man
 
 .if !defined(XMMS2_SLAVE)
 USE_GNOME=	glib20
@@ -53,23 +56,23 @@ XML_DESC=	Support XML based playlists (XSPF, RSS)
 .include <bsd.port.options.mk>
 
 .if defined(XMMS2_SLAVE)
-EXCLUDE+=	--without-xmms2d
+CONFIGURE_ARGS+=	--without-xmms2d
 
 .if   ${XMMS2_SLAVE} == "python"
-EXCLUDE+=	--with-optionals="python"
+CONFIGURE_ARGS+=	--with-optionals="python"
 .elif ${XMMS2_SLAVE} == "ruby"
-EXCLUDE+=	--with-optionals="ruby"
+CONFIGURE_ARGS+=	--with-optionals="ruby"
 .elif ${XMMS2_SLAVE} == "perl"
-EXCLUDE+=	--with-optionals="perl"
+CONFIGURE_ARGS+=	--with-optionals="perl"
 .elif ${XMMS2_SLAVE} == "ruby-ecore"
-EXCLUDE+=	--with-optionals="ruby" --with-optionals="xmmsclient-ecore"
+CONFIGURE_ARGS+=	--with-optionals="ruby" --with-optionals="xmmsclient-ecore"
 .elif ${XMMS2_SLAVE} == "cpp"
-EXCLUDE+=	--with-optionals="xmmsclient++" \
+CONFIGURE_ARGS+=	--with-optionals="xmmsclient++" \
 		--with-optionals="xmmsclient++-glib"
 .endif
 
 .else # XMMS2_SLAVE
-EXCLUDE+=	--without-optionals="python" \
+CONFIGURE_ARGS+=	--without-optionals="python" \
 		--without-optionals="ruby" \
 		--without-optionals="xmmsclient-ecore" \
 		--without-optionals="xmmsclient++" \
@@ -83,7 +86,7 @@ EXCLUDE+=	--without-optionals="python" \
 USE_OPENSSL=	yes
 PLIST_SUB+=	AIRPLAY=""
 .else
-EXCLUDE+=	--without-plugins="airplay"
+CONFIGURE_ARGS+=	--without-plugins="airplay"
 PLIST_SUB+=	AIRPLAY="@comment "
 .endif
 
@@ -91,7 +94,7 @@ PLIST_SUB+=	AIRPLAY="@comment "
 LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
 PLIST_SUB+=	AO=""
 .else
-EXCLUDE+=	--without-plugins="ao"
+CONFIGURE_ARGS+=	--without-plugins="ao"
 PLIST_SUB+=	AO="@comment "
 .endif
 
@@ -99,7 +102,7 @@ PLIST_SUB+=	AO="@comment "
 LIB_DEPENDS+=	libmac.so:${PORTSDIR}/audio/mac
 PLIST_SUB+=	MAC=""
 .else
-EXCLUDE+=	--without-plugins="mac"
+CONFIGURE_ARGS+=	--without-plugins="mac"
 PLIST_SUB+=	MAC="@comment "
 .endif
 
@@ -107,7 +110,7 @@ PLIST_SUB+=	MAC="@comment "
 LIB_DEPENDS+=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	AVCODEC=""
 .else
-EXCLUDE+=	--without-plugins="avcodec"
+CONFIGURE_ARGS+=	--without-plugins="avcodec"
 PLIST_SUB+=	AVCODEC="@comment "
 .endif
 
@@ -117,7 +120,7 @@ LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
 		libdiscid.so:${PORTSDIR}/audio/libdiscid
 PLIST_SUB+=	CDDA=""
 .else
-EXCLUDE+=	--without-plugins="cdda"
+CONFIGURE_ARGS+=	--without-plugins="cdda"
 PLIST_SUB+=	CDDA="@comment "
 .endif
 
@@ -125,7 +128,7 @@ PLIST_SUB+=	CDDA="@comment "
 LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 PLIST_SUB+=	CURL=""
 .else
-EXCLUDE+=	--without-plugins="curl" --without-plugins="icymetaint"
+CONFIGURE_ARGS+=	--without-plugins="curl" --without-plugins="icymetaint"
 PLIST_SUB+=	CURL="@comment "
 .endif
 
@@ -133,7 +136,7 @@ PLIST_SUB+=	CURL="@comment "
 LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 PLIST_SUB+=	FAAD=""
 .else
-EXCLUDE+=	--without-plugins="faad" --without-plugins="mp4"
+CONFIGURE_ARGS+=	--without-plugins="faad" --without-plugins="mp4"
 PLIST_SUB+=	FAAD="@comment "
 .endif
 
@@ -141,7 +144,7 @@ PLIST_SUB+=	FAAD="@comment "
 USES+=		fam:gamin
 PLIST_SUB+=	FAM=""
 .else
-EXCLUDE+=	--without-optionals="medialib-updater"
+CONFIGURE_ARGS+=	--without-optionals="medialib-updater"
 PLIST_SUB+=	FAM="@comment "
 .endif
 
@@ -149,7 +152,7 @@ PLIST_SUB+=	FAM="@comment "
 LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 PLIST_SUB+=	FLAC=""
 .else
-EXCLUDE+=	--without-plugins="flac"
+CONFIGURE_ARGS+=	--without-plugins="flac"
 PLIST_SUB+=	FLAC="@comment "
 .endif
 
@@ -157,7 +160,7 @@ PLIST_SUB+=	FLAC="@comment "
 LIB_DEPENDS+=	libgme.so:${PORTSDIR}/audio/libgme
 PLIST_SUB+=	GME=""
 .else
-EXCLUDE+=	--without-plugins="gme"
+CONFIGURE_ARGS+=	--without-plugins="gme"
 PLIST_SUB+=	GME="@comment "
 .endif
 
@@ -165,7 +168,7 @@ PLIST_SUB+=	GME="@comment "
 USE_GNOME+=	gvfs
 PLIST_SUB+=	GVFS=""
 .else
-EXCLUDE+=	--without-plugins="gvfs"
+CONFIGURE_ARGS+=	--without-plugins="gvfs"
 PLIST_SUB+=	GVFS="@comment "
 .endif
 
@@ -173,7 +176,7 @@ PLIST_SUB+=	GVFS="@comment "
 LIB_DEPENDS+=	libshout.so:${PORTSDIR}/audio/libshout
 PLIST_SUB+=	ICES=""
 .else
-EXCLUDE+=	--without-plugins="ices"
+CONFIGURE_ARGS+=	--without-plugins="ices"
 PLIST_SUB+=	ICES="@comment "
 .endif
 
@@ -181,7 +184,7 @@ PLIST_SUB+=	ICES="@comment "
 LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 PLIST_SUB+=	JACK=""
 .else
-EXCLUDE+=	--without-plugins="jack"
+CONFIGURE_ARGS+=	--without-plugins="jack"
 PLIST_SUB+=	JACK="@comment "
 .endif
 
@@ -189,16 +192,16 @@ PLIST_SUB+=	JACK="@comment "
 LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
 PLIST_SUB+=	MAD=""
 .else
-EXCLUDE+=	--without-plugins="mad"
+CONFIGURE_ARGS+=	--without-plugins="mad"
 PLIST_SUB+=	MAD="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MMDNS)
-EXCLUDE+=	--without-optionals="mdns"
+CONFIGURE_ARGS+=	--without-optionals="mdns"
 .endif
 
 .if ${PORT_OPTIONS:MMDNS_APPLE}
-EXCLUDE+=	--with-mdns-backend="dns_sd"
+CONFIGURE_ARGS+=	--with-mdns-backend="dns_sd"
 LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 PLIST_SUB+=	MDNS_APPLE=""
 .else
@@ -206,7 +209,7 @@ PLIST_SUB+=	MDNS_APPLE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMDNS_AVAHI}
-EXCLUDE+=	--with-mdns-backend="avahi"
+CONFIGURE_ARGS+=	--with-mdns-backend="avahi"
 LIB_DEPENDS+=	libavahi-core.so:${PORTSDIR}/net/avahi-app
 PLIST_SUB+=	MDNS_AVAHI=""
 MAN1+=		xmms2-mdns-avahi.1
@@ -218,7 +221,7 @@ PLIST_SUB+=	MDNS_AVAHI="@comment "
 LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
 PLIST_SUB+=	MMS=""
 .else
-EXCLUDE+=	--without-plugins="mms"
+CONFIGURE_ARGS+=	--without-plugins="mms"
 PLIST_SUB+=	MMS="@comment "
 .endif
 
@@ -226,7 +229,7 @@ PLIST_SUB+=	MMS="@comment "
 LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
 PLIST_SUB+=	MODPLUG=""
 .else
-EXCLUDE+=	--without-plugins="modplug"
+CONFIGURE_ARGS+=	--without-plugins="modplug"
 PLIST_SUB+=	MODPLUG="@comment "
 .endif
 
@@ -234,7 +237,7 @@ PLIST_SUB+=	MODPLUG="@comment "
 LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
 PLIST_SUB+=	MPG123=""
 .else
-EXCLUDE+=	--without-plugins="mpg123"
+CONFIGURE_ARGS+=	--without-plugins="mpg123"
 PLIST_SUB+=	MPG123="@comment "
 .endif
 
@@ -242,7 +245,7 @@ PLIST_SUB+=	MPG123="@comment "
 LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
 PLIST_SUB+=	MUSEPACK=""
 .else
-EXCLUDE+=	--without-plugins="musepack"
+CONFIGURE_ARGS+=	--without-plugins="musepack"
 PLIST_SUB+=	MUSEPACK="@comment "
 .endif
 
@@ -250,7 +253,7 @@ PLIST_SUB+=	MUSEPACK="@comment "
 LIB_DEPENDS+=	libofa.so:${PORTSDIR}/audio/libofa
 PLIST_SUB+=	OFA=""
 .else
-EXCLUDE+=	--without-plugins="ofa"
+CONFIGURE_ARGS+=	--without-plugins="ofa"
 PLIST_SUB+=	OFA="@comment "
 .endif
 
@@ -258,7 +261,7 @@ PLIST_SUB+=	OFA="@comment "
 LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
-EXCLUDE+=	--without-plugins="pulse"
+CONFIGURE_ARGS+=	--without-plugins="pulse"
 PLIST_SUB+=	PULSE="@comment "
 .endif
 
@@ -266,7 +269,7 @@ PLIST_SUB+=	PULSE="@comment "
 LIB_DEPENDS+=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	SAMBA=""
 .else
-EXCLUDE+=	--without-plugins="samba"
+CONFIGURE_ARGS+=	--without-plugins="samba"
 PLIST_SUB+=	SAMBA="@comment "
 .endif
 
@@ -274,7 +277,7 @@ PLIST_SUB+=	SAMBA="@comment "
 LIB_DEPENDS+=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
 PLIST_SUB+=	SID=""
 .else
-EXCLUDE+=	--without-plugins="sid"
+CONFIGURE_ARGS+=	--without-plugins="sid"
 PLIST_SUB+=	SID="@comment "
 .endif
 
@@ -282,7 +285,7 @@ PLIST_SUB+=	SID="@comment "
 LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 PLIST_SUB+=	SNDFILE=""
 .else
-EXCLUDE+=	--without-plugins="sndfile"
+CONFIGURE_ARGS+=	--without-plugins="sndfile"
 PLIST_SUB+=	SNDFILE="@comment "
 .endif
 
@@ -290,7 +293,7 @@ PLIST_SUB+=	SNDFILE="@comment "
 LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
 PLIST_SUB+=	SPEEX=""
 .else
-EXCLUDE+=	--without-plugins="speex"
+CONFIGURE_ARGS+=	--without-plugins="speex"
 PLIST_SUB+=	SPEEX="@comment "
 .endif
 
@@ -298,7 +301,7 @@ PLIST_SUB+=	SPEEX="@comment "
 LIB_DEPENDS+=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
 PLIST_SUB+=	TREMOR=""
 .else
-EXCLUDE+=	--without-plugins="tremor"
+CONFIGURE_ARGS+=	--without-plugins="tremor"
 PLIST_SUB+=	TREMOR="@comment "
 .endif
 
@@ -314,10 +317,10 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-clients-vistest-wscript
 USE_SDL=	yes
 LIB_DEPENDS+=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
 .else
-EXCLUDE+=	--without-optionals="vistest"
+CONFIGURE_ARGS+=	--without-optionals="vistest"
 .endif
 
-.if ${PORT_OPTIONS:MVISUAL} && ${EXCLUDE:M--with-vis-reference-clients}
+.if ${PORT_OPTIONS:MVISUAL} && ${CONFIGURE_ARGS:M--with-vis-reference-clients}
 PLIST_SUB+=	VISUAL=""
 .else
 PLIST_SUB+=	VISUAL="@comment "
@@ -328,7 +331,7 @@ LIB_DEPENDS+=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 PLIST_SUB+=	VOCODER=""
 .else
-EXCLUDE+=	--without-plugins="vocoder"
+CONFIGURE_ARGS+=	--without-plugins="vocoder"
 PLIST_SUB+=	VOCODER="@comment "
 .endif
 
@@ -336,7 +339,7 @@ PLIST_SUB+=	VOCODER="@comment "
 LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
-EXCLUDE+=	--without-plugins="vorbis"
+CONFIGURE_ARGS+=	--without-plugins="vorbis"
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
@@ -344,7 +347,7 @@ PLIST_SUB+=	VORBIS="@comment "
 LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
 PLIST_SUB+=	WAVPACK=""
 .else
-EXCLUDE+=	--without-plugins="wavpack"
+CONFIGURE_ARGS+=	--without-plugins="wavpack"
 PLIST_SUB+=	WAVPACK="@comment "
 .endif
 
@@ -352,7 +355,7 @@ PLIST_SUB+=	WAVPACK="@comment "
 USE_GNOME+=	libxml2
 PLIST_SUB+=	XML=""
 .else
-EXCLUDE+=	--without-plugins="xml" --without-plugins="rss" \
+CONFIGURE_ARGS+=	--without-plugins="xml" --without-plugins="rss" \
 		--without-plugins="xspf"
 PLIST_SUB+=	XML="@comment "
 .endif
@@ -361,7 +364,7 @@ PLIST_SUB+=	XML="@comment "
 PLIST_SUB+=	ET=""
 MAN1+=		xmms2-et.1
 .else
-EXCLUDE+=	--without-optionals="et"
+CONFIGURE_ARGS+=	--without-optionals="et"
 PLIST_SUB+=	ET="@comment "
 .endif
 
@@ -374,20 +377,9 @@ post-patch:
 		${WRKSRC}/src/clients/vistest/wscript
 .endif
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf ${_MAKE_JOBS} configure \
-		--conf-prefix=${LOCALBASE} --prefix=${PREFIX} \
-		--mandir=${PREFIX}/man ${EXCLUDE}
-
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf ${_MAKE_JOBS} build
-
-do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf install --destdir=${STAGEDIR} --without-ldconfig
+post-install:
 .if !defined(XMMS2_SLAVE)
-	if [ ! -d ${STAGEDIR}${DATADIR}/scripts/startup.d ]; then \
-		${MKDIR} ${STAGEDIR}${DATADIR}/scripts/startup.d; \
-	fi
+	${MKDIR} ${STAGEDIR}${DATADIR}/scripts/startup.d
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index 40c34768094b..dd161a40332b 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -15,9 +15,9 @@ LICENSE=		GPLv3
 
 CONFLICTS=		*samba3[0-4]-3.*
 
-USES=			compiler pkgconfig python:2
+USES=			compiler pkgconfig python:2 waf
 USE_LDCONFIG=		yes
-WAF_TOOL=		buildtools/bin/waf
+WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 USE_OPENLDAP=		yes
@@ -25,11 +25,8 @@ USE_OPENLDAP=		yes
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--mandir=${MANPREFIX}/man \
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}
-# Support staging
-DESTDIRNAME=		--destdir
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
@@ -44,8 +41,6 @@ CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt \
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb
 
-.include <bsd.port.options.mk>
-
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
@@ -87,11 +82,6 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
-CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
-.endif
-
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util.so \
 			lib/libpyldb-util.so.1 \
@@ -109,10 +99,6 @@ LDB_MAN3=		man/man3/ldb.3.gz
 
 PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
 
-CONFIGURE_TARGET=	configure
-ALL_TARGET=		build
-INSTALL_TARGET=		install
-
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-patch:
@@ -128,23 +114,6 @@ pre-configure:
 				${FALSE}; \
 			fi
 
-do-configure:
-			@(cd ${CONFIGURE_WRKSRC} && \
-			    ${SET_LATE_CONFIGURE_ARGS} \
-				if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-					CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-					LDFLAGS="${LDFLAGS}" \
-					INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
-					INSTALL_DATA="${INSTALL_DATA}" \
-					INSTALL_LIB="${INSTALL_LIB}" \
-					INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-					INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-					${CONFIGURE_ENV} ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/${WAF_TOOL} ${CONFIGURE_ARGS} ${CONFIGURE_TARGET}; then \
-						${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
-						(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-						${FALSE}; \
-				fi)
-
 pre-build:
 .if ! ${PORT_OPTIONS:MMANPAGES}
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
@@ -153,17 +122,4 @@ pre-build:
 .	endfor
 .endif
 
-do-build:
-			@(cd ${BUILD_WRKSRC}; \
-			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
-				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
-					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
-					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-				fi; \
-			${FALSE}; \
-			fi)
-
-do-install:
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
-
 .include <bsd.port.post.mk>
diff --git a/databases/ntdb/Makefile b/databases/ntdb/Makefile
index 088652f5216a..aae678a36f1b 100644
--- a/databases/ntdb/Makefile
+++ b/databases/ntdb/Makefile
@@ -15,20 +15,17 @@ LICENSE=		GPLv3
 
 CONFLICTS=
 
-USES=			compiler pkgconfig
+USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
-WAF_TOOL=		buildtools/bin/waf
+WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--mandir=${MANPREFIX}/man \
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
 			--without-gettext
-# Support staging
-DESTDIRNAME=		--destdir
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
@@ -37,7 +34,6 @@ MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .if defined(NO_PYTHON)
 CONFIGURE_ARGS+=	--disable-python
-USES+=			python:2,build
 .else
 USES+=			python:2
 PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/ntdb.so
@@ -68,11 +64,6 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
-CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
-.endif
-
 TDB_MAN3=		man/man3/ntdb.3.gz
 
 TDB_MAN8=		man/man8/ntdbbackup.8.gz \
@@ -82,10 +73,6 @@ TDB_MAN8=		man/man8/ntdbbackup.8.gz \
 
 PLIST_FILES+=		${TDB_MAN3} ${TDB_MAN8}
 
-CONFIGURE_TARGET=	configure
-ALL_TARGET=		build
-INSTALL_TARGET=		install
-
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-patch:
@@ -101,23 +88,6 @@ pre-configure:
 				${FALSE}; \
 			fi
 
-do-configure:
-			@(cd ${CONFIGURE_WRKSRC} && \
-			    ${SET_LATE_CONFIGURE_ARGS} \
-				if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-					CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-					LDFLAGS="${LDFLAGS}" \
-					INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
-					INSTALL_DATA="${INSTALL_DATA}" \
-					INSTALL_LIB="${INSTALL_LIB}" \
-					INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-					INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-					${CONFIGURE_ENV} ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/${WAF_TOOL} ${CONFIGURE_ARGS} ${CONFIGURE_TARGET}; then \
-						${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
-						(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-						${FALSE}; \
-				fi)
-
 pre-build:
 .if ! ${PORT_OPTIONS:MMANPAGES}
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
@@ -126,17 +96,4 @@ pre-build:
 .	endfor
 .endif
 
-do-build:
-			@(cd ${BUILD_WRKSRC}; \
-			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
-				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
-					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
-					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-				fi; \
-			${FALSE}; \
-			fi)
-
-do-install:
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
-
 .include <bsd.port.post.mk>
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index c2522510d19c..1683a188fad7 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -15,19 +15,16 @@ LICENSE=		GPLv3
 
 CONFLICTS=		*samba3[0-4]-3.*
 
-USES=			compiler pkgconfig
+USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
-WAF_TOOL=		buildtools/bin/waf
+WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--mandir=${MANPREFIX}/man \
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}
-# Support staging
-DESTDIRNAME=		--destdir
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
@@ -36,7 +33,6 @@ MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .if defined(NO_PYTHON)
 CONFIGURE_ARGS+=	--disable-python
-USES+=			python:2,build
 .else
 USES+=			python:2
 PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/tdb.so
@@ -67,11 +63,6 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
-CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
-.endif
-
 TDB_MAN8=		man/man8/tdbbackup.8.gz \
 			man/man8/tdbdump.8.gz \
 			man/man8/tdbrestore.8.gz \
@@ -79,10 +70,6 @@ TDB_MAN8=		man/man8/tdbbackup.8.gz \
 
 PLIST_FILES+=		${TDB_MAN8}
 
-CONFIGURE_TARGET=	configure
-ALL_TARGET=		build
-INSTALL_TARGET=		install
-
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-patch:
@@ -98,23 +85,6 @@ pre-configure:
 				${FALSE}; \
 			fi
 
-do-configure:
-			@(cd ${CONFIGURE_WRKSRC} && \
-			    ${SET_LATE_CONFIGURE_ARGS} \
-				if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-					CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-					LDFLAGS="${LDFLAGS}" \
-					INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
-					INSTALL_DATA="${INSTALL_DATA}" \
-					INSTALL_LIB="${INSTALL_LIB}" \
-					INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-					INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-					${CONFIGURE_ENV} ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/${WAF_TOOL} ${CONFIGURE_ARGS} ${CONFIGURE_TARGET}; then \
-						${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
-						(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-						${FALSE}; \
-				fi)
-
 pre-build:
 .if ! ${PORT_OPTIONS:MMANPAGES}
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
@@ -123,17 +93,4 @@ pre-build:
 .	endfor
 .endif
 
-do-build:
-			@(cd ${BUILD_WRKSRC}; \
-			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
-				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
-					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
-					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-				fi; \
-			${FALSE}; \
-			fi)
-
-do-install:
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
-
 .include <bsd.port.post.mk>
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index ce35db6eed9a..1fce8fe20fd2 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 		${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 
-USES=		gettext gmake pkgconfig python tar:bzip2
+USES=		gettext gmake pkgconfig python tar:bzip2 waf
 USE_XORG=	xscrnsaver
 USE_GNOME=	gnomeprefix intlhack pygnomedesktop \
 		gnomecontrolcenter2 gnomedocutils
@@ -30,22 +30,10 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	hamster-applet.schemas
 
-.include <bsd.port.pre.mk>
-
-# WAF needs that
-CONFIGURE_ENV+=	CC="${CC}"
-
-do-configure:
-	@cd ${WRKSRC} && ./waf --prefix=${PREFIX} configure
-
-do-build:
-	@cd ${WRKSRC} && ./waf build
-
-do-install:
-	@cd ${WRKSRC} && DESTDIR=${STAGEDIR} dbus-launch ./waf install
+post-install:
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/kupfer/Makefile b/deskutils/kupfer/Makefile
index 6649f1707efd..eb0901266857 100644
--- a/deskutils/kupfer/Makefile
+++ b/deskutils/kupfer/Makefile
@@ -28,9 +28,10 @@ GH_PROJECT=	kupfer
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	0268e36
 
-USES=		desktop-file-utils python shared-mime-info
+USES=		desktop-file-utils python shared-mime-info waf
 USE_GNOME=	gvfs intltool pygtk2 pygnomedesktop
 INSTALLS_ICONS=	yes
+CONFIGURE_ARGS=	--${PREFIX}/man
 
 PORTDOCS=	*
 
@@ -63,16 +64,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^build_subdirs/s|po||g' ${WRKSRC}/wscript
 .endif
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf configure \
-		--prefix=${STAGEDIR}${PREFIX} --mandir=${STAGEDIR}${PREFIX}/man
-
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build
-
-do-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/build/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index b16960d58861..55a538f14896 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -16,7 +16,8 @@ USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
 USE_QT4=	corelib gui linguist_build svg webkit xml \
 		moc_build qmake_build uic_build
-USES=		pkgconfig python shebangfix tar:bzip2
+USES=		pkgconfig python shebangfix tar:bzip2 waf
+QT_NONSTANDARD=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS}" \
 		PATH="${KDE4_PREFIX}/bin:$$PATH" \
 		WAF_HOME="${WRKSRC}"
@@ -44,17 +45,7 @@ post-patch:
 		${WRKSRC}/wscript
 .endif
 
-do-configure:
-	@cd ${WRKSRC}; \
-		${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} waf configure --prefix=${PREFIX}
-
-do-build:
-	@cd ${WRKSRC}; \
-		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf build ${_MAKE_JOBS}
-
-do-install:
-	@cd ${WRKSRC}; \
-		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf install
+post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 710beff6c5d3..e9907e9789f5 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -15,20 +15,17 @@ LICENSE=		LGPL3
 
 CONFLICTS=		samba33-3.*
 
-USES=			compiler pkgconfig
+USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
-WAF_TOOL=		buildtools/bin/waf
+WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--mandir=${MANPREFIX}/man \
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
 			--without-gettext
-# Support staging
-DESTDIRNAME=		--destdir
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
@@ -37,7 +34,6 @@ MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .if defined(NO_PYTHON)
 CONFIGURE_ARGS+=	--disable-python
-USES+=			python:2,build
 .else
 USES+=			python:2
 PLIST_FILES+=		include/pytalloc.h \
@@ -68,19 +64,10 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
-CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
-.endif
-
 TALLOC_MAN3=		man/man3/talloc.3.gz
 
 PLIST_FILES+=		${TALLOC_MAN3}
 
-CONFIGURE_TARGET=	configure
-ALL_TARGET=		build
-INSTALL_TARGET=		install
-
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-patch:
@@ -96,23 +83,6 @@ pre-configure:
 				${FALSE}; \
 			fi
 
-do-configure:
-			@(cd ${CONFIGURE_WRKSRC} && \
-			    ${SET_LATE_CONFIGURE_ARGS} \
-				if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-					CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-					LDFLAGS="${LDFLAGS}" \
-					INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
-					INSTALL_DATA="${INSTALL_DATA}" \
-					INSTALL_LIB="${INSTALL_LIB}" \
-					INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-					INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-					${CONFIGURE_ENV} ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/${WAF_TOOL} ${CONFIGURE_ARGS} ${CONFIGURE_TARGET}; then \
-						${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
-						(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-						${FALSE}; \
-				fi)
-
 pre-build:
 .if ! ${PORT_OPTIONS:MMANPAGES}
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
@@ -121,17 +91,4 @@ pre-build:
 .	endfor
 .endif
 
-do-build:
-			@(cd ${BUILD_WRKSRC}; \
-			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
-				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
-					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
-					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-				fi; \
-			${FALSE}; \
-			fi)
-
-do-install:
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
-
 .include <bsd.port.post.mk>
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index ea09a17f2a4f..665d1312a756 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -15,20 +15,17 @@ LICENSE=		LGPL3
 
 CONFLICTS=
 
-USES=			compiler pkgconfig
+USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
-WAF_TOOL=		buildtools/bin/waf
+WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--mandir=${MANPREFIX}/man \
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
 			--without-gettext
-# Support staging
-DESTDIRNAME=		--destdir
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
@@ -40,7 +37,6 @@ RUN_DEPENDS:=		${BUILD_DEPENDS}
 
 .if defined(NO_PYTHON)
 CONFIGURE_ARGS+=	--disable-python
-USES+=			python:2,build
 .else
 USES+=			python:2
 PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/_tevent.so \
@@ -72,15 +68,6 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
-CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
-.endif
-
-CONFIGURE_TARGET=	configure
-ALL_TARGET=		build
-INSTALL_TARGET=		install
-
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-patch:
@@ -96,38 +83,8 @@ pre-configure:
 				${FALSE}; \
 			fi
 
-do-configure:
-			@(cd ${CONFIGURE_WRKSRC} && \
-			    ${SET_LATE_CONFIGURE_ARGS} \
-				if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-					CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-					LDFLAGS="${LDFLAGS}" \
-					INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
-					INSTALL_DATA="${INSTALL_DATA}" \
-					INSTALL_LIB="${INSTALL_LIB}" \
-					INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-					INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-					${CONFIGURE_ENV} ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/${WAF_TOOL} ${CONFIGURE_ARGS} ${CONFIGURE_TARGET}; then \
-						${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
-						(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-						${FALSE}; \
-				fi)
-
-do-build:
-			@(cd ${BUILD_WRKSRC}; \
-			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
-				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
-					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
-					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-				fi; \
-			${FALSE}; \
-			fi)
-
 post-build:
 			${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py
 			${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py
 
-do-install:
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
-
 .include <bsd.port.post.mk>
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index b95d3a87112a..e8edf7c0e7d8 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Application to view PDF files
 
 LICENSE=	GPLv2
 
-USES=		desktop-file-utils pkgconfig python:2 tar:bzip2
+USES=		desktop-file-utils pkgconfig python:2 tar:bzip2 waf
 USE_GNOME=	gtk20 glib20 intltool intlhack
 
 MAKE_ENV=	DESTDIR="${STAGEDIR}" \
@@ -34,15 +34,7 @@ PDF_CONFIGURE_OFF=	--disable-pdf
 PS_LIB_DEPENDS=		libspectre.so:${PORTSDIR}/print/libspectre
 PS_CONFIGURE_OFF=	--disable-ps
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf configure \
-		${CONFIGURE_ARGS} && ${TRUE})
-
-do-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf build && ${TRUE})
-
-do-install:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf install && ${TRUE})
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/electrix
 
 .include <bsd.port.mk>
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index fe10cd4d6a17..73f3c8e3fab6 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	py2${PORTNAME}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python 2 bindings for Cairo
 
-USES=		pkgconfig python:2 shebangfix tar:bzip2
+USES=		pkgconfig python:2 shebangfix tar:bzip2 waf
 USE_GNOME=	cairo
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -24,16 +24,6 @@ python_OLD_CMD?=	/usr/bin/env python
 python_CMD?=		${LOCALBASE}/bin/python2
 SHEBANG_FILES=		examples/*.py examples/*/*.py test/*.py
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
-		./waf configure
-
-do-build:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ./waf
-
-do-install:
-	cd ${WRKSRC} && ${PYTHON_CMD} ./waf install --destdir=${STAGEDIR}
-
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
diff --git a/graphics/py3-cairo/Makefile b/graphics/py3-cairo/Makefile
index 56abce221f5a..28c1e83c430b 100644
--- a/graphics/py3-cairo/Makefile
+++ b/graphics/py3-cairo/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python 3 bindings for Cairo
 
-USES=		pkgconfig python:3 shebangfix tar:bzip2
+USES=		pkgconfig python:3 shebangfix tar:bzip2 waf
 USE_GNOME=	cairo
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -28,20 +28,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|python %s|${PYTHON_CMD} %s|g' \
 		${WRKSRC}/test/examples_test.py
 
-do-configure:
+pre-configure:
 # Run waf configure twice, once to extract waflib and patch and then actual configure
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
-		./waf configure || :
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} || :
 	@cd ${WRKSRC}/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/ && \
 		${PATCH} -p1 < ${FILESDIR}/pycairo-1.10.0-waf-py3_4.patch
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
-		./waf configure
-
-do-build:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ./waf
-
-do-install:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ./waf install --destdir=${STAGEDIR}
 
 post-install:
 	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/__init__.py[co]
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index f091f1d02ec1..a6434423a47b 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -20,23 +20,14 @@ LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib  \
 		libsword.so:${PORTSDIR}/misc/sword
 
-USES=		gettext pkgconfig python:build
+USES=		gettext pkgconfig waf
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gtkhtml4 intlhack gtk30 gconf2 libgsf
 
 OPTIONS_DEFINE=	DOCS
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./waf configure \
-		--prefix=${PREFIX} --destdir=${STAGEDIR} \
-		${WAF_CONFIGURE_ARGS}
-
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build --prefix=${PREFIX} --destdir=${STAGEDIR}
-
-do-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install --prefix=${PREFIX} --destdir=${STAGEDIR}
+post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/icon-theme.cache
 
 .include <bsd.port.mk>
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index b4d810c7e023..5548d0de9eed 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -28,7 +28,7 @@ GH_COMMIT=	ff4c1cc
 
 WAF_VERSION=	1.8.7
 
-USES=		compiler:c11 desktop-file-utils iconv pkgconfig python:build
+USES=		compiler:c11 desktop-file-utils iconv pkgconfig python:build waf
 USE_XORG=	x11 xv xxf86vm
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
@@ -126,8 +126,6 @@ JACK_CONFIGURE_ENABLE=		jack
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	${CP} ${DISTDIR}/waf-${WAF_VERSION} ${WRKSRC}/waf
 	@${CHMOD} +x ${WRKSRC}/waf
@@ -138,18 +136,6 @@ post-patch:
 	@${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/usr/local|${PREFIX}|g'
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-		waf configure ${_MAKE_JOBS} ${CONFIGURE_ARGS}
-
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-		waf build ${_MAKE_JOBS}
-
-do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
-		waf install --destdir=${STAGEDIR}
-
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mpv
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpv.so
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 942d7316dd6d..519520315b58 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -38,8 +38,7 @@ SAMBA4_INCLUDEDIR=	${PREFIX}/include/${SAMBA4_PORTNAME}
 SAMBA4_CONFDIR=		${PREFIX}/etc
 SAMBA4_CONFIG=		smb4.conf
 
-CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
-			--exec-prefix="${PREFIX}" \
+CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
 			--mandir="${MANPREFIX}/man" \
 			--sysconfdir="${SAMBA4_CONFDIR}" \
 			--includedir="${SAMBA4_INCLUDEDIR}" \
@@ -58,16 +57,14 @@ CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
 			--with-cachedir="${SAMBA4_LOCKDIR}" \
 			--with-privatedir="${SAMBA4_PRIVATEDIR}" \
 			--with-logfilebase="${SAMBA4_LOGDIR}"
-# Support staging
-DESTDIRNAME=		--destdir
 # Flags
 CONFIGURE_ENV+=		PTHREAD_LDFLAGS="-lpthread"
 
 USES=			compiler cpe execinfo iconv perl5 pkgconfig \
-			python:2 readline shebangfix
+			python:2 readline shebangfix waf
 USE_PERL5=		build
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
-WAF_TOOL=		buildtools/bin/waf
+WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
@@ -407,11 +404,6 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
-CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
-.endif
-
 SAMBA_MAN1+=		dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \
 			log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \
 			nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \
@@ -445,10 +437,6 @@ SAMBA_MAN8+=		eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
 
 PORTDOCS=		README.FreeBSD
 
-CONFIGURE_TARGET=	configure
-ALL_TARGET=		build
-INSTALL_TARGET=		install
-
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-extract:
@@ -474,23 +462,6 @@ pre-configure:
 				${FALSE}; \
 			fi
 
-do-configure:
-			@(cd ${CONFIGURE_WRKSRC} && \
-			    ${SET_LATE_CONFIGURE_ARGS} \
-				if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-					CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-					LDFLAGS="${LDFLAGS}" \
-					INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
-					INSTALL_DATA="${INSTALL_DATA}" \
-					INSTALL_LIB="${INSTALL_LIB}" \
-					INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-					INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-					${CONFIGURE_ENV} ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/${WAF_TOOL} ${CONFIGURE_ARGS} ${CONFIGURE_TARGET}; then \
-						${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
-						(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-						${FALSE}; \
-				fi)
-
 # XXX: Gross hack to allow build newer Samba while old one is installed.
 # This implies that LINKFLAGS_PYEMBED contains flags which are already
 # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread
@@ -521,19 +492,6 @@ pre-build:
 .	endfor
 .endif
 
-do-build:
-			@(cd ${BUILD_WRKSRC}; \
-			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
-				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
-					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
-					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-				fi; \
-			${FALSE}; \
-			fi)
-
-do-install:
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
-
 post-install:
 			@${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index 86c335aed84e..b6ab84cbf242 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -38,8 +38,7 @@ SAMBA4_INCLUDEDIR=	${PREFIX}/include/${SAMBA4_PORTNAME}
 SAMBA4_CONFDIR=		${PREFIX}/etc
 SAMBA4_CONFIG=		smb4.conf
 
-CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
-			--exec-prefix="${PREFIX}" \
+CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
 			--mandir="${MANPREFIX}/man" \
 			--sysconfdir="${SAMBA4_CONFDIR}" \
 			--includedir="${SAMBA4_INCLUDEDIR}" \
@@ -58,16 +57,14 @@ CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
 			--with-cachedir="${SAMBA4_LOCKDIR}" \
 			--with-privatedir="${SAMBA4_PRIVATEDIR}" \
 			--with-logfilebase="${SAMBA4_LOGDIR}"
-# Support staging
-DESTDIRNAME=		--destdir
 # Flags
 CONFIGURE_ENV+=		PTHREAD_LDFLAGS="-lpthread"
 
 USES=			compiler cpe execinfo iconv perl5 pkgconfig \
-			python:2 readline shebangfix
+			python:2 readline shebangfix waf
 USE_PERL5=		build
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
-WAF_TOOL=		buildtools/bin/waf
+WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
@@ -406,11 +403,6 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
-CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS_NUMBER}
-_MAKE_JOBS+=		--jobs=${MAKE_JOBS_NUMBER}
-.endif
-
 SAMBA_MAN1+=		dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \
 			log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \
 			nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \
@@ -445,10 +437,6 @@ SAMBA_MAN8+=		eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
 
 PORTDOCS=		README.FreeBSD
 
-CONFIGURE_TARGET=	configure
-ALL_TARGET=		build
-INSTALL_TARGET=		install
-
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-extract:
@@ -474,23 +462,6 @@ pre-configure:
 				${FALSE}; \
 			fi
 
-do-configure:
-			@(cd ${CONFIGURE_WRKSRC} && \
-			    ${SET_LATE_CONFIGURE_ARGS} \
-				if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
-					CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-					LDFLAGS="${LDFLAGS}" \
-					INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
-					INSTALL_DATA="${INSTALL_DATA}" \
-					INSTALL_LIB="${INSTALL_LIB}" \
-					INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-					INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-					${CONFIGURE_ENV} ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/${WAF_TOOL} ${CONFIGURE_ARGS} ${CONFIGURE_TARGET}; then \
-						${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
-						(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-						${FALSE}; \
-				fi)
-
 # XXX: Gross hack to allow build newer Samba while old one is installed.
 # This implies that LINKFLAGS_PYEMBED contains flags which are already
 # used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread
@@ -521,19 +492,6 @@ pre-build:
 .	endfor
 .endif
 
-do-build:
-			@(cd ${BUILD_WRKSRC}; \
-			if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
-				if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
-					${ECHO_MSG} "===> Compilation failed unexpectedly."; \
-					(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-				fi; \
-			${FALSE}; \
-			fi)
-
-do-install:
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET})
-
 post-install:
 			@${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz
 .if ${PORT_OPTIONS:MDOCS}
@@ -552,7 +510,7 @@ post-install:
 
 .if ${PORT_OPTIONS:MDEVELOPER}
 test: build
-			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} $@)
+			@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@)
 .endif
 
 # !SAMBA4_SUBPORT
diff --git a/security/hotssh/Makefile b/security/hotssh/Makefile
index 127ca72ba198..5aafc4300a22 100644
--- a/security/hotssh/Makefile
+++ b/security/hotssh/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
 
 USE_GNOME=	pygtk2 gnomedocutils libxslt glib20
-USES=		gettext python tar:bzip2
+USES=		gettext python tar:bzip2 waf
 INSTALLS_ICONS=	yes
 
 B64DECODE?=	/usr/bin/b64decode
@@ -37,13 +37,4 @@ post-extract:
 	@cd ${WRKSRC} && ${B64DECODE} -o waf.diff ${FILESDIR}/waf.diff && ${BSPATCH} waf.beforepatch waf waf.diff && ${CHMOD} 755 waf
 	@${GREP} -Rl '%%LOCALBASE%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g"
 
-do-configure:
-	@cd ${WRKSRC} && ./waf configure --prefix=${PREFIX}
-
-do-build:
-	@cd ${WRKSRC} && ./waf
-
-do-install:
-	@cd ${WRKSRC} && ./waf install --destdir=${STAGEDIR}
-
 .include <bsd.port.mk>