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.

4 files changed, 44 insertions, 22 deletions

diff --git a/databases/adabase/Makefile b/databases/adabase/Makefile
index 464b46a62aa..f36d2d3b179 100644
--- a/databases/adabase/Makefile
+++ b/databases/adabase/Makefile
@@ -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>
diff --git a/databases/adabase/distinfo b/databases/adabase/distinfo
index e450ba378f2..cbfcf3d985e 100644
--- a/databases/adabase/distinfo
+++ b/databases/adabase/distinfo
@@ -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
diff --git a/databases/adabase/files/adabase.gpr b/databases/adabase/files/adabase.gpr
deleted file mode 100644
index a59f794ed57..00000000000
--- a/databases/adabase/files/adabase.gpr
+++ /dev/null
@@ -1,7 +0,0 @@
-library project AdaBase is
-   for Library_Name     use "adabase";
-   for Library_Kind     use "static";
-   for Source_Dirs      use ("../../include/adabase");
-   for Library_Dir      use "../../lib/adabase";
-   for Externally_Built use "true";
-end AdaBase;
diff --git a/databases/adabase/pkg-plist b/databases/adabase/pkg-plist
index 8f6cdb63079..87ee4ab6205 100644
--- a/databases/adabase/pkg-plist
+++ b/databases/adabase/pkg-plist
@@ -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_converters.ads
 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