4 files changed, 42 insertions, 64 deletions

diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 79b1fb370102..21150f74c3b1 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	libdbi
-PORTVERSION=	0.6.7
-PORTREVISION=	1
+PORTVERSION=	0.7.1
+PORTREVISION=	0
 CATEGORIES=	databases devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://linux.ucla.edu/~dap24/%SUBDIR%/
@@ -20,25 +20,6 @@ COMMENT=	Database Independent Abstraction Layer for C
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
-.if defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/databases/mysql323-client
-CONFIGURE_ARGS+=	--with-mysql \
-			--with-mysql-incdir=${LOCALBASE}/include \
-			--with-mysql-libdir=${LOCALBASE}/lib/mysql
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if defined(WITH_PGSQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-CONFIGURE_ARGS+=	--with-pgsql
-PLIST_SUB+=	PGSQL=""
-.else
-PLIST_SUB+=	PGSQL="@comment "
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/databases/libdbi/distinfo b/databases/libdbi/distinfo
index 9302b1637b33..9d0c3893a750 100644
--- a/databases/libdbi/distinfo
+++ b/databases/libdbi/distinfo
@@ -1 +1 @@
-MD5 (libdbi-0.6.7.tar.gz) = 29026ec0291f82b28ee51e0a13f86979
+MD5 (libdbi-0.7.1.tar.gz) = d16eff24c26be4ff917d32d4ddb30da9
diff --git a/databases/libdbi/files/patch-Makefile.in b/databases/libdbi/files/patch-Makefile.in
index d829153ee232..9b734cac9993 100644
--- a/databases/libdbi/files/patch-Makefile.in
+++ b/databases/libdbi/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sat Jun 15 09:45:17 2002
-+++ Makefile.in	Sat Oct  5 21:18:07 2002
-@@ -92,7 +92,7 @@
+--- Makefile.in.orig	Thu Oct 30 10:24:07 2003
++++ Makefile.in	Thu Oct 30 10:24:15 2003
+@@ -88,7 +88,7 @@
  
  AUTOMAKE_OPTIONS = foreign dist-zip
  
--SUBDIRS = src include doc drivers tests
-+SUBDIRS = src include drivers tests
+-SUBDIRS = src include doc
++SUBDIRS = src include
  
- 
- #m4datadir = $(datadir)/aclocal
+ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO libdbi.spec.in config.h.in Makefile.w32 autogen.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/databases/libdbi/pkg-plist b/databases/libdbi/pkg-plist
index 0bcd938cd6ed..a5d48b972461 100644
--- a/databases/libdbi/pkg-plist
+++ b/databases/libdbi/pkg-plist
@@ -5,39 +5,36 @@ include/dbi/dbi.h
 lib/libdbi.a
 lib/libdbi.so
 lib/libdbi.so.0
-%%MYSQL%%lib/dbd/libmysql.so
-%%PGSQL%%lib/dbd/libpgsql.so
-%%PORTDOCS%%share/doc/libdbi/driver-guide.pdf
-%%PORTDOCS%%share/doc/libdbi/driver-guide/contact.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/copying-fdl.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/description.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/driverfuncs-dbquery.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/driverfuncs-infrastructure.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/driverfuncs.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/gnugpl.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/helperfuncs.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/index.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/intro.html
-%%PORTDOCS%%share/doc/libdbi/driver-guide/terminology.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide.pdf
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/contact.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/copying-fdl.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/description.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/gnugpl.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/index.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/intro.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/quickstart-code.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/quickstart-debriefing.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/quickstart.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-conn.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-core.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-database.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-driver.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-field.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference.html
-%%PORTDOCS%%share/doc/libdbi/programmers-guide/terminology.html
-%%PORTDOCS%%@dirrm share/doc/libdbi/programmers-guide
-%%PORTDOCS%%@dirrm share/doc/libdbi/driver-guide
-%%PORTDOCS%%@dirrm share/doc/libdbi
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/contact.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/copying-fdl.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/description.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverfuncs-dbquery.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverfuncs-infrastructure.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverfuncs.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/gnugpl.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/helperfuncs.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/index.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/driver-guide/terminology.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/contact.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/copying-fdl.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/description.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/gnugpl.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/index.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/quickstart-code.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/quickstart-debriefing.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/quickstart.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference-conn.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference-core.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference-database.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference-driver.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference-field.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/terminology.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/programmers-guide
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/driver-guide
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/dbi
-@unexec rmdir %D/lib/dbd 2>/dev/null || true