6 files changed, 26 insertions, 54 deletions

diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 37140b6fad32..e9f38b448b7b 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -7,30 +7,30 @@
 #
 
 PORTNAME=	libdbi
-PORTVERSION=	0.7.2
-PORTREVISION=	0
+PORTVERSION=	0.8.0
 CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://linux.ucla.edu/~dap24/%SUBDIR%/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Database Independent Abstraction Layer for C
 
-USE_INC_LIBTOOL_VER=	13
-INSTALLS_SHLIB=	yes
+USE_REINPLACE=		yes
+USE_LIBTOOL_VER=	15
+INSTALLS_SHLIB=		yes
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|-O20|${CFLAGS}|g" -e "s|-std=gnu99||g" \
+		 ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf \
-		${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/driver-guide
-	${INSTALL_DATA} ${WRKSRC}/doc/driver-guide/*.html \
-		${DOCSDIR}/driver-guide
+	${INSTALL_DATA} ${WRKSRC}/doc/driver-guide/*.html ${DOCSDIR}/driver-guide
 	@${MKDIR} ${DOCSDIR}/programmers-guide
-	${INSTALL_DATA} ${WRKSRC}/doc/programmers-guide/*.html \
-		${DOCSDIR}/programmers-guide
+	${INSTALL_DATA} ${WRKSRC}/doc/programmers-guide/*.html ${DOCSDIR}/programmers-guide
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/libdbi/distinfo b/databases/libdbi/distinfo
index 472a1c664b0c..c9ba500472a3 100644
--- a/databases/libdbi/distinfo
+++ b/databases/libdbi/distinfo
@@ -1,2 +1,2 @@
-MD5 (libdbi-0.7.2.tar.gz) = 308e5746a2d0804be1d638319ad7b9c0
-SIZE (libdbi-0.7.2.tar.gz) = 516197
+MD5 (libdbi-0.8.0.tar.gz) = 1ea2b4ec8ad7c2e443f65ae7edb0a746
+SIZE (libdbi-0.8.0.tar.gz) = 1021069
diff --git a/databases/libdbi/files/patch-Makefile.in b/databases/libdbi/files/patch-Makefile.in
index 9b734cac9993..e73779c150e5 100644
--- a/databases/libdbi/files/patch-Makefile.in
+++ b/databases/libdbi/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Thu Oct 30 10:24:07 2003
-+++ Makefile.in	Thu Oct 30 10:24:15 2003
-@@ -88,7 +88,7 @@
- 
+--- Makefile.in.orig	Mon Aug 29 16:47:49 2005
++++ Makefile.in	Thu Sep  1 22:16:12 2005
+@@ -176,7 +176,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign dist-zip
- 
 -SUBDIRS = src include doc
 +SUBDIRS = src include
- 
- 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
+ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/databases/libdbi/files/patch-configure b/databases/libdbi/files/patch-configure
deleted file mode 100644
index 3fa8e5d81bad..000000000000
--- a/databases/libdbi/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Mon Oct 28 02:01:23 2002
-+++ configure	Sun Nov  3 09:35:03 2002
-@@ -5412,6 +5412,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -5452,8 +5453,8 @@
-                 PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
-         *)
-                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
--                CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
--                PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-+                CFLAGS="$CFLAGS -D__NO_MATH_INLINES -fsigned-char"
-+                PROFILE="$CFLAGS -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-         esac
- fi
- 
diff --git a/databases/libdbi/files/patch-src::Makefile.in b/databases/libdbi/files/patch-src::Makefile.in
deleted file mode 100644
index 40cbc3515dad..000000000000
--- a/databases/libdbi/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Mon Oct 28 02:01:32 2002
-+++ src/Makefile.in	Sun Nov  3 09:31:37 2002
-@@ -96,7 +96,7 @@
- libdbi_la_SOURCES = dbi_main.c dbi_result.c dbd_helper.c atoll.c asprintf.c
- libdbi_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
- 
--CFLAGS = -DDBI_DRIVER_DIR=\"@driverdir@\"
-+CFLAGS = @CFLAGS@ -DDBI_DRIVER_DIR=\"@driverdir@\"
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/databases/libdbi/pkg-plist b/databases/libdbi/pkg-plist
index a5d48b972461..3e322f8c35a6 100644
--- a/databases/libdbi/pkg-plist
+++ b/databases/libdbi/pkg-plist
@@ -11,6 +11,7 @@ lib/libdbi.so.0
 %%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-publicdbquery.html
 %%PORTDOCS%%%%DOCSDIR%%/driver-guide/driverfuncs.html
 %%PORTDOCS%%%%DOCSDIR%%/driver-guide/gnugpl.html
 %%PORTDOCS%%%%DOCSDIR%%/driver-guide/helperfuncs.html
@@ -32,6 +33,9 @@ lib/libdbi.so.0
 %%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-field-idx.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference-field-meta.html
+%%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference-query.html
 %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/reference.html
 %%PORTDOCS%%%%DOCSDIR%%/programmers-guide/terminology.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/programmers-guide