4 files changed, 59 insertions, 85 deletions

diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index 08d74cd06b80..b1a01d62585a 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	libdbi-drivers
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+DISTVERSION=	0.8.2-1
 CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Drivers for libdbi
@@ -22,14 +20,12 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-static \
 		--with-dbi-incdir=${LOCALBASE}/include/dbi
 
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-
 OPTIONS=	MYSQL		"With MySQL Driver" 		on  \
 		MSQL		"With MSQL Driver" 		off \
 		PGSQL		"With PostgreSQL Driver"	on  \
 		SQLITE2		"With SQLite 2 Driver" 		off \
 		SQLITE3		"With SQLite 3 Driver" 		on  \
-		FIREBIRD	"With Firebird Driver" 		off \
+		FIREBIRD	"With Firebird Driver (BROKEN)"	off \
 		FREETDS		"With FreeTDS Driver"		off
 
 .include <bsd.port.pre.mk>
@@ -37,7 +33,7 @@ OPTIONS=	MYSQL		"With MySQL Driver" 		on  \
 .if defined(WITHOUT_MYSQL) && defined(WITHOUT_MSQL) && defined(WITHOUT_PGSQL) \
 	&& defined(WITHOUT_SQLITE2) && defined(WITHOUT_SQLITE3) \
 	&& defined(WITHOUT_FIREBIRD) && defined(WITHOUT_FREETDS)
-IGNORE=		You must choose at least one driver
+#IGNORE=		choose at least one driver
 .endif
 
 .if !defined(WITHOUT_MYSQL)
@@ -81,7 +77,7 @@ PLIST_SUB+=	SQLITE3="@comment "
 .endif
 
 .if defined(WITH_FIREBIRD)
-LIB_DEPENDS+=	gds.1:${PORTSDIR}/databases/firebird-client
+LIB_DEPENDS+=	gds.2:${PORTSDIR}/databases/firebird2-client
 CONFIGURE_ARGS+=	--with-firebird
 PLIST_SUB+=	FIREBIRD=""
 .else
diff --git a/databases/libdbi-drivers/distinfo b/databases/libdbi-drivers/distinfo
index bc8edcb26720..0db89ddabc0a 100644
--- a/databases/libdbi-drivers/distinfo
+++ b/databases/libdbi-drivers/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdbi-drivers-0.8.1.tar.gz) = bca4dd6184e3e78676c35eb9a7ae1186
-SHA256 (libdbi-drivers-0.8.1.tar.gz) = 1b45bb53693feccdcc7fe7d32d37474e3ae15e8013553cc7051faa101f445bcd
-SIZE (libdbi-drivers-0.8.1.tar.gz) = 1147446
+MD5 (libdbi-drivers-0.8.2-1.tar.gz) = d7535f03fafd321acf37dee96430599f
+SHA256 (libdbi-drivers-0.8.2-1.tar.gz) = 570553e5ec78683de1057bc61f0d860b966afb2dfb8f4e1982c1e53103e5d4ad
+SIZE (libdbi-drivers-0.8.2-1.tar.gz) = 930395
diff --git a/databases/libdbi-drivers/files/patch-drivers__freetds__Makefile.in b/databases/libdbi-drivers/files/patch-drivers__freetds__Makefile.in
deleted file mode 100644
index 2511c1057496..000000000000
--- a/databases/libdbi-drivers/files/patch-drivers__freetds__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- drivers/freetds/Makefile.in.orig	Sat Oct  1 23:09:48 2005
-+++ drivers/freetds/Makefile.in	Sat Oct  1 23:09:56 2005
-@@ -227,7 +227,7 @@
- # for each driver
- @HAVE_FREETDS_TRUE@docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
- @HAVE_FREETDS_FALSE@htmldir = 
--@HAVE_FREETDS_TRUE@htmldir = $(docdir)dbd_freetds
-+@HAVE_FREETDS_TRUE@htmldir = $(docdir)/dbd_freetds
- @HAVE_FREETDS_FALSE@freetds_ltlibs = 
- #doc_DATA = dbd_freetds.pdf
- #html_DATA =  dbd_freetds/* 
diff --git a/databases/libdbi-drivers/pkg-plist b/databases/libdbi-drivers/pkg-plist
index 5c9a12a84c6f..e0d02119c3ce 100644
--- a/databases/libdbi-drivers/pkg-plist
+++ b/databases/libdbi-drivers/pkg-plist
@@ -1,67 +1,56 @@
-%%MYSQL%%lib/dbd/libmysql.a
-%%MYSQL%%lib/dbd/libmysql.la
-%%MYSQL%%lib/dbd/libmysql.so
-%%PGSQL%%lib/dbd/libpgsql.a
-%%PGSQL%%lib/dbd/libpgsql.la
-%%PGSQL%%lib/dbd/libpgsql.so
-%%SQLITE2%%lib/dbd/libsqlite.a
-%%SQLITE2%%lib/dbd/libsqlite.la
-%%SQLITE2%%lib/dbd/libsqlite.so
-%%SQLITE3%%lib/dbd/libsqlite3.a
-%%SQLITE3%%lib/dbd/libsqlite3.la
-%%SQLITE3%%lib/dbd/libsqlite3.so
-%%FIREBIRD%%lib/dbd/libfirebird.a
-%%FIREBIRD%%lib/dbd/libfirebird.la
-%%FIREBIRD%%lib/dbd/libfirebird.so
-%%FREETDS%%lib/dbd/libfreetds.a
-%%FREETDS%%lib/dbd/libfreetds.la
-%%FREETDS%%lib/dbd/libfreetds.so
+%%MYSQL%%lib/dbd/libdbdmysql.a
+%%MYSQL%%lib/dbd/libdbdmysql.la
+%%MYSQL%%lib/dbd/libdbdmysql.so
+%%PGSQL%%lib/dbd/libdbdpgsql.a
+%%PGSQL%%lib/dbd/libdbdpgsql.la
+%%PGSQL%%lib/dbd/libdbdpgsql.so
+%%SQLITE2%%lib/dbd/libdbdsqlite.a
+%%SQLITE2%%lib/dbd/libdbdsqlite.la
+%%SQLITE2%%lib/dbd/libdbdsqlite.so
+%%SQLITE3%%lib/dbd/libdbdsqlite3.a
+%%SQLITE3%%lib/dbd/libdbdsqlite3.la
+%%SQLITE3%%lib/dbd/libdbdsqlite3.so
+%%FIREBIRD%%lib/dbd/libdbdfirebird.a
+%%FIREBIRD%%lib/dbd/libdbdfirebird.la
+%%FIREBIRD%%lib/dbd/libdbdfirebird.so
+%%FREETDS%%lib/dbd/libdbdfreetds.a
+%%FREETDS%%lib/dbd/libdbdfreetds.la
+%%FREETDS%%lib/dbd/libdbdfreetds.so
 @dirrmtry lib/dbd
+%%DOCSDIR%%/index.html
 %%MYSQL%%%%DOCSDIR%%/dbd_mysql.pdf
-%%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/x139.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x42.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x56.html
+%%MYSQL%%%%DOCSDIR%%/c136.html
+%%MYSQL%%%%DOCSDIR%%/c35.html
+%%MYSQL%%%%DOCSDIR%%/c39.html
+%%MYSQL%%%%DOCSDIR%%/c93.html
+%%MYSQL%%%%DOCSDIR%%/f24.html
+%%MYSQL%%%%DOCSDIR%%/x139.html
+%%MYSQL%%%%DOCSDIR%%/x42.html
+%%MYSQL%%%%DOCSDIR%%/x56.html
 %%PGSQL%%%%DOCSDIR%%/dbd_pgsql.pdf
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/copying-fdl.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
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/install.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/intro.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/options.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/specific.html
+%%PGSQL%%%%DOCSDIR%%/copying-fdl.html
+%%PGSQL%%%%DOCSDIR%%/f30.html
+%%PGSQL%%%%DOCSDIR%%/install-build.html
+%%PGSQL%%%%DOCSDIR%%/install-prereq.html
+%%PGSQL%%%%DOCSDIR%%/install.html
+%%PGSQL%%%%DOCSDIR%%/intro.html
+%%PGSQL%%%%DOCSDIR%%/options.html
+%%PGSQL%%%%DOCSDIR%%/specific.html
 %%SQLITE2%%%%DOCSDIR%%/dbd_sqlite.pdf
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c118.html
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c26.html
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c37.html
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c92.html
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/f15.html
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/index.html
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x121.html
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x197.html
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x40.html
-%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x54.html
+%%SQLITE2%%%%DOCSDIR%%/c118.html
+%%SQLITE2%%%%DOCSDIR%%/c26.html
+%%SQLITE2%%%%DOCSDIR%%/c37.html
+%%SQLITE2%%%%DOCSDIR%%/c92.html
+%%SQLITE2%%%%DOCSDIR%%/f15.html
+%%SQLITE2%%%%DOCSDIR%%/x121.html
+%%SQLITE2%%%%DOCSDIR%%/x197.html
+%%SQLITE2%%%%DOCSDIR%%/x40.html
+%%SQLITE2%%%%DOCSDIR%%/x54.html
 %%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3.pdf
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c120.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/x123.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x195.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x42.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x56.html
-%%MYSQL%%@dirrm %%DOCSDIR%%/dbd_mysql
-%%PGSQL%%@dirrm %%DOCSDIR%%/dbd_pgsql
-%%SQLITE2%%@dirrm %%DOCSDIR%%/dbd_sqlite
-%%SQLITE3%%@dirrm %%DOCSDIR%%/dbd_sqlite3
-%%FREETDS%%@dirrm %%DOCSDIR%%/dbd_freetds
-@dirrmtry %%DOCSDIR%%
+%%SQLITE3%%%%DOCSDIR%%/c120.html
+%%SQLITE3%%%%DOCSDIR%%/c26.html
+%%SQLITE3%%%%DOCSDIR%%/c94.html
+%%SQLITE3%%%%DOCSDIR%%/f15.html
+%%SQLITE3%%%%DOCSDIR%%/x123.html
+%%SQLITE3%%%%DOCSDIR%%/x195.html
+@dirrm %%DOCSDIR%%