Tue Jan 22 00:42:00 2008 UTC ()
Added some patches to fix the use of the sigsend() function, which is
not available on NetBSD.


(rillig)
diff -r1.28 -r1.29 pkgsrc/databases/mysql5-client/Makefile.common
diff -r1.17 -r1.18 pkgsrc/databases/mysql5-server/distinfo
diff -r0 -r1.1 pkgsrc/databases/mysql5-server/patches/patch-ca
diff -r0 -r1.1 pkgsrc/databases/mysql5-server/patches/patch-cb
diff -r0 -r1.1 pkgsrc/databases/mysql5-server/patches/patch-cc
cvs diff -r1.28 -r1.29 pkgsrc/databases/mysql5-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-client/Attic/Makefile.common 2007/12/14 13:36:52 1.28
+++ pkgsrc/databases/mysql5-client/Attic/Makefile.common 2008/01/22 00:41:59 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.28 2007/12/14 13:36:52 tron Exp $ 1# $NetBSD: Makefile.common,v 1.29 2008/01/22 00:41:59 rillig Exp $
2 2
3DISTNAME= mysql-5.0.51 3DISTNAME= mysql-5.0.51
4CATEGORIES= databases 4CATEGORIES= databases
5MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.0/} 5MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.0/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.mysql.com/ 8HOMEPAGE= http://www.mysql.com/
9 9
10USE_LIBTOOL= yes 10USE_LIBTOOL= yes
11GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
12 12
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14.include "options.mk" 14.include "options.mk"
@@ -79,27 +79,27 @@ CFLAGS+= -DHAVE_CURSES_H @@ -79,27 +79,27 @@ CFLAGS+= -DHAVE_CURSES_H
79CXXFLAGS+= -DHAVE_CURSES_H 79CXXFLAGS+= -DHAVE_CURSES_H
80.endif 80.endif
81 81
82.include "../../mk/pthread.buildlink3.mk" 82.include "../../mk/pthread.buildlink3.mk"
83 83
84.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 84.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
85CFLAGS+= -DSIGNALS_DONT_BREAK_READ 85CFLAGS+= -DSIGNALS_DONT_BREAK_READ
86CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 86CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
87CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no 87CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no
88CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no 88CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
89.endif 89.endif
90 90
91USE_LANGUAGES= c c++ 91USE_LANGUAGES= c c++
92USE_TOOLS+= autoconf gmake perl:run 92USE_TOOLS+= autoconf autoheader gmake perl:run
93LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 93LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
94 94
95SUBST_CLASSES= mk 95SUBST_CLASSES= mk
96SUBST_STAGE.mk= post-patch 96SUBST_STAGE.mk= post-patch
97SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \ 97SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \
98 mysys/Makefile.in strings/Makefile.in 98 mysys/Makefile.in strings/Makefile.in
99SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//" 99SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//"
100SUBST_MESSAGE.mk= Fixing Makefiles. 100SUBST_MESSAGE.mk= Fixing Makefiles.
101 101
102SUBST_CLASSES+= scr 102SUBST_CLASSES+= scr
103SUBST_STAGE.scr= post-patch 103SUBST_STAGE.scr= post-patch
104SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 104SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
105 scripts/mysql_secure_installation.sh \ 105 scripts/mysql_secure_installation.sh \
@@ -107,16 +107,16 @@ SUBST_FILES.scr= scripts/mysql_install_d @@ -107,16 +107,16 @@ SUBST_FILES.scr= scripts/mysql_install_d
107SUBST_SED.scr= -e "s,chown,${CHOWN},g" 107SUBST_SED.scr= -e "s,chown,${CHOWN},g"
108SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 108SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
109SUBST_MESSAGE.scr= Fixing scripts. 109SUBST_MESSAGE.scr= Fixing scripts.
110 110
111# Fix broken shared library detection under Mac OS X 111# Fix broken shared library detection under Mac OS X
112.if ${OPSYS} == Darwin 112.if ${OPSYS} == Darwin
113SUBST_CLASSES+= dylib 113SUBST_CLASSES+= dylib
114SUBST_STAGE.dylib= post-patch 114SUBST_STAGE.dylib= post-patch
115SUBST_FILES.dylib= configure 115SUBST_FILES.dylib= configure
116SUBST_SED.dylib= -e "s|\\\$$shrext_cmds|\\.dylib|g" 116SUBST_SED.dylib= -e "s|\\\$$shrext_cmds|\\.dylib|g"
117.endif 117.endif
118 118
119pre-configure: 119pre-configure:
120 cd ${WRKSRC} && autoconf 120 cd ${WRKSRC} && autoconf && autoheader
121 121
122.include "../../devel/zlib/buildlink3.mk" 122.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.17 -r1.18 pkgsrc/databases/mysql5-server/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql5-server/Attic/distinfo 2007/12/14 13:36:53 1.17
+++ pkgsrc/databases/mysql5-server/Attic/distinfo 2008/01/22 00:41:59 1.18
@@ -1,19 +1,22 @@ @@ -1,19 +1,22 @@
1$NetBSD: distinfo,v 1.17 2007/12/14 13:36:53 tron Exp $ 1$NetBSD: distinfo,v 1.18 2008/01/22 00:41:59 rillig Exp $
2 2
3SHA1 (mysql-5.0.51.tar.gz) = a9a253ea842e973df6f475c04dac77522de0dea7 3SHA1 (mysql-5.0.51.tar.gz) = a9a253ea842e973df6f475c04dac77522de0dea7
4RMD160 (mysql-5.0.51.tar.gz) = e14baa1c40cb385fa64fc72355db9ca58a6be2f9 4RMD160 (mysql-5.0.51.tar.gz) = e14baa1c40cb385fa64fc72355db9ca58a6be2f9
5Size (mysql-5.0.51.tar.gz) = 27045586 bytes 5Size (mysql-5.0.51.tar.gz) = 27045586 bytes
6SHA1 (patch-aa) = 913ffbbd5ce8496f412d30515fb5ecef23854023 6SHA1 (patch-aa) = 913ffbbd5ce8496f412d30515fb5ecef23854023
7SHA1 (patch-ab) = 7d3ff56e929f93b4843d62014a3f5f37cc1e84bc 7SHA1 (patch-ab) = 7d3ff56e929f93b4843d62014a3f5f37cc1e84bc
8SHA1 (patch-ad) = 2956a12d9a5a053fd5dd380f856475242e8c1199 8SHA1 (patch-ad) = 2956a12d9a5a053fd5dd380f856475242e8c1199
9SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71 9SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71
10SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec 10SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
11SHA1 (patch-ag) = 7c12975196f504c76954bfe92ffff0a98ba63019 11SHA1 (patch-ag) = 7c12975196f504c76954bfe92ffff0a98ba63019
12SHA1 (patch-ah) = 7f0a59e03ced1f0c5947a807d99cb6fad64be597 12SHA1 (patch-ah) = 7f0a59e03ced1f0c5947a807d99cb6fad64be597
13SHA1 (patch-ai) = c8ba7dfe00f37682e3f521314fe4225aa0b8e4a3 13SHA1 (patch-ai) = c8ba7dfe00f37682e3f521314fe4225aa0b8e4a3
14SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55 14SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55
15SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea 15SHA1 (patch-ak) = 27698a132b42519e267dda0584a75eae1b74edea
16SHA1 (patch-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1 16SHA1 (patch-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1
17SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5 17SHA1 (patch-am) = 3820fde3c4124822cba9a2e6265f21b08d8276d5
18SHA1 (patch-an) = b657862771fbc4f6ba748e5b02e4eae51fa87ac1 18SHA1 (patch-an) = b657862771fbc4f6ba748e5b02e4eae51fa87ac1
19SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299 19SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
 20SHA1 (patch-ca) = 1548b047c0767bb0f32e3960218150fbc6c739b5
 21SHA1 (patch-cb) = 282ba93d296927236eaff690201e0139cdc8fbcb
 22SHA1 (patch-cc) = ae90cc9787b9f29fcba6a1222e2973f296893bd4
File Added: pkgsrc/databases/mysql5-server/patches/Attic/patch-ca
$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
File Added: pkgsrc/databases/mysql5-server/patches/Attic/patch-cb
$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
File Added: pkgsrc/databases/mysql5-server/patches/Attic/patch-cc
$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