Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Jul 2016 11:28:46 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r418664 - head/databases/cppdb
Message-ID:  <201607171128.u6HBSkv4074811@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



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