[pkgsrc/trunk]: pkgsrc/databases Added some patches to fix the use of the sig...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac1f5b1e678f
branches:  trunk
changeset: 537958:ac1f5b1e678f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Jan 22 00:41:59 2008 +0000

description:
Added some patches to fix the use of the sigsend() function, which is
not available on NetBSD.

diffstat:

 databases/mysql5-client/Makefile.common  |   6 +++---
 databases/mysql5-server/distinfo         |   5 ++++-
 databases/mysql5-server/patches/patch-ca |  17 +++++++++++++++++
 databases/mysql5-server/patches/patch-cb |  15 +++++++++++++++
 databases/mysql5-server/patches/patch-cc |  15 +++++++++++++++
 5 files changed, 54 insertions(+), 4 deletions(-)

diffs (101 lines):

diff -r cca77813cb09 -r ac1f5b1e678f databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Mon Jan 21 21:32:36 2008 +0000
+++ b/databases/mysql5-client/Makefile.common   Tue Jan 22 00:41:59 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2007/12/14 13:36:52 tron Exp $
+# $NetBSD: Makefile.common,v 1.29 2008/01/22 00:41:59 rillig Exp $
 
 DISTNAME=              mysql-5.0.51
 CATEGORIES=            databases
@@ -89,7 +89,7 @@
 .endif
 
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            autoconf gmake perl:run
+USE_TOOLS+=            autoconf autoheader gmake perl:run
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
 SUBST_CLASSES=         mk
@@ -117,6 +117,6 @@
 .endif
 
 pre-configure:
-       cd ${WRKSRC} && autoconf
+       cd ${WRKSRC} && autoconf && autoheader
 
 .include "../../devel/zlib/buildlink3.mk"
diff -r cca77813cb09 -r ac1f5b1e678f databases/mysql5-server/distinfo
--- a/databases/mysql5-server/distinfo  Mon Jan 21 21:32:36 2008 +0000
+++ b/databases/mysql5-server/distinfo  Tue Jan 22 00:41:59 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2007/12/14 13:36:53 tron Exp $
+$NetBSD: distinfo,v 1.18 2008/01/22 00:41:59 rillig Exp $
 
 SHA1 (mysql-5.0.51.tar.gz) = a9a253ea842e973df6f475c04dac77522de0dea7
 RMD160 (mysql-5.0.51.tar.gz) = e14baa1c40cb385fa64fc72355db9ca58a6be2f9
@@ -17,3 +17,6 @@
 SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5
 SHA1 (patch-an) = b657862771fbc4f6ba748e5b02e4eae51fa87ac1
 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
+SHA1 (patch-ca) = 1548b047c0767bb0f32e3960218150fbc6c739b5
+SHA1 (patch-cb) = 282ba93d296927236eaff690201e0139cdc8fbcb
+SHA1 (patch-cc) = ae90cc9787b9f29fcba6a1222e2973f296893bd4
diff -r cca77813cb09 -r ac1f5b1e678f databases/mysql5-server/patches/patch-ca
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql5-server/patches/patch-ca  Tue Jan 22 00:41:59 2008 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ca,v 1.1 2008/01/22 00:41:59 rillig Exp $
+
+Before calling sigsend(), make sure the function actuall exists. Fixes
+the build on NetBSD >= 4.99.49, in which the macro P_MYID is defined
+somewhere unrelated to signals.
+
+--- configure.in.orig  2007-11-15 15:06:32.000000000 +0100
++++ configure.in       2008-01-22 01:11:07.000000000 +0100
+@@ -1955,7 +1955,7 @@ AC_CHECK_HEADERS(varargs.h stdarg.h dire
+ paths.h semaphore.h)
+ 
+ # Already-done: strcasecmp
+-AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
++AC_CHECK_FUNCS(lstat putenv select setenv setlocale sigsend strcoll tcgetattr)
+ 
+ AC_STAT_MACROS_BROKEN
+ MYSQL_SIGNAL_CHECK
diff -r cca77813cb09 -r ac1f5b1e678f databases/mysql5-server/patches/patch-cb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql5-server/patches/patch-cb  Tue Jan 22 00:41:59 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-cb,v 1.1 2008/01/22 00:42:00 rillig Exp $
+
+See patch-ca.
+
+--- libmysqld/stacktrace.c.orig        2007-11-15 15:06:35.000000000 +0100
++++ libmysqld/stacktrace.c     2008-01-22 01:16:41.000000000 +0100
+@@ -251,7 +251,7 @@ void write_core(int sig)
+   __gcov_flush();
+ #endif
+   pthread_kill(pthread_self(), sig);
+-#if defined(P_MYID) && !defined(SCO)
++#if HAVE_SIGSEND && defined(P_MYID) && !defined(SCO)
+   /* On Solaris, the above kill is not enough */
+   sigsend(P_PID,P_MYID,sig);
+ #endif
diff -r cca77813cb09 -r ac1f5b1e678f databases/mysql5-server/patches/patch-cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql5-server/patches/patch-cc  Tue Jan 22 00:41:59 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-cc,v 1.1 2008/01/22 00:42:00 rillig Exp $
+
+See patch-ca.
+
+--- sql/stacktrace.c.orig      2007-11-15 15:06:35.000000000 +0100
++++ sql/stacktrace.c   2008-01-22 01:17:08.000000000 +0100
+@@ -251,7 +251,7 @@ void write_core(int sig)
+   __gcov_flush();
+ #endif
+   pthread_kill(pthread_self(), sig);
+-#if defined(P_MYID) && !defined(SCO)
++#if HAVE_SIGSEND && defined(P_MYID) && !defined(SCO)
+   /* On Solaris, the above kill is not enough */
+   sigsend(P_PID,P_MYID,sig);
+ #endif