3 files changed, 113 insertions, 37 deletions

diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index b1a01d62585a..255ec4616f87 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdbi-drivers
-DISTVERSION=	0.8.2-1
+DISTVERSION=	0.8.3-1
 CATEGORIES=	databases devel
 MASTER_SITES=	SF
 
@@ -19,6 +19,7 @@ USE_GNOME=	gnometarget lthack
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-static \
 		--with-dbi-incdir=${LOCALBASE}/include/dbi
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
 
 OPTIONS=	MYSQL		"With MySQL Driver" 		on  \
 		MSQL		"With MSQL Driver" 		off \
@@ -33,7 +34,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=		choose at least one driver
+IGNORE=		choose at least one driver
 .endif
 
 .if !defined(WITHOUT_MYSQL)
@@ -92,7 +93,11 @@ PLIST_SUB+=	FREETDS=""
 PLIST_SUB+=	FREETDS="@comment "
 .endif
 
+PLIST_SUB+=	INGRES="@comment "
+PLIST_SUB+=	ORACLE="@comment "
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O20|${CFLAGS}|g' ${WRKSRC}/configure
+	@${TOUCH} ${WRKSRC}/drivers/*/dbd_*/*
 
 .include <bsd.port.post.mk>
diff --git a/databases/libdbi-drivers/distinfo b/databases/libdbi-drivers/distinfo
index 0db89ddabc0a..cfb882380dc9 100644
--- a/databases/libdbi-drivers/distinfo
+++ b/databases/libdbi-drivers/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (libdbi-drivers-0.8.3-1.tar.gz) = 4de79b323162a5a7652b65b608eca6cd
+SHA256 (libdbi-drivers-0.8.3-1.tar.gz) = 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72
+SIZE (libdbi-drivers-0.8.3-1.tar.gz) = 1534420
diff --git a/databases/libdbi-drivers/pkg-plist b/databases/libdbi-drivers/pkg-plist
index e0d02119c3ce..0a4f4fef7091 100644
--- a/databases/libdbi-drivers/pkg-plist
+++ b/databases/libdbi-drivers/pkg-plist
@@ -17,40 +17,111 @@
 %%FREETDS%%lib/dbd/libdbdfreetds.la
 %%FREETDS%%lib/dbd/libdbdfreetds.so
 @dirrmtry lib/dbd
-%%DOCSDIR%%/index.html
+%%FIREBIRD%%%%DOCSDIR%%/dbd_firebird.pdf
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/copying-fdl.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/f25.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/index.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/install-build.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/install-prereq.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/install.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/intro.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/options.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/specific.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres/specific.html
+%%INGRES%%%%DOCSDIR%%/dbd_ingres.pdf
+%%MSQL%%%%DOCSDIR%%/dbd_msql/c26.html
+%%MSQL%%%%DOCSDIR%%/dbd_msql/c30.html
+%%MSQL%%%%DOCSDIR%%/dbd_msql/c81.html
+%%MSQL%%%%DOCSDIR%%/dbd_msql/f15.html
+%%MSQL%%%%DOCSDIR%%/dbd_msql/index.html
+%%MSQL%%%%DOCSDIR%%/dbd_msql/x33.html
+%%MSQL%%%%DOCSDIR%%/dbd_msql/x47.html
+%%MSQL%%%%DOCSDIR%%/dbd_msql.pdf
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c168.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c173.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c35.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c39.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c40.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c44.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c93.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c98.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/copying-fdl.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/f24.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/f29.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/index.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x171.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x176.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x42.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x47.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x56.html
+%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x61.html
 %%MYSQL%%%%DOCSDIR%%/dbd_mysql.pdf
-%%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
+%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c26.html
+%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c29.html
+%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c38.html
+%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c41.html
+%%ORACLE%%%%DOCSDIR%%/dbd_oracle/f15.html
+%%ORACLE%%%%DOCSDIR%%/dbd_oracle/index.html
+%%ORACLE%%%%DOCSDIR%%/dbd_oracle/x32.html
+%%ORACLE%%%%DOCSDIR%%/dbd_oracle/x35.html
+%%ORACLE%%%%DOCSDIR%%/dbd_oracle.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%%/dbd_pgsql.pdf
-%%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/c100.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c118.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c126.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c26.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c34.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c37.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c45.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c92.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/copying-fdl.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/f15.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/f23.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/index.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x121.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x129.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x197.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x205.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x40.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x48.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x54.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x62.html
 %%SQLITE2%%%%DOCSDIR%%/dbd_sqlite.pdf
-%%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/c102.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c120.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c128.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c26.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c34.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c39.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c47.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c94.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/copying-fdl.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f15.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f23.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/index.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x123.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x131.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x195.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x203.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x42.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x50.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x56.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x64.html
 %%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3.pdf
-%%SQLITE3%%%%DOCSDIR%%/c120.html
-%%SQLITE3%%%%DOCSDIR%%/c26.html
-%%SQLITE3%%%%DOCSDIR%%/c94.html
-%%SQLITE3%%%%DOCSDIR%%/f15.html
-%%SQLITE3%%%%DOCSDIR%%/x123.html
-%%SQLITE3%%%%DOCSDIR%%/x195.html
+%%INGRES%%@dirrm %%DOCSDIR%%/dbd_ingres
+%%MSQL%%@dirrm %%DOCSDIR%%/dbd_msql
+%%MYSQL%%@dirrm %%DOCSDIR%%/dbd_mysql
+%%ORACLE%%@dirrm %%DOCSDIR%%/dbd_oracle
+%%PGSQL%%@dirrm %%DOCSDIR%%/dbd_pgsql
+%%SQLITE2%%@dirrm %%DOCSDIR%%/dbd_sqlite
+%%SQLITE3%%@dirrm %%DOCSDIR%%/dbd_sqlite3
 @dirrm %%DOCSDIR%%