From bd58662a8fe93aab5c2eaae0aa8fa4714dec1782 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Tue, 24 Feb 2004 14:53:54 +0000
Subject: adapt patch from FreeBSD ports to fix build on FreeBSD 5.2:

http://www.freebsd.org/cgi/cvsweb.cgi/ports/databases/mysql41-server/files/patch-sql::mysqld.cc?rev=1.1

from Michal Pasternak in PR pkg/24447.
---
 databases/mysql4-server/distinfo         |  3 ++-
 databases/mysql4-server/patches/patch-av | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 databases/mysql4-server/patches/patch-av

(limited to 'databases')

diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index e1d67827288..4dcf98bacd4 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/20 16:00:42 martti Exp $
+$NetBSD: distinfo,v 1.2 2004/02/24 14:53:54 grant Exp $
 
 SHA1 (mysql-4.0.17.tar.gz) = b2588d2ccc9d2683e874e7c5cb4d9c55c2196b9e
 Size (mysql-4.0.17.tar.gz) = 12959051 bytes
@@ -12,3 +12,4 @@ SHA1 (patch-ar) = dfb126a4cca3bb6fd06608222277ed8773b3d34d
 SHA1 (patch-as) = 3e2266ce1942715a21ae1e686b162c198811fb49
 SHA1 (patch-at) = 459e33b9e06f3ffc78d5dfc7e43068eb10e21b0d
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
+SHA1 (patch-av) = 6ea5b9338d223f1380386288c537f55d4fd7a7d7
diff --git a/databases/mysql4-server/patches/patch-av b/databases/mysql4-server/patches/patch-av
new file mode 100644
index 00000000000..92e0ee6e32e
--- /dev/null
+++ b/databases/mysql4-server/patches/patch-av
@@ -0,0 +1,24 @@
+$NetBSD: patch-av,v 1.1 2004/02/24 14:53:54 grant Exp $
+
+--- sql/mysqld.cc.orig	2003-12-15 08:23:47.000000000 +1100
++++ sql/mysqld.cc
+@@ -106,7 +106,18 @@ extern "C" {					// Because of SCO 3.2V4
+ int allow_severity = LOG_INFO;
+ int deny_severity = LOG_WARNING;
+ 
+-#ifdef __STDC__
++#ifdef __FreeBSD__
++#  include <osreldate.h>
++#  if defined(__STDC__) && __FreeBSD_version < 500000
++#    define my_fromhost(A)	   fromhost(A)
++#    define my_hosts_access(A) hosts_access(A)
++#    define my_eval_client(A)  eval_client(A)
++#  else
++#    define my_fromhost(A)	   fromhost()
++#    define my_hosts_access(A) hosts_access()
++#    define my_eval_client(A)  eval_client()
++#  endif
++#elif defined(__STDC__)
+ #define my_fromhost(A)	   fromhost(A)
+ #define my_hosts_access(A) hosts_access(A)
+ #define my_eval_client(A)  eval_client(A)
-- 
cgit v1.2.3