From 6f526a58c83ec9ded7066f0537bb735fa17c73e1 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 6 Dec 2005 19:31:24 +0000
Subject: DragonFly support.

---
 databases/mysql-client/distinfo         |  4 ++--
 databases/mysql-client/patches/patch-af | 27 +++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'databases/mysql-client')

diff --git a/databases/mysql-client/distinfo b/databases/mysql-client/distinfo
index 20c8141864c..f068afa4d46 100644
--- a/databases/mysql-client/distinfo
+++ b/databases/mysql-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2005/09/27 00:13:29 xtraeme Exp $
+$NetBSD: distinfo,v 1.21 2005/12/06 19:31:24 joerg Exp $
 
 SHA1 (mysql-4.0.26.tar.gz) = e644df3568a3aa07ede2282bf5d2d9fd9adb865f
 RMD160 (mysql-4.0.26.tar.gz) = 274777aa46091618c8957aa42397d3e42d5318b4
 Size (mysql-4.0.26.tar.gz) = 11144366 bytes
-SHA1 (patch-af) = 2f3bab4108c002420e243a4ca6c9c0c3d4bdd21b
+SHA1 (patch-af) = 0183b07640ccb41ae612e089d96b901dcf75a9b9
 SHA1 (patch-av) = 684c1e2ff1f96652225045653c25707850fe0ff2
 SHA1 (patch-aw) = 23d54ceddd0631aa93b32666853965a5fc7bdfab
 SHA1 (patch-ax) = 49c803e55f483827507b596d695327c2deec81fb
diff --git a/databases/mysql-client/patches/patch-af b/databases/mysql-client/patches/patch-af
index 21ea2627987..6836bb36d44 100644
--- a/databases/mysql-client/patches/patch-af
+++ b/databases/mysql-client/patches/patch-af
@@ -1,8 +1,17 @@
-$NetBSD: patch-af,v 1.10 2004/11/09 06:11:48 xtraeme Exp $
+$NetBSD: patch-af,v 1.11 2005/12/06 19:31:24 joerg Exp $
 
 --- configure.orig	2004-11-08 20:11:05.000000000 +0100
 +++ configure	2004-11-08 20:12:44.000000000 +0100
-@@ -22842,10 +22842,7 @@
+@@ -20819,7 +20819,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*)
+@@ -23938,10 +23938,7 @@ int main(int argv, char **argc)
    return 0;
  }
  
@@ -13,7 +22,17 @@ $NetBSD: patch-af,v 1.10 2004/11/09 06:11:48 xtraeme Exp $
  
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -32058,34 +32055,10 @@
+@@ -24891,6 +24888,9 @@ 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 }'`
+@@ -34070,34 +34070,10 @@ else
    mysqlfs=no
  fi;
  
@@ -48,7 +67,7 @@ $NetBSD: patch-af,v 1.10 2004/11/09 06:11:48 xtraeme Exp $
  
    echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
  echo $ECHO_N "checking if we should build MySQLFS... $ECHO_C" >&6
-@@ -32358,7 +32331,7 @@
+@@ -34370,7 +34346,7 @@ then
  else
    bench_dirs=""
  fi
-- 
cgit v1.2.3