summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/mysql4-client/distinfo6
-rw-r--r--databases/mysql4-server/distinfo7
-rw-r--r--databases/mysql4-server/patches/patch-af26
3 files changed, 33 insertions, 6 deletions
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index 9b08a5130e5..4e44f9cf87e 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.22 2005/09/26 22:34:49 xtraeme Exp $
+$NetBSD: distinfo,v 1.23 2005/10/26 17:33:07 joerg Exp $
SHA1 (mysql-4.1.14.tar.gz) = 275e5a304d0f9175734c7ff00eba49f0f856436d
RMD160 (mysql-4.1.14.tar.gz) = 43a637109ac54f30ddd2c437f81f50776a5d0b2c
Size (mysql-4.1.14.tar.gz) = 17074439 bytes
+SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
+SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
+SHA1 (patch-ac) = 091b9253fd94aaf79d2287b51142a39b482f7192
+SHA1 (patch-ad) = 9d15d073dc07b1ca192a4912c7869024a6e6c7a6
SHA1 (patch-af) = 2d2f8d6eef794e0d296a1b4fdb118323e4e89b6c
SHA1 (patch-av) = 6cc37eb4265f31ea0fb0bcf4bf05f84f812e96c9
SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index 760a7ba3b6c..ba02f37c7c5 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2005/09/26 22:34:51 xtraeme Exp $
+$NetBSD: distinfo,v 1.21 2005/10/26 17:33:07 joerg Exp $
SHA1 (mysql-4.1.14.tar.gz) = 275e5a304d0f9175734c7ff00eba49f0f856436d
RMD160 (mysql-4.1.14.tar.gz) = 43a637109ac54f30ddd2c437f81f50776a5d0b2c
@@ -6,7 +6,10 @@ Size (mysql-4.1.14.tar.gz) = 17074439 bytes
SHA1 (patch-aa) = 169ca69b31c92819275b3e7825c60034cb61ddfd
SHA1 (patch-ab) = 45f97d4e449c76e46cacba246d5dc9ac8417ec44
SHA1 (patch-ac) = 4f4bf372ac7ccc2255430a77da47bc5552653d8a
-SHA1 (patch-af) = 15cb787f6127f7b750851282a94515eb684419e1
+SHA1 (patch-ad) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
+SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
+SHA1 (patch-af) = eb62ce5a52d2311722203c3f2409fe4301e5d724
+SHA1 (patch-ag) = 091b9253fd94aaf79d2287b51142a39b482f7192
SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
SHA1 (patch-am) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5
diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af
index 5f95a5f43df..1811a7f2418 100644
--- a/databases/mysql4-server/patches/patch-af
+++ b/databases/mysql4-server/patches/patch-af
@@ -1,8 +1,28 @@
-$NetBSD: patch-af,v 1.8 2005/05/23 14:00:21 xtraeme Exp $
+$NetBSD: patch-af,v 1.9 2005/10/26 17:33:07 joerg Exp $
--- configure.orig 2005-05-13 13:34:04.000000000 +0200
+++ configure 2005-05-23 15:42:07.000000000 +0200
-@@ -37003,33 +37003,10 @@
+@@ -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 }'`
+@@ -37003,33 +37007,10 @@
fi;
@@ -36,7 +56,7 @@ $NetBSD: patch-af,v 1.8 2005/05/23 14:00:21 xtraeme Exp $
echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
-@@ -37421,7 +37398,7 @@
+@@ -37421,7 +37402,7 @@
main ()
{