3 files changed, 8 insertions, 40 deletions
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 =