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.

11 files changed, 102 insertions, 184 deletions

diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
index 62e1fcad316..42092973b8d 100644
--- a/databases/mysql4-client/Makefile
+++ b/databases/mysql4-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/11/01 20:00:51 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2004/11/08 18:19:41 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
+PKGREVISION=		2
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 4, a free SQL database (client)
 
@@ -11,6 +11,7 @@ USE_BUILDLINK3=		yes
 
 .include "Makefile.common"
 
+CONFIGURE_ARGS+=	--without-extra-tools
 CONFIGURE_ARGS+=	--without-server
 CONFIGURE_ARGS+=	--enable-thread-safe-client
 UNWRAP_FILES=		scripts/mysql_config
@@ -18,9 +19,6 @@ UNWRAP_FILES=		scripts/mysql_config
 INFO_FILES=		mysql.info
 
 post-install:
-	cd ${PREFIX}/man/man1 && \
-		 ${RM} -f mysqld.1 mysqld_multi.1 mysqld_safe.1 safe_mysqld.1
-	cd ${PREFIX}/share/mysql && ${RM} -f mysql.server
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
 .include "../../devel/readline/buildlink3.mk"
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 69b76725d69..feabc710996 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2004/11/01 08:30:24 grant Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/11/08 18:19:41 xtraeme Exp $
 
 DISTNAME=		mysql-4.1.7
 CATEGORIES=		databases
@@ -53,6 +53,10 @@ CONFIGURE_ARGS+=	--with-vio
 CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET}
 CONFIGURE_ARGS+=	--with-extra-charsets=${MYSQL_EXTRA_CHARSET}
 
+.if !empty(MACHINE_ARCH:Mi386)
+CONFIGURE_ARGS+=	--enable-assembler
+.endif
+
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
 
@@ -65,6 +69,15 @@ CFLAGS+=		-DHAVE_CURSES_H
 CXXFLAGS+=		-DHAVE_CURSES_H
 .endif
 
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
+CFLAGS+=	-DSIGNALS_DONT_BREAK_READ
+CXXFLAGS+=	-DSIGNALS_DONT_BREAK_READ
+CONFIGURE_ENV+=	ac_cv_func_pthread_setschedparam=no
+CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
+.endif
+
 USE_LANGUAGES=		c c++
 USE_GNU_TOOLS+=		make
 USE_PERL5=		# defined
@@ -85,4 +98,3 @@ SUBST_MESSAGE.scripts=	"Fixing scripts."
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
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
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index ca015d2aee1..ac60fa5a802 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.9 2004/11/01 20:23:21 jdolecek Exp $
+$NetBSD: distinfo,v 1.10 2004/11/08 18:19:41 xtraeme Exp $
 
 SHA1 (mysql-4.1.7.tar.gz) = 11c1c3a3004175d8b9ac710f9c7815cf759e6293
 Size (mysql-4.1.7.tar.gz) = 19849046 bytes
 SHA1 (patch-af) = 890b096c132339660cff33128d410a99646f49e1
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
+SHA1 (patch-av) = bc68c2e72d41e920f981c2ac277bcd5c8ff91611
+SHA1 (patch-aw) = d431580785ecddda8af80e6b816f5eabcba55a27
+SHA1 (patch-ax) = 5421a348d7a43ea30c570a09d1250a7e25ec00f9
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 \
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 143daf3ab8d..898c860fb81 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/10/22 01:10:04 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/11/08 18:19:41 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
+PKGREVISION=		1
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL 4, a free SQL database (server)
 
@@ -36,14 +37,6 @@ BUILD_DIRS=		${WRKSRC} ${WRKSRC}/man
 
 .include "../../databases/mysql4-client/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
-CFLAGS+=	-DSIGNALS_DONT_BREAK_READ
-CXXFLAGS+=	-DSIGNALS_DONT_BREAK_READ
-CONFIGURE_ENV+=	ac_cv_func_pthread_setschedparam=no
-CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
-.endif
 
 post-configure:
 	cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index cb1d1031396..0de85df7f83 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.9 2004/10/31 08:55:20 grant Exp $
+$NetBSD: distinfo,v 1.10 2004/11/08 18:19:41 xtraeme Exp $
 
 SHA1 (mysql-4.1.7.tar.gz) = 11c1c3a3004175d8b9ac710f9c7815cf759e6293
 Size (mysql-4.1.7.tar.gz) = 19849046 bytes
 SHA1 (patch-aa) = 54d4f8cc3aa80fa49d7330873d41e13f0bb42100
 SHA1 (patch-ab) = fa03cc4b5fe58a3436687d24dd5120d48388f721
 SHA1 (patch-ac) = 184919dfda45836f0c7ad7c80e27624961ab6fea
-SHA1 (patch-ae) = d5dcade3dea37c2f9be12bbddf6091ddb57344ac
-SHA1 (patch-af) = 890b096c132339660cff33128d410a99646f49e1
+SHA1 (patch-af) = 270755264242a436047c749c5a3eb3aba2b6a25b
 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
 SHA1 (patch-am) = 2279653e5ee3df2f19242e9d4212d3666188b1d2
 SHA1 (patch-aq) = 235893947fcfdcb9f5660ade38b0b6e8423529dc
diff --git a/databases/mysql4-server/patches/patch-ae b/databases/mysql4-server/patches/patch-ae
deleted file mode 100644
index e3a7116a329..00000000000
--- a/databases/mysql4-server/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
-
---- configure.in.orig	2003-12-14 21:23:49.000000000 +0000
-+++ configure.in	2003-12-20 12:08:47.000000000 +0000
-@@ -2159,7 +2159,6 @@
- else
-   bench_dirs=""
- fi
--bench_dirs="$bench_dirs mysql-test"
- AC_SUBST(bench_dirs)
- 
- # Don't build readline, i have it already
diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af
index d4976c006a8..8a76a1162af 100644
--- a/databases/mysql4-server/patches/patch-af
+++ b/databases/mysql4-server/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2004/10/31 08:55:21 grant Exp $
+$NetBSD: patch-af,v 1.6 2004/11/08 18:19:41 xtraeme Exp $
 
 --- configure.orig	2004-10-23 17:29:20.000000000 +1000
 +++ configure
@@ -56,7 +56,7 @@ $NetBSD: patch-af,v 1.5 2004/10/31 08:55:21 grant Exp $
    bench_dirs=""
  fi
 -bench_dirs="$bench_dirs mysql-test"
-+#bench_dirs="$bench_dirs mysql-test"
++bench_dirs="$bench_dirs mysql-test"
  
  
  # Don't build readline, i have it already