* 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.
This commit is contained in:
taca 2010-09-21 15:57:30 +00:00
parent 3aeda366a0
commit 6f294a2ad9
20 changed files with 96 additions and 39 deletions

View file

@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.4 2010/04/20 22:58:10 taca Exp $
# $NetBSD: Makefile,v 1.5 2010/09/21 15:57:30 taca Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
PKGREVISION= 1
SVR4_PKGNAME= mysqc
COMMENT= MySQL 5, a free SQL database (client)

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $
@comment $NetBSD: PLIST,v 1.2 2010/09/21 15:57:30 taca Exp $
bin/msql2mysql
bin/mysql
bin/mysql_config
@ -28,6 +28,7 @@ include/mysql/m_ctype.h
include/mysql/m_string.h
include/mysql/my_alloc.h
include/mysql/my_attribute.h
include/mysql/my_compiler.h
include/mysql/my_config.h
include/mysql/my_dbug.h
include/mysql/my_dir.h

View file

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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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