Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Dec 2016 18:41:28 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429814 - head/audio/cantata
Message-ID:  <201612281841.uBSIfSvt045113@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Dec 28 18:41:28 2016
New Revision: 429814
URL: https://svnweb.freebsd.org/changeset/ports/429814

Log:
  - Remove bogus (in presence of USE_GITHUB) USES=tar*
  - Switch to opt_CMAKE_BOOL
  
  Approved by:	portmgr blanket

Modified:
  head/audio/cantata/Makefile

Modified: head/audio/cantata/Makefile
==============================================================================
--- head/audio/cantata/Makefile	Wed Dec 28 18:25:45 2016	(r429813)
+++ head/audio/cantata/Makefile	Wed Dec 28 18:41:28 2016	(r429814)
@@ -21,7 +21,7 @@ USE_QT5=		buildtools_build concurrent co
 CMAKE_ARGS=		-DENABLE_QT5:BOOL=TRUE	\
 			-DENABLE_KDE:BOOL=FALSE
 
-USES=			cmake:outsource cpe pkgconfig shebangfix tar:bzip2
+USES=			cmake:outsource cpe pkgconfig shebangfix
 SHEBANG_FILES=		dynamic/cantata-dynamic cantata-remote.cmake
 CPE_VENDOR=		craig_drummond
 USE_LDCONFIG=		yes
@@ -49,32 +49,26 @@ VLC_DESC=		HTTP streams support via libV
 
 CDDB_IMPLIES=		CDPARANOIA
 CDDB_LIB_DEPENDS=	libcddb.so:audio/libcddb
-CDDB_CMAKE_ON=		-DENABLE_CDDB:BOOL=TRUE
-CDDB_CMAKE_OFF=		-DENABLE_CDDB:BOOL=FALSE
+CDDB_CMAKE_BOOL=	ENABLE_CDDB
 
 CDPARANOIA_IMPLIES=	TAGLIB
 CDPARANOIA_LIB_DEPENDS=	libcdda_interface.so:audio/cdparanoia
-CDPARANOIA_CMAKE_ON=	-DENABLE_CDPARANOIA:BOOL=TRUE
-CDPARANOIA_CMAKE_OFF=	-DENABLE_CDPARANOIA:BOOL=FALSE
+CDPARANOIA_CMAKE_BOOL=	ENABLE_CDPARANOIA
 
 FFMPEG_IMPLIES=		TAGLIB
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-FFMPEG_CMAKE_ON=	-DENABLE_FFMPEG:BOOL=TRUE
-FFMPEG_CMAKE_OFF=	-DENABLE_FFMPEG:BOOL=FALSE
+FFMPEG_CMAKE_BOOL=	ENABLE_FFMPEG
 
 MPG123_IMPLIES=		TAGLIB
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
-MPG123_CMAKE_ON=	-DENABLE_MPG123:BOOL=TRUE
-MPG123_CMAKE_OFF=	-DENABLE_MPG123:BOOL=FALSE
+MPG123_CMAKE_BOOL=	ENABLE_MPG123
 
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
-MTP_CMAKE_ON=		-DENABLE_MTP:BOOL=TRUE
-MTP_CMAKE_OFF=		-DENABLE_MTP:BOOL=FALSE
+MTP_CMAKE_BOOL=		ENABLE_MTP
 
 MUSICBRAINZ_IMPLIES=	CDPARANOIA
 MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5
-MUSICBRAINZ_CMAKE_ON=	-DENABLE_MUSICBRAINZ:BOOL=TRUE
-MUSICBRAINZ_CMAKE_OFF=	-DENABLE_MUSICBRAINZ:BOOL=FALSE
+MUSICBRAINZ_CMAKE_BOOL=	ENABLE_MUSICBRAINZ
 
 NLS_USE=		QT5=linguisttools_build
 NLS_CMAKE_ON=		-DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \
@@ -82,22 +76,17 @@ NLS_CMAKE_ON=		-DLCONVERT_EXECUTABLE:STR
 NLS_CMAKE_OFF=		-DLCONVERT_EXECUTABLE:BOOL=FALSE \
 			-DLRELEASE_EXECUTABLE:BOOL=FALSE
 
-PROXY_CMAKE_ON=		-DENABLE_PROXY_CONFIG:BOOL=TRUE
-PROXY_CMAKE_OFF=	-DENABLE_PROXY_CONFIG:BOOL=FALSE
+PROXY_CMAKE_BOOL=	ENABLE_PROXY_CONFIG
 
 QT5_USE=		QT5=multimedia
 
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib \
 			libtag-extras.so:audio/taglib-extras
 TAGLIB_USES=		localbase
-TAGLIB_CMAKE_ON=	-DENABLE_TAGLIB_EXTRAS:BOOL=TRUE \
-			-DENABLE_TAGLIB:BOOL=TRUE
-TAGLIB_CMAKE_OFF=	-DENABLE_TAGLIB_EXTRAS:BOOL=FALSE \
-			-DENABLE_TAGLIB:BOOL=FALSE
+TAGLIB_CMAKE_BOOL=	ENABLE_TAGLIB ENABLE_TAGLIB_EXTRAS
 
 VLC_LIB_DEPENDS=	libvlc.so:multimedia/vlc
-VLC_CMAKE_ON=		-DENABLE_LIBVLC:BOOL=TRUE
-VLC_CMAKE_OFF=		-DENABLE_LIBVLC:BOOL=FALSE
+VLC_CMAKE_BOOL=		ENABLE_LIBVLC
 
 .include <bsd.port.options.mk>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612281841.uBSIfSvt045113>