Fix breakage added in last commits in mysql4-* packages:

* Make mysql4-client build on NetBSD 1.[56]*
* Don't install mysqld and friends in mysql4-client (eww!)
* Remove an unneeded patch.
* Remove duplicated files in mysql4-client's PLIST.

Also, use assembler functions when MACHINE_ARCH == i386.

This closes PR pkg/27154, pkg/27720, pkg/27744 and pkg/28035.

BTW, I tested them on NetBSD 1.6.2, 2.0_RC4 and -current.

Bump PKGREVISION for both packages.

3 files changed, 74 insertions, 0 deletions

diff --git a/databases/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av
new file mode 100644
index 00000000000..2ad46461b8a
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-av
@@ -0,0 +1,20 @@
+$NetBSD: patch-av,v 1.1 2004/11/08 18:19:41 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 @@
+ 
+ # 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 \
+-			netware @libmysqld_dirs@ \
+-			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+-
+-
++SUBDIRS = . include @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
new file mode 100644
index 00000000000..87391005a7a
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-aw
@@ -0,0 +1,17 @@
+$NetBSD: patch-aw,v 1.1 2004/11/08 18:19:41 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 @@
+ 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
+ 
+ EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
+ 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax
new file mode 100644
index 00000000000..de0ce5b3558
--- /dev/null
+++ b/databases/mysql4-client/patches/patch-ax
@@ -0,0 +1,37 @@
+$NetBSD: patch-ax,v 1.1 2004/11/08 18:19:41 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 @@
+ vio_libs = @vio_libs@
+ zlib_dir = @zlib_dir@
+ 
+-bin_SCRIPTS = @server_scripts@ \
+-			msql2mysql \
+-			mysql_config \
+-			mysql_fix_privilege_tables \
+-			mysql_fix_extensions \
+-			mysql_setpermission \
+-			mysql_secure_installation \
+-			mysql_zap \
+-			mysqlaccess \
+-			mysqlbug \
+-			mysql_convert_table_format \
+-			mysql_find_rows \
+-			mysqlhotcopy \
+-			mysqldumpslow \
+-			mysql_explain_log \
+-			mysql_tableinfo \
+-			mysqld_multi \
+-			make_win_src_distribution \
+-			make_win_binary_distribution \
++bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
++	      mysql_setpermission mysql_zap mysqlaccess mysqlbug \
++	      mysql_convert_table_format mysql_find_rows mysqlhotcopy \
++	      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 \