4 files changed, 38 insertions, 56 deletions
diff --git a/databases/mysql-client/patches/patch-aa b/databases/mysql-client/patches/patch-aa
deleted file mode 100644
index ffa6decec89..00000000000
--- a/databases/mysql-client/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/03/26 13:26:44 bad Exp $
-
---- client/Makefile.in.orig	Mon Jan 22 14:44:00 2001
-+++ client/Makefile.in	Thu Feb  1 22:50:13 2001
-@@ -190,7 +190,7 @@
- mysqltest_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES)
- 
- # Fix for mit-threads
--DEFS = -DUNDEF_THREADS_HACK
-+DEFS = -DUNDEF_THREADS_HACK -Dunix
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/databases/mysql-client/patches/patch-ab b/databases/mysql-client/patches/patch-ab
deleted file mode 100644
index d890cd520f0..00000000000
--- a/databases/mysql-client/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/03/26 13:26:44 bad Exp $
-
---- configure.orig	Mon Jan 22 14:37:14 2001
-+++ configure	Thu Feb  1 22:48:00 2001
-@@ -2050,6 +2050,7 @@
- *) lt_target="$target" ;;
- esac
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- #
- # the following will cause an existing older ltconfig to fail, so
-@@ -2208,6 +2209,7 @@
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -9328,7 +9330,7 @@
-   # This requires readline to be in a standard place. Mosty for linux
-   # there readline may be a shared library.
-   readline_dir=""
--  readline_link="-lreadline"
-+  readline_link="-ledit"
- fi
- 
- 
diff --git a/databases/mysql-client/patches/patch-ad b/databases/mysql-client/patches/patch-ad
deleted file mode 100644
index 2bc6dc97476..00000000000
--- a/databases/mysql-client/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2001/03/26 13:26:44 bad Exp $
-
---- readline/Makefile.in.orig	Mon Jan 22 14:43:57 2001
-+++ readline/Makefile.in	Thu Feb  1 22:48:01 2001
-@@ -395,7 +395,8 @@
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
-+install: all
-+	@:
- uninstall-am: uninstall-pkgincludeHEADERS
- uninstall: uninstall-am
- all-am: Makefile $(LIBRARIES) $(HEADERS)
diff --git a/databases/mysql-client/patches/patch-af b/databases/mysql-client/patches/patch-af
new file mode 100644
index 00000000000..4ce9bf24133
--- /dev/null
+++ b/databases/mysql-client/patches/patch-af
@@ -0,0 +1,38 @@
+$NetBSD: patch-af,v 1.1 2001/05/02 08:22:30 jlam Exp $
+
+--- configure.orig	Thu Mar 15 19:52:05 2001
++++ configure
+@@ -5004,7 +5004,10 @@
+ #define HAVE_LIBWRAP 1
+ EOF
+ 
+-        WRAPLIBS="-L$with_libwrap/lib -lwrap"
++	if test "$with_libwrap" != "yes"; then
++	    WRAPLIBS="-L${with_libwrap}/lib"
++	fi
++	WRAPLIBS="${WRAPLIBS} -lwrap"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -9345,7 +9348,11 @@
+   # This requires readline to be in a standard place. Mosty for linux
+   # there readline may be a shared library.
+   readline_dir=""
+-  readline_link="-lreadline"
++  if test -z "$readline_lib"
++  then
++    readline_lib="readline"
++  fi
++  readline_link="-l$readline_lib"
+ fi
+ 
+ 
+@@ -10466,7 +10473,7 @@
+ 
+     MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
+     
+-    MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
++    MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
+     
+     LIBS="$MT_LD_ADD $LIBS"
+     echo ""