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.

1 files changed, 1 insertions, 150 deletions

diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
index 58b2316868b..983b4cd95c1 100644
--- a/databases/mysql4-client/PLIST
+++ b/databases/mysql4-client/PLIST
@@ -1,52 +1,28 @@
-@comment $NetBSD: PLIST,v 1.8 2004/10/31 10:14:14 grant Exp $
-bin/client_test
-bin/comp_err
-bin/isamchk
-bin/isamlog
-bin/make_win_binary_distribution
-bin/make_win_src_distribution
+@comment $NetBSD: PLIST,v 1.9 2004/11/08 18:19:41 xtraeme Exp $
 bin/msql2mysql
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
 bin/mysql
 bin/mysql_config
 bin/mysql_convert_table_format
 bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
-bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
-bin/mysql_install_db
-bin/mysql_secure_installation
 bin/mysql_setpermission
 bin/mysql_tableinfo
-bin/mysql_tzinfo_to_sql
-bin/mysql_waitpid
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbinlog
 bin/mysqlbug
 bin/mysqlcheck
-bin/mysqld_multi
-bin/mysqld_safe
 bin/mysqldump
 bin/mysqldumpslow
 bin/mysqlhotcopy
 bin/mysqlimport
-bin/mysqlmanager
 bin/mysqlmanager-pwgen
 bin/mysqlmanagerc
 bin/mysqlshow
 bin/mysqltest
-bin/pack_isam
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
 include/mysql/errmsg.h
 include/mysql/keycache.h
 include/mysql/m_ctype.h
@@ -77,20 +53,8 @@ include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
-lib/mysql/libdbug.a
-lib/mysql/libheap.a
-lib/mysql/libmerge.a
-lib/mysql/libmyisam.a
-lib/mysql/libmyisammrg.a
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.la
-lib/mysql/libmystrings.a
-lib/mysql/libmysys.a
-lib/mysql/libnisam.a
-lib/mysql/libvio.a
-libexec/mysqld
-man/man1/isamchk.1
-man/man1/isamlog.1
 man/man1/mysql.1
 man/man1/mysql_fix_privilege_tables.1
 man/man1/mysql_zap.1
@@ -98,121 +62,8 @@ man/man1/mysqlaccess.1
 man/man1/mysqladmin.1
 man/man1/mysqldump.1
 man/man1/mysqlshow.1
-man/man1/perror.1
-man/man1/replace.1
-share/mysql/Description.plist
-share/mysql/Info.plist
-share/mysql/MySQL-shared-compat.spec
-share/mysql/StartupParameters.plist
-share/mysql/charsets/Index.xml
-share/mysql/charsets/README
-share/mysql/charsets/armscii8.xml
-share/mysql/charsets/ascii.xml
-share/mysql/charsets/cp1250.xml
-share/mysql/charsets/cp1251.xml
-share/mysql/charsets/cp1256.xml
-share/mysql/charsets/cp1257.xml
-share/mysql/charsets/cp850.xml
-share/mysql/charsets/cp852.xml
-share/mysql/charsets/cp866.xml
-share/mysql/charsets/dec8.xml
-share/mysql/charsets/geostd8.xml
-share/mysql/charsets/greek.xml
-share/mysql/charsets/hebrew.xml
-share/mysql/charsets/hp8.xml
-share/mysql/charsets/keybcs2.xml
-share/mysql/charsets/koi8r.xml
-share/mysql/charsets/koi8u.xml
-share/mysql/charsets/latin1.xml
-share/mysql/charsets/latin2.xml
-share/mysql/charsets/latin5.xml
-share/mysql/charsets/latin7.xml
-share/mysql/charsets/macce.xml
-share/mysql/charsets/macroman.xml
-share/mysql/charsets/swe7.xml
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/danish/errmsg.sys
-share/mysql/danish/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
-share/mysql/english/errmsg.sys
-share/mysql/english/errmsg.txt
-share/mysql/estonian/errmsg.sys
-share/mysql/estonian/errmsg.txt
 share/mysql/fill_help_tables.sql
-share/mysql/french/errmsg.sys
-share/mysql/french/errmsg.txt
-share/mysql/german/errmsg.sys
-share/mysql/german/errmsg.txt
-share/mysql/greek/errmsg.sys
-share/mysql/greek/errmsg.txt
-share/mysql/hungarian/errmsg.sys
-share/mysql/hungarian/errmsg.txt
-share/mysql/italian/errmsg.sys
-share/mysql/italian/errmsg.txt
-share/mysql/japanese/errmsg.sys
-share/mysql/japanese/errmsg.txt
-share/mysql/korean/errmsg.sys
-share/mysql/korean/errmsg.txt
-share/mysql/mi_test_all
-share/mysql/mi_test_all.res
-share/mysql/my-huge.cnf
-share/mysql/my-innodb-heavy-4G.cnf
-share/mysql/my-large.cnf
-share/mysql/my-medium.cnf
-share/mysql/my-small.cnf
-share/mysql/mysql-${PKGVERSION}.spec
-share/mysql/mysql-log-rotate
 share/mysql/mysql_fix_privilege_tables.sql
-share/mysql/norwegian-ny/errmsg.sys
-share/mysql/norwegian-ny/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/portuguese/errmsg.sys
-share/mysql/portuguese/errmsg.txt
-share/mysql/postinstall
-share/mysql/preinstall
-share/mysql/romanian/errmsg.sys
-share/mysql/romanian/errmsg.txt
-share/mysql/russian/errmsg.sys
-share/mysql/russian/errmsg.txt
-share/mysql/serbian/errmsg.sys
-share/mysql/serbian/errmsg.txt
-share/mysql/slovak/errmsg.sys
-share/mysql/slovak/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/ukrainian/errmsg.sys
-share/mysql/ukrainian/errmsg.txt
-@dirrm share/mysql/ukrainian
-@dirrm share/mysql/swedish
-@dirrm share/mysql/spanish
-@dirrm share/mysql/slovak
-@dirrm share/mysql/serbian
-@dirrm share/mysql/russian
-@dirrm share/mysql/romanian
-@dirrm share/mysql/portuguese
-@dirrm share/mysql/polish
-@dirrm share/mysql/norwegian-ny
-@dirrm share/mysql/norwegian
-@dirrm share/mysql/korean
-@dirrm share/mysql/japanese
-@dirrm share/mysql/italian
-@dirrm share/mysql/hungarian
-@dirrm share/mysql/greek
-@dirrm share/mysql/german
-@dirrm share/mysql/french
-@dirrm share/mysql/estonian
-@dirrm share/mysql/english
-@dirrm share/mysql/dutch
-@dirrm share/mysql/danish
-@dirrm share/mysql/czech
-@dirrm share/mysql/charsets
 @dirrm share/mysql
 @dirrm lib/mysql
 @dirrm include/mysql