databases/adabase: Upgrade version 2.0 => 3.0

This release brings the promised PostgreSQL driver, along with several
fixes to the MySQL and SQLite drivers.  The API was changed based on
feedback from comp.lang.ada but chances nobody is really impacted yet
(meaning this is the time for breaking changes).

4 files changed, 35 insertions, 11 deletions

diff --git a/databases/adabase/Makefile b/databases/adabase/Makefile
index f36d2d3b1790..5d5899d8bfa4 100644
--- a/databases/adabase/Makefile
+++ b/databases/adabase/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adabase
-PORTVERSION=	2.0
+PORTVERSION=	3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
@@ -19,11 +19,14 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	jrmarino
 GH_PROJECT=	AdaBase
 
+OPTIONS_DEFINE=		DEBUG
 OPTIONS_MULTI=		DBASE
-OPTIONS_MULTI_DBASE=	MYSQL SQLITE
-OPTIONS_DEFAULT=	MYSQL SQLITE
+OPTIONS_MULTI_DBASE=	MYSQL SQLITE PGSQL
+OPTIONS_DEFAULT=	MYSQL SQLITE PGSQL
 OPTIONS_SUB=		yes
 
+DBASE_DESC=		Databases Supported
+
 SQLITE_MAKE_ENV=	SQLITE=yes
 SQLITE_USES=		sqlite:3
 SQLITE_VARS=		DRVSQLITE=yes
@@ -34,10 +37,19 @@ MYSQL_USES=		mysql
 MYSQL_VARS=		DRVMYSQL=yes
 MYSQL_VARS_OFF=		DRVMYSQL=no
 
+PGSQL_MAKE_ENV=		POSTGRESQL=yes
+PGSQL_USES=		pgsql
+PGSQL_VARS=		DRVPGSQL=yes
+PGSQL_VARS_OFF=		DRVPGSQL=no
+
+DEBUG_MAKE_ENV=		DEBUGSYM=yes
+
 MAKE_ENV+=	OS_VERSION=unix
 
-post-extract:
+post-patch:
 	${RM} ${WRKSRC}/src/drivers/adabase-driver-base-firebird.ad?
+	${REINPLACE_CMD} -e '/Driver_MySQL/ s/yes/no/' \
+		${WRKSRC}/adabase.gpr
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
@@ -52,6 +64,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/include/adabase
 	${SED} -e "s|@PREFIX@|${PREFIX}|" \
 	       -e "s|@MYSQL@|${DRVMYSQL}|" \
+	       -e "s|@PGSQL@|${DRVPGSQL}|" \
 	       -e "s|@SQLITE@|${DRVSQLITE}|" ${WRKSRC}/adabase.gpr.in > \
 		${STAGEDIR}${PREFIX}/lib/gnat/adabase.gpr
 
diff --git a/databases/adabase/distinfo b/databases/adabase/distinfo
index cbfcf3d985ec..5e219997c0c7 100644
--- a/databases/adabase/distinfo
+++ b/databases/adabase/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jrmarino-AdaBase-v2.0_GH0.tar.gz) = 15ee05548ad63bccdfec5b99b556f62a67ac4c99f3fdf41e8bc4d4c166386c3c
-SIZE (jrmarino-AdaBase-v2.0_GH0.tar.gz) = 94254
+SHA256 (jrmarino-AdaBase-v3.0_GH0.tar.gz) = 65b2b81b1b083951771ff6f8c4efa6dadb84ecdc7147659dffb10527803b54c5
+SIZE (jrmarino-AdaBase-v3.0_GH0.tar.gz) = 132468
diff --git a/databases/adabase/pkg-descr b/databases/adabase/pkg-descr
index 7a11227002c4..6a7bb5a37a04 100644
--- a/databases/adabase/pkg-descr
+++ b/databases/adabase/pkg-descr
@@ -1,10 +1,10 @@
 Thick database bindings for MySQL, PostgreSQL and SQLite written in Ada.
 
-This is the second release of AdaBase, an abstraction library that provides
-a consistent interface to multiple database servers.  Currently only two
-drivers are provided, MySQL and SQLite, but the PostgreSQL driver is
-planned for the near term.  It's extensible, so support for other
-databases such as Firebird, Oracle and MSSQL would be easily possible.
+This is the third release of AdaBase, an abstraction library that provides
+a consistent interface to multiple database servers.  Currently three
+drivers are provided, MySQL, PostgreSQL and SQLite.  It's extensible, so
+support for other databases such as Firebird, Oracle and MSSQL would be
+easily possible.
 
 AdaBase offers unique features over similar frameworks.  For starters,
 it's limited to database support rather than including many other unwanted
diff --git a/databases/adabase/pkg-plist b/databases/adabase/pkg-plist
index 87ee4ab6205b..222e66b32a74 100644
--- a/databases/adabase/pkg-plist
+++ b/databases/adabase/pkg-plist
@@ -1,8 +1,11 @@
 %%MYSQL%%include/adabase/adabase-bindings-mysql.ads
+%%PGSQL%%include/adabase/adabase-bindings-postgresql.ads
 %%SQLITE%%include/adabase/adabase-bindings-sqlite.ads
 include/adabase/adabase-bindings.ads
 %%MYSQL%%include/adabase/adabase-connection-base-mysql.adb
 %%MYSQL%%include/adabase/adabase-connection-base-mysql.ads
+%%PGSQL%%include/adabase/adabase-connection-base-postgresql.adb
+%%PGSQL%%include/adabase/adabase-connection-base-postgresql.ads
 %%SQLITE%%include/adabase/adabase-connection-base-sqlite.adb
 %%SQLITE%%include/adabase/adabase-connection-base-sqlite.ads
 include/adabase/adabase-connection-base.adb
@@ -10,6 +13,8 @@ include/adabase/adabase-connection-base.ads
 include/adabase/adabase-connection.ads
 %%MYSQL%%include/adabase/adabase-driver-base-mysql.adb
 %%MYSQL%%include/adabase/adabase-driver-base-mysql.ads
+%%PGSQL%%include/adabase/adabase-driver-base-postgresql.adb
+%%PGSQL%%include/adabase/adabase-driver-base-postgresql.ads
 %%SQLITE%%include/adabase/adabase-driver-base-sqlite.adb
 %%SQLITE%%include/adabase/adabase-driver-base-sqlite.ads
 include/adabase/adabase-driver-base.adb
@@ -40,6 +45,8 @@ include/adabase/adabase-results-sets.ads
 include/adabase/adabase-results.ads
 %%MYSQL%%include/adabase/adabase-statement-base-mysql.adb
 %%MYSQL%%include/adabase/adabase-statement-base-mysql.ads
+%%PGSQL%%include/adabase/adabase-statement-base-postgresql.adb
+%%PGSQL%%include/adabase/adabase-statement-base-postgresql.ads
 %%SQLITE%%include/adabase/adabase-statement-base-sqlite.adb
 %%SQLITE%%include/adabase/adabase-statement-base-sqlite.ads
 include/adabase/adabase-statement-base.adb
@@ -49,13 +56,16 @@ include/adabase/adabase.ads
 include/adabase/commontext.adb
 include/adabase/commontext.ads
 %%MYSQL%%lib/adabase/adabase-bindings-mysql.ali
+%%PGSQL%%lib/adabase/adabase-bindings-postgresql.ali
 %%SQLITE%%lib/adabase/adabase-bindings-sqlite.ali
 lib/adabase/adabase-bindings.ali
 %%MYSQL%%lib/adabase/adabase-connection-base-mysql.ali
+%%PGSQL%%lib/adabase/adabase-connection-base-postgresql.ali
 %%SQLITE%%lib/adabase/adabase-connection-base-sqlite.ali
 lib/adabase/adabase-connection-base.ali
 lib/adabase/adabase-connection.ali
 %%MYSQL%%lib/adabase/adabase-driver-base-mysql.ali
+%%PGSQL%%lib/adabase/adabase-driver-base-postgresql.ali
 %%SQLITE%%lib/adabase/adabase-driver-base-sqlite.ali
 lib/adabase/adabase-driver-base.ali
 lib/adabase/adabase-driver.ali
@@ -75,6 +85,7 @@ lib/adabase/adabase-results-generic_converters.ali
 lib/adabase/adabase-results-sets.ali
 lib/adabase/adabase-results.ali
 %%MYSQL%%lib/adabase/adabase-statement-base-mysql.ali
+%%PGSQL%%lib/adabase/adabase-statement-base-postgresql.ali
 %%SQLITE%%lib/adabase/adabase-statement-base-sqlite.ali
 lib/adabase/adabase-statement-base.ali
 lib/adabase/adabase-statement.ali