Index: head/databases/adabase/files/adabase.gpr
===================================================================
--- head/databases/adabase/files/adabase.gpr	(revision 415145)
+++ head/databases/adabase/files/adabase.gpr	(nonexistent)
@@ -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;

Property changes on: head/databases/adabase/files/adabase.gpr
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/databases/adabase/Makefile
===================================================================
--- head/databases/adabase/Makefile	(revision 415145)
+++ head/databases/adabase/Makefile	(revision 415146)
@@ -1,40 +1,58 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	adabase
-PORTVERSION=	1.0
+PORTVERSION=	2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Thick database bindings for Ada
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada
 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:
 	${RM} ${WRKSRC}/src/drivers/adabase-driver-base-firebird.ad?
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		gprbuild -p -P adabase ${BUILD_ARGS})
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/adabase \
 		${STAGEDIR}${PREFIX}/lib/adabase \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${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>
Index: head/databases/adabase/distinfo
===================================================================
--- head/databases/adabase/distinfo	(revision 415145)
+++ head/databases/adabase/distinfo	(revision 415146)
@@ -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
Index: head/databases/adabase/pkg-plist
===================================================================
--- head/databases/adabase/pkg-plist	(revision 415145)
+++ head/databases/adabase/pkg-plist	(revision 415146)
@@ -1,73 +1,84 @@
-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
 include/adabase/adabase-interfaces-connection.ads
 include/adabase/adabase-interfaces-driver.ads
 include/adabase/adabase-interfaces-logger.ads
 include/adabase/adabase-interfaces-statement.ads
 include/adabase/adabase-interfaces.ads
 include/adabase/adabase-logger-base-file.adb
 include/adabase/adabase-logger-base-file.ads
 include/adabase/adabase-logger-base-screen.adb
 include/adabase/adabase-logger-base-screen.ads
 include/adabase/adabase-logger-base.adb
 include/adabase/adabase-logger-base.ads
 include/adabase/adabase-logger-facility.adb
 include/adabase/adabase-logger-facility.ads
 include/adabase/adabase-logger.ads
 include/adabase/adabase-results-converters.adb
 include/adabase/adabase-results-converters.ads
 include/adabase/adabase-results-field.adb
 include/adabase/adabase-results-field.ads
 include/adabase/adabase-results-generic_converters.adb
 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
 lib/adabase/adabase-interfaces-driver.ali
 lib/adabase/adabase-interfaces-logger.ali
 lib/adabase/adabase-interfaces-statement.ali
 lib/adabase/adabase-interfaces.ali
 lib/adabase/adabase-logger-base-file.ali
 lib/adabase/adabase-logger-base-screen.ali
 lib/adabase/adabase-logger-base.ali
 lib/adabase/adabase-logger-facility.ali
 lib/adabase/adabase-logger.ali
 lib/adabase/adabase-results-converters.ali
 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
 lib/adabase/commontext.ali
 lib/adabase/libadabase.a
 lib/gnat/adabase.gpr