[pkgsrc/trunk]: pkgsrc/databases Also commit patches for the DragonFly support.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6050840386ef
branches:  trunk
changeset: 501719:6050840386ef
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Oct 26 17:33:49 2005 +0000

description:
Also commit patches for the DragonFly support.

diffstat:

 databases/mysql4-client/patches/patch-aa |  13 +++++++++++++
 databases/mysql4-client/patches/patch-ab |  13 +++++++++++++
 databases/mysql4-client/patches/patch-ac |  13 +++++++++++++
 databases/mysql4-client/patches/patch-ad |  24 ++++++++++++++++++++++++
 databases/mysql4-server/patches/patch-ad |  13 +++++++++++++
 databases/mysql4-server/patches/patch-ae |  13 +++++++++++++
 databases/mysql4-server/patches/patch-ag |  13 +++++++++++++
 7 files changed, 102 insertions(+), 0 deletions(-)

diffs (130 lines):

diff -r 4671e18749de -r 6050840386ef databases/mysql4-client/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-client/patches/patch-aa  Wed Oct 26 17:33:49 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/10/26 17:33:49 joerg Exp $
+
+--- mysys/my_gethwaddr.c.orig  2005-10-14 10:21:10.000000000 +0000
++++ mysys/my_gethwaddr.c
+@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to
+   return res;
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #include <net/ethernet.h>
+ #include <sys/sysctl.h>
diff -r 4671e18749de -r 6050840386ef databases/mysql4-client/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-client/patches/patch-ab  Wed Oct 26 17:33:49 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/10/26 17:33:49 joerg Exp $
+
+--- sql/mysqld.cc.orig 2005-10-14 10:21:12.000000000 +0000
++++ sql/mysqld.cc
+@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName
+ int initgroups(const char *,unsigned int);
+ #endif
+ 
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
+ #include <ieeefp.h>
+ #ifdef HAVE_FP_EXCEPT                         // Fix type conflict
+ typedef fp_except fp_except_t;
diff -r 4671e18749de -r 6050840386ef databases/mysql4-client/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-client/patches/patch-ac  Wed Oct 26 17:33:49 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2005/10/26 17:33:49 joerg Exp $
+
+--- vio/vio.c.orig     2005-10-14 10:23:58.000000000 +0000
++++ vio/vio.c
+@@ -132,7 +132,7 @@ Vio *vio_new(my_socket sd, enum enum_vio
+           vio->sd);
+ #if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2)
+ #if !defined(NO_FCNTL_NONBLOCK)
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+     fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */
+ #endif
+     vio->fcntl_mode = fcntl(sd, F_GETFL);
diff -r 4671e18749de -r 6050840386ef databases/mysql4-client/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-client/patches/patch-ad  Wed Oct 26 17:33:49 2005 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2005/10/26 17:33:49 joerg Exp $
+
+--- configure.orig     2005-10-14 10:25:05.000000000 +0000
++++ configure
+@@ -21053,7 +21053,7 @@ then
+   FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
+ else
+   case $SYSTEM_TYPE in
+-    *freebsd*)
++    *freebsd* | *dragonfly*)
+       FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
+       ;;
+     *darwin*)
+@@ -25265,6 +25265,10 @@ case $SYSTEM_TYPE in
+       MAX_C_OPTIMIZE="-O"
+     fi
+     ;;
++  *dragonfly*)
++    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    ;;
++    
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
diff -r 4671e18749de -r 6050840386ef databases/mysql4-server/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-server/patches/patch-ad  Wed Oct 26 17:33:49 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/10/26 17:33:49 joerg Exp $
+
+--- sql/mysqld.cc.orig 2005-10-14 10:21:12.000000000 +0000
++++ sql/mysqld.cc
+@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName
+ int initgroups(const char *,unsigned int);
+ #endif
+ 
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H)
+ #include <ieeefp.h>
+ #ifdef HAVE_FP_EXCEPT                         // Fix type conflict
+ typedef fp_except fp_except_t;
diff -r 4671e18749de -r 6050840386ef databases/mysql4-server/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-server/patches/patch-ae  Wed Oct 26 17:33:49 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2005/10/26 17:33:49 joerg Exp $
+
+--- mysys/my_gethwaddr.c.orig  2005-10-14 10:21:10.000000000 +0000
++++ mysys/my_gethwaddr.c
+@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to
+   return res;
+ }
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #include <net/ethernet.h>
+ #include <sys/sysctl.h>
diff -r 4671e18749de -r 6050840386ef databases/mysql4-server/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-server/patches/patch-ag  Wed Oct 26 17:33:49 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/10/26 17:33:49 joerg Exp $
+
+--- vio/vio.c.orig     2005-10-14 10:23:58.000000000 +0000
++++ vio/vio.c
+@@ -132,7 +132,7 @@ Vio *vio_new(my_socket sd, enum enum_vio
+           vio->sd);
+ #if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2)
+ #if !defined(NO_FCNTL_NONBLOCK)
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+     fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */
+ #endif
+     vio->fcntl_mode = fcntl(sd, F_GETFL);