From owner-svn-ports-head@FreeBSD.ORG Mon Feb 11 12:41:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9C3AD543; Mon, 11 Feb 2013 12:41:32 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 88D4E64B; Mon, 11 Feb 2013 12:41:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCfW1Q093514; Mon, 11 Feb 2013 12:41:32 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCfWkd093513; Mon, 11 Feb 2013 12:41:32 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201302111241.r1BCfWkd093513@svn.freebsd.org> From: Max Brazhnikov Date: Mon, 11 Feb 2013 12:41:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312057 - head/audio/clementine-player X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2013 12:41:32 -0000 Author: makc Date: Mon Feb 11 12:41:31 2013 New Revision: 312057 URL: http://svnweb.freebsd.org/changeset/ports/312057 Log: - Add missing/remove useless dependencies - Remove DBUS option - Set LATEST_LINK Approved by: maintainer via irc Modified: head/audio/clementine-player/Makefile Modified: head/audio/clementine-player/Makefile ============================================================================== --- head/audio/clementine-player/Makefile Mon Feb 11 12:18:03 2013 (r312056) +++ head/audio/clementine-player/Makefile Mon Feb 11 12:41:31 2013 (r312057) @@ -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 @@ -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