1 files changed, 10 insertions, 21 deletions

diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index dc97235f6205..63ef3861742f 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clementine
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-player
@@ -15,19 +15,19 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 		tag:${PORTSDIR}/audio/taglib \
-		notify:${PORTSDIR}/devel/libnotify \
+		chromaprint:${PORTSDIR}/audio/chromaprint \
 		protobuf-lite:${PORTSDIR}/devel/protobuf \
-		xine:${PORTSDIR}/multimedia/libxine \
 		qjson:${PORTSDIR}/devel/qjson \
 		fftw3:${PORTSDIR}/math/fftw3
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 
+# avoid clash with x11-wm/clementine
+LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 PROJECTHOST=	${PORTNAME}${PKGNAMESUFFIX}
 
 USE_CMAKE=	yes
-USE_ICONV=	yes
 USE_GL=		glew
-USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4=	dbus gui xml qmake_build uic_build moc_build rcc_build \
 		linguist_build network sql opengl qtestlib corelib webkit
 USE_GCC=	4.2+
 INSTALLS_ICONS=	yes
@@ -36,12 +36,11 @@ MAKE_JOBS_UNSAFE=	yes
 
 CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib"
 
-OPTIONS_DEFINE=		AUDIOCD BREAKPAD DBUS DEVICEKIT GIO GOOGLE_DRIVE GPOD \
+OPTIONS_DEFINE=		AUDIOCD BREAKPAD DEVICEKIT GIO GOOGLE_DRIVE GPOD \
 			IMOBILEDEVICE LASTFM MTP SPOTIFY VISUALISATION WIIMOTEDEV
 
 AUDIOCD_DESC=		Devices: Audio CD support
 BREAKPAD_DESC=		Crash reporting
-DBUS_DESC=		D-Bus support
 DEVICEKIT_DESC=		Devices: DeviceKit backend
 GIO_DESC=		Devices: GIO device backend
 GOOGLE_DRIVE_DESC=	Google Drive support
@@ -49,11 +48,11 @@ GPOD_DESC=		iPod support
 IMOBILEDEVICE_DESC=	Devices: iPod Touch, iPhone, iPad support
 LASTFM_DESC=		Support Last.fm service (requires ruby)
 MTP_DESC=		MTP device support
-SPOTIFY_DESC=		Spotify support: core code
+SPOTIFY_DESC=		Support for Spotify service
 VISUALISATION_DESC=	Visualisations from projectM
 WIIMOTEDEV_DESC=	Wiimote support
 
-OPTIONS_DEFAULT=	AUDIOCD DBUS DEVICEKIT GIO GOOGLE_DRIVE LASTFM MTP SPOTIFY \
+OPTIONS_DEFAULT=	AUDIOCD DEVICEKIT GIO GOOGLE_DRIVE LASTFM MTP SPOTIFY \
 			VISUALISATION WIIMOTEDEV
 
 .include <bsd.port.options.mk>
@@ -71,16 +70,8 @@ CMAKE_ARGS+=	-DENABLE_BREAKPAD=ON
 CMAKE_ARGS+=	-DENABLE_BREAKPAD=OFF
 .endif
 
-.if ${PORT_OPTIONS:MDBUS}
-CMAKE_ARGS+=	-DENABLE_DBUS=ON
-USE_QT4+=	dbus
-.else
-CMAKE_ARGS+=	-DENABLE_DBUS=OFF
-.endif
-
 .if ${PORT_OPTIONS:MDEVICEKIT}
 CMAKE_ARGS+=	-DENABLE_DEVICEKIT=ON
-USE_QT4+=	dbus
 .else
 CMAKE_ARGS+=	-DENABLE_DEVICEKIT=OFF
 .endif
@@ -94,7 +85,7 @@ CMAKE_ARGS+=	-DENABLE_GIO=OFF
 
 .if ${PORT_OPTIONS:MGOOGLE_DRIVE}
 CMAKE_ARGS+=	-DENABLE_GOOGLE_DRIVE=ON
-BUILD_DEPENDS+=	${LOCALBASE}/include/google/sparsehash/sparseconfig.h:${PORTSDIR}/devel/google-sparsehash
+BUILD_DEPENDS+=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
 .else
 CMAKE_ARGS+=	-DENABLE_GOOGLE_DRIVE=OFF
 .endif
@@ -131,21 +122,19 @@ CMAKE_ARGS+=	-DENABLE_LIBMTP=OFF
 
 .if ${PORT_OPTIONS:MSPOTIFY}
 CMAKE_ARGS+=	-DENABLE_SPOTIFY=ON
+LIB_DEPENDS+=	qca:${PORTSDIR}/devel/qca
 .else
 CMAKE_ARGS+=	-DENABLE_SPOTIFY=OFF
 .endif
 
 .if ${PORT_OPTIONS:MVISUALISATION}
 CMAKE_ARGS+=	-DENABLE_VISUALISATIONS=ON
-PLIST_SUB+=	VSL=""
 .else
 CMAKE_ARGS+=	-DENABLE_VISUALISATIONS=OFF
-PLIST_SUB+=	VSL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWIIMOTEDEV}
 CMAKE_ARGS+=	-DENABLE_WIIMOTEDEV=ON
-USE_QT4+=	dbus
 .else
 CMAKE_ARGS+=	-DENABLE_WIIMOTEDEV=OFF
 .endif