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

8 files changed, 76 insertions, 158 deletions

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>