[pkgsrc/trunk]: pkgsrc/databases make mysql 3.23.51 compile on 1.6.x, which u...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/02efa5c986f7
branches:  trunk
changeset: 462238:02efa5c986f7
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Sep 28 15:09:48 2003 +0000

description:
make mysql 3.23.51 compile on 1.6.x, which uses bundled mit-pthreads
fixes PR pkg/22988 by Adrian Portelli

diffstat:

 databases/mysql-client/distinfo         |   3 ++-
 databases/mysql-client/patches/patch-am |  12 ++++++++++++
 databases/mysql-server/distinfo         |   3 ++-
 databases/mysql-server/patches/patch-ao |  13 +++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 62cb2426c964 -r 02efa5c986f7 databases/mysql-client/distinfo
--- a/databases/mysql-client/distinfo   Sun Sep 28 14:52:55 2003 +0000
+++ b/databases/mysql-client/distinfo   Sun Sep 28 15:09:48 2003 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2003/09/28 09:03:52 jdolecek Exp $
+$NetBSD: distinfo,v 1.11 2003/09/28 15:09:48 jdolecek Exp $
 
 SHA1 (mysql-3.23.51.tar.gz) = 5833feb9ecacd9870586d20a94c4c4650f988770
 Size (mysql-3.23.51.tar.gz) = 11203102 bytes
 SHA1 (patch-af) = 89dc4d3761cb9f2be0afc2658b80595ceacd1643
 SHA1 (patch-al) = 8d8738a168233dcf968b02c7c48c0711342ea200
+SHA1 (patch-am) = b7266fdb45cce5db44aaea5bd2a869ce452933e3
diff -r 62cb2426c964 -r 02efa5c986f7 databases/mysql-client/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql-client/patches/patch-am   Sun Sep 28 15:09:48 2003 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2003/09/28 15:09:48 jdolecek Exp $
+
+--- mysys/my_gethostbyname.c.orig      Sun Sep 28 16:33:05 2003
++++ mysys/my_gethostbyname.c   Sun Sep 28 16:33:20 2003
+@@ -18,7 +18,6 @@
+ /* Thread safe version of gethostbyname_r() */
+ 
+ #include "mysys_priv.h"
+-#include "my_pthread.h"
+ #include <assert.h>
+ #if !defined(MSDOS) && !defined(__WIN__)
+ #include <netdb.h>
diff -r 62cb2426c964 -r 02efa5c986f7 databases/mysql-server/distinfo
--- a/databases/mysql-server/distinfo   Sun Sep 28 14:52:55 2003 +0000
+++ b/databases/mysql-server/distinfo   Sun Sep 28 15:09:48 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2003/09/28 09:03:53 jdolecek Exp $
+$NetBSD: distinfo,v 1.23 2003/09/28 15:09:48 jdolecek Exp $
 
 SHA1 (mysql-3.23.51.tar.gz) = 5833feb9ecacd9870586d20a94c4c4650f988770
 Size (mysql-3.23.51.tar.gz) = 11203102 bytes
@@ -16,3 +16,4 @@
 SHA1 (patch-al) = 75b237ea28da2b44f05c0c0fb3493bba060004dc
 SHA1 (patch-am) = adc14bcc3bd21e5a522e1a732ded223b641a2ac7
 SHA1 (patch-an) = c42a40e8772eb4a59eacae71c416b62682ce78dd
+SHA1 (patch-ao) = 39feaabdfe23d3007722001e3bda0b8967c473eb
diff -r 62cb2426c964 -r 02efa5c986f7 databases/mysql-server/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql-server/patches/patch-ao   Sun Sep 28 15:09:48 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.3 2003/09/28 15:09:48 jdolecek Exp $
+
+--- mit-pthreads/include/netdb.h.orig  Sun Sep 28 16:36:39 2003
++++ mit-pthreads/include/netdb.h       Sun Sep 28 16:37:20 2003
+@@ -49,6 +49,8 @@
+ #define __NETDB_MAXALIASES    35
+ #define __NETDB_MAXADDRS      35
+ 
++extern int h_errno;
++
+ /*
+  * Structures returned by network data base library.  All addresses are
+  * supplied in host order, and returned in network order (suitable for