From owner-svn-ports-head@freebsd.org Sun Jul 17 11:28:48 2016 Return-Path: Delivered-To: svn-ports-head@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 0A52CB9CB6A; Sun, 17 Jul 2016 11:28:48 +0000 (UTC) (envelope-from riggs@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 B438A17A2; Sun, 17 Jul 2016 11:28:47 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6HBSkhg074812; Sun, 17 Jul 2016 11:28:46 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6HBSkv4074811; Sun, 17 Jul 2016 11:28:46 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201607171128.u6HBSkv4074811@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 17 Jul 2016 11:28:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418664 - head/databases/cppdb 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.22 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: Sun, 17 Jul 2016 11:28:48 -0000 Author: riggs Date: Sun Jul 17 11:28:46 2016 New Revision: 418664 URL: https://svnweb.freebsd.org/changeset/ports/418664 Log: Fix plist for non-default OPTIONs While on it: USE_MYSQL -> USES=mysql PR: 211165 Submitted by: info@babaei.net (maintainer) Reported by: riggs Modified: head/databases/cppdb/Makefile Modified: head/databases/cppdb/Makefile ============================================================================== --- head/databases/cppdb/Makefile Sun Jul 17 10:01:30 2016 (r418663) +++ head/databases/cppdb/Makefile Sun Jul 17 11:28:46 2016 (r418664) @@ -49,15 +49,16 @@ USES= cmake:outsource ninja tar:bzip2 CMAKE_ARGS+= -DDISABLE_MYSQL:BOOL=ON PLIST_SUB+= MYSQL="@comment " .else -USE_MYSQL= yes +USES+= mysql CMAKE_ARGS+= -DDISABLE_MYSQL:BOOL=OFF .if ${PORT_OPTIONS:MMYSQL_INTERNAL} CMAKE_ARGS+= -DMYSQL_BACKEND_INTERNAL:BOOL=ON +PLIST_SUB+= MYSQL="@comment " .elif ${PORT_OPTIONS:MMYSQL_MODULE} CMAKE_ARGS+= -DMYSQL_BACKEND_INTERNAL:BOOL=OFF -.endif PLIST_SUB+= MYSQL="" .endif +.endif .if ${PORT_OPTIONS:MODBC_DISABLE} CMAKE_ARGS+= -DDISABLE_ODBC:BOOL=ON @@ -67,11 +68,12 @@ LIB_DEPENDS+= libodbc.so:databases/unixO CMAKE_ARGS+= -DDISABLE_ODBC:BOOL=OFF .if ${PORT_OPTIONS:MODBC_INTERNAL} CMAKE_ARGS+= -DODBC_BACKEND_INTERNAL:BOOL=ON +PLIST_SUB+= ODBC="@comment " .elif ${PORT_OPTIONS:MODBC_MODULE} CMAKE_ARGS+= -DODBC_BACKEND_INTERNAL:BOOL=OFF -.endif PLIST_SUB+= ODBC="" .endif +.endif .if ${PORT_OPTIONS:MPGSQL_DISABLE} CMAKE_ARGS+= -DDISABLE_PQ:BOOL=ON @@ -81,11 +83,12 @@ USES+= pgsql CMAKE_ARGS+= -DDISABLE_PQ:BOOL=OFF .if ${PORT_OPTIONS:MPGSQL_INTERNAL} CMAKE_ARGS+= -DPQ_BACKEND_INTERNAL:BOOL=ON +PLIST_SUB+= PGSQL="@comment " .elif ${PORT_OPTIONS:MPGSQL_MODULE} CMAKE_ARGS+= -DPQ_BACKEND_INTERNAL:BOOL=OFF -.endif PLIST_SUB+= PGSQL="" .endif +.endif .if ${PORT_OPTIONS:MSQLITE3_DISABLE} CMAKE_ARGS+= -DDISABLE_SQLITE:BOOL=ON @@ -95,10 +98,11 @@ USES+= sqlite:3 CMAKE_ARGS+= -DDISABLE_SQLITE:BOOL=OFF .if ${PORT_OPTIONS:MSQLITE3_INTERNAL} CMAKE_ARGS+= -DSQLITE_BACKEND_INTERNAL:BOOL=ON +PLIST_SUB+= SQLITE3="@comment " .elif ${PORT_OPTIONS:MSQLITE3_MODULE} CMAKE_ARGS+= -DSQLITE_BACKEND_INTERNAL:BOOL=OFF -.endif PLIST_SUB+= SQLITE3="" .endif +.endif .include