svn commit: r415146 - in head/databases/adabase: . files

[John Marino]

Author: marino
Date: Fri May 13 19:55:27 2016
New Revision: 415146
URL: https://svnweb.freebsd.org/changeset/ports/415146

Log:
  database/adabase: Upgrade version 1.0 => 2.0 (SQLite Driver)
  
  This new release provides some minor fixes for MySQL driver and brings
  in the SQLite3 driver.  The now has options where MySQL and SQLite drivers
  are built by default, but either (but not both) can be disabled.  The
  adabase.gpr was changed to a template and moved into the codebase.
  Also, since the adabase library can't be linked without the database
  libraries, they've been added as library dependencies through the options
  framework.

Deleted:
  head/databases/adabase/files/
Modified:
  head/databases/adabase/Makefile
  head/databases/adabase/distinfo
  head/databases/adabase/pkg-plist

Modified: head/databases/adabase/Makefile
==============================================================================
--- head/databases/adabase/Makefile	Fri May 13 19:44:21 2016	(r415145)
+++ head/databases/adabase/Makefile	Fri May 13 19:55:27 2016	(r415146)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adabase
-PORTVERSION=	1.0
+PORTVERSION=	2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
@@ -19,6 +19,21 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	jrmarino
 GH_PROJECT=	AdaBase
 
+OPTIONS_MULTI=		DBASE
+OPTIONS_MULTI_DBASE=	MYSQL SQLITE
+OPTIONS_DEFAULT=	MYSQL SQLITE
+OPTIONS_SUB=		yes
+
+SQLITE_MAKE_ENV=	SQLITE=yes
+SQLITE_USES=		sqlite:3
+SQLITE_VARS=		DRVSQLITE=yes
+SQLITE_VARS_OFF=	DRVSQLITE=no
+
+MYSQL_MAKE_ENV=		MYSQL=yes
+MYSQL_USES=		mysql
+MYSQL_VARS=		DRVMYSQL=yes
+MYSQL_VARS_OFF=		DRVMYSQL=no
+
 MAKE_ENV+=	OS_VERSION=unix
 
 post-extract:
@@ -35,6 +50,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib/adabase
 	${INSTALL_DATA} ${WRKSRC}/src/*/*.ad[bs] ${WRKSRC}/src/adabase.ads \
 		${STAGEDIR}${PREFIX}/include/adabase
-	${INSTALL_DATA} ${FILESDIR}/adabase.gpr ${STAGEDIR}${PREFIX}/lib/gnat
+	${SED} -e "s|@PREFIX@|${PREFIX}|" \
+	       -e "s|@MYSQL@|${DRVMYSQL}|" \
+	       -e "s|@SQLITE@|${DRVSQLITE}|" ${WRKSRC}/adabase.gpr.in > \
+		${STAGEDIR}${PREFIX}/lib/gnat/adabase.gpr
 
 .include <bsd.port.mk>

Modified: head/databases/adabase/distinfo
==============================================================================
--- head/databases/adabase/distinfo	Fri May 13 19:44:21 2016	(r415145)
+++ head/databases/adabase/distinfo	Fri May 13 19:55:27 2016	(r415146)
@@ -1,2 +1,2 @@
-SHA256 (jrmarino-AdaBase-v1.0_GH0.tar.gz) = fb9bec4376a5df61670c543f8c49c5e1e335032ae46658f966f2b0277c89d338
-SIZE (jrmarino-AdaBase-v1.0_GH0.tar.gz) = 75278
+SHA256 (jrmarino-AdaBase-v2.0_GH0.tar.gz) = 15ee05548ad63bccdfec5b99b556f62a67ac4c99f3fdf41e8bc4d4c166386c3c
+SIZE (jrmarino-AdaBase-v2.0_GH0.tar.gz) = 94254

Modified: head/databases/adabase/pkg-plist
==============================================================================
--- head/databases/adabase/pkg-plist	Fri May 13 19:44:21 2016	(r415145)
+++ head/databases/adabase/pkg-plist	Fri May 13 19:55:27 2016	(r415146)
@@ -1,12 +1,17 @@
-include/adabase/adabase-bindings-mysql.ads
+%%MYSQL%%include/adabase/adabase-bindings-mysql.ads
+%%SQLITE%%include/adabase/adabase-bindings-sqlite.ads
 include/adabase/adabase-bindings.ads
-include/adabase/adabase-connection-base-mysql.adb
-include/adabase/adabase-connection-base-mysql.ads
+%%MYSQL%%include/adabase/adabase-connection-base-mysql.adb
+%%MYSQL%%include/adabase/adabase-connection-base-mysql.ads
+%%SQLITE%%include/adabase/adabase-connection-base-sqlite.adb
+%%SQLITE%%include/adabase/adabase-connection-base-sqlite.ads
 include/adabase/adabase-connection-base.adb
 include/adabase/adabase-connection-base.ads
 include/adabase/adabase-connection.ads
-include/adabase/adabase-driver-base-mysql.adb
-include/adabase/adabase-driver-base-mysql.ads
+%%MYSQL%%include/adabase/adabase-driver-base-mysql.adb
+%%MYSQL%%include/adabase/adabase-driver-base-mysql.ads
+%%SQLITE%%include/adabase/adabase-driver-base-sqlite.adb
+%%SQLITE%%include/adabase/adabase-driver-base-sqlite.ads
 include/adabase/adabase-driver-base.adb
 include/adabase/adabase-driver-base.ads
 include/adabase/adabase-driver.ads
@@ -33,20 +38,25 @@ include/adabase/adabase-results-generic_
 include/adabase/adabase-results-sets.adb
 include/adabase/adabase-results-sets.ads
 include/adabase/adabase-results.ads
-include/adabase/adabase-statement-base-mysql.adb
-include/adabase/adabase-statement-base-mysql.ads
+%%MYSQL%%include/adabase/adabase-statement-base-mysql.adb
+%%MYSQL%%include/adabase/adabase-statement-base-mysql.ads
+%%SQLITE%%include/adabase/adabase-statement-base-sqlite.adb
+%%SQLITE%%include/adabase/adabase-statement-base-sqlite.ads
 include/adabase/adabase-statement-base.adb
 include/adabase/adabase-statement-base.ads
 include/adabase/adabase-statement.ads
 include/adabase/adabase.ads
 include/adabase/commontext.adb
 include/adabase/commontext.ads
-lib/adabase/adabase-bindings-mysql.ali
+%%MYSQL%%lib/adabase/adabase-bindings-mysql.ali
+%%SQLITE%%lib/adabase/adabase-bindings-sqlite.ali
 lib/adabase/adabase-bindings.ali
-lib/adabase/adabase-connection-base-mysql.ali
+%%MYSQL%%lib/adabase/adabase-connection-base-mysql.ali
+%%SQLITE%%lib/adabase/adabase-connection-base-sqlite.ali
 lib/adabase/adabase-connection-base.ali
 lib/adabase/adabase-connection.ali
-lib/adabase/adabase-driver-base-mysql.ali
+%%MYSQL%%lib/adabase/adabase-driver-base-mysql.ali
+%%SQLITE%%lib/adabase/adabase-driver-base-sqlite.ali
 lib/adabase/adabase-driver-base.ali
 lib/adabase/adabase-driver.ali
 lib/adabase/adabase-interfaces-connection.ali
@@ -64,7 +74,8 @@ lib/adabase/adabase-results-field.ali
 lib/adabase/adabase-results-generic_converters.ali
 lib/adabase/adabase-results-sets.ali
 lib/adabase/adabase-results.ali
-lib/adabase/adabase-statement-base-mysql.ali
+%%MYSQL%%lib/adabase/adabase-statement-base-mysql.ali
+%%SQLITE%%lib/adabase/adabase-statement-base-sqlite.ali
 lib/adabase/adabase-statement-base.ali
 lib/adabase/adabase-statement.ali
 lib/adabase/adabase.ali