move patch-af back here and don't share patches with mysql4-server.

some of the patches disable part of the build and break the client
build.

should fix build issue noted on tech-pkg.

3 files changed, 68 insertions, 4 deletions

diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index de3978b156a..69b76725d69 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2004/10/31 09:24:27 grant Exp $
+# $NetBSD: Makefile.common,v 1.20 2004/11/01 08:30:24 grant Exp $
 
 DISTNAME=		mysql-4.1.7
 CATEGORIES=		databases
@@ -11,9 +11,6 @@ HOMEPAGE=		http://www.mysql.com/
 
 EXTRACT_USING_PAX=	# defined
 
-PATCHDIR=		${.CURDIR}/../../databases/mysql4-server/patches
-DISTINFO_FILE=		${.CURDIR}/../../databases/mysql4-server/distinfo
-
 .include "../../mk/bsd.prefs.mk"
 
 # MYSQL_USER		username of the database administrator
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
new file mode 100644
index 00000000000..7f4d5a03400
--- /dev/null
+++ b/databases/mysql4-client/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.8 2004/11/01 08:30:24 grant Exp $
+
+SHA1 (mysql-4.1.7.tar.gz) = 11c1c3a3004175d8b9ac710f9c7815cf759e6293
+Size (mysql-4.1.7.tar.gz) = 19849046 bytes
+SHA1 (patch-af) = 890b096c132339660cff33128d410a99646f49e1
diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
new file mode 100644
index 00000000000..371d9920718
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-af
@@ -0,0 +1,62 @@
+$NetBSD: patch-af,v 1.4 2004/11/01 08:30:25 grant Exp $
+
+--- configure.orig	2004-10-23 17:29:20.000000000 +1000
++++ configure
+@@ -23040,7 +23040,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
+-int link_test() { return compress(0, (unsigned long*) 0, "", 0); }
++return compress(0, (unsigned long*) 0, "", 0);
+   ;
+   return 0;
+ }
+@@ -23109,7 +23109,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
+-int link_test() { return compress(0, (unsigned long*) 0, "", 0); }
++return compress(0, (unsigned long*) 0, "", 0);
+   ;
+   return 0;
+ }
+@@ -34120,30 +34120,10 @@ else
+ fi;
+ 
+ 
+-echo "$as_me:$LINENO: checking for ORBit" >&5
+-echo $ECHO_N "checking for ORBit... $ECHO_C" >&6
+-orbit_config_path=`which orbit-config`
+-if test -n "$orbit_config_path" -a $? = 0
+-then
+-  orbit_exec_prefix=`orbit-config --exec-prefix`
+-  orbit_includes=`orbit-config --cflags server`
+-  orbit_libs=`orbit-config --libs server`
+-  orbit_idl="$orbit_exec_prefix/bin/orbit-idl"
+-  echo "$as_me:$LINENO: result: found!" >&5
+-echo "${ECHO_T}found!" >&6
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ORBIT 1
+-_ACEOF
+-
+-else
+   orbit_exec_prefix=
+   orbit_includes=
+   orbit_libs=
+   orbit_idl=
+-  echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-fi
+ 
+ 
+ 
+@@ -34422,7 +34402,7 @@ then
+ else
+   bench_dirs=""
+ fi
+-bench_dirs="$bench_dirs mysql-test"
++#bench_dirs="$bench_dirs mysql-test"
+ 
+ 
+ # Don't build readline, i have it already