7 files changed, 38 insertions, 35 deletions
diff --git a/databases/mysql5-client/patches/patch-ab b/databases/mysql5-client/patches/patch-ab
index 446170613e3..b5df1ab1760 100644
--- a/databases/mysql5-client/patches/patch-ab
+++ b/databases/mysql5-client/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ab,v 1.3 2008/09/18 11:50:44 taca Exp $
 
---- sql/mysqld.cc.orig	2007-03-05 20:21:11.000000000 +0100
-+++ sql/mysqld.cc
-@@ -171,7 +171,7 @@ static void getvolumeID(BYTE *volumeName
+--- sql/mysqld.cc.orig	2008-08-04 15:20:07.000000000 +0300
++++ sql/mysqld.cc	2008-09-16 12:16:20.000000000 +0300
+@@ -181,7 +181,7 @@
  int initgroups(const char *,unsigned int);
  #endif
  
diff --git a/databases/mysql5-client/patches/patch-ac b/databases/mysql5-client/patches/patch-ac
new file mode 100644
index 00000000000..10be8afff82
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.7 2008/09/18 11:50:44 taca Exp $
+
+--- configure.in.orig	2008-08-04 21:19:07.000000000 +0900
++++ configure.in
+@@ -2697,9 +2697,9 @@ linked_client_targets="linked_libmysql_s
+ 
+ if test "$THREAD_SAFE_CLIENT" = "no"
+ then
+-  sql_client_dirs="strings regex mysys dbug extra libmysql client"
++  sql_client_dirs="strings regex libmysql client"
+ else
+-  sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"
++  sql_client_dirs="strings regex libmysql libmysql_r client"
+   linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
+   AC_CONFIG_FILES(libmysql_r/Makefile)
+   AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af
index ba726f27c6e..975fcc422a0 100644
--- a/databases/mysql5-client/patches/patch-af
+++ b/databases/mysql5-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-af,v 1.7 2008/09/18 11:50:44 taca Exp $
 
---- man/Makefile.in.orig	2007-03-05 20:22:54.000000000 +0100
-+++ man/Makefile.in
-@@ -348,8 +348,9 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
+--- man/Makefile.in.orig	2008-08-04 15:22:07.000000000 +0300
++++ man/Makefile.in	2008-09-16 12:17:49.000000000 +0300
+@@ -354,8 +354,9 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
diff --git a/databases/mysql5-client/patches/patch-ag b/databases/mysql5-client/patches/patch-ag
index f2897508fbc..8b5b10db0f6 100644
--- a/databases/mysql5-client/patches/patch-ag
+++ b/databases/mysql5-client/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ag,v 1.4 2008/09/18 11:50:44 taca Exp $
 
---- strings/Makefile.in.orig	2007-03-05 20:23:22.000000000 +0100
-+++ strings/Makefile.in
-@@ -616,7 +616,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+--- strings/Makefile.in.orig	2008-08-04 15:22:30.000000000 +0300
++++ strings/Makefile.in	2008-09-16 12:18:09.000000000 +0300
+@@ -622,7 +622,6 @@
  	  if test -f $$p; then \
  	    f=$(am__strip_dir) \
  	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.3 2007/03/11 18:42:28 adam Exp $
  	  else :; fi; \
  	done
  	@$(POST_INSTALL)
-@@ -624,7 +623,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+@@ -630,7 +629,6 @@
  	  if test -f $$p; then \
  	    p=$(am__strip_dir) \
  	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
@@ -18,7 +18,7 @@ $NetBSD: patch-ag,v 1.3 2007/03/11 18:42:28 adam Exp $
  	  else :; fi; \
  	done
  
-@@ -633,7 +631,6 @@ uninstall-pkglibLIBRARIES:
+@@ -639,7 +637,6 @@
  	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
  	  p=$(am__strip_dir) \
  	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
diff --git a/databases/mysql5-client/patches/patch-aj b/databases/mysql5-client/patches/patch-aj
index 2c7bfd0df27..f0b061c53fd 100644
--- a/databases/mysql5-client/patches/patch-aj
+++ b/databases/mysql5-client/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-aj,v 1.3 2008/09/18 11:50:44 taca Exp $
 
---- client/mysqladmin.cc.orig	2007-03-05 20:21:42.000000000 +0100
-+++ client/mysqladmin.cc
-@@ -325,8 +325,14 @@ int main(int argc,char *argv[])
+--- client/mysqladmin.cc.orig	2008-08-04 15:19:04.000000000 +0300
++++ client/mysqladmin.cc	2008-09-16 12:18:37.000000000 +0300
+@@ -331,8 +331,14 @@
    if (tty_password)
      opt_password = get_tty_password(NullS);
  
diff --git a/databases/mysql5-client/patches/patch-ak b/databases/mysql5-client/patches/patch-ak
deleted file mode 100644
index c2342d538b2..00000000000
--- a/databases/mysql5-client/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2007/03/11 18:42:28 adam Exp $
-
---- mysys/Makefile.in.orig	2007-03-05 20:22:57.000000000 +0100
-+++ mysys/Makefile.in
-@@ -428,7 +428,7 @@ MYSQLBASEdir = $(prefix)
- INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
- 			-I$(top_srcdir)/include -I$(srcdir)
- 
--pkglib_LIBRARIES = libmysys.a
-+pkglib_LIBRARIES =
- LDADD = libmysys.a ../dbug/libdbug.a \
- 			../strings/libmystrings.a
- 
diff --git a/databases/mysql5-client/patches/patch-al b/databases/mysql5-client/patches/patch-al
index 79e04eb77dc..423598a4d83 100644
--- a/databases/mysql5-client/patches/patch-al
+++ b/databases/mysql5-client/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-al,v 1.3 2008/09/18 11:50:44 taca Exp $
 
---- include/Makefile.in.orig	2007-03-11 09:24:33.000000000 +0100
-+++ include/Makefile.in
-@@ -360,6 +360,7 @@ zlib_dir = @zlib_dir@
+--- include/Makefile.in.orig	2008-08-04 15:22:05.000000000 +0300
++++ include/Makefile.in	2008-09-16 12:19:22.000000000 +0300
+@@ -366,6 +366,7 @@
  BUILT_SOURCES = $(HEADERS_GEN) abi_check
  HEADERS_GEN = mysql_version.h my_config.h
  HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \