Update mysql4-* to 4.1.12.

Lots of changes and bugs fixed, see
http://dev.mysql.com/doc/mysql/en/news-4-1-12.html
for more information.

5 files changed, 26 insertions, 16 deletions

diff --git a/databases/mysql4-client/MESSAGE b/databases/mysql4-client/MESSAGE
index ba909323f2c..a62c2db0cb0 100644
--- a/databases/mysql4-client/MESSAGE
+++ b/databases/mysql4-client/MESSAGE
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/12/02 00:42:06 xtraeme Exp $
+$NetBSD: MESSAGE,v 1.2 2005/05/23 14:00:20 xtraeme Exp $
 
 To use the ``mysqlhotcopy'' script, you'll have to install the following
 packages:
 
-	devel/p5-File-Temp
 	databases/p5-DBD-mysql
+	devel/p5-File-Temp
 
 ===========================================================================
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index fe29d6fc7b1..41c9afe92a3 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.39 2005/05/22 20:07:46 jlam Exp $
+# $NetBSD: Makefile.common,v 1.40 2005/05/23 14:00:20 xtraeme Exp $
 
-DISTNAME=		mysql-4.1.11
+DISTNAME=		mysql-4.1.12
 CATEGORIES=		databases
 MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \
 			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
@@ -43,6 +43,7 @@ CONFIGURE_ENV+=		ac_cv_lib_gen_p2open="no"
 
 # We always use our own readline, either system- or pkgsrc-supplied.
 CONFIGURE_ARGS+=	--without-readline
+CONFIGURE_ARGS+=	--without-libedit
 
 # This forces mysql.info _not_ to be rebuilt.
 CONFIGURE_ARGS+=	--without-docs
diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
index feb1dac1133..3d121c4750a 100644
--- a/databases/mysql4-client/buildlink3.mk
+++ b/databases/mysql4-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/03/15 15:09:14 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2005/05/23 14:00:20 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=4.1.7
-BUILDLINK_RECOMMENDED.mysql-client+=	mysql-client>=4.1.10a
+BUILDLINK_RECOMMENDED.mysql-client+=	mysql-client>=4.1.12
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql4-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 .endif	# MYSQL_CLIENT_BUILDLINK3_MK
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index 6c6f608727a..1bc841c7236 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2005/04/06 14:13:45 xtraeme Exp $
+$NetBSD: distinfo,v 1.20 2005/05/23 14:00:20 xtraeme Exp $
 
-SHA1 (mysql-4.1.11.tar.gz) = 3fa4a9afbf56ca39bf4a2e393bc7b7f6b3cbee05
-RMD160 (mysql-4.1.11.tar.gz) = 1e61c58e5a23a39d71a3c8cdc535061560e5485f
-Size (mysql-4.1.11.tar.gz) = 22880239 bytes
-SHA1 (patch-af) = 40c6d8a8a51bad8f0132bf63dbf865e4a5362504
+SHA1 (mysql-4.1.12.tar.gz) = 2cea7ff988d9b19e8adfb5234164d671f21b0ed9
+RMD160 (mysql-4.1.12.tar.gz) = f0990c34dd7b15aa137cb002c56bf036be00e8ad
+Size (mysql-4.1.12.tar.gz) = 17069350 bytes
+SHA1 (patch-af) = 2d2f8d6eef794e0d296a1b4fdb118323e4e89b6c
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
 SHA1 (patch-av) = 4f73104cd3b798103eb2c4f83073dbac02b4db90
 SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
index a86f7c17def..7162eabe02d 100644
--- a/databases/mysql4-client/patches/patch-af
+++ b/databases/mysql4-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2005/01/17 14:42:35 xtraeme Exp $
+$NetBSD: patch-af,v 1.7 2005/05/23 14:00:21 xtraeme Exp $
 
---- configure.orig	2005-01-17 15:03:22.000000000 +0100
-+++ configure	2005-01-17 15:05:30.000000000 +0100
-@@ -36436,30 +36436,10 @@
+--- configure.orig	2005-05-13 13:34:04.000000000 +0200
++++ configure	2005-05-23 12:36:42.000000000 +0200
+@@ -37003,30 +37003,10 @@
  fi;
  
  
@@ -33,7 +33,7 @@ $NetBSD: patch-af,v 1.6 2005/01/17 14:42:35 xtraeme Exp $
  
  
  
-@@ -36738,7 +36718,7 @@
+@@ -37304,7 +37284,7 @@
  else
    bench_dirs=""
  fi
@@ -42,3 +42,12 @@ $NetBSD: patch-af,v 1.6 2005/01/17 14:42:35 xtraeme Exp $
  
  
  # Don't build readline, i have it already
+@@ -37421,7 +37401,7 @@
+ main ()
+ {
+ 
+-		char res= *(*rl_completion_entry_function)(0,0);
++		char res=(*rl_completion_entry_function)(0,0);
+ 		completion_matches(0,0);
+ 
+   ;