1 files changed, 22 insertions, 27 deletions

diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 45c269b01f62..ab48451f65d1 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clementine
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-player
@@ -27,54 +27,50 @@ LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 PROJECTHOST=	${PORTNAME}${PKGNAMESUFFIX}
 
 USES=		compiler:c++11-lib cmake pkgconfig
-NO_STAGE=	yes
 USE_GL=		glew
 USE_QT4=	dbus gui xml qmake_build uic_build moc_build rcc_build \
 		linguist_build network sql opengl qtestlib corelib webkit
 INSTALLS_ICONS=	yes
 USE_GSTREAMER=	gio ogg mp3 flac soup vorbis
-MAKE_JOBS_UNSAFE=	yes
 CONFLICTS_BUILD=	qt-3.*
 
 CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \
-		-DENABLE_DBUS=ON -DENABLE_BOX=OFF \
-		-DENABLE_IMOBILEDEVICE=OFF -DENABLE_SPARKLE=OFF \
-		-DENABLE_SOUNDMENU=OFF -DENABLE_UBUNTU_ONE=OFF \
-		-DENABLE_DROPBOX=OFF -DENABLE_SKYDRIVE=OFF
+		-DENABLE_DBUS=ON -DENABLE_SPARKLE=OFF \
+		-DENABLE_SOUNDMENU=OFF -DENABLE_SPOTIFY_BLOB=OFF \
+		-DENABLE_UBUNTU_ONE=OFF -DENABLE_SKYDRIVE=OFF
 
-OPTIONS_DEFINE=		AUDIOCD BREAKPAD DEVICEKIT GIO GOOGLE_DRIVE GPOD \
-			LASTFM MTP SPOTIFY VISUALISATION WIIMOTEDEV \
-			USE_BUILTIN_TAGLIB MOODBAR
+OPTIONS_DEFINE=		AUDIOCD BREAKPAD DEVICEKIT DROPBOX BOX GIO GOOGLE_DRIVE \
+			GPOD LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR
 
 AUDIOCD_DESC=		Devices: Audio CD support
 BREAKPAD_DESC=		Crash reporting
+BOX_DESC=		Box Drive support
 DEVICEKIT_DESC=		Devices: DeviceKit backend
+DROPBOX_DESC=		Dropbox Support
 GIO_DESC=		Devices: GIO device backend
 GOOGLE_DRIVE_DESC=	Google Drive support
 GPOD_DESC=		iPod support
 LASTFM_DESC=		Support Last.fm service (requires ruby)
 MTP_DESC=		MTP device support
-SPOTIFY_DESC=		Support for Spotify service
 VISUALISATION_DESC=	Visualisations from projectM
 WIIMOTEDEV_DESC=	Wiimote support
 MOODBAR_DESC=		Moodbar Support
-USE_BUILTIN_TAGLIB=	Use Clementine builtin taglib support
 
-OPTIONS_DEFAULT=	AUDIOCD DEVICEKIT GIO LASTFM MTP SPOTIFY VISUALISATION \
-			WIIMOTEDEV MOODBAR
+OPTIONS_DEFAULT=	AUDIOCD BOX DEVICEKIT DROPBOX GIO GOOGLE_DRIVE GPOD \
+			LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMOODBAR}
-CMAKE_ARGS+=	-DENABLE_MOODBAR=ON
+.if ${PORT_OPTIONS:MDROPBOX}
+CMAKE_ARGS+=	-DENABLE_DROPBOX=ON
 .else
-CMAKE_ARGS+=	-DENABLE_MOODBAR=OFF
+CMAKE_ARGS+=	-DENABLE_DROPBOX=OFF
 .endif
 
-.if ${PORT_OPTIONS:MUSE_BUILTIN_TAGLIB}
-CMAKE_ARGS+=    -DENABLE_USE_BUILTIN_TAGLIB=ON
+.if ${PORT_OPTIONS:MMOODBAR}
+CMAKE_ARGS+=	-DENABLE_MOODBAR=ON
 .else
-CMAKE_ARGS+=	-DENABLE_USE_BUILTIN_TAGLIB=OFF
+CMAKE_ARGS+=	-DENABLE_MOODBAR=OFF
 .endif
 
 .if ${PORT_OPTIONS:MAUDIOCD}
@@ -84,6 +80,12 @@ LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
 CMAKE_ARGS+=	-DENABLE_AUDIOCD=OFF
 .endif
 
+.if ${PORT_OPTIONS:MBOX}
+CMAKE_ARGS+=	-DENABLE_BOX=ON
+.else
+CMAKE_ARGS+=	-DENABLE_BOX=OFF
+.endif
+
 .if ${PORT_OPTIONS:MBREAKPAD}
 CMAKE_ARGS+=	-DENABLE_BREAKPAD=ON
 .else
@@ -131,13 +133,6 @@ LIB_DEPENDS+=	libmtp.so:${PORTSDIR}/audio/libmtp
 CMAKE_ARGS+=	-DENABLE_LIBMTP=OFF
 .endif
 
-.if ${PORT_OPTIONS:MSPOTIFY}
-CMAKE_ARGS+=	-DENABLE_SPOTIFY=ON
-LIB_DEPENDS+=	libqca.so:${PORTSDIR}/devel/qca
-.else
-CMAKE_ARGS+=	-DENABLE_SPOTIFY=OFF -DENABLE_SPOTIFY_BLOB=OFF
-.endif
-
 .if ${PORT_OPTIONS:MVISUALISATION}
 CMAKE_ARGS+=	-DENABLE_VISUALISATIONS=ON
 .else