Update mysql4-* to 4.1.8a.

Please check http://dev.mysql.com/doc/mysql/en/News-4.1.8.html to
see the list of changes, new features added and a bunch of bugs were
fixed.

9 files changed, 81 insertions, 66 deletions

diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
index 7516960b9da..1ad48edaf62 100644
--- a/databases/mysql4-client/Makefile
+++ b/databases/mysql4-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/01/01 00:37:56 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/01/10 15:47:18 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		6
+#PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 4, a free SQL database (client)
 
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 1845c98ac4b..597fe7d6d1c 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.27 2004/12/17 17:48:08 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/01/10 15:47:18 xtraeme Exp $
 
-DISTNAME=		mysql-4.1.7
+DISTNAME=		mysql-4.1.8a
 CATEGORIES=		databases
 MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \
 			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
@@ -51,6 +51,7 @@ CONFIGURE_ARGS+=	--without-bench
 CONFIGURE_ARGS+=	--with-low-memory
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-vio
+CONFIGURE_ARGS+=	--without-mysqlfs
 
 CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET}
 CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET}
diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
index cb6442fbd1f..bb0aa3b9d45 100644
--- a/databases/mysql4-client/PLIST
+++ b/databases/mysql4-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/11/23 16:07:02 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/01/10 15:47:18 xtraeme Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -70,6 +70,6 @@ share/examples/mysql/my-small.cnf
 share/mysql/fill_help_tables.sql
 share/mysql/mysql_fix_privilege_tables.sql
 @dirrm share/mysql
-@dirrm lib/mysql
 @dirrm share/examples/mysql
+@dirrm lib/mysql
 @dirrm include/mysql
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index ac60fa5a802..0d27913db4c 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2004/11/08 18:19:41 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2005/01/10 15:47:18 xtraeme Exp $
 
-SHA1 (mysql-4.1.7.tar.gz) = 11c1c3a3004175d8b9ac710f9c7815cf759e6293
-Size (mysql-4.1.7.tar.gz) = 19849046 bytes
-SHA1 (patch-af) = 890b096c132339660cff33128d410a99646f49e1
+SHA1 (mysql-4.1.8a.tar.gz) = 845555eb6d1f48806e24e66a7a28ae822729cdcf
+Size (mysql-4.1.8a.tar.gz) = 22945198 bytes
+SHA1 (patch-af) = 66ac801ebd289d36a36434c6626cfea09a022713
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
-SHA1 (patch-av) = bc68c2e72d41e920f981c2ac277bcd5c8ff91611
-SHA1 (patch-aw) = d431580785ecddda8af80e6b816f5eabcba55a27
-SHA1 (patch-ax) = 5421a348d7a43ea30c570a09d1250a7e25ec00f9
+SHA1 (patch-av) = e2563965cb074c4dbd3b225b98de579dbb1d2b9b
+SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
+SHA1 (patch-ax) = 9e9176468d6d335617862a4d77a358931d7c8c49
+SHA1 (patch-ay) = 5cb2f32bd1a0dfb0cc9d94c08736dceeac799d12
diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
index 371d9920718..2a45b52a844 100644
--- a/databases/mysql4-client/patches/patch-af
+++ b/databases/mysql4-client/patches/patch-af
@@ -1,26 +1,8 @@
-$NetBSD: patch-af,v 1.4 2004/11/01 08:30:25 grant Exp $
+$NetBSD: patch-af,v 1.5 2005/01/10 15:47:18 xtraeme 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
+--- configure.orig	2004-12-27 17:48:08.000000000 +0100
++++ configure	2005-01-10 15:44:21.000000000 +0100
+@@ -36429,34 +36429,10 @@
  fi;
  
  
@@ -41,17 +23,25 @@ $NetBSD: patch-af,v 1.4 2004/11/01 08:30:25 grant Exp $
 -_ACEOF
 -
 -else
-   orbit_exec_prefix=
-   orbit_includes=
-   orbit_libs=
-   orbit_idl=
+-  orbit_exec_prefix=
+-  orbit_includes=
+-  orbit_libs=
+-  orbit_idl=
 -  echo "$as_me:$LINENO: result: not found" >&5
 -echo "${ECHO_T}not found" >&6
 -fi
+-
+-
+-
+-
++orbit_exec_prefix=
++orbit_includes=
++orbit_libs=
++orbit_idl=
  
- 
- 
-@@ -34422,7 +34402,7 @@ then
+   echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
+ echo $ECHO_N "checking if we should build MySQLFS... $ECHO_C" >&6
+@@ -36731,7 +36707,7 @@
  else
    bench_dirs=""
  fi
@@ -60,3 +50,12 @@ $NetBSD: patch-af,v 1.4 2004/11/01 08:30:25 grant Exp $
  
  
  # Don't build readline, i have it already
+@@ -38915,7 +38891,7 @@
+ server_scripts=
+ thread_dirs=
+ 
+-sql_client_dirs="libmysql client"
++sql_client_dirs="libmysql regex client"
+ linked_client_targets="linked_libmysql_sources"
+ CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS
+ if test "$THREAD_SAFE_CLIENT" != "no"
diff --git a/databases/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av
index 2ad46461b8a..4919ef78a03 100644
--- a/databases/mysql4-client/patches/patch-av
+++ b/databases/mysql4-client/patches/patch-av
@@ -1,20 +1,18 @@
-$NetBSD: patch-av,v 1.1 2004/11/08 18:19:41 xtraeme Exp $
+$NetBSD: patch-av,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
 
---- Makefile.in.orig	2004-11-08 17:03:55.000000000 +0100
-+++ Makefile.in	2004-11-08 17:05:09.000000000 +0100
-@@ -301,14 +301,7 @@
+--- Makefile.in.orig	2005-01-10 13:38:58.000000000 +0100
++++ Makefile.in	2005-01-10 13:40:52.000000000 +0100
+@@ -338,12 +338,7 @@
  
  # These are built from source in the Docs directory
  EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
--			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests \
+-			@thread_dirs@ pstack \
+-			@sql_server_dirs@ @sql_client_dirs@ scripts man tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
--
--
-+SUBDIRS = . include @sql_client_dirs@ scripts man
++SUBDIRS = . include strings @sql_client_dirs@ scripts man
+ 
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
  			@readline_topdir@ sql-common \
- 			@thread_dirs@ pstack @sql_client_dirs@ \
diff --git a/databases/mysql4-client/patches/patch-aw b/databases/mysql4-client/patches/patch-aw
index 87391005a7a..2fabaa3c178 100644
--- a/databases/mysql4-client/patches/patch-aw
+++ b/databases/mysql4-client/patches/patch-aw
@@ -1,15 +1,14 @@
-$NetBSD: patch-aw,v 1.1 2004/11/08 18:19:41 xtraeme Exp $
+$NetBSD: patch-aw,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
 
---- man/Makefile.in.orig	2004-11-08 17:27:29.000000000 +0100
-+++ man/Makefile.in	2004-11-08 17:28:09.000000000 +0100
-@@ -296,10 +296,8 @@
+--- man/Makefile.in.orig	2005-01-10 13:41:15.000000000 +0100
++++ man/Makefile.in	2005-01-10 13:41:46.000000000 +0100
+@@ -313,9 +313,8 @@
+ vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
- 
 -man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
 -		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
 -		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
--
 +man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
 +	   mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
  
diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax
index de0ce5b3558..c0f1dd05e86 100644
--- a/databases/mysql4-client/patches/patch-ax
+++ b/databases/mysql4-client/patches/patch-ax
@@ -1,11 +1,11 @@
-$NetBSD: patch-ax,v 1.1 2004/11/08 18:19:41 xtraeme Exp $
+$NetBSD: patch-ax,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
 
---- scripts/Makefile.in.orig	2004-11-08 17:28:31.000000000 +0100
-+++ scripts/Makefile.in	2004-11-08 17:30:26.000000000 +0100
-@@ -295,28 +295,12 @@
+--- scripts/Makefile.in.orig	2005-01-10 13:42:12.000000000 +0100
++++ scripts/Makefile.in	2005-01-10 13:43:10.000000000 +0100
+@@ -316,25 +316,10 @@
+ vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
- 
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
@@ -31,7 +31,4 @@ $NetBSD: patch-ax,v 1.1 2004/11/08 18:19:41 xtraeme Exp $
 +	      mysqldumpslow mysql_explain_log mysql_tableinfo \
  			mysql_create_system_tables
  
--
  EXTRA_SCRIPTS = make_binary_distribution.sh \
- 			make_sharedlib_distribution.sh \
- 			make_win_src_distribution.sh \
diff --git a/databases/mysql4-client/patches/patch-ay b/databases/mysql4-client/patches/patch-ay
new file mode 100644
index 00000000000..3e94fb987d8
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ay
@@ -0,0 +1,20 @@
+$NetBSD: patch-ay,v 1.1 2005/01/10 15:47:18 xtraeme Exp $
+
+--- strings/Makefile.in.orig	2005-01-10 15:59:35.000000000 +0100
++++ strings/Makefile.in	2005-01-10 16:00:49.000000000 +0100
+@@ -599,7 +599,6 @@
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+-	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 	@$(POST_INSTALL)
+@@ -616,7 +615,6 @@
+ 	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+ 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+-	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
+ 	done
+ 
+ clean-pkglibLIBRARIES: