Update mysql5-{client,server} to 5.0.18.

Too many changes to list... more information via:
http://dev.mysql.com/doc/refman/5.0/en/news-5-0-18.html

6 files changed, 39 insertions, 30 deletions

diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index 597d8f66e3d..ba3543e45bf 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/01/08 17:45:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
+#PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 9c949720a9d..04704c7733c 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.4 2005/12/05 23:55:04 rillig Exp $
+# $NetBSD: Makefile.common,v 1.5 2006/01/09 16:25:01 xtraeme Exp $
 
-DISTNAME=		mysql-5.0.16
+DISTNAME=		mysql-5.0.18
 CATEGORIES=		databases
 MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/ \
 			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \
@@ -61,7 +61,8 @@ CONFIGURE_ARGS+=	--disable-dependency-tracking
 CONFIGURE_ARGS+=	--without-debug
 CONFIGURE_ARGS+=	--without-bench
 CONFIGURE_ARGS+=	--with-low-memory
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl:Q}
+CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q}
 CONFIGURE_ARGS+=	--with-vio
 
 CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET:Q}
@@ -73,6 +74,7 @@ CONFIGURE_ARGS+=	--enable-assembler
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE:Q}
+CONFIGURE_ENV+=		mysql_cv_compress="yes"
 
 CPPFLAGS+=		-Dunix
 CFLAGS+=		-DUSE_OLD_FUNCTIONS # 3.23.x compat
@@ -111,5 +113,13 @@ SUBST_SED.scripts=	-e "s,chown,${CHOWN},g" \
 			-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scripts=	"Fixing scripts."
 
+# Detect correctly sem_init(3) on NetBSD.
+.if !empty(OPSYS:MNetBSD)
+SUBST_CLASSES+=		sem
+SUBST_STAGE.sem=	post-patch
+SUBST_FILES.sem=	configure
+SUBST_SED.sem=		"s|-lposix4|-lrt|g"
+.endif
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index 2232ee0db03..62927961edf 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.3 2006/01/08 17:45:23 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2006/01/09 16:25:01 xtraeme Exp $
 
-SHA1 (mysql-5.0.16.tar.gz) = 28f7a20ffefcade3c1cce7250e9d3ea1fa33ab37
-RMD160 (mysql-5.0.16.tar.gz) = ec3108fc8fe043db54329af66a7f99e2da8c716c
-Size (mysql-5.0.16.tar.gz) = 19031670 bytes
+SHA1 (mysql-5.0.18.tar.gz) = e102a5086455c0f80a830e5dfc65acccc5e19a60
+RMD160 (mysql-5.0.18.tar.gz) = 1987df6d9446637c8e353f61e269e9a57d995803
+Size (mysql-5.0.18.tar.gz) = 19169082 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
 SHA1 (patch-ac) = c97ef88d13cba67b79cdb40fc23facf29edbe0b8
-SHA1 (patch-ad) = aab3c8771e398ecab6b7f6c1a85ffaf60f324053
-SHA1 (patch-ae) = 1b0b3886e0a4a8e52a3ab5bdf59db281b05caf6a
-SHA1 (patch-af) = bafd3a6bfad180473549278dd5c92a8d7ac889ef
+SHA1 (patch-ad) = 81c48274e3a43e46cf9d53f9ed4620c02761902a
+SHA1 (patch-ae) = fa70584c1846c81fe72a7796b1f7f237b398bc30
+SHA1 (patch-af) = 61f9cfd169e630708809142694d2bbea0055d20d
 SHA1 (patch-ag) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
 SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
 SHA1 (patch-ai) = 242c97ab4658838a6001d9c288e01209abfcee77
diff --git a/databases/mysql5-client/patches/patch-ad b/databases/mysql5-client/patches/patch-ad
index cd3c46eb509..058ed51c90d 100644
--- a/databases/mysql5-client/patches/patch-ad
+++ b/databases/mysql5-client/patches/patch-ad
@@ -1,18 +1,18 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2 2006/01/09 16:25:01 xtraeme Exp $
 
---- Makefile.in.orig	2005-10-31 09:11:04.000000000 +0100
-+++ Makefile.in	2005-10-31 09:11:33.000000000 +0100
-@@ -359,12 +359,7 @@
+--- Makefile.in.orig	2006-01-09 15:51:25.000000000 +0100
++++ Makefile.in	2006-01-09 15:51:43.000000000 +0100
+@@ -365,12 +365,7 @@
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
  
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
 -			@sql_union_dirs@ scripts @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @tools_dirs@
-+SUBDIRS = . include strings @sql_client_dirs@ scripts man
++SUBDIRS = . include strings @sql_client_dirs@ scripts man 
  
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
  			@readline_topdir@ sql-common \
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index 3e74805fdda..b97f05128fb 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
+$NetBSD: patch-ae,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
 
---- scripts/Makefile.in.orig	2005-11-29 20:46:22.000000000 +0100
-+++ scripts/Makefile.in	2005-11-29 20:47:23.000000000 +0100
+--- scripts/Makefile.in.orig	2006-01-09 15:54:43.000000000 +0100
++++ scripts/Makefile.in	2006-01-09 15:55:14.000000000 +0100
 @@ -341,23 +341,10 @@
- yassl_libs = @yassl_libs@
  yassl_libs_with_path = @yassl_libs_with_path@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af
index 5570a08a2d5..0536e61b370 100644
--- a/databases/mysql5-client/patches/patch-af
+++ b/databases/mysql5-client/patches/patch-af
@@ -1,15 +1,14 @@
-$NetBSD: patch-af,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
+$NetBSD: patch-af,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
 
---- man/Makefile.in.orig	2005-11-29 20:47:54.000000000 +0100
-+++ man/Makefile.in	2005-11-29 20:49:58.000000000 +0100
-@@ -338,7 +338,9 @@
- yassl_libs = @yassl_libs@
+--- man/Makefile.in.orig	2006-01-09 15:56:55.000000000 +0100
++++ man/Makefile.in	2006-01-09 15:57:22.000000000 +0100
+@@ -338,7 +338,8 @@
  yassl_libs_with_path = @yassl_libs_with_path@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
 +man1_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
-+	    mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
-+
++	mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
  EXTRA_DIST = $(man1_MANS)
  all: all-am