From owner-svn-ports-all@freebsd.org Sat Dec 16 15:01:08 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71674E84FDF; Sat, 16 Dec 2017 15:01:08 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 35024675FB; Sat, 16 Dec 2017 15:01:08 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBGF17gB037135; Sat, 16 Dec 2017 15:01:07 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBGF17AY037134; Sat, 16 Dec 2017 15:01:07 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201712161501.vBGF17AY037134@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sat, 16 Dec 2017 15:01:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456472 - head/audio/murmur X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: head/audio/murmur X-SVN-Commit-Revision: 456472 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Dec 2017 15:01:08 -0000 Author: feld Date: Sat Dec 16 15:01:07 2017 New Revision: 456472 URL: https://svnweb.freebsd.org/changeset/ports/456472 Log: audio/murmur: Provode separate options for MYSQL and SQLITE PR: 220476 Modified: head/audio/murmur/Makefile Modified: head/audio/murmur/Makefile ============================================================================== --- head/audio/murmur/Makefile Sat Dec 16 14:25:05 2017 (r456471) +++ head/audio/murmur/Makefile Sat Dec 16 15:01:07 2017 (r456472) @@ -3,7 +3,7 @@ PORTNAME= murmur PORTVERSION= 1.2.19 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio net MAINTAINER= feld@FreeBSD.org @@ -18,7 +18,7 @@ LIB_DEPENDS= libprotobuf.so:devel/protobuf USERS= murmur GROUPS= murmur USES= compiler:c++11-lang qmake pkgconfig ssl -USE_QT4= moc_build corelib network xml sql sql-sqlite3_run +USE_QT4= moc_build corelib network sql xml USE_GITHUB= YES GH_ACCOUNT= mumble-voip @@ -30,8 +30,10 @@ QMAKE_ARGS= "CONFIG+=${CONFIG}" USE_RC_SUBR= murmur SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}" -OPTIONS_DEFINE= ICE DBUS BONJOUR DOCS -OPTIONS_DEFAULT= BONJOUR +OPTIONS_DEFINE= BONJOUR DBUS DOCS ICE +OPTIONS_DEFAULT= BONJOUR DOCS MYSQL SQLITE +OPTIONS_MULTI= SQL +OPTIONS_MULTI_SQL= MYSQL SQLITE ICE_DESC= Ice Support BONJOUR_DESC= Bonjour Support @@ -53,6 +55,18 @@ CONFIG+= no-dbus LIB_DEPENDS+= libdns_sd.so:net/mDNSResponder .else CONFIG+= no-bonjour +.endif + +.if ${PORT_OPTIONS:MMYSQL} +USE_QT4+= sql-mysql +.else +CONFIG+= no-sql-mysql +.endif + +.if ${PORT_OPTIONS:MSQLITE} +USE_QT4+= sql-sqlite3_run +.else +CONFIG+= no-sqlite3_run .endif .include