6 files changed, 470 insertions, 171 deletions

diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index e4aeb6baf0e7..112888538c99 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -6,195 +6,492 @@
 #
 
 PORTNAME=	qmmp
-PORTVERSION=	0.4.5
-PORTREVISION=	1
+PORTVERSION=	0.5.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
-	${MASTER_SITE_GOOGLE_CODE}
+		${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	liangtai.s4@gmail.com
 COMMENT=	A Qt4-based multimedia player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		ogg.7:${PORTSDIR}/audio/libogg \
-		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		wavpack.2:${PORTSDIR}/audio/wavpack \
-		tag.1:${PORTSDIR}/audio/taglib \
-		curl.6:${PORTSDIR}/ftp/curl \
-		mms.0:${PORTSDIR}/net/libmms
-
 USE_BZIP2=	yes
 USE_QT_VER=	4
-USE_GMAKE=	yes
+USE_CMAKE=	yes
 QT_COMPONENTS=	corelib gui network xml dbus \
 		qmake_build rcc_build uic_build moc_build linguist_build
 USE_LDCONFIG=	yes
 
-OPTIONS=	JACK "Support the JACK output server" on \
-		PULSE "Support the PulseAudio output" on \
-		ALSA "Support the ALSA output" off \
-		BS2B "Support the Bauer stereophonic2binaural" on \
-		FLAC "Support to playback FLAC files" on \
-		MUSEPACK "Support to playback MPC files" on \
-		FFMPEG "Support to playback FFMPEG files" on \
-		MODPLUG "Support to playback MOD files" on \
-		FAAD "Support to playback through FAAD decoder" on \
-		CDIO "Support to playback compact discs" on \
-		LADSPA "Support the LADSPA effect" on \
-		ENCA "Support the sample rate converter" on \
-		MPLAYER "Support to playback through Mplayer" on \
-		PROJECTM "Support the projectM music visualiser" on
-
-.include <bsd.port.pre.mk>
-
-PLUGIN_OPTIONS?=	OSS_PLUGIN #default
-
-.if !defined(WITHOUT_JACK)
+OPTIONS=	SKINNEDUI	"Skinned GUI" on \
+		APIDOC	"Doxygen generated class reference document" off \
+		PULSE	"Support the PulseAudio output" on \
+		ALSA	"Support the ALSA output" off \
+		OSS	"Support the OSS output" on \
+		OSS4	"Support the OSS4 output" off \
+		JACK	"Support the JACK output" on \
+		NULLOUT "Support a null output" on \
+		FLAC	"Support to playback FLAC files" on \
+		MUSEPACK	"Support to playback MPC files" on \
+		FFMPEG	"Support to playback FFMPEG files" on \
+		MODPLUG	"Support to playback MOD files" on \
+		WILDMIDI	"Support to playback MIDI files" on \
+		GME	"Support video game music files" on \
+		MAD	"Support to playback MAD files" on \
+		VORBIS	"Support to playback Vorbis/OGG files" on \
+		SNDFILE "Support to playback Sndfile files" on \
+		WAVPACK "Support to playback WAVPack files" on \
+		CUE	"Support to CUE sheets" on \
+		CDIO	"Support to playback compact discs" on \
+		FAAD	"Support to playback through FAAD decoder" on \
+		LADSPA	"Support the LADSPA effect" on \
+		CROSSFADE "Support cross-fade effect" on \
+		BS2B	"Support the Bauer stereophonic2binaural effect" on \
+		STEREO	"Support stereo effect" on \
+		SRCONV 	"Support the sample rate converter" on \
+		MPLAYER	"Support VIDEO playback through Mplayer" on \
+		CURL	"Support cURL streaming transport" on \
+		MMS	"Support MMS streaming transport" on \
+		PROJECTM	"Support the projectM music visualiser" on \
+		ANALYZER	"Supoort spectrum analyzer visualization" on \
+		ENCA	"Support automatic character set detection" on \
+		MPRIS	"Support the Media Player Remote" on \
+		SCROBBLER	"Support Libre.fm/Last.fm scrobbler feature" on \
+		STATICON	"Support to show status icon" on \
+		NOTIFIER	"Support to popup notifier" on \
+		LYRICS	"Support to show lyrics using lyrics.wikia.com" on \
+		HOTKEY	"Support to set shortcut keys" on \
+		FILEOPS	"Support file operation" on \
+		COVER	"Support to show cover images" on \
+		KDENOTIFY	"Support to popup notifier for KDE" on \
+		HAL "Support removable disc detection using HAL" on \
+		UDISKS	"Support removable disc detection using UDisks" on \
+		QMMP_DIALOG	"An original dialog" on
+
+.include <bsd.port.options.mk>
+
+.ifndef(WITHOUT_APIDOC)
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+.endif
+
+.ifndef(WITHOUT_SKINNEDUI)
+PLIST_SUB+=	SKINNEDUI=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SKINNED:BOOL=TRUE
+.else
+PLIST_SUB+=	SKINNEDUI="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SKINNED:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_JACK)
 PLIST_SUB+=	JACK=""
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
-PLUGIN_OPTIONS+=	JACK_PLUGIN
+#LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+BUILD_DEPENDS+=	jackit>=0.121.2:${PORTSDIR}/audio/jack
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_JACK:BOOL=TRUE
 .else
 PLIST_SUB+=	JACK="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_JACK:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_ALSA)
+.ifndef(WITHOUT_ALSA)
 PLIST_SUB+=	ALSA=""
 LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
-PLUGIN_OPTIONS+=	ALSA_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_ALSA:BOOL=TRUE
 .else
 PLIST_SUB+=	ALSA="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_ALSA:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_BS2B)
+.ifndef(WITHOUT_BS2B)
 PLIST_SUB+=	BS2B=""
 LIB_DEPENDS+=	bs2b.0:${PORTSDIR}/audio/libbs2b
-PLUGIN_OPTIONS+=	BS2B_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_BS2B:BOOL=TRUE
 .else
 PLIST_SUB+=	BS2B="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_BS2B:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_PULSE)
+.ifndef(WITHOUT_PULSE)
 PLIST_SUB+=	PULSE_AUDIO=""
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-PLUGIN_OPTIONS+=	PULSE_AUDIO_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_PULSE:BOOL=TRUE
 .else
 PLIST_SUB+=	PULSE_AUDIO="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_PULSE:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_FLAC)
+.ifndef(WITHOUT_FLAC)
 PLIST_SUB+=	FLAC=""
 LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
-PLUGIN_OPTIONS+=	FLAC_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_FLAC:BOOL=TRUE
 .else
 PLIST_SUB+=	FLAC="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_FLAC:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_MUSEPACK)
+.ifndef(WITHOUT_MUSEPACK)
 PLIST_SUB+=	MUSEPACK=""
 LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
-PLUGIN_OPTIONS+=	MUSEPACK_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPC:BOOL=TRUE
 .else
 PLIST_SUB+=	MUSEPACK="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPC:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_GME)
+PLIST_SUB+=	GME=""
+LIB_DEPENDS+=	gme.0:${PORTSDIR}/audio/libgme
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_GME:BOOL=TRUE
+.else
+PLIST_SUB+=	GME="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_GME:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_FFMPEG)
+.ifndef(WITHOUT_FFMPEG)
 PLIST_SUB+=	FFMPEG=""
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-PLUGIN_OPTIONS+=	FFMPEG_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFMPEG:BOOL=TRUE
 .else
 PLIST_SUB+=	FFMPEG="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFMPEG:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_MODPLUG)
+.ifndef(WITHOUT_MODPLUG)
 PLIST_SUB+=	MODPLUG=""
 LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug
-PLUGIN_OPTIONS+=	MODPLUG_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MODPLUG:BOOL=TRUE
 .else
 PLIST_SUB+=	MODPLUG="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MODPLUG:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_FAAD)
+.ifndef(WITHOUT_FAAD)
 PLIST_SUB+=	FAAD=""
 LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
-PLUGIN_OPTIONS+=	AAC_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_AAC:BOOL=TRUE
 .else
 PLIST_SUB+=	FAAD="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_AAC:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_CDIO)
+.ifndef(WITHOUT_CDIO)
 PLIST_SUB+=	CDIO=""
 LIB_DEPENDS+=	cdio.12:${PORTSDIR}/sysutils/libcdio
-PLUGIN_OPTIONS+=	CDAUDIO_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CDA:BOOL=TRUE
 .else
 PLIST_SUB+=	CDIO="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CDA:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_ENCA)
+.ifndef(WITHOUT_ENCA)
 PLIST_SUB+=	ENCA=""
 LIB_DEPENDS+=	enca.5:${PORTSDIR}/converters/enca
-PLUGIN_OPTIONS+=	WITH_ENCA
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_ENCA:BOOL=TRUE
 .else
 PLIST_SUB+=	ENCA="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_ENCA:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_MPLAYER)
+.ifndef(WITHOUT_MPLAYER)
 PLIST_SUB+=	MPLAYER=""
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
-PLUGIN_OPTIONS+=	MPLAYER_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPLAYER:BOOL=TRUE
 .else
 PLIST_SUB+=	MPLAYER="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPLAYER:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_PROJECTM)
+.ifndef(WITHOUT_PROJECTM)
 PLIST_SUB+=	PROJECTM=""
 LIB_DEPENDS+=	projectM.2:${PORTSDIR}/graphics/libprojectm
-PLUGIN_OPTIONS+=	PROJECTM_PLUGIN WITH_PROJECTM20
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_PROJECTM:BOOL=TRUE
 .else
 PLIST_SUB+=	PROJECTM="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_PROJECTM:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_LADSPA)
+.ifndef(WITHOUT_OSS)
+PLIST_SUB+=	OSS=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS:BOOL=TRUE
+.else
+PLIST_SUB+=	OSS="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_OSS4)
+PLIST_SUB+=	OSS4=""
+BUILD_DEPENDS+=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:${PORTSDIR}/audio/oss
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS4:BOOL=TRUE
+.else
+PLIST_SUB+=	OSS4="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS4:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_LADSPA)
 PLIST_SUB+=	LADSPA=""
 RUN_DEPENDS+=	analyseplugin:${PORTSDIR}/audio/ladspa
-PLUGIN_OPTIONS+=	LADSPA_PLUGIN
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_LADSPA:BOOL=TRUE
 .else
 PLIST_SUB+=	LADSPA="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_LADSPA:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_WILDMIDI)
+PLIST_SUB+=	WILDMIDI=""
+LIB_DEPENDS+=	WildMidi.1:${PORTSDIR}/audio/wildmidi
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MIDI:BOOL=TRUE
+.else
+PLIST_SUB+=	WILDMIDI="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MIDI:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_MAD)
+PLIST_SUB+=	MAD=""
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MAD:BOOL=TRUE
+.else
+PLIST_SUB+=	MAD="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MAD:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_SNDFILE)
+PLIST_SUB+=	SNDFILE=""
+LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SNDFILE:BOOL=TRUE
+.else
+PLIST_SUB+=	SNDFILE="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SNDFILE:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_VORBIS)
+PLIST_SUB+=	VORBIS=""
+LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_VORBIS:BOOL=TRUE
+.else
+PLIST_SUB+=	VORBIS="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_VORBIS:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_WAVPACK)
+PLIST_SUB+=	WAVPACK=""
+LIB_DEPENDS+=	wavpack.2:${PORTSDIR}/audio/wavpack
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_WAVPACK:BOOL=TRUE
+.else
+PLIST_SUB+=	WAVPACK="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_WAVPACK:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_CURL)
+PLIST_SUB+=	CURL=""
+LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CURL:BOOL=TRUE
+.else
+PLIST_SUB+=	CURL="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CURL:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_MMS)
+PLIST_SUB+=	MMS=""
+LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MMS:BOOL=TRUE
+.else
+PLIST_SUB+=	MMS="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MMS:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_CUE)
+PLIST_SUB+=	CUE=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CUE:BOOL=TRUE
+.else
+PLIST_SUB+=	CUE="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CUE:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_NULLOUT)
+PLIST_SUB+=	NULLOUT=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_NULL:BOOL=TRUE
+.else
+PLIST_SUB+=	NULLOUT="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_NULL:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_SRCONV)
+PLIST_SUB+=	SRCONV=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SRC:BOOL=TRUE
+.else
+PLIST_SUB+=	SRCONV="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SRC:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_CROSSFADE)
+PLIST_SUB+=	CROSSFADE=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CROSSFADE:BOOL=TRUE
+.else
+PLIST_SUB+=	CROSSFADE="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_CROSSFADE:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_STEREO)
+PLIST_SUB+=	STEREO=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_STEREO:BOOL=TRUE
+.else
+PLIST_SUB+=	STEREO="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_STEREO:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_ANALYZER)
+PLIST_SUB+=	ANALYZER=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_ANALYZER:BOOL=TRUE
+.else
+PLIST_SUB+=	ANALYZER="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_ANALYZER:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_MPRIS)
+PLIST_SUB+=	MPRIS=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPRIS:BOOL=TRUE
+.else
+PLIST_SUB+=	MPRIS="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPRIS:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_SCROBBLER)
+PLIST_SUB+=	SCROBBLER=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SCROBBLER:BOOL=TRUE
+.else
+PLIST_SUB+=	SCROBBLER="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_SCROBBLER:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_STATICON)
+PLIST_SUB+=	STATICON=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_STATICON:BOOL=TRUE
+.else
+PLIST_SUB+=	STATICON="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_STATICON:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_NOTIFIER)
+PLIST_SUB+=	NOTIFIER=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_NOTIFIER:BOOL=TRUE
+.else
+PLIST_SUB+=	NOTIFIER="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_NOTIFIER:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_LYRICS)
+PLIST_SUB+=	LYRICS=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_LYRICS:BOOL=TRUE
+.else
+PLIST_SUB+=	LYRICS="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_LYRICS:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_HAL)
+PLIST_SUB+=	HAL=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_HAL:BOOL=TRUE
+.else
+PLIST_SUB+=	HAL="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_HAL:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_HOTKEY)
+PLIST_SUB+=	HOTKEY=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_HOTKEY:BOOL=TRUE
+.else
+PLIST_SUB+=	HOTKEY="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_HOTKEY:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_FILEOPS)
+PLIST_SUB+=	FILEOPS=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_FILEOPS:BOOL=TRUE
+.else
+PLIST_SUB+=	FILEOPS="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_FILEOPS:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_COVER)
+PLIST_SUB+=	COVER=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_COVER:BOOL=TRUE
+.else
+PLIST_SUB+=	COVER="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_COVER:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_KDENOTIFY)
+PLIST_SUB+=	KDENOTIFY=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_KDENOTIFY:BOOL=TRUE
+.else
+PLIST_SUB+=	KDENOTIFY="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_KDENOTIFY:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_UDISKS)
+PLIST_SUB+=	UDISKS=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_UDISKS:BOOL=TRUE
+.else
+PLIST_SUB+=	UDISKS="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_UDISKS:BOOL=FALSE
+.endif
+
+.ifndef(WITHOUT_QMMP_DIALOG)
+PLIST_SUB+=	QMMP_DIALOG=""
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_QMMP_DIALOG:BOOL=TRUE
+.else
+PLIST_SUB+=	QMMP_DIALOG="@comment "
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_QMMP_DIALOG:BOOL=FALSE
+.endif
+
+.if !defined(WITHOUT_FAAD) || !defined(WITHOUT_MAD) \
+	|| !defined(WITHOUT_MUSEPACK) || !defined(WITHOUT_FLAC) \
+	|| !defined(WITHOUT_VORBIS)
+LIB_DEPENDS+=	tag.1:${PORTSDIR}/audio/taglib
 .endif
 
 PORTDOCS=	README README.RUS AUTHORS
 SUB_FILES=	qmmp
 INSTALLS_ICONS=	yes
 
-QMAKE_ARGS+=	CONFIG+="${PLUGIN_OPTIONS}" PREFIX=${PREFIX} \
-		LIB_DIR=${PREFIX}/lib
+CMAKE_ARGS+=	${PLUGIN_OPTIONS_CMAKE} \
+	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
+CMAKE_OUTSOURCE=yes
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 post-patch:
-	${REINPLACE_CMD} -e 's|^CONFIG += |#CONFIG +=|' \
-		${WRKSRC}/qmmp.pri
-	${FIND} ${WRKSRC} -name Makefile -delete
-	${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' \
-		${WRKSRC}/src/plugins/Input/ffmpeg/ffmpeg.pro \
-		${WRKSRC}/src/plugins/Input/mpc/mpc.pro
-	${REINPLACE_CMD} -e 's| /include| $$$$PREFIX/include|' \
-		${WRKSRC}/src/qmmp/qmmp.pro ${WRKSRC}/src/qmmpui/qmmpui.pro
-	${REINPLACE_CMD} -e 's| /bin| $$$$PREFIX/libexec|; \
-		s| /share| $$$$PREFIX/share|' \
-		${WRKSRC}/src/ui/ui.pro ${WRKSRC}/src/plugins/Input/cue/cue.pro
-
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
-
-pre-install:
-	${STRIP_CMD} ${WRKSRC}/bin/qmmp
+	${REINPLACE_CMD} -e 's| -ldl| $${CMAKE_DL_LIBS}|' \
+		${WRKSRC}/src/plugins/Effect/ladspa/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|/usr/|${LOCALBASE}/|g' \
+		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|DESTINATION bin|DESTINATION libexec|' \
+		${WRKSRC}/src/ui/CMakeLists.txt
+
+pre-configure:
+	${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+
+post-build:
+.ifndef(WITHOUT_APIDOC)
+	cd ${WRKSRC}/doc && doxygen Doxyfile
+.endif
 
 post-install:
+.ifndef(WITHOUT_SKINNEDUI)
 	${INSTALL_SCRIPT} ${WRKDIR}/qmmp ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.endif
+.ifndef(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}; \
 	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${DOCSDIR}
 .endif
+.ifndef(WITHOUT_APIDOC)
+	${MKDIR} ${DOCSDIR}/html/search ; \
+	cd ${WRKSRC}/doc/html && ${INSTALL_MAN} *.html *.png *.css ${DOCSDIR}/html ; \
+	cd ${WRKSRC}/doc/html/search && \
+		${INSTALL_MAN} *.html *.png *.css *.js ${DOCSDIR}/html/search ; \
+	${RM} -f ${WRKDIR}/PLIST.doc ; \
+	${FIND} ${DOCSDIR}/html -type f | ${SED} 's|${LOCALBASE}/||' \
+		>> ${WRKDIR}/PLIST.doc ; \
+	${FIND} ${DOCSDIR}/html -type d | ${SED} 's|${LOCALBASE}/|@dirrm |' \
+		| ${SORT} -r >> ${WRKDIR}/PLIST.doc ; \
+	cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/qmmp/distinfo b/multimedia/qmmp/distinfo
index 0f36d465a870..97e089bb64f3 100644
--- a/multimedia/qmmp/distinfo
+++ b/multimedia/qmmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.4.5.tar.bz2) = 85d2edf528b57d1ccbffadf74b6822dd9131c7cd00ee0ed49518b13ef8a0dc50
-SIZE (qmmp-0.4.5.tar.bz2) = 652511
+SHA256 (qmmp-0.5.2.tar.bz2) = 6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec
+SIZE (qmmp-0.5.2.tar.bz2) = 704517
diff --git a/multimedia/qmmp/files/patch-plugins.pri b/multimedia/qmmp/files/patch-plugins.pri
deleted file mode 100644
index e551fdaddfcc..000000000000
--- a/multimedia/qmmp/files/patch-plugins.pri
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/plugins/plugins.pri	(revision 2054)
-+++ src/plugins/plugins.pri	(working copy)
-@@ -1,3 +1,4 @@
- include(../../qmmp.pri)
- unix:PLUGINS_PREFIX=../../../../lib/qmmp
- win32:PLUGINS_PREFIX=../../../../../bin/plugins
-+INCLUDEPATH += ../../../qmmp
diff --git a/multimedia/qmmp/files/patch-plugins_Effect_ladspa.pro b/multimedia/qmmp/files/patch-plugins_Effect_ladspa.pro
deleted file mode 100644
index af35d305a44d..000000000000
--- a/multimedia/qmmp/files/patch-plugins_Effect_ladspa.pro
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/plugins/Effect/ladspa/ladspa.pro.orig	2010-01-26 05:36:55.000000000 +0900
-+++ src/plugins/Effect/ladspa/ladspa.pro	2010-05-07 19:43:53.000000000 +0900
-@@ -23,8 +23,7 @@
- QMAKE_LIBDIR += ../../../../lib
- LIBS += -lqmmp \
-     -L/usr/lib \
--    -I/usr/include \
--    -ldl
-+    -I/usr/include
- TRANSLATIONS = translations/ladspa_plugin_cs.ts \
-     translations/ladspa_plugin_de.ts \
-     translations/ladspa_plugin_zh_CN.ts \
diff --git a/multimedia/qmmp/pkg-descr b/multimedia/qmmp/pkg-descr
index aea96ab5ee05..9b722a67515b 100644
--- a/multimedia/qmmp/pkg-descr
+++ b/multimedia/qmmp/pkg-descr
@@ -1,18 +1,24 @@
 This program is an audio-player, written with help of Qt library.
-Its user interface is similar to winamp or xmms.
-
-features:
-	Last.fm scrobbler, D-Bus, Spectrum Analyzer, sample rate conversion,
-	streaming (MP3, Vorbis via IceCast/ShoutCast), projectm visualization,
-	device detection, MPRIS, global hotkey, video playback using Mplayer,
-	Bauer Stereophonic-to-Binaural DSP, projectM audio visulaliser,
-	lyrics (from LyricWiki.orig), and all skins for winamp and/or xmms
-input plugins:
-	MPEG1 layer 1/2/3, Ogg Vorbis, native FLAC, Musepack, WavePack,
-	ModPlug, WMA (and other formats provided by FFmpeg library), PCM WAVE,
-	AAC, CD audio and CUE (including flac, WavPack embeded cue)
-output plugins:
-	PulseAudio, OSS and Jack
-
-WWW: http://qmmp.ylsoftware.com/
-or http://code.google.com/p/qmmp/
+Supported formats:
+	MPEG1 layer 2/3, Ogg Vorbis, Native FLAC, Ogg FLAC, Musepack, WavePack,
+	tracker modules (mod, s3m, it, xm, etc.), ADTS AAC, CD Audio, MIDI,
+	WMA-Monkey's Audio (and other formats provided by FFmpeg library),
+	PCM Wave (and other formats provided by libsndfile library), and
+	chiptune formats (AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ, VTX)
+DSP effects:
+	Bauer Stereophonic-to-Binaural effect, sample rate conversion,
+    LADSPA effects, extra stereo effect, and crossfade effect
+Visual effects:
+	Spectrum Analyzer, and projectM audio visulaliser
+Output system support:
+	PulseAudio, OSS, OSS4, jack, and ALSA
+Other features:
+	10-band equalizer, Last.fm/Libre.fm scrobbler, MMS support, global hotkey,
+	streaming (MP3, Vorbis, AAC, AAC+ via IceCast/ShoutCast), CDDB support,
+	removable device detection (via HAL or UDisks), MPRIS, cover art support,
+	multiple playlists, ReplayGain support, CUE sheet support,
+	embedded CUE support (for FLAC and WavPack), MPRIS (1.0 and 2.0),
+	automatic charset detection for cue files and ShoutCast metadata,
+	video playback via Mplayer, lyrics (using lyrics.wikia.com), and
+	skinned UI (supports all skins for XMMS and Winamp 2.x)
+WWW: http://qmmp.ylsoftware.com/ or http://code.google.com/p/qmmp/
diff --git a/multimedia/qmmp/pkg-plist b/multimedia/qmmp/pkg-plist
index e8c121974903..c4bc398452cd 100644
--- a/multimedia/qmmp/pkg-plist
+++ b/multimedia/qmmp/pkg-plist
@@ -1,5 +1,5 @@
-bin/qmmp
-libexec/qmmp
+%%SKINNEDUI%%bin/qmmp
+%%SKINNEDUI%%libexec/qmmp
 include/qmmp/abstractengine.h
 include/qmmp/audioparameters.h
 include/qmmp/buffer.h
@@ -8,6 +8,7 @@ include/qmmp/decoderfactory.h
 include/qmmp/effect.h
 include/qmmp/effectfactory.h
 include/qmmp/enginefactory.h
+include/qmmp/eqsettings.h
 include/qmmp/fileinfo.h
 include/qmmp/inputsource.h
 include/qmmp/inputsourcefactory.h
@@ -24,7 +25,6 @@ include/qmmp/tagmodel.h
 include/qmmp/visual.h
 include/qmmp/visualfactory.h
 include/qmmp/volumecontrol.h
-include/qmmpui/abstractplaylistitem.h
 include/qmmpui/commandlinemanager.h
 include/qmmpui/commandlineoption.h
 include/qmmpui/detailsdialog.h
@@ -43,73 +43,88 @@ include/qmmpui/playlistparser.h
 include/qmmpui/templateeditor.h
 lib/libqmmp.so
 lib/libqmmp.so.0
-lib/libqmmp.so.0.4
-lib/libqmmp.so.0.4.5
+lib/libqmmp.so.0.5.2
 lib/libqmmpui.so
 lib/libqmmpui.so.0
-lib/libqmmpui.so.0.4
-lib/libqmmpui.so.0.4.5
+lib/libqmmpui.so.0.5.2
 lib/qmmp/CommandLineOptions/libincdecvolumeoption.so
 lib/qmmp/CommandLineOptions/libseekoption.so
+lib/qmmp/CommandLineOptions/libstatusoption.so
 %%LADSPA%%lib/qmmp/Effect/libladspa.so
 %%BS2B%%lib/qmmp/Effect/libbs2b.so
-lib/qmmp/Effect/libsrconverter.so
-lib/qmmp/FileDialogs/libqmmpfiledialog.so
-lib/qmmp/General/libcovermanager.so
-lib/qmmp/General/libfileops.so
-lib/qmmp/General/libhal.so
-lib/qmmp/General/libhotkey.so
-lib/qmmp/General/libkdenotify.so
-lib/qmmp/General/liblyrics.so
-lib/qmmp/General/libmpris.so
-lib/qmmp/General/libnotifier.so
-lib/qmmp/General/libscrobbler.so
-lib/qmmp/General/libstatusicon.so
+%%SRCONV%%lib/qmmp/Effect/libsrconverter.so
+%%STEREO%%lib/qmmp/Effect/libstereo.so
+%%CROSSFADE%%lib/qmmp/Effect/libcrossfade.so
+%%QMMP_DIALOG%%lib/qmmp/FileDialogs/libqmmpfiledialog.so
+%%COVER%%lib/qmmp/General/libcovermanager.so
+%%FILEOPS%%lib/qmmp/General/libfileops.so
+%%HAL%%lib/qmmp/General/libhal.so
+%%HOTKEY%%lib/qmmp/General/libhotkey.so
+%%KDENOTIFY%%lib/qmmp/General/libkdenotify.so
+%%LYRICS%%lib/qmmp/General/liblyrics.so
+%%MPRIS%%lib/qmmp/General/libmpris.so
+%%NOTIFIER%%lib/qmmp/General/libnotifier.so
+%%SCROBBLER%%lib/qmmp/General/libscrobbler.so
+%%STATICON%%lib/qmmp/General/libstatusicon.so
+%%UDISKS%%lib/qmmp/General/libudisks.so
 %%FAAD%%lib/qmmp/Input/libaac.so
 %%CDIO%%lib/qmmp/Input/libcdaudio.so
-lib/qmmp/Input/libcue.so
+%%CUE%%lib/qmmp/Input/libcue.so
 %%FFMPEG%%lib/qmmp/Input/libffmpeg.so
 %%FLAC%%lib/qmmp/Input/libflac.so
-lib/qmmp/Input/libmad.so
+%%MAD%%lib/qmmp/Input/libmad.so
 %%MODPLUG%%lib/qmmp/Input/libmodplug.so
+%%GME%%lib/qmmp/Input/libgme.so
 %%MUSEPACK%%lib/qmmp/Input/libmpc.so
-%%MPLAYER%%lib/qmmp/Input/libmplayer.so
-lib/qmmp/Input/libsndfile.so
-lib/qmmp/Input/libvorbis.so
-lib/qmmp/Input/libwavpack.so
+%%MPLAYER%%lib/qmmp/Engines/libmplayer.so
+%%SNDFILE%%lib/qmmp/Input/libsndfile.so
+%%VORBIS%%lib/qmmp/Input/libvorbis.so
+%%WAVPACK%%lib/qmmp/Input/libwavpack.so
+%%WILDMIDI%%lib/qmmp/Input/libwildmidi.so
 %%JACK%%lib/qmmp/Output/libjack.so
 %%ALSA%%lib/qmmp/Output/libalsa.so
-lib/qmmp/Output/libnull.so
-lib/qmmp/Output/liboss.so
+%%NULLOUT%%lib/qmmp/Output/libnull.so
+%%OSS%%lib/qmmp/Output/liboss.so
+%%OSS4%%lib/qmmp/Output/liboss4.so
 %%PULSE_AUDIO%%lib/qmmp/Output/libpulseaudio.so
 lib/qmmp/PlaylistFormats/libm3uplaylistformat.so
 lib/qmmp/PlaylistFormats/libplsplaylistformat.so
 lib/qmmp/PlaylistFormats/libxspfplaylistformat.so
-lib/qmmp/Transports/libhttp.so
-lib/qmmp/Transports/libmms.so
-lib/qmmp/Visual/libanalyzer.so
+%%CURL%%lib/qmmp/Transports/libhttp.so
+%%MMS%%lib/qmmp/Transports/libmms.so
+%%ANALYZER%%lib/qmmp/Visual/libanalyzer.so
 %%PROJECTM%%lib/qmmp/Visual/libprojectm.so
-share/applications/qmmp.desktop
-share/applications/qmmp_enqueue.desktop
-share/applications/qmmp_cue.desktop
-share/icons/hicolor/16x16/apps/qmmp.png
-share/icons/hicolor/32x32/apps/qmmp.png
-share/icons/hicolor/48x48/apps/qmmp.png
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
+%%SKINNEDUI%%share/applications/qmmp.desktop
+%%SKINNEDUI%%share/applications/qmmp_enqueue.desktop
+%%CUE%%share/applications/qmmp_cue.desktop
+%%SKINNEDUI%%share/icons/hicolor/16x16/apps/qmmp.png
+%%SKINNEDUI%%share/icons/hicolor/32x32/apps/qmmp.png
+%%SKINNEDUI%%share/icons/hicolor/48x48/apps/qmmp.png
+%%SKINNEDUI%%share/icons/hicolor/scalable/apps/qmmp.svgz
+%%SKINNEDUI%%share/icons/hicolor/scalable/apps/qmmp-simple.svgz
+%%KDENOTIFY%%%%DATADIR%%/images/app_icon.png
+%%KDENOTIFY%%%%DATADIR%%/images/empty_cover.png
+%%KDENOTIFY%%@dirrm %%DATADIR%%/images
+%%KDENOTIFY%%@dirrm %%DATADIR%%
+%%SKINNEDUI%%@dirrmtry share/icons/hicolor/scalable/apps
+%%SKINNEDUI%%@dirrmtry share/icons/hicolor/scalable
+%%SKINNEDUI%%@dirrmtry share/icons/hicolor/48x48/apps
+%%SKINNEDUI%%@dirrmtry share/icons/hicolor/48x48
+%%SKINNEDUI%%@dirrmtry share/icons/hicolor/32x32/apps
+%%SKINNEDUI%%@dirrmtry share/icons/hicolor/32x32
+%%SKINNEDUI%%@dirrmtry share/icons/hicolor/16x16/apps
+%%SKINNEDUI%%@dirrmtry share/icons/hicolor/16x16
+@comment Insert PLIST.doc here
 @dirrm include/qmmp
 @dirrm include/qmmpui
-@dirrm lib/qmmp/CommandLineOptions
-@dirrm lib/qmmp/Effect
-@dirrm lib/qmmp/FileDialogs
-@dirrm lib/qmmp/General
-@dirrm lib/qmmp/Input
-@dirrm lib/qmmp/Output
-@dirrm lib/qmmp/PlaylistFormats
-@dirrm lib/qmmp/Transports
-@dirrm lib/qmmp/Visual
+@dirrmtry lib/qmmp/CommandLineOptions
+@dirrmtry lib/qmmp/Effect
+@dirrmtry lib/qmmp/Engines
+@dirrmtry lib/qmmp/FileDialogs
+@dirrmtry lib/qmmp/General
+@dirrmtry lib/qmmp/Input
+@dirrmtry lib/qmmp/Output
+@dirrmtry lib/qmmp/PlaylistFormats
+@dirrmtry lib/qmmp/Transports
+@dirrmtry lib/qmmp/Visual
 @dirrm lib/qmmp