Tue Sep 21 15:57:30 2010 UTC ()
* 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.


(taca)
diff -r1.4 -r1.5 pkgsrc/databases/mysql51-client/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/PLIST
diff -r1.7 -r1.8 pkgsrc/databases/mysql51-client/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-ab
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-ac
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-ae
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-af
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-ag
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-ah
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-ai
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-aj
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-ak
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-am
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-at
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-au
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-av
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-aw
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/patch-ay
diff -r1.2 -r1.3 pkgsrc/databases/mysql51-client/patches/patch-ap
cvs diff -r1.4 -r1.5 pkgsrc/databases/mysql51-client/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/Makefile 2010/04/20 22:58:10 1.4
+++ pkgsrc/databases/mysql51-client/Attic/Makefile 2010/09/21 15:57:30 1.5
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.4 2010/04/20 22:58:10 taca Exp $ 1# $NetBSD: Makefile,v 1.5 2010/09/21 15:57:30 taca Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
 4PKGREVISION= 1
4SVR4_PKGNAME= mysqc 5SVR4_PKGNAME= mysqc
5COMMENT= MySQL 5, a free SQL database (client) 6COMMENT= MySQL 5, a free SQL database (client)
6 7
7CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} 8CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
8 9
9PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
10 11
11.include "Makefile.common" 12.include "Makefile.common"
12 13
13CONFIGURE_ARGS+= --without-extra-tools 14CONFIGURE_ARGS+= --without-extra-tools
14CONFIGURE_ARGS+= --without-server 15CONFIGURE_ARGS+= --without-server
15UNWRAP_FILES+= scripts/mysql_config 16UNWRAP_FILES+= scripts/mysql_config
16INFO_FILES= yes 17INFO_FILES= yes
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/PLIST 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/Attic/PLIST 2010/09/21 15:57:30 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1@comment $NetBSD: PLIST,v 1.2 2010/09/21 15:57:30 taca Exp $
2bin/msql2mysql 2bin/msql2mysql
3bin/mysql 3bin/mysql
4bin/mysql_config 4bin/mysql_config
5bin/mysql_convert_table_format 5bin/mysql_convert_table_format
6bin/mysql_find_rows 6bin/mysql_find_rows
7bin/mysql_fix_extensions 7bin/mysql_fix_extensions
8bin/mysql_fix_privilege_tables 8bin/mysql_fix_privilege_tables
9bin/mysql_setpermission 9bin/mysql_setpermission
10bin/mysql_upgrade 10bin/mysql_upgrade
11bin/mysql_zap 11bin/mysql_zap
12bin/mysqlaccess 12bin/mysqlaccess
13bin/mysqladmin 13bin/mysqladmin
14bin/mysqlbinlog 14bin/mysqlbinlog
@@ -18,26 +18,27 @@ bin/mysqldump @@ -18,26 +18,27 @@ bin/mysqldump
18bin/mysqldumpslow 18bin/mysqldumpslow
19bin/mysqlhotcopy 19bin/mysqlhotcopy
20bin/mysqlimport 20bin/mysqlimport
21bin/mysqlshow 21bin/mysqlshow
22bin/mysqlslap 22bin/mysqlslap
23bin/mysqltest 23bin/mysqltest
24include/mysql/decimal.h 24include/mysql/decimal.h
25include/mysql/errmsg.h 25include/mysql/errmsg.h
26include/mysql/keycache.h 26include/mysql/keycache.h
27include/mysql/m_ctype.h 27include/mysql/m_ctype.h
28include/mysql/m_string.h 28include/mysql/m_string.h
29include/mysql/my_alloc.h 29include/mysql/my_alloc.h
30include/mysql/my_attribute.h 30include/mysql/my_attribute.h
 31include/mysql/my_compiler.h
31include/mysql/my_config.h 32include/mysql/my_config.h
32include/mysql/my_dbug.h 33include/mysql/my_dbug.h
33include/mysql/my_dir.h 34include/mysql/my_dir.h
34include/mysql/my_getopt.h 35include/mysql/my_getopt.h
35include/mysql/my_global.h 36include/mysql/my_global.h
36include/mysql/my_list.h 37include/mysql/my_list.h
37include/mysql/my_net.h 38include/mysql/my_net.h
38include/mysql/my_no_pthread.h 39include/mysql/my_no_pthread.h
39include/mysql/my_pthread.h 40include/mysql/my_pthread.h
40include/mysql/my_sys.h 41include/mysql/my_sys.h
41include/mysql/my_xml.h 42include/mysql/my_xml.h
42include/mysql/mysql.h 43include/mysql/mysql.h
43include/mysql/mysql_com.h 44include/mysql/mysql_com.h
cvs diff -r1.7 -r1.8 pkgsrc/databases/mysql51-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/Attic/distinfo 2010/09/08 16:24:57 1.7
+++ pkgsrc/databases/mysql51-client/Attic/distinfo 2010/09/21 15:57:30 1.8
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: distinfo,v 1.7 2010/09/08 16:24:57 taca Exp $ 1$NetBSD: distinfo,v 1.8 2010/09/21 15:57:30 taca Exp $
2 2
3SHA1 (mysql-5.1.50.tar.gz) = fb5982fb73bb2eb0494615352a7510f75114c6d9 3SHA1 (mysql-5.1.50.tar.gz) = fb5982fb73bb2eb0494615352a7510f75114c6d9
4RMD160 (mysql-5.1.50.tar.gz) = 5f4b6ac445ee386bb3004f0c27607283d011da3c 4RMD160 (mysql-5.1.50.tar.gz) = 5f4b6ac445ee386bb3004f0c27607283d011da3c
5Size (mysql-5.1.50.tar.gz) = 23750564 bytes 5Size (mysql-5.1.50.tar.gz) = 23750564 bytes
6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 6SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1
7SHA1 (patch-ab) = 8bbbb84d659810031162475917ec233951c67ca4 7SHA1 (patch-ab) = 7258ade5c4d9aa26cb1b1a93aac9da2f7ed92c2c
8SHA1 (patch-ac) = 5d5f1b67eb96254b821cf4a3e99eec26dd703bf6 8SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4
9SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c 9SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c
10SHA1 (patch-ae) = c74481e5856cbd73662495630c73baec93586e9b 10SHA1 (patch-ae) = 5373aeea5d67d8d1cbee1fa4d04c03227b544e3d
11SHA1 (patch-af) = 399a55ac369831757fad5aec4dbd8b76050276e4 11SHA1 (patch-af) = cc6cd10021b63564b893b02e1967d3c470f0e0b2
12SHA1 (patch-ag) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c 12SHA1 (patch-ag) = 20e4f5ac5e7b7927339b8c46329533f29a3df56f
13SHA1 (patch-ah) = 5fd4db0e04a97289f38a5467bbae5041f4082b51 13SHA1 (patch-ah) = 715bef16c95e26f4abb39eb05fd23dbc9f7fa96b
14SHA1 (patch-ai) = 722364e59070ab2d3377a694698f32bf25427bf2 14SHA1 (patch-ai) = 625474e24c6f6c7b921ffd1534fd2ff93fdf02c8
15SHA1 (patch-aj) = 476384877154dd8d2465c6c9a0e411c220d405e4 15SHA1 (patch-aj) = 5b67806269894c6f1725716f96433643260184db
16SHA1 (patch-ak) = 5dd0982e9c9b2d0199a3a148a12a4dd219533e9d 16SHA1 (patch-ak) = 9a083a1c9c63a4c4b5b5e663dafd4d4bc53e26fd
17SHA1 (patch-al) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec 17SHA1 (patch-al) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
18SHA1 (patch-am) = 7cced70246776a64e782e0c7d335d5948a2189f1 18SHA1 (patch-am) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
19SHA1 (patch-an) = a608060cee7aadaf8bcde84016a73131a75dea32 19SHA1 (patch-an) = a608060cee7aadaf8bcde84016a73131a75dea32
20SHA1 (patch-ao) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a 20SHA1 (patch-ao) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
21SHA1 (patch-ap) = 187a956b4aa7ddbf7cb80d02d1c902757b0749be 21SHA1 (patch-ap) = 8d27b99a54071dce99f3b287676ed88c93028cc0
22SHA1 (patch-aq) = d04016a2ab84709aee0c08aef71c2f79e82fc6f3 22SHA1 (patch-aq) = d04016a2ab84709aee0c08aef71c2f79e82fc6f3
23SHA1 (patch-ar) = bc0e2083ec285be8adac1027e63bf076e4c57211 23SHA1 (patch-ar) = bc0e2083ec285be8adac1027e63bf076e4c57211
24SHA1 (patch-as) = 5eb3a9308b13a25fa813db0ed4a06f8e43db74f6 24SHA1 (patch-as) = 5eb3a9308b13a25fa813db0ed4a06f8e43db74f6
25SHA1 (patch-at) = 241049f78ed4aa51497c1ebac4acea75efb0da03 25SHA1 (patch-at) = c192492ef048399da01ea191586808319ce21dc5
26SHA1 (patch-au) = b177ebba44026ebd6ad5683f81875544c6f8746d 26SHA1 (patch-au) = e454e1a4f4232e57f2105ac5150e1df0be709864
27SHA1 (patch-av) = 8b5eb4b6535f1acb4e64496cd1228107895741a1 27SHA1 (patch-av) = b9a23506c947e8cfce5f92f0da5d2d3749220f8a
28SHA1 (patch-aw) = 96b2078f40a57ec5377f551b1c756473c684612e 28SHA1 (patch-aw) = 50b811871b68506131020750f9af41e6834ec1cb
29SHA1 (patch-ax) = 390debbc31e710f5aa41fda6a8b1134a14a2ff23 29SHA1 (patch-ax) = 390debbc31e710f5aa41fda6a8b1134a14a2ff23
30SHA1 (patch-ay) = 857758885a24d72ceb206475474b4f395543cb8e 30SHA1 (patch-ay) = 0b9c334c1e50c0c341e38d3fb189194de2d05b87
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-aa 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-aa 2010/09/21 15:57:30 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-aa,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-aa,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Don't use "==" in test(1).
2 4
3--- BUILD/compile-pentium-gcov.orig 2010-02-04 11:36:48.000000000 +0000 5--- BUILD/compile-pentium-gcov.orig 2010-02-04 11:36:48.000000000 +0000
4+++ BUILD/compile-pentium-gcov 6+++ BUILD/compile-pentium-gcov
5@@ -7,7 +7,7 @@ CCACHE_GCOV_VERSION_ENABLED=0 7@@ -7,7 +7,7 @@ CCACHE_GCOV_VERSION_ENABLED=0
6 if ccache -V > /dev/null 2>&1 8 if ccache -V > /dev/null 2>&1
7 then 9 then
8 CCACHE_VER=`ccache -V | head -1 | sed s/"ccache version "//` 10 CCACHE_VER=`ccache -V | head -1 | sed s/"ccache version "//`
9- if test "$CCACHE_VER" == "2.4-gcov" 11- if test "$CCACHE_VER" == "2.4-gcov"
10+ if test "$CCACHE_VER" = "2.4-gcov" 12+ if test "$CCACHE_VER" = "2.4-gcov"
11 then 13 then
12 CCACHE_GCOV_VERSION_ENABLED=1 14 CCACHE_GCOV_VERSION_ENABLED=1
13 else 15 else
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ab 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ab 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-ab,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* process directories in client package.
2 4
3--- Makefile.in.orig 2010-02-04 11:46:48.000000000 +0000 5--- Makefile.in.orig 2010-02-04 11:46:48.000000000 +0000
4+++ Makefile.in 6+++ Makefile.in
5@@ -407,14 +407,8 @@ AUTOMAKE_OPTIONS = foreign 7@@ -407,14 +407,8 @@ AUTOMAKE_OPTIONS = foreign
6 EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ 8 EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
7 README COPYING EXCEPTIONS-CLIENT CMakeLists.txt 9 README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
8  10
9-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ 11-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
10- @readline_topdir@ sql-common scripts \ 12- @readline_topdir@ sql-common scripts \
11- @pstack_dir@ \ 13- @pstack_dir@ \
12- @sql_union_dirs@ unittest \ 14- @sql_union_dirs@ unittest \
13- @sql_server@ @man_dirs@ tests \ 15- @sql_server@ @man_dirs@ tests \
14- netware @libmysqld_dirs@ \ 16- netware @libmysqld_dirs@ \
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ac 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ac 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ac,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-ac,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Portability: include <bstring.h> if exists.
2 4
3--- client/completion_hash.cc.orig 2010-02-04 11:36:51.000000000 +0000 5--- client/completion_hash.cc.orig 2010-02-04 11:36:51.000000000 +0000
4+++ client/completion_hash.cc 6+++ client/completion_hash.cc
5@@ -22,6 +22,10 @@ 7@@ -22,6 +22,10 @@
6  8
7 #include <my_global.h> 9 #include <my_global.h>
8 #include <m_string.h> 10 #include <m_string.h>
9+#ifdef NEEDS_BSTRING_H // defines bzero() 11+#ifdef NEEDS_BSTRING_H // defines bzero()
10+#include <bstring.h> 12+#include <bstring.h>
11+#endif 13+#endif
12+ 14+
13 #undef SAFEMALLOC // Speed things up 15 #undef SAFEMALLOC // Speed things up
14 #include <my_sys.h> 16 #include <my_sys.h>
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ae 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ae 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ae,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-ae,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Portability: include <bstring.h> if exists.
2 4
3--- client/mysqlbinlog.cc.orig 2010-02-04 11:36:52.000000000 +0000 5--- client/mysqlbinlog.cc.orig 2010-02-04 11:36:52.000000000 +0000
4+++ client/mysqlbinlog.cc 6+++ client/mysqlbinlog.cc
5@@ -34,6 +34,9 @@ 7@@ -34,6 +34,9 @@
6 #include "mysql_priv.h"  8 #include "mysql_priv.h"
7 #include "log_event.h" 9 #include "log_event.h"
8 #include "sql_common.h" 10 #include "sql_common.h"
9+#ifdef NEEDS_BSTRING_H 11+#ifdef NEEDS_BSTRING_H
10+#include <bstring.h> /* defines bzero() */ 12+#include <bstring.h> /* defines bzero() */
11+#endif 13+#endif
12  14
13 #define BIN_LOG_HEADER_SIZE 4 15 #define BIN_LOG_HEADER_SIZE 4
14 #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4) 16 #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4)
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-af 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-af 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-af,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-af,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Portability: include <bstring.h> if exists.
2 4
3--- client/sql_string.cc.orig 2010-02-04 11:36:53.000000000 +0000 5--- client/sql_string.cc.orig 2010-02-04 11:36:53.000000000 +0000
4+++ client/sql_string.cc 6+++ client/sql_string.cc
5@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr); 7@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr);
6  8
7 #include "sql_string.h" 9 #include "sql_string.h"
8  10
9+#ifdef NEEDS_BSTRING_H 11+#ifdef NEEDS_BSTRING_H
10+#include <bstring.h> /* defines bzero() */ 12+#include <bstring.h> /* defines bzero() */
11+#endif 13+#endif
12+ 14+
13 /***************************************************************************** 15 /*****************************************************************************
14 ** String functions 16 ** String functions
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ag 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ag 2010/09/21 15:57:30 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ag,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-ag,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Correct function call with a pointer to function.
2 4
3--- config/ac-macros/readline.m4.orig 2010-02-04 11:36:58.000000000 +0000 5--- config/ac-macros/readline.m4.orig 2010-02-04 11:36:58.000000000 +0000
4+++ config/ac-macros/readline.m4 6+++ config/ac-macros/readline.m4
5@@ -26,7 +26,7 @@ AC_DEFUN([MYSQL_CHECK_LIBEDIT_INTERFACE] 7@@ -26,7 +26,7 @@ AC_DEFUN([MYSQL_CHECK_LIBEDIT_INTERFACE]
6 #include "readline/readline.h" 8 #include "readline/readline.h"
7 ], 9 ],
8 [  10 [
9- char res= *(*rl_completion_entry_function)(0,0); 11- char res= *(*rl_completion_entry_function)(0,0);
10+ char res= (*rl_completion_entry_function)(0,0); 12+ char res= (*rl_completion_entry_function)(0,0);
11 completion_matches(0,0); 13 completion_matches(0,0);
12 ], 14 ],
13 [ 15 [
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ah 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ah 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ah,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-ah,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Don't use "==" in test(1).
2 4
3--- config/ac-macros/ssl.m4.orig 2010-02-04 11:36:58.000000000 +0000 5--- config/ac-macros/ssl.m4.orig 2010-02-04 11:36:58.000000000 +0000
4+++ config/ac-macros/ssl.m4 6+++ config/ac-macros/ssl.m4
5@@ -105,7 +105,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 7@@ -105,7 +105,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [
6 openssl_libs="-L$location/lib/ -lssl -lcrypto" 8 openssl_libs="-L$location/lib/ -lssl -lcrypto"
7 MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) 9 MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
8  10
9- if test "$mysql_ssl_found" == "no" 11- if test "$mysql_ssl_found" == "no"
10+ if test "$mysql_ssl_found" = "no" 12+ if test "$mysql_ssl_found" = "no"
11 then 13 then
12 # 14 #
13 # BUG 764: Compile failure with OpenSSL on Red Hat Linux (krb5.h missing) 15 # BUG 764: Compile failure with OpenSSL on Red Hat Linux (krb5.h missing)
14@@ -115,7 +115,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 16@@ -115,7 +115,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ai 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ai 2010/09/21 15:57:30 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ai,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-ai,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Limit directories in client package.
2 4
3--- configure.in.orig 2010-02-04 11:36:59.000000000 +0000 5--- configure.in.orig 2010-02-04 11:36:59.000000000 +0000
4+++ configure.in 6+++ configure.in
5@@ -2784,7 +2784,7 @@ server_scripts= 7@@ -2784,7 +2784,7 @@ server_scripts=
6  8
7 dnl This probably should be cleaned up more - for now the threaded 9 dnl This probably should be cleaned up more - for now the threaded
8 dnl client is just using plain-old libs. 10 dnl client is just using plain-old libs.
9-sql_client_dirs="strings mysys dbug extra regex libmysql" 11-sql_client_dirs="strings mysys dbug extra regex libmysql"
10+sql_client_dirs="strings mysys regex libmysql" 12+sql_client_dirs="strings mysys regex libmysql"
11  13
12 AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no") 14 AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
13  15
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-aj (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-aj 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-aj 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aj,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-aj,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Limit directories in client package.
2 4
3--- extra/Makefile.in.orig 2010-02-04 11:46:15.000000000 +0000 5--- extra/Makefile.in.orig 2010-02-04 11:46:15.000000000 +0000
4+++ extra/Makefile.in 6+++ extra/Makefile.in
5@@ -818,7 +818,7 @@ distdir: $(DISTFILES) 7@@ -818,7 +818,7 @@ distdir: $(DISTFILES)
6 check-am: all-am 8 check-am: all-am
7 check: $(BUILT_SOURCES) 9 check: $(BUILT_SOURCES)
8 $(MAKE) $(AM_MAKEFLAGS) check-recursive 10 $(MAKE) $(AM_MAKEFLAGS) check-recursive
9-all-am: Makefile $(PROGRAMS) $(HEADERS) 11-all-am: Makefile $(PROGRAMS) $(HEADERS)
10+all-am: Makefile $(HEADERS) 12+all-am: Makefile $(HEADERS)
11 installdirs: installdirs-recursive 13 installdirs: installdirs-recursive
12 installdirs-am: 14 installdirs-am:
13 for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \ 15 for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \
14@@ -876,7 +876,7 @@ install-data-am: install-pkgincludeHEADE 16@@ -876,7 +876,7 @@ install-data-am: install-pkgincludeHEADE
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-ak (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ak 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ak 2010/09/21 15:57:30 1.2
@@ -1,12 +1,35 @@ @@ -1,12 +1,35 @@
1$NetBSD: patch-ak,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-ak,v 1.2 2010/09/21 15:57:30 taca Exp $
2 2
3--- include/Makefile.in.orig 2010-02-04 11:46:18.000000000 +0000 3* Add some headers to HEADERS_ABI for building properly.
 4* Install my_compiler.h as public header. This is the same fix in
 5 MySQL's repository.
 6
 7--- include/Makefile.in.orig 2010-08-03 17:28:49.000000000 +0000
4+++ include/Makefile.in 8+++ include/Makefile.in
5@@ -393,6 +393,7 @@ BUILT_SOURCES = $(HEADERS_GEN_MAKE) link 9@@ -397,6 +397,7 @@ BUILT_SOURCES = $(HEADERS_GEN_MAKE) link
6 HEADERS_GEN_CONFIGURE = mysql_version.h 10 HEADERS_GEN_CONFIGURE = mysql_version.h
7 HEADERS_GEN_MAKE = my_config.h 11 HEADERS_GEN_MAKE = my_config.h
8 HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ 12 HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
9+ mysqld_ername.h mysqld_error.h sql_state.h \ 13+ mysqld_ername.h mysqld_error.h sql_state.h \
10 my_list.h my_alloc.h typelib.h mysql/plugin.h 14 my_list.h my_alloc.h typelib.h mysql/plugin.h
11  15
12 pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ 16 pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
 17@@ -405,7 +406,8 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_d
 18 decimal.h errmsg.h my_global.h my_net.h \
 19 my_getopt.h sslopt-longopts.h my_dir.h \
 20 sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
 21- m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
 22+ m_ctype.h my_attribute.h my_compiler.h \
 23+ $(HEADERS_GEN_CONFIGURE) \
 24 $(HEADERS_GEN_MAKE)
 25
 26 noinst_HEADERS = config-win.h config-netware.h my_bit.h \
 27@@ -416,7 +418,7 @@ noinst_HEADERS = config-win.h config-net
 28 my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
 29 thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
 30 my_handler.h my_time.h my_vle.h my_user.h \
 31- my_libwrap.h my_stacktrace.h my_compiler.h
 32+ my_libwrap.h my_stacktrace.h
 33
 34 EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp
 35
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-am 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-am 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-am,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-am,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Define SHUT_RDWR for Irix 5.
2 4
3--- include/my_net.h.orig 2010-02-04 11:37:06.000000000 +0000 5--- include/my_net.h.orig 2010-02-04 11:37:06.000000000 +0000
4+++ include/my_net.h 6+++ include/my_net.h
5@@ -64,6 +64,15 @@ C_MODE_START 7@@ -64,6 +64,15 @@ C_MODE_START
6  8
7 #endif 9 #endif
8  10
9+#if defined(__sgi) && !defined(SHUT_RDWR) 11+#if defined(__sgi) && !defined(SHUT_RDWR)
10+ 12+
11+/* 13+/*
12+ IRIX 5 does not define SHUT_RDWR 14+ IRIX 5 does not define SHUT_RDWR
13+*/ 15+*/
14+ 16+
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-at (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-at 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-at 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-at,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-at,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Portability: include <bstring.h> if exists.
2 4
3--- sql/log_event.cc.orig 2010-02-04 11:39:50.000000000 +0000 5--- sql/log_event.cc.orig 2010-02-04 11:39:50.000000000 +0000
4+++ sql/log_event.cc 6+++ sql/log_event.cc
5@@ -32,6 +32,9 @@ 7@@ -32,6 +32,9 @@
6 #include "rpl_utility.h" 8 #include "rpl_utility.h"
7 #include "rpl_record.h" 9 #include "rpl_record.h"
8 #include <my_dir.h> 10 #include <my_dir.h>
9+#ifdef NEEDS_BSTRING_H 11+#ifdef NEEDS_BSTRING_H
10+#include <bstring.h> /* defines bcmp() */ 12+#include <bstring.h> /* defines bcmp() */
11+#endif 13+#endif
12  14
13 #endif /* MYSQL_CLIENT */ 15 #endif /* MYSQL_CLIENT */
14  16
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-au (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-au 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-au 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-au,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-au,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Portability: include <bstring.h> if exists.
2 4
3--- sql/log_event.h.orig 2010-02-04 11:39:50.000000000 +0000 5--- sql/log_event.h.orig 2010-02-04 11:39:50.000000000 +0000
4+++ sql/log_event.h 6+++ sql/log_event.h
5@@ -28,6 +28,10 @@ 7@@ -28,6 +28,10 @@
6 #ifndef _log_event_h 8 #ifndef _log_event_h
7 #define _log_event_h 9 #define _log_event_h
8  10
9+#ifdef NEEDS_BSTRING_H 11+#ifdef NEEDS_BSTRING_H
10+#include <bstring.h> /* defines bzero() */ 12+#include <bstring.h> /* defines bzero() */
11+#endif 13+#endif
12+ 14+
13 #if defined(USE_PRAGMA_INTERFACE) && !defined(MYSQL_CLIENT) 15 #if defined(USE_PRAGMA_INTERFACE) && !defined(MYSQL_CLIENT)
14 #pragma interface /* gcc class implementation */ 16 #pragma interface /* gcc class implementation */
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-av (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-av 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-av 2010/09/21 15:57:30 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-av,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-av,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Handle DragonFly as the same as FreeBSD.
2 4
3--- sql/mysqld.cc.orig 2010-02-04 11:39:50.000000000 +0000 5--- sql/mysqld.cc.orig 2010-02-04 11:39:50.000000000 +0000
4+++ sql/mysqld.cc 6+++ sql/mysqld.cc
5@@ -173,7 +173,7 @@ static void getvolumeID(BYTE *volumeName 7@@ -173,7 +173,7 @@ static void getvolumeID(BYTE *volumeName
6 int initgroups(const char *,unsigned int); 8 int initgroups(const char *,unsigned int);
7 #endif 9 #endif
8  10
9-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) 11-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
10+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H) 12+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
11 #include <ieeefp.h> 13 #include <ieeefp.h>
12 #ifdef HAVE_FP_EXCEPT // Fix type conflict 14 #ifdef HAVE_FP_EXCEPT // Fix type conflict
13 typedef fp_except fp_except_t; 15 typedef fp_except fp_except_t;
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-aw (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-aw 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-aw 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aw,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-aw,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Portability: include <bstring.h> if exists.
2 4
3--- sql/sql_string.cc.orig 2010-02-04 11:39:53.000000000 +0000 5--- sql/sql_string.cc.orig 2010-02-04 11:39:53.000000000 +0000
4+++ sql/sql_string.cc 6+++ sql/sql_string.cc
5@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr); 7@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr);
6  8
7 #include "sql_string.h" 9 #include "sql_string.h"
8  10
9+#ifdef NEEDS_BSTRING_H 11+#ifdef NEEDS_BSTRING_H
10+#include <bstring.h> /* defines bzero() */ 12+#include <bstring.h> /* defines bzero() */
11+#endif 13+#endif
12+ 14+
13 /***************************************************************************** 15 /*****************************************************************************
14 ** String functions 16 ** String functions
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-client/patches/Attic/patch-ay (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ay 2010/03/04 16:27:18 1.1.1.1
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ay 2010/09/21 15:57:30 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ay,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ 1$NetBSD: patch-ay,v 1.2 2010/09/21 15:57:30 taca Exp $
 2
 3* Portability: include <bstring.h> if exists.
2 4
3--- strings/decimal.c.orig 2010-02-04 11:40:24.000000000 +0000 5--- strings/decimal.c.orig 2010-02-04 11:40:24.000000000 +0000
4+++ strings/decimal.c 6+++ strings/decimal.c
5@@ -105,6 +105,9 @@ 7@@ -105,6 +105,9 @@
6 #include <my_sys.h> /* for my_alloca */ 8 #include <my_sys.h> /* for my_alloca */
7 #include <m_string.h> 9 #include <m_string.h>
8 #include <decimal.h> 10 #include <decimal.h>
9+#ifdef NEEDS_BSTRING_H 11+#ifdef NEEDS_BSTRING_H
10+#include <bstring.h> /* defines bzero() */ 12+#include <bstring.h> /* defines bzero() */
11+#endif 13+#endif
12  14
13 /* 15 /*
14 Internally decimal numbers are stored base 10^9 (see DIG_BASE below) 16 Internally decimal numbers are stored base 10^9 (see DIG_BASE below)
cvs diff -r1.2 -r1.3 pkgsrc/databases/mysql51-client/patches/Attic/patch-ap (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-client/patches/Attic/patch-ap 2010/08/11 23:18:04 1.2
+++ pkgsrc/databases/mysql51-client/patches/Attic/patch-ap 2010/09/21 15:57:30 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ap,v 1.2 2010/08/11 23:18:04 taca Exp $ 1$NetBSD: patch-ap,v 1.3 2010/09/21 15:57:30 taca Exp $
 2
 3* Tweak installig manual pages for client package.
2 4
3--- man/Makefile.in.orig 2010-07-09 12:38:13.000000000 +0000 5--- man/Makefile.in.orig 2010-07-09 12:38:13.000000000 +0000
4+++ man/Makefile.in 6+++ man/Makefile.in
5@@ -381,8 +381,9 @@ yassl_libs = @yassl_libs@ 7@@ -381,8 +381,9 @@ yassl_libs = @yassl_libs@
6 yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ 8 yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
7 yassl_thread_cxxflags = @yassl_thread_cxxflags@ 9 yassl_thread_cxxflags = @yassl_thread_cxxflags@
8 zlib_dir = @zlib_dir@ 10 zlib_dir = @zlib_dir@
9-man1_MANS = @man1_files@ 11-man1_MANS = @man1_files@
10-man8_MANS = @man8_files@ 12-man8_MANS = @man8_files@
11+man1_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \ 13+man1_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
12+ mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1 14+ mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
13+man8_MANS =  15+man8_MANS =
14 EXTRA_DIST = $(man1_MANS) $(man8_MANS) 16 EXTRA_DIST = $(man1_MANS) $(man8_MANS)