pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/mysql4-server adapt patch from FreeBSD ports...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce91f9aa27f7
branches:  trunk
changeset: 469499:ce91f9aa27f7
user:      grant <grant%pkgsrc.org@localhost>
date:      Tue Feb 24 14:53:54 2004 +0000

description:
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.

diffstat:

 databases/mysql4-server/distinfo         |   3 ++-
 databases/mysql4-server/patches/patch-av |  24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r 5c19401ded33 -r ce91f9aa27f7 databases/mysql4-server/distinfo
--- a/databases/mysql4-server/distinfo  Tue Feb 24 14:29:34 2004 +0000
+++ b/databases/mysql4-server/distinfo  Tue Feb 24 14:53:54 2004 +0000
@@ -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-as) = 3e2266ce1942715a21ae1e686b162c198811fb49
 SHA1 (patch-at) = 459e33b9e06f3ffc78d5dfc7e43068eb10e21b0d
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
+SHA1 (patch-av) = 6ea5b9338d223f1380386288c537f55d4fd7a7d7
diff -r 5c19401ded33 -r ce91f9aa27f7 databases/mysql4-server/patches/patch-av
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-server/patches/patch-av  Tue Feb 24 14:53:54 2004 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index