3 files changed, 72 insertions, 40 deletions

diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index b0820d7463c7..1cc251b92e1c 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libdbi-drivers
-PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTVERSION=	0.8.0
 CATEGORIES=	databases devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,14 +24,17 @@ CONFIGURE_ARGS=	--disable-static \
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
-OPTIONS=	MYSQL	"With MySQL Driver" on \
-		MSQL	"With MSQL Driver" off \
-		PGSQL	"With PostgreSQL Driver" on \
-		SQLITE	"With SQLite Driver" on
+OPTIONS=	MYSQL		"With MySQL Driver" 		on \
+		MSQL		"With MSQL Driver" 		off \
+		PGSQL		"With PostgreSQL Driver"	on \
+		SQLITE3		"With SQLite 3 Driver" 		on \
+		SQLITE2		"With SQLite 2 Driver" 		off \
+		FIREBIRD	"With Firebird Driver" 		off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_MYSQL) && defined(WITHOUT_PGSQL) && defined(WITHOUT_SQLITE) && defined(WITHOUT_MSQL)
+.if defined(WITHOUT_MYSQL) && defined(WITHOUT_MSQL) && defined(WITHOUT_PGSQL) \
+	&& defined(WITHOUT_SQLITE2) && defined(WITHOUT_SQLITE3) && defined(WITHOUT_FIREBIRD)
 IGNORE=		You must choose at least one driver
 .endif
 
@@ -44,6 +46,14 @@ PLIST_SUB+=	MYSQL=""
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
+.if defined(WITH_MSQL)
+LIB_DEPENDS+=	msql.1:${PORTSDIR}/databases/msql
+CONFIGURE_ARGS+=	--with-msql
+PLIST_SUB+=	MSQL=""
+.else
+PLIST_SUB+=	MSQL="@comment "
+.endif
+
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-pgsql
@@ -52,23 +62,31 @@ PLIST_SUB+=	PGSQL=""
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if defined(WITH_SQLITE2)
 LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
 CONFIGURE_ARGS+=	--with-sqlite
-PLIST_SUB+=	SQLITE=""
+PLIST_SUB+=	SQLITE2=""
 .else
-PLIST_SUB+=	SQLITE="@comment "
+PLIST_SUB+=	SQLITE2="@comment "
 .endif
 
-.if defined(WITH_MSQL)
-LIB_DEPENDS+=	msql.1:${PORTSDIR}/databases/msql
-CONFIGURE_ARGS+=	--with-msql
-PLIST_SUB+=	MSQL=""
+.if defined(WITH_SQLITE3)
+LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=	--with-sqlite3
+PLIST_SUB+=	SQLITE3=""
 .else
-PLIST_SUB+=	MSQL="@comment "
+PLIST_SUB+=	SQLITE3="@comment "
+.endif
+
+.if defined(WITH_FIREBIRD)
+LIB_DEPENDS+=	gds.1:${PORTSDIR}/databases/firebird-client
+CONFIGURE_ARGS+=	--with-firebird
+PLIST_SUB+=	FIREBIRD=""
+.else
+PLIST_SUB+=	FIREBIRD="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O20|$$CFLAGS|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-O20|${CFLAGS}|g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/databases/libdbi-drivers/distinfo b/databases/libdbi-drivers/distinfo
index 351c6bf7c5e5..3b29c09b5f75 100644
--- a/databases/libdbi-drivers/distinfo
+++ b/databases/libdbi-drivers/distinfo
@@ -1,2 +1,2 @@
-MD5 (libdbi-drivers-0.7.1.tar.gz) = f11020119ceb7a6dee3969cb0589d4bc
-SIZE (libdbi-drivers-0.7.1.tar.gz) = 488642
+MD5 (libdbi-drivers-0.8.0.tar.gz) = cac2d09b90d2c58b01425d5e855f5499
+SIZE (libdbi-drivers-0.8.0.tar.gz) = 1115598
diff --git a/databases/libdbi-drivers/pkg-plist b/databases/libdbi-drivers/pkg-plist
index 23f86ce003ee..826fe979d6b1 100644
--- a/databases/libdbi-drivers/pkg-plist
+++ b/databases/libdbi-drivers/pkg-plist
@@ -1,20 +1,22 @@
 %%MYSQL%%lib/dbd/libmysql.so
 %%PGSQL%%lib/dbd/libpgsql.so
-%%SQLITE%%lib/dbd/libsqlite.so
+%%SQLITE2%%lib/dbd/libsqlite.so
+%%SQLITE3%%lib/dbd/libsqlite3.so
+%%FIREBIRD%%lib/dbd/libfirebird.so
 @unexec rmdir %D/lib/dbd 2>/dev/null || true
 %%MYSQL%%%%DOCSDIR%%/dbd_mysql.pdf
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c128.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c32.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c36.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c90.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/f21.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c136.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c35.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c39.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c93.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/f24.html
 %%MYSQL%%%%DOCSDIR%%/dbd_mysql/index.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x131.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x39.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x53.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x139.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x42.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x56.html
 %%PGSQL%%%%DOCSDIR%%/dbd_pgsql.pdf
 %%PGSQL%%%%DOCSDIR%%/dbd_pgsql/copying-fdl.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/f27.html
+%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/f30.html
 %%PGSQL%%%%DOCSDIR%%/dbd_pgsql/index.html
 %%PGSQL%%%%DOCSDIR%%/dbd_pgsql/install-build.html
 %%PGSQL%%%%DOCSDIR%%/dbd_pgsql/install-prereq.html
@@ -22,18 +24,30 @@
 %%PGSQL%%%%DOCSDIR%%/dbd_pgsql/intro.html
 %%PGSQL%%%%DOCSDIR%%/dbd_pgsql/options.html
 %%PGSQL%%%%DOCSDIR%%/dbd_pgsql/specific.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite.pdf
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/c119.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/c32.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/c43.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/c98.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/f21.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/index.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/x122.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/x198.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/x46.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/x60.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite.pdf
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c101.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c122.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c35.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c46.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/f24.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x125.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x201.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x49.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x63.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/index.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3.pdf
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c115.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c26.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c39.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c94.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f15.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/index.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x118.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x190.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x42.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x56.html
 %%MYSQL%%@dirrm %%DOCSDIR%%/dbd_mysql
 %%PGSQL%%@dirrm %%DOCSDIR%%/dbd_pgsql
-%%SQLITE%%@dirrm %%DOCSDIR%%/dbd_sqlite
+%%SQLITE2%%@dirrm %%DOCSDIR%%/dbd_sqlite
+%%SQLITE3%%@dirrm %%DOCSDIR%%/dbd_sqlite3
 @unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true