- Use option helpers

- Strip binaries
- Fix AIRPLAY option
- Fix packaging with MDSN option turned off
- Regenerate patches

15 files changed, 193 insertions, 356 deletions

diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 0e6b0a830e26..79e570cb843a 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -4,7 +4,7 @@
 PORTNAME?=	xmms2
 PORTVERSION=	0.8
 DISTVERSIONSUFFIX=DrO_o
-PORTREVISION?=	16
+PORTREVISION?=	17
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
 
@@ -52,325 +52,159 @@ VISUAL_DESC=	Visualization plugins support
 VOCODER_DESC=	Phase Vocoder effect plugin
 XML_DESC=	Support XML based playlists (XSPF, RSS)
 
-.endif # !XMMS_SLAVE
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+AIRPLAY_USE=		OPENSSL=yes
+AIRPLAY_CONFIGURE_OFF=	--without-plugins="airplay"
 
-.if defined(XMMS2_SLAVE)
-CONFIGURE_ARGS+=	--without-xmms2d
+AO_LIB_DEPENDS=		libao.so:${PORTSDIR}/audio/libao
+AO_CONFIGURE_OFF=	--without-plugins="ao"
 
-.if   ${XMMS2_SLAVE} == "python"
-CONFIGURE_ARGS+=	--with-optionals="python"
-.elif ${XMMS2_SLAVE} == "ruby"
-CONFIGURE_ARGS+=	--with-optionals="ruby"
-.elif ${XMMS2_SLAVE} == "perl"
-CONFIGURE_ARGS+=	--with-optionals="perl"
-.elif ${XMMS2_SLAVE} == "ruby-ecore"
-CONFIGURE_ARGS+=	--with-optionals="ruby" --with-optionals="xmmsclient-ecore"
-.elif ${XMMS2_SLAVE} == "cpp"
-CONFIGURE_ARGS+=	--with-optionals="xmmsclient++" \
-		--with-optionals="xmmsclient++-glib"
-.endif
+APE_LIB_DEPENDS=	libmac.so:${PORTSDIR}/audio/mac
+APE_CONFIGURE_OFF=	--without-plugins="mac"
 
-.else # XMMS2_SLAVE
-CONFIGURE_ARGS+=	--without-optionals="python" \
-		--without-optionals="ruby" \
-		--without-optionals="xmmsclient-ecore" \
-		--without-optionals="xmmsclient++" \
-		--without-optionals="xmmsclient++-glib" \
-		--without-optionals="perl"
-.endif # XMMS2_SLAVE
+AVCODEC_LIB_DEPENDS=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+AVCODEC_CONFIGURE_OFF=	--without-plugins="avcodec"
 
-.if !defined(XMMS2_SLAVE)
+CDDA_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
+			libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia \
+			libdiscid.so:${PORTSDIR}/audio/libdiscid
+CDDA_CONFIGURE_OFF=	--without-plugins="cdda"
 
-.if ${PORT_OPTIONS:MAIRPLAY}
-USE_OPENSSL=	yes
-PLIST_SUB+=	AIRPLAY=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="airplay"
-PLIST_SUB+=	AIRPLAY="@comment "
-.endif
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CONFIGURE_OFF=	--without-plugins="curl" --without-plugins="icymetaint"
 
-.if ${PORT_OPTIONS:MAO}
-LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
-PLIST_SUB+=	AO=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="ao"
-PLIST_SUB+=	AO="@comment "
-.endif
+FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+FAAD_CONFIGURE_OFF=	--without-plugins="faad" --without-plugins="mp4"
 
-.if ${PORT_OPTIONS:MAPE}
-LIB_DEPENDS+=	libmac.so:${PORTSDIR}/audio/mac
-PLIST_SUB+=	MAC=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="mac"
-PLIST_SUB+=	MAC="@comment "
-.endif
+FAM_USES=		fam:gamin
+FAM_CONFIGURE_OFF=	--without-optionals="medialib-updater"
 
-.if ${PORT_OPTIONS:MAVCODEC}
-LIB_DEPENDS+=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
-PLIST_SUB+=	AVCODEC=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="avcodec"
-PLIST_SUB+=	AVCODEC="@comment "
-.endif
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
 
-.if ${PORT_OPTIONS:MCDDA}
-LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
-		libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia \
-		libdiscid.so:${PORTSDIR}/audio/libdiscid
-PLIST_SUB+=	CDDA=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="cdda"
-PLIST_SUB+=	CDDA="@comment "
-.endif
+GME_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+GME_CONFIGURE_OFF=	--without-plugins="gme"
 
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-PLIST_SUB+=	CURL=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="curl" --without-plugins="icymetaint"
-PLIST_SUB+=	CURL="@comment "
-.endif
+GVFS_USE=		GNOME=gvfs
+GVFS_CONFIGURE_OFF=	--without-plugins="gvfs"
 
-.if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
-PLIST_SUB+=	FAAD=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="faad" --without-plugins="mp4"
-PLIST_SUB+=	FAAD="@comment "
-.endif
+ICES_LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout
+ICES_CONFIGURE_OFF=	--without-plugins="ices"
 
-.if ${PORT_OPTIONS:MFAM}
-USES+=		fam:gamin
-PLIST_SUB+=	FAM=""
-.else
-CONFIGURE_ARGS+=	--without-optionals="medialib-updater"
-PLIST_SUB+=	FAM="@comment "
-.endif
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_CONFIGURE_OFF=	--without-plugins="jack"
 
-.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
-PLIST_SUB+=	FLAC=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="flac"
-PLIST_SUB+=	FLAC="@comment "
-.endif
+MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_CONFIGURE_OFF=	--without-plugins="mad"
 
-.if ${PORT_OPTIONS:MGME}
-LIB_DEPENDS+=	libgme.so:${PORTSDIR}/audio/libgme
-PLIST_SUB+=	GME=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="gme"
-PLIST_SUB+=	GME="@comment "
-.endif
+MDNS_CONFIGURE_OFF=	--without-optionals="mdns"
 
-.if ${PORT_OPTIONS:MGVFS}
-USE_GNOME+=	gvfs
-PLIST_SUB+=	GVFS=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="gvfs"
-PLIST_SUB+=	GVFS="@comment "
-.endif
+MDNS_APPLE_CONFIGURE_ON=	--with-mdns-backend="dns_sd"
+MDNS_APPLE_LIB_DEPENDS=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 
-.if ${PORT_OPTIONS:MICES}
-LIB_DEPENDS+=	libshout.so:${PORTSDIR}/audio/libshout
-PLIST_SUB+=	ICES=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="ices"
-PLIST_SUB+=	ICES="@comment "
-.endif
+MDNS_AVAHI_CONFIGURE_ON=	--with-mdns-backend="avahi"
+MDNS_AVAHI_LIB_DEPENDS=		libavahi-core.so:${PORTSDIR}/net/avahi-app
 
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
-PLIST_SUB+=	JACK=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="jack"
-PLIST_SUB+=	JACK="@comment "
-.endif
+MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_CONFIGURE_OFF=	--without-plugins="mms"
 
-.if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
-PLIST_SUB+=	MAD=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="mad"
-PLIST_SUB+=	MAD="@comment "
-.endif
+MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_CONFIGURE_OFF=	--without-plugins="modplug"
 
-.if empty(PORT_OPTIONS:MMDNS)
-CONFIGURE_ARGS+=	--without-optionals="mdns"
-.endif
+MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_CONFIGURE_OFF=	--without-plugins="mpg123"
 
-.if ${PORT_OPTIONS:MMDNS_APPLE}
-CONFIGURE_ARGS+=	--with-mdns-backend="dns_sd"
-LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
-PLIST_SUB+=	MDNS_APPLE=""
-.else
-PLIST_SUB+=	MDNS_APPLE="@comment "
-.endif
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack
+MUSEPACK_CONFIGURE_OFF=	--without-plugins="musepack"
 
-.if ${PORT_OPTIONS:MMDNS_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
-.else
-PLIST_SUB+=	MDNS_AVAHI="@comment "
-.endif
+OFA_LIB_DEPENDS=	libofa.so:${PORTSDIR}/audio/libofa
+OFA_CONFIGURE_OFF=	--without-plugins="ofa"
 
-.if ${PORT_OPTIONS:MMMS}
-LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
-PLIST_SUB+=	MMS=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="mms"
-PLIST_SUB+=	MMS="@comment "
-.endif
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_OFF=	--without-plugins="pulse"
 
-.if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
-PLIST_SUB+=	MODPLUG=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="modplug"
-PLIST_SUB+=	MODPLUG="@comment "
-.endif
+SAMBA_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SAMBA_CONFIGURE_OFF=	--without-plugins="samba"
 
-.if ${PORT_OPTIONS:MMPG123}
-LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
-PLIST_SUB+=	MPG123=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="mpg123"
-PLIST_SUB+=	MPG123="@comment "
-.endif
+SID_LIB_DEPENDS=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
+SID_CONFIGURE_OFF=	--without-plugins="sid"
 
-.if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
-PLIST_SUB+=	MUSEPACK=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="musepack"
-PLIST_SUB+=	MUSEPACK="@comment "
-.endif
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_CONFIGURE_OFF=	--without-plugins="sndfile"
 
-.if ${PORT_OPTIONS:MOFA}
-LIB_DEPENDS+=	libofa.so:${PORTSDIR}/audio/libofa
-PLIST_SUB+=	OFA=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="ofa"
-PLIST_SUB+=	OFA="@comment "
-.endif
+SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_CONFIGURE_OFF=	--without-plugins="speex"
 
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-PLIST_SUB+=	PULSE=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="pulse"
-PLIST_SUB+=	PULSE="@comment "
-.endif
+TREMOR_LIB_DEPENDS=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
+TREMOR_CONFIGURE_OFF=	--without-plugins="tremor"
 
-.if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
-PLIST_SUB+=	SAMBA=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="samba"
-PLIST_SUB+=	SAMBA="@comment "
-.endif
+VISUAL_USE=		SDL=yes
+VISUAL_LIB_DEPENDS=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
+VISUAL_CONFIGURE_OFF=	--without-optionals="vistest"
+VISUAL_CONFIGURE_ON=	--with-vis-reference-clients
 
-.if ${PORT_OPTIONS:MSID}
-LIB_DEPENDS+=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
-PLIST_SUB+=	SID=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="sid"
-PLIST_SUB+=	SID="@comment "
-.endif
+VOCODER_LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
+			libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+VOCODER_CONFIGURE_OFF=	--without-plugins="vocoder"
 
-.if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-PLIST_SUB+=	SNDFILE=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="sndfile"
-PLIST_SUB+=	SNDFILE="@comment "
-.endif
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_OFF=	--without-plugins="vorbis"
 
-.if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
-PLIST_SUB+=	SPEEX=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="speex"
-PLIST_SUB+=	SPEEX="@comment "
-.endif
+WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CONFIGURE_OFF=	--without-plugins="wavpack"
 
-.if ${PORT_OPTIONS:MTREMOR}
-LIB_DEPENDS+=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
-PLIST_SUB+=	TREMOR=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="tremor"
-PLIST_SUB+=	TREMOR="@comment "
-.endif
+XML_USE=		GNOME=libxml2
+XML_CONFIGURE_OFF=	--without-plugins="xml" --without-plugins="rss" \
+			--without-plugins="xspf"
 
-# xmms2-ripper
-.if ${PORT_OPTIONS:MVISUAL} && ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-clients-vistest-wscript
-.endif
+ET_CONFIGURE_OFF=	--without-optionals="et"
 
-# XXX: shm support requires semtimedop(2)
-.if ${PORT_OPTIONS:MVISUAL}
-USE_SDL=	yes
-LIB_DEPENDS+=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
-.else
-CONFIGURE_ARGS+=	--without-optionals="vistest"
-.endif
+.endif # !XMMS_SLAVE
 
-.if ${PORT_OPTIONS:MVISUAL} && ${CONFIGURE_ARGS:M--with-vis-reference-clients}
-PLIST_SUB+=	VISUAL=""
-.else
-PLIST_SUB+=	VISUAL="@comment "
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MVOCODER}
-LIB_DEPENDS+=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-PLIST_SUB+=	VOCODER=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="vocoder"
-PLIST_SUB+=	VOCODER="@comment "
-.endif
+.if defined(XMMS2_SLAVE)
+CONFIGURE_ARGS+=	--without-xmms2d
 
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-PLIST_SUB+=	VORBIS=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="vorbis"
-PLIST_SUB+=	VORBIS="@comment "
+.if   ${XMMS2_SLAVE} == "python"
+CONFIGURE_ARGS+=	--with-optionals="python"
+.elif ${XMMS2_SLAVE} == "ruby"
+CONFIGURE_ARGS+=	--with-optionals="ruby"
+.elif ${XMMS2_SLAVE} == "perl"
+CONFIGURE_ARGS+=	--with-optionals="perl"
+.elif ${XMMS2_SLAVE} == "ruby-ecore"
+CONFIGURE_ARGS+=	--with-optionals="ruby" --with-optionals="xmmsclient-ecore"
+.elif ${XMMS2_SLAVE} == "cpp"
+CONFIGURE_ARGS+=	--with-optionals="xmmsclient++" \
+		--with-optionals="xmmsclient++-glib"
 .endif
 
-.if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
-PLIST_SUB+=	WAVPACK=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="wavpack"
-PLIST_SUB+=	WAVPACK="@comment "
-.endif
+.else # XMMS2_SLAVE
+CONFIGURE_ARGS+=	--without-optionals="python" \
+		--without-optionals="ruby" \
+		--without-optionals="xmmsclient-ecore" \
+		--without-optionals="xmmsclient++" \
+		--without-optionals="xmmsclient++-glib" \
+		--without-optionals="perl"
+.endif # XMMS2_SLAVE
 
-.if ${PORT_OPTIONS:MXML}
-USE_GNOME+=	libxml2
-PLIST_SUB+=	XML=""
-.else
-CONFIGURE_ARGS+=	--without-plugins="xml" --without-plugins="rss" \
-		--without-plugins="xspf"
-PLIST_SUB+=	XML="@comment "
-.endif
+.if !defined(XMMS2_SLAVE)
 
-.if ${PORT_OPTIONS:MET}
-PLIST_SUB+=	ET=""
-MAN1+=		xmms2-et.1
+# xmms2-ripper
+.if ${PORT_OPTIONS:MVISUAL} && ${PORT_OPTIONS:MVORBIS}
+LIB_DEPENDS+=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
 .else
-CONFIGURE_ARGS+=	--without-optionals="et"
-PLIST_SUB+=	ET="@comment "
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-clients-vistest-wscript
 .endif
 
 .endif # !XMMS2_SLAVE
 
+.include <bsd.port.pre.mk>
+
+# Force to nothing to avoid bsd.openssl.mk adding definitions
+# to it when AIRPLAY option is active, waf does not understand it anyway.
+MAKE_ARGS=
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" ${WRKSRC}/wscript
 .if ${PORT_OPTIONS:MVISUAL} && ${PORT_OPTIONS:MVORBIS}
@@ -381,6 +215,9 @@ post-patch:
 post-install:
 .if !defined(XMMS2_SLAVE)
 	${MKDIR} ${STAGEDIR}${DATADIR}/scripts/startup.d
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxmmsclient*
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/xmms2/files/patch-src-clients-lib-xmmsclient-glib-wscript b/audio/xmms2/files/patch-src-clients-lib-xmmsclient-glib-wscript
index 4d2b61ae2e2a..782a4b98cafb 100644
--- a/audio/xmms2/files/patch-src-clients-lib-xmmsclient-glib-wscript
+++ b/audio/xmms2/files/patch-src-clients-lib-xmmsclient-glib-wscript
@@ -1,5 +1,5 @@
---- src/clients/lib/xmmsclient-glib/wscript.orig	2013-05-24 16:43:51.815281865 +0200
-+++ src/clients/lib/xmmsclient-glib/wscript	2013-05-24 17:00:04.966198019 +0200
+--- src/clients/lib/xmmsclient-glib/wscript.orig	2011-10-20 19:26:08 UTC
++++ src/clients/lib/xmmsclient-glib/wscript
 @@ -1,19 +1,21 @@
  from waftools import tool
  
diff --git a/audio/xmms2/files/patch-src-clients-lib-xmmsclient-wscript b/audio/xmms2/files/patch-src-clients-lib-xmmsclient-wscript
index 9f6901520127..a8135f56f562 100644
--- a/audio/xmms2/files/patch-src-clients-lib-xmmsclient-wscript
+++ b/audio/xmms2/files/patch-src-clients-lib-xmmsclient-wscript
@@ -1,6 +1,6 @@
---- src/clients/lib/xmmsclient/wscript.orig	2013-05-24 16:42:05.810273309 +0200
-+++ src/clients/lib/xmmsclient/wscript	2013-05-24 17:00:19.345205807 +0200
-@@ -25,19 +25,21 @@
+--- src/clients/lib/xmmsclient/wscript.orig	2011-10-20 19:26:08 UTC
++++ src/clients/lib/xmmsclient/wscript
+@@ -25,19 +25,21 @@ def build(bld):
      else:
          source.extend(["visualization/dummy.c"])
  
diff --git a/audio/xmms2/files/patch-src-include-wscript b/audio/xmms2/files/patch-src-include-wscript
index 4352004271fa..a4e84c9edaa5 100644
--- a/audio/xmms2/files/patch-src-include-wscript
+++ b/audio/xmms2/files/patch-src-include-wscript
@@ -1,6 +1,6 @@
---- src/include/wscript.orig	2011-10-20 21:26:08.000000000 +0200
-+++ src/include/wscript	2013-05-24 17:17:24.643159743 +0200
-@@ -2,12 +2,13 @@
+--- src/include/wscript.orig	2011-10-20 19:26:08 UTC
++++ src/include/wscript
+@@ -2,12 +2,13 @@ import os
  
  def build(bld):
      # FIXME: This is a test that should work.
diff --git a/audio/xmms2/files/patch-src-include-xmmsclient-xmmsclient++-coll.h b/audio/xmms2/files/patch-src-include-xmmsclient-xmmsclient++-coll.h
index 08137388bf26..f237eea4085b 100644
--- a/audio/xmms2/files/patch-src-include-xmmsclient-xmmsclient++-coll.h
+++ b/audio/xmms2/files/patch-src-include-xmmsclient-xmmsclient++-coll.h
@@ -1,6 +1,6 @@
---- src/include/xmmsclient/xmmsclient++/coll.h.orig	2013-05-24 12:04:02.505430442 +0200
-+++ src/include/xmmsclient/xmmsclient++/coll.h	2013-05-24 12:07:11.694426120 +0200
-@@ -612,7 +612,7 @@
+--- src/include/xmmsclient/xmmsclient++/coll.h.orig	2011-10-20 19:26:08 UTC
++++ src/include/xmmsclient/xmmsclient++/coll.h
+@@ -612,7 +612,7 @@ namespace Xmms 
  
  		template< typename keyT, typename valT >
  		AbstractElement< keyT, valT >::AbstractElement( const Coll& coll, keyT index )
diff --git a/audio/xmms2/files/patch-src-plugins-airplay-wscript b/audio/xmms2/files/patch-src-plugins-airplay-wscript
index 961daba7755b..5b1e9bf87006 100644
--- a/audio/xmms2/files/patch-src-plugins-airplay-wscript
+++ b/audio/xmms2/files/patch-src-plugins-airplay-wscript
@@ -1,5 +1,5 @@
---- src/plugins/airplay/wscript.orig	2010-02-19 18:43:54.000000000 +0100
-+++ src/plugins/airplay/wscript	2010-03-17 15:14:34.459359323 +0100
+--- src/plugins/airplay/wscript.orig	2011-10-20 19:26:08 UTC
++++ src/plugins/airplay/wscript
 @@ -12,8 +12,6 @@ rtspmessage.c
  def plugin_configure(conf):
      # MinGW doesn't ship sys/select.h
diff --git a/audio/xmms2/files/patch-src-plugins-file-wscript b/audio/xmms2/files/patch-src-plugins-file-wscript
index b148d973ec0d..a09b4fbbd95b 100644
--- a/audio/xmms2/files/patch-src-plugins-file-wscript
+++ b/audio/xmms2/files/patch-src-plugins-file-wscript
@@ -1,5 +1,5 @@
---- src/plugins/file/wscript.orig	2011-10-20 21:26:08.000000000 +0200
-+++ src/plugins/file/wscript	2012-05-04 23:01:58.940585349 +0200
+--- src/plugins/file/wscript.orig	2011-10-20 19:26:08 UTC
++++ src/plugins/file/wscript
 @@ -1,7 +1,7 @@
  from waftools.plugin import plugin
  
@@ -9,7 +9,7 @@
          obj.source.append('browse/fstatat.c')
      else:
          obj.source.append('browse/gdir.c')
-@@ -9,7 +9,6 @@
+@@ -9,7 +9,6 @@ def plugin_build(bld, obj):
  def plugin_configure(conf):
      conf.check_cc(function_name='fstatat', header_name=['fcntl.h','sys/stat.h'],
              defines=['_ATFILE_SOURCE=1'])
diff --git a/audio/xmms2/files/patch-src-plugins-modplug-modplug.c b/audio/xmms2/files/patch-src-plugins-modplug-modplug.c
index 0fbd5dc4333e..4f4d24268f6e 100644
--- a/audio/xmms2/files/patch-src-plugins-modplug-modplug.c
+++ b/audio/xmms2/files/patch-src-plugins-modplug-modplug.c
@@ -1,5 +1,5 @@
---- src/plugins/modplug/modplug.c.orig	2011-10-20 21:26:08.000000000 +0200
-+++ src/plugins/modplug/modplug.c	2014-04-09 15:05:29.232679291 +0200
+--- src/plugins/modplug/modplug.c.orig	2011-10-20 19:26:08 UTC
++++ src/plugins/modplug/modplug.c
 @@ -9,7 +9,7 @@
  #include "xmms/xmms_sample.h"
  #include "xmms/xmms_medialib.h"
diff --git a/audio/xmms2/files/patch-src__plugins__cdda__cdda.c b/audio/xmms2/files/patch-src__plugins__cdda__cdda.c
index 7b88cc108e27..f7b55f5cf915 100644
--- a/audio/xmms2/files/patch-src__plugins__cdda__cdda.c
+++ b/audio/xmms2/files/patch-src__plugins__cdda__cdda.c
@@ -1,5 +1,5 @@
---- src/plugins/cdda/cdda.c.orig	2011-10-20 23:26:08.000000000 +0400
-+++ src/plugins/cdda/cdda.c	2014-08-21 14:24:46.000000000 +0400
+--- src/plugins/cdda/cdda.c.orig	2011-10-20 19:26:08 UTC
++++ src/plugins/cdda/cdda.c
 @@ -18,7 +18,7 @@
  #include "xmms/xmms_log.h"
  #include "xmms/xmms_util.h"
diff --git a/audio/xmms2/files/patch-src_plugins_ao_ao.c b/audio/xmms2/files/patch-src_plugins_ao_ao.c
index c05085ab24f1..972ef05bbfe4 100644
--- a/audio/xmms2/files/patch-src_plugins_ao_ao.c
+++ b/audio/xmms2/files/patch-src_plugins_ao_ao.c
@@ -1,6 +1,6 @@
---- src/plugins/ao/ao.c.orig
+--- src/plugins/ao/ao.c.orig	2011-10-20 19:26:08 UTC
 +++ src/plugins/ao/ao.c
-@@ -160,6 +160,7 @@
+@@ -162,6 +162,7 @@ xmms_ao_new (xmms_output_t *output)
  
  		/* let's just use some common format to check if the device
  		 * name is valid */
diff --git a/audio/xmms2/files/patch-src_plugins_avcodec_avcodec.c b/audio/xmms2/files/patch-src_plugins_avcodec_avcodec.c
index f7b5449c557e..da9bd420ba57 100644
--- a/audio/xmms2/files/patch-src_plugins_avcodec_avcodec.c
+++ b/audio/xmms2/files/patch-src_plugins_avcodec_avcodec.c
@@ -1,5 +1,5 @@
---- src/plugins/avcodec/avcodec.c.orig	2011-10-20 21:26:08.000000000 +0200
-+++ src/plugins/avcodec/avcodec.c	2014-02-27 18:55:51.060717698 +0100
+--- src/plugins/avcodec/avcodec.c.orig	2011-10-20 19:26:08 UTC
++++ src/plugins/avcodec/avcodec.c
 @@ -1,7 +1,7 @@
  /** @file avcodec.c
   *  Decoder plugin for ffmpeg avcodec formats
@@ -30,7 +30,7 @@
  
  #include "avcodec_compat.h"
  
-@@ -36,6 +37,8 @@
+@@ -36,6 +37,8 @@ typedef struct {
  	guint buffer_size;
  	gboolean no_demuxer;
  
@@ -39,7 +39,7 @@
  	guint channels;
  	guint samplerate;
  	xmms_sample_format_t sampleformat;
-@@ -53,10 +56,14 @@
+@@ -53,10 +56,14 @@ typedef struct {
  static gboolean xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_plugin);
  static gboolean xmms_avcodec_init (xmms_xform_t *xform);
  static void xmms_avcodec_destroy (xmms_xform_t *xform);
@@ -54,7 +54,7 @@
  
  /*
   * Plugin header
-@@ -85,13 +92,23 @@
+@@ -85,13 +92,23 @@ xmms_avcodec_plugin_setup (xmms_xform_pl
  	xmms_magic_add ("A/52 (AC-3) header", "audio/x-ffmpeg-ac3",
  	                "0 beshort 0x0b77", NULL);
  	xmms_magic_add ("DTS header", "audio/x-ffmpeg-dca",
@@ -79,7 +79,7 @@
  	return TRUE;
  }
  
-@@ -107,6 +124,7 @@
+@@ -107,6 +124,7 @@ xmms_avcodec_destroy (xmms_xform_t *xfor
  
  	avcodec_close (data->codecctx);
  	av_free (data->codecctx);
@@ -87,7 +87,7 @@
  
  	g_string_free (data->outbuf, TRUE);
  	g_free (data->buffer);
-@@ -132,9 +150,10 @@
+@@ -132,9 +150,10 @@ xmms_avcodec_init (xmms_xform_t *xform)
  	data->buffer_size = AVCODEC_BUFFER_SIZE;
  	data->codecctx = NULL;
  
@@ -99,7 +99,7 @@
  	avcodec_register_all ();
  
  	mimetype = xmms_xform_indata_get_str (xform,
-@@ -161,12 +180,12 @@
+@@ -161,12 +180,12 @@ xmms_avcodec_init (xmms_xform_t *xform)
  		data->channels = ret;
  	}
  
@@ -114,7 +114,7 @@
  	xmms_xform_auxdata_get_int (xform,
  	                            "samplebits",
  	                            &data->samplebits);
-@@ -188,7 +207,8 @@
+@@ -188,7 +207,8 @@ xmms_avcodec_init (xmms_xform_t *xform)
  		    !strcmp (data->codec_id, "adpcm_swf") ||
  		    !strcmp (data->codec_id, "pcm_s16le") ||
  		    !strcmp (data->codec_id, "ac3") ||
@@ -124,7 +124,7 @@
  			/* number 1024 taken from libavformat raw.c RAW_PACKET_SIZE */
  			data->extradata = g_malloc0 (1024);
  			data->extradata_size = 1024;
-@@ -196,22 +216,22 @@
+@@ -196,22 +216,22 @@ xmms_avcodec_init (xmms_xform_t *xform)
  		} else {
  			/* A demuxer plugin forgot to give decoder config? */
  			xmms_log_error ("Decoder config data not found!");
@@ -151,7 +151,7 @@
  		XMMS_DBG ("Opening decoder '%s' failed", codec->name);
  		goto err;
  	} else {
-@@ -220,7 +240,7 @@
+@@ -220,7 +240,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
  
  		/* some codecs need to have something read before they set
  		 * the samplerate and channels correctly, unfortunately... */
@@ -160,7 +160,7 @@
  			g_string_insert_len (data->outbuf, 0, buf, ret);
  		} else {
  			XMMS_DBG ("First read failed, codec is not working...");
-@@ -231,19 +251,27 @@
+@@ -231,19 +251,27 @@ xmms_avcodec_init (xmms_xform_t *xform)
  
  	data->samplerate = data->codecctx->sample_rate;
  	data->channels = data->codecctx->channels;
@@ -190,7 +190,7 @@
  
  	return TRUE;
  
-@@ -251,6 +279,9 @@
+@@ -251,6 +279,9 @@ err:
  	if (data->codecctx) {
  		av_free (data->codecctx);
  	}
@@ -200,7 +200,7 @@
  	g_string_free (data->outbuf, TRUE);
  	g_free (data->extradata);
  	g_free (data);
-@@ -263,102 +294,24 @@
+@@ -263,102 +294,24 @@ xmms_avcodec_read (xmms_xform_t *xform, 
                     xmms_error_t *error)
  {
  	xmms_avcodec_data_t *data;
@@ -233,8 +233,7 @@
 -				XMMS_DBG ("EOF");
 -				return 0;
 -			}
-+			gint bytes_read;
- 
+-
 -			read_total = bytes_read;
 -
 -			/* If we have a demuxer plugin, make sure we read the whole packet */
@@ -269,10 +268,8 @@
 -
 -			/* Update the buffer length */
 -			data->buffer_length += read_total;
-+			bytes_read = xmms_avcodec_internal_read_some (xform, data, error);
-+			if (bytes_read <= 0) { return bytes_read; }
- 		}
- 
+-		}
+-
 -		packet.data = data->buffer;
 -		packet.size = data->buffer_length;
 -
@@ -299,11 +296,14 @@
 -		}
 -
 -		data->buffer_length -= bytes_read;
--
++			gint bytes_read;
+ 
 -		if (outbufsize > 0) {
 -			g_string_append_len (data->outbuf, outbuf, outbufsize);
--		}
--
++			bytes_read = xmms_avcodec_internal_read_some (xform, data, error);
++			if (bytes_read <= 0) { return bytes_read; }
+ 		}
+ 
 -		size = MIN (data->outbuf->len, len);
 +		res = xmms_avcodec_internal_decode_some (data);
 +		if (res < 0) { return res; }
@@ -311,7 +311,7 @@
  	}
  
  	memcpy (buf, data->outbuf->str, size);
-@@ -371,8 +324,6 @@
+@@ -371,8 +324,6 @@ static gint64
  xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t whence, xmms_error_t *err)
  {
  	xmms_avcodec_data_t *data;
@@ -320,7 +320,7 @@
  	gint64 ret = -1;
  
  	g_return_val_if_fail (xform, -1);
-@@ -390,23 +341,11 @@
+@@ -390,23 +341,11 @@ xmms_avcodec_seek (xmms_xform_t *xform, 
  
  	/* The buggy ape decoder doesn't flush buffers, so we need to finish decoding
  	 * the frame before seeking to avoid segfaults... this hack sucks */
@@ -346,7 +346,7 @@
  	}
  
  	ret = xmms_xform_seek (xform, samples, whence, err);
-@@ -420,3 +359,178 @@
+@@ -420,3 +359,178 @@ xmms_avcodec_seek (xmms_xform_t *xform, 
  
  	return ret;
  }
diff --git a/audio/xmms2/files/patch-src_plugins_avcodec_avcodec__compat.h b/audio/xmms2/files/patch-src_plugins_avcodec_avcodec__compat.h
index c7b0376c45dc..665c4a6f01d8 100644
--- a/audio/xmms2/files/patch-src_plugins_avcodec_avcodec__compat.h
+++ b/audio/xmms2/files/patch-src_plugins_avcodec_avcodec__compat.h
@@ -1,5 +1,5 @@
---- src/plugins/avcodec/avcodec_compat.h.orig	2011-10-20 21:26:08.000000000 +0200
-+++ src/plugins/avcodec/avcodec_compat.h	2014-02-27 18:38:22.000000000 +0100
+--- src/plugins/avcodec/avcodec_compat.h.orig	2011-10-20 19:26:08 UTC
++++ src/plugins/avcodec/avcodec_compat.h
 @@ -1,7 +1,7 @@
  /** @file avcodec_compat.h
   *  Compatibility header for libavcodec backwards compatibility
@@ -17,12 +17,8 @@
 - * avcodec_decode_audio in versions earlier than 51.28 */
 -#if LIBAVCODEC_VERSION_INT < 0x331c00
 -# define avcodec_decode_audio2 avcodec_decode_audio
-+/* Map avcodec_free_frame to av_freep if the former doesn't exist.
-+ * (This is in versions earlier than 54.28.0 (libav) or 54.59.100 (ffmpeg)) */
-+#if ! HAVE_AVCODEC_FREE_FRAME
-+# define avcodec_free_frame av_freep
- #endif
- 
+-#endif
+-
 -/* Handle API change that happened in libavcodec 52.00 */
 -#if LIBAVCODEC_VERSION_INT < 0x340000
 -# define CONTEXT_BPS(codecctx) (codecctx)->bits_per_sample
@@ -46,13 +42,7 @@
 -    (pkt)->data = NULL; \
 -    (pkt)->size = 0; \
 -  } while(0)
-+/* Map av_frame_alloc, av_frame_unref, av_frame_free into their
-+ * deprecated versions in versions earlier than 55.28.1 */
-+#if LIBAVCODEC_VERSION_INT < 0x371c01
-+# define av_frame_alloc avcodec_alloc_frame
-+# define av_frame_unref avcodec_get_frame_defaults
-+# define av_frame_free avcodec_free_frame
- #endif
+-#endif
 -
 -/* Map avcodec_decode_audio3 into the deprecated version
 - * avcodec_decode_audio2 in versions earlier than 52.26 */
@@ -60,10 +50,20 @@
 -# define avcodec_decode_audio3(avctx, samples, frame_size_ptr, avpkt) \
 -    avcodec_decode_audio2(avctx, samples, frame_size_ptr, \
 -                          (avpkt)->data, (avpkt)->size)
--#endif
--
++/* Map avcodec_free_frame to av_freep if the former doesn't exist.
++ * (This is in versions earlier than 54.28.0 (libav) or 54.59.100 (ffmpeg)) */
++#if ! HAVE_AVCODEC_FREE_FRAME
++# define avcodec_free_frame av_freep
+ #endif
+ 
 -/* Handle API change that happened in libavcodec 52.64 */
 -#if LIBAVCODEC_VERSION_INT < 0x344000
 -# define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
--#endif
++/* Map av_frame_alloc, av_frame_unref, av_frame_free into their
++ * deprecated versions in versions earlier than 55.28.1 */
++#if LIBAVCODEC_VERSION_INT < 0x371c01
++# define av_frame_alloc avcodec_alloc_frame
++# define av_frame_unref avcodec_get_frame_defaults
++# define av_frame_free avcodec_free_frame
+ #endif
 -
diff --git a/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript b/audio/xmms2/files/patch-src_plugins_musepack_wscript
index 174234794991..8c5f646cfebb 100644
--- a/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript
+++ b/audio/xmms2/files/patch-src_plugins_musepack_wscript
@@ -1,5 +1,5 @@
---- src/plugins/musepack/wscript.orig	2010-09-10 22:55:03.412930402 +0200
-+++ src/plugins/musepack/wscript	2010-09-10 23:02:05.738208553 +0200
+--- src/plugins/musepack/wscript.orig	2011-10-20 19:26:08 UTC
++++ src/plugins/musepack/wscript
 @@ -8,7 +8,7 @@ def plugin_configure(conf):
          conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD",
                  uselib_store="mpcdec")
diff --git a/audio/xmms2/files/patch-wscript b/audio/xmms2/files/patch-wscript
index b443ce0d1226..de05e67ce918 100644
--- a/audio/xmms2/files/patch-wscript
+++ b/audio/xmms2/files/patch-wscript
@@ -1,6 +1,6 @@
---- wscript.orig	2011-10-20 21:26:08.000000000 +0200
-+++ wscript	2013-05-24 16:57:29.409207485 +0200
-@@ -131,7 +131,8 @@
+--- wscript.orig	2011-10-20 19:26:08 UTC
++++ wscript
+@@ -131,7 +131,8 @@ def build(bld):
              VERSION = bld.env.VERSION
              )
  
@@ -10,7 +10,7 @@
  
      bld.add_post_fun(shutdown)
  
-@@ -295,9 +296,6 @@
+@@ -295,9 +296,6 @@ def configure(conf):
          conf.msg("uncommited changed", changed and "yes" or "no")
          conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
  
@@ -20,7 +20,7 @@
      if conf.options.with_profiling:
          conf.env.with_profiling = True
          conf.env.append_unique('CFLAGS', ['--coverage'])
-@@ -330,7 +328,7 @@
+@@ -330,7 +328,7 @@ def configure(conf):
          conf.env.PKGCONFIGDIR = conf.options.pkgconfigdir
          Logs.pprint('Normal', conf.env.PKGCONFIGDIR) #XXX What is it ?
      else:
@@ -29,7 +29,7 @@
  
      if conf.options.config_prefix:
          for d in conf.options.config_prefix:
-@@ -339,6 +337,8 @@
+@@ -339,6 +337,8 @@ def configure(conf):
              conf.env.prepend_value('LIBPATH', os.path.join(d, 'lib'))
              conf.env.prepend_value('CPPPATH', os.path.join(d, 'include'))
  
diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist
index 8b4abc88ceaf..7fdb6d21404e 100644
--- a/audio/xmms2/pkg-plist
+++ b/audio/xmms2/pkg-plist
@@ -3,11 +3,11 @@ bin/nyxmms2
 %%VISUAL%%bin/vistest-fft
 bin/xmms2
 %%ET%%bin/xmms2-et
-%%MDNS_AVAHI%%bin/xmms2-find-avahi
+%%MDNS%%%%MDNS_AVAHI%%bin/xmms2-find-avahi
 bin/xmms2-launcher
 %%VISUAL%%bin/xmms2-libvisual
-%%MDNS_AVAHI%%bin/xmms2-mdns-avahi
-%%MDNS_APPLE%%bin/xmms2-mdns-dnssd
+%%MDNS%%%%MDNS_AVAHI%%bin/xmms2-mdns-avahi
+%%MDNS%%%%MDNS_APPLE%%bin/xmms2-mdns-dnssd
 %%FAM%%bin/xmms2-mlib-updater
 %%VISUAL%%%%VORBIS%%bin/xmms2-ripper
 bin/xmms2d
@@ -103,7 +103,7 @@ lib/libxmmsclient.so.6.0.0
 %%JACK%%%%LIBDIR%%/libxmms_jack.so
 %%LIBDIR%%/libxmms_karaoke.so
 %%LIBDIR%%/libxmms_m3u.so
-%%MAC%%%%LIBDIR%%/libxmms_mac.so
+%%APE%%%%LIBDIR%%/libxmms_mac.so
 %%MAD%%%%LIBDIR%%/libxmms_mad.so
 %%MMS%%%%LIBDIR%%/libxmms_mms.so
 %%MODPLUG%%%%LIBDIR%%/libxmms_modplug.so
@@ -116,7 +116,7 @@ lib/libxmmsclient.so.6.0.0
 %%OFA%%%%LIBDIR%%/libxmms_ofa.so
 %%LIBDIR%%/libxmms_oss.so
 %%LIBDIR%%/libxmms_pls.so
-%%PULSE%%%%LIBDIR%%/libxmms_pulse.so
+%%PULSEAUDIO%%%%LIBDIR%%/libxmms_pulse.so
 %%LIBDIR%%/libxmms_replaygain.so
 %%XML%%%%LIBDIR%%/libxmms_rss.so
 %%SAMBA%%%%LIBDIR%%/libxmms_samba.so
@@ -136,7 +136,7 @@ libdata/pkgconfig/xmms2-client.pc
 libdata/pkgconfig/xmms2-plugin.pc
 %%ET%%man/man1/xmms2-et.1.gz
 man/man1/xmms2-launcher.1.gz
-%%MDNS_AVAHI%%man/man1/xmms2-mdns-avahi.1.gz
+%%MDNS%%%%MDNS_AVAHI%%man/man1/xmms2-mdns-avahi.1.gz
 man/man1/xmms2.1.gz
 man/man1/xmms2d.1.gz
 share/pixmaps/xmms2-128.png
@@ -148,7 +148,7 @@ share/pixmaps/xmms2-white-on-black.svg
 share/pixmaps/xmms2.svg
 %%DATADIR%%/mind.in.a.box-lament_snipplet.ogg
 %%ET%%%%DATADIR%%/scripts/startup.d/xmms2-et-launcher.sh
-%%MDNS_AVAHI%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
-%%MDNS_APPLE%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
+%%MDNS%%%%MDNS_AVAHI%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
+%%MDNS%%%%MDNS_APPLE%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
 %%FAM%%%%DATADIR%%/scripts/startup.d/xmms2-mlib-updater.sh
 @dir %%DATADIR%%/scripts/startup.d