Added some patches to fix the use of the sigsend() function, which is

not available on NetBSD.

5 files changed, 54 insertions, 4 deletions

diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 60bc9c9a0a2..d7c4d76ec3c 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -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 @@ CONFIGURE_ENV+=		ac_cv_func_pthread_attr_setschedparam=no
 .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 @@ SUBST_SED.dylib=	-e "s|\\\$$shrext_cmds|\\.dylib|g"
 .endif
 
 pre-configure:
-	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC} && autoconf && autoheader
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index c77f037bf85..45451599892 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -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-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1
 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 --git a/databases/mysql5-server/patches/patch-ca b/databases/mysql5-server/patches/patch-ca
new file mode 100644
index 00000000000..10b8178ccb7
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-ca
@@ -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 --git a/databases/mysql5-server/patches/patch-cb b/databases/mysql5-server/patches/patch-cb
new file mode 100644
index 00000000000..52aab1edc87
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-cb
@@ -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 --git a/databases/mysql5-server/patches/patch-cc b/databases/mysql5-server/patches/patch-cc
new file mode 100644
index 00000000000..0000de495a7
--- /dev/null
+++ b/databases/mysql5-server/patches/patch-cc
@@ -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