* Install my_compiler.h as public header. It is already fixed in

  MySQL's repository.
* Add comments to patches.

Bump PKGREVISION and it fixes P$ pkg/43887.

17 files changed, 74 insertions, 19 deletions

diff --git a/databases/mysql51-client/patches/patch-aa b/databases/mysql51-client/patches/patch-aa
index 751fe99f86d..205f6fc86a6 100644
--- a/databases/mysql51-client/patches/patch-aa
+++ b/databases/mysql51-client/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-aa,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Don't use "==" in test(1).
 
 --- BUILD/compile-pentium-gcov.orig	2010-02-04 11:36:48.000000000 +0000
 +++ BUILD/compile-pentium-gcov
diff --git a/databases/mysql51-client/patches/patch-ab b/databases/mysql51-client/patches/patch-ab
index 5d5fbdd968a..ca621ffbc40 100644
--- a/databases/mysql51-client/patches/patch-ab
+++ b/databases/mysql51-client/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-ab,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* process directories in client package.
 
 --- Makefile.in.orig	2010-02-04 11:46:48.000000000 +0000
 +++ Makefile.in
diff --git a/databases/mysql51-client/patches/patch-ac b/databases/mysql51-client/patches/patch-ac
index fdc3e435575..5edb46c5747 100644
--- a/databases/mysql51-client/patches/patch-ac
+++ b/databases/mysql51-client/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-ac,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Portability: include <bstring.h> if exists.
 
 --- client/completion_hash.cc.orig	2010-02-04 11:36:51.000000000 +0000
 +++ client/completion_hash.cc
diff --git a/databases/mysql51-client/patches/patch-ae b/databases/mysql51-client/patches/patch-ae
index a6bbf45fe11..8d37ef2b123 100644
--- a/databases/mysql51-client/patches/patch-ae
+++ b/databases/mysql51-client/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-ae,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Portability: include <bstring.h> if exists.
 
 --- client/mysqlbinlog.cc.orig	2010-02-04 11:36:52.000000000 +0000
 +++ client/mysqlbinlog.cc
diff --git a/databases/mysql51-client/patches/patch-af b/databases/mysql51-client/patches/patch-af
index dec461e4b40..f313632dd8d 100644
--- a/databases/mysql51-client/patches/patch-af
+++ b/databases/mysql51-client/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-af,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Portability: include <bstring.h> if exists.
 
 --- client/sql_string.cc.orig	2010-02-04 11:36:53.000000000 +0000
 +++ client/sql_string.cc
diff --git a/databases/mysql51-client/patches/patch-ag b/databases/mysql51-client/patches/patch-ag
index 2262dd3db9c..43162c19074 100644
--- a/databases/mysql51-client/patches/patch-ag
+++ b/databases/mysql51-client/patches/patch-ag
@@ -1,4 +1,6 @@
-$NetBSD: patch-ag,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-ag,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Correct function call with a pointer to function.
 
 --- config/ac-macros/readline.m4.orig	2010-02-04 11:36:58.000000000 +0000
 +++ config/ac-macros/readline.m4
diff --git a/databases/mysql51-client/patches/patch-ah b/databases/mysql51-client/patches/patch-ah
index 84184c766f9..5d7f48f6128 100644
--- a/databases/mysql51-client/patches/patch-ah
+++ b/databases/mysql51-client/patches/patch-ah
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-ah,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Don't use "==" in test(1).
 
 --- config/ac-macros/ssl.m4.orig	2010-02-04 11:36:58.000000000 +0000
 +++ config/ac-macros/ssl.m4
diff --git a/databases/mysql51-client/patches/patch-ai b/databases/mysql51-client/patches/patch-ai
index 826aec45dde..3bb8240f3b7 100644
--- a/databases/mysql51-client/patches/patch-ai
+++ b/databases/mysql51-client/patches/patch-ai
@@ -1,4 +1,6 @@
-$NetBSD: patch-ai,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-ai,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Limit directories in client package.
 
 --- configure.in.orig	2010-02-04 11:36:59.000000000 +0000
 +++ configure.in
diff --git a/databases/mysql51-client/patches/patch-aj b/databases/mysql51-client/patches/patch-aj
index d7d06072905..b316ea53d5f 100644
--- a/databases/mysql51-client/patches/patch-aj
+++ b/databases/mysql51-client/patches/patch-aj
@@ -1,4 +1,6 @@
-$NetBSD: patch-aj,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-aj,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Limit directories in client package.
 
 --- extra/Makefile.in.orig	2010-02-04 11:46:15.000000000 +0000
 +++ extra/Makefile.in
diff --git a/databases/mysql51-client/patches/patch-ak b/databases/mysql51-client/patches/patch-ak
index 9d868be46d4..398425443a7 100644
--- a/databases/mysql51-client/patches/patch-ak
+++ b/databases/mysql51-client/patches/patch-ak
@@ -1,8 +1,12 @@
-$NetBSD: patch-ak,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-ak,v 1.2 2010/09/21 15:57:30 taca Exp $
 
---- include/Makefile.in.orig	2010-02-04 11:46:18.000000000 +0000
+* Add some headers to HEADERS_ABI for building properly.
+* Install my_compiler.h as public header.  This is the same fix in
+  MySQL's repository.
+
+--- include/Makefile.in.orig	2010-08-03 17:28:49.000000000 +0000
 +++ include/Makefile.in
-@@ -393,6 +393,7 @@ BUILT_SOURCES = $(HEADERS_GEN_MAKE) link
+@@ -397,6 +397,7 @@ BUILT_SOURCES = $(HEADERS_GEN_MAKE) link
  HEADERS_GEN_CONFIGURE = mysql_version.h
  HEADERS_GEN_MAKE = my_config.h
  HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
@@ -10,3 +14,22 @@ $NetBSD: patch-ak,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
  			my_list.h my_alloc.h typelib.h mysql/plugin.h
  
  pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
+@@ -405,7 +406,8 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_d
+ 			decimal.h errmsg.h my_global.h my_net.h \
+ 			my_getopt.h sslopt-longopts.h my_dir.h \
+ 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
+-			m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
++			m_ctype.h my_attribute.h my_compiler.h \
++			$(HEADERS_GEN_CONFIGURE) \
+ 			$(HEADERS_GEN_MAKE)
+ 
+ noinst_HEADERS = config-win.h config-netware.h my_bit.h \
+@@ -416,7 +418,7 @@ noinst_HEADERS = config-win.h config-net
+ 			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
+ 			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
+ 			my_handler.h my_time.h my_vle.h my_user.h \
+-			my_libwrap.h my_stacktrace.h my_compiler.h
++			my_libwrap.h my_stacktrace.h
+ 
+ EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp
+ 
diff --git a/databases/mysql51-client/patches/patch-am b/databases/mysql51-client/patches/patch-am
index c95363a014c..69d9e0fc54f 100644
--- a/databases/mysql51-client/patches/patch-am
+++ b/databases/mysql51-client/patches/patch-am
@@ -1,4 +1,6 @@
-$NetBSD: patch-am,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-am,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Define SHUT_RDWR for Irix 5.
 
 --- include/my_net.h.orig	2010-02-04 11:37:06.000000000 +0000
 +++ include/my_net.h
diff --git a/databases/mysql51-client/patches/patch-ap b/databases/mysql51-client/patches/patch-ap
index d294dc7edf9..7551cac44ef 100644
--- a/databases/mysql51-client/patches/patch-ap
+++ b/databases/mysql51-client/patches/patch-ap
@@ -1,4 +1,6 @@
-$NetBSD: patch-ap,v 1.2 2010/08/11 23:18:04 taca Exp $
+$NetBSD: patch-ap,v 1.3 2010/09/21 15:57:30 taca Exp $
+
+* Tweak installig manual pages for client package.
 
 --- man/Makefile.in.orig	2010-07-09 12:38:13.000000000 +0000
 +++ man/Makefile.in
diff --git a/databases/mysql51-client/patches/patch-at b/databases/mysql51-client/patches/patch-at
index f8305a485c0..ab84fdccad7 100644
--- a/databases/mysql51-client/patches/patch-at
+++ b/databases/mysql51-client/patches/patch-at
@@ -1,4 +1,6 @@
-$NetBSD: patch-at,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-at,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Portability: include <bstring.h> if exists.
 
 --- sql/log_event.cc.orig	2010-02-04 11:39:50.000000000 +0000
 +++ sql/log_event.cc
diff --git a/databases/mysql51-client/patches/patch-au b/databases/mysql51-client/patches/patch-au
index 4e45b5b5ea2..b4b616d2f8f 100644
--- a/databases/mysql51-client/patches/patch-au
+++ b/databases/mysql51-client/patches/patch-au
@@ -1,4 +1,6 @@
-$NetBSD: patch-au,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-au,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Portability: include <bstring.h> if exists.
 
 --- sql/log_event.h.orig	2010-02-04 11:39:50.000000000 +0000
 +++ sql/log_event.h
diff --git a/databases/mysql51-client/patches/patch-av b/databases/mysql51-client/patches/patch-av
index 13fad7ed923..648db611c3b 100644
--- a/databases/mysql51-client/patches/patch-av
+++ b/databases/mysql51-client/patches/patch-av
@@ -1,4 +1,6 @@
-$NetBSD: patch-av,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-av,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Handle DragonFly as the same as FreeBSD.
 
 --- sql/mysqld.cc.orig	2010-02-04 11:39:50.000000000 +0000
 +++ sql/mysqld.cc
diff --git a/databases/mysql51-client/patches/patch-aw b/databases/mysql51-client/patches/patch-aw
index d8feb4bc2ac..b7f2626b3ff 100644
--- a/databases/mysql51-client/patches/patch-aw
+++ b/databases/mysql51-client/patches/patch-aw
@@ -1,4 +1,6 @@
-$NetBSD: patch-aw,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-aw,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Portability: include <bstring.h> if exists.
 
 --- sql/sql_string.cc.orig	2010-02-04 11:39:53.000000000 +0000
 +++ sql/sql_string.cc
diff --git a/databases/mysql51-client/patches/patch-ay b/databases/mysql51-client/patches/patch-ay
index 6605e9ddc02..52f38e1478b 100644
--- a/databases/mysql51-client/patches/patch-ay
+++ b/databases/mysql51-client/patches/patch-ay
@@ -1,4 +1,6 @@
-$NetBSD: patch-ay,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
+$NetBSD: patch-ay,v 1.2 2010/09/21 15:57:30 taca Exp $
+
+* Portability: include <bstring.h> if exists.
 
 --- strings/decimal.c.orig	2010-02-04 11:40:24.000000000 +0000
 +++ strings/decimal.c