Update mysql to 3.22.32.

This includes a security fix for the remote password checking protocol.

Other wise it's just the regular bunch of bugfixes.  See appendix D of
the manual.

23 files changed, 33 insertions, 1107 deletions

diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index d0006c3fc52..0f74329a3bc 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1999/12/13 20:31:51 bad Exp $
+# $NetBSD: Makefile,v 1.5 2000/02/15 04:46:31 bad Exp $
 #
 
-DISTNAME=	mysql-3.22.27
+DISTNAME=	mysql-3.22.32
 PKGNAME=	${DISTNAME:S/-/-client-/}
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.mysql.com/pub/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql-client/files/md5 b/databases/mysql-client/files/md5
index b36f64434e8..9e75fa7befc 100644
--- a/databases/mysql-client/files/md5
+++ b/databases/mysql-client/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/12/13 20:31:52 bad Exp $
+$NetBSD: md5,v 1.3 2000/02/15 04:46:32 bad Exp $
 
-MD5 (mysql-3.22.27.tar.gz) = 385bee829a157b0a50e61402fc859035
+MD5 (mysql-3.22.32.tar.gz) = 244e08d9a1f4b2ad799aa40ad3cc897a
diff --git a/databases/mysql-client/pkg/PLIST b/databases/mysql-client/pkg/PLIST
index db5412ee617..86504bf89db 100644
--- a/databases/mysql-client/pkg/PLIST
+++ b/databases/mysql-client/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/12/13 20:31:53 bad Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/02/15 04:46:32 bad Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_zap
@@ -8,19 +8,29 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
+bin/mysqlhotcopy
 bin/mysqlimport
 bin/mysqlshow
 bin/mysql_setpermission
 include/mysql/dbug.h
 include/mysql/errmsg.h
-include/mysql/m_ctype.h.in
+include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/my_config.h
+include/mysql/my_global.h
 include/mysql/my_list.h
+include/mysql/my_net.h
+include/mysql/my_pthread.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
+include/mysql/raid.h
+include/mysql/sslopt-case.h
+include/mysql/sslopt-longopts.h
+include/mysql/sslopt-usage.h
+include/mysql/sslopt-vars.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec install-info %D/info/mysql.info %D/info/dir
@@ -29,7 +39,7 @@ lib/mysql/libmysqlclient.so.6.0
 share/mysql/binary-configure
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.27.spec
+share/mysql/mysql-3.22.32.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 man/man1/mysql.1
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 70c9df5f6c4..044ba32cce0 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 1999/12/13 23:57:22 bad Exp $
+# $NetBSD: Makefile,v 1.10 2000/02/15 04:46:23 bad Exp $
 #
 
-DISTNAME=		mysql-3.22.27
+DISTNAME=		mysql-3.22.32
 PKGNAME=		${DISTNAME:S/-/-server-/}
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.mysql.com/pub/mysql/Downloads/MySQL-3.22/ \
@@ -41,6 +41,9 @@ post-extract:
 		${SED} -e '/^install-exec:/s/install-pkglibLIBRARIES//' $$dir/Makefile.in.orig >$$dir/Makefile.in; \
 	done
 
+post-configure:
+	@cd ${WRKSRC} && ${CP} config.h include/my_config.h
+
 post-install:
 	@cd ${WRKSRC}/scripts && \
 		${MAKE_PROGRAM} safe_mysqld mysql_install_db && \
diff --git a/databases/mysql-server/files/md5 b/databases/mysql-server/files/md5
index e6adc6468dc..9918a212664 100644
--- a/databases/mysql-server/files/md5
+++ b/databases/mysql-server/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/12/13 20:36:22 bad Exp $
+$NetBSD: md5,v 1.3 2000/02/15 04:46:24 bad Exp $
 
-MD5 (mysql-3.22.27.tar.gz) = 385bee829a157b0a50e61402fc859035
+MD5 (mysql-3.22.32.tar.gz) = 244e08d9a1f4b2ad799aa40ad3cc897a
diff --git a/databases/mysql-server/files/patch-sum b/databases/mysql-server/files/patch-sum
index 7feb4848687..a982c32f0f4 100644
--- a/databases/mysql-server/files/patch-sum
+++ b/databases/mysql-server/files/patch-sum
@@ -1,18 +1,3 @@
-$NetBSD: patch-sum,v 1.9 2000/01/17 17:15:31 bad Exp $
+$NetBSD: patch-sum,v 1.10 2000/02/15 04:46:24 bad Exp $
 
-MD5 (patch-aa) = f365bcd221de53ff6c21e25142e5c5e5
-MD5 (patch-ah) = b8aed564301f4cbea7c9677590917925
-MD5 (patch-ar) = 0b7cdad4dd69b6ca13ad0fbde37df8d6
-MD5 (patch-as) = 13776a945f3ed5a04fc1a3a4aa042dee
-MD5 (patch-au) = 6c45abe0f6c1600e0f2589f813047b1b
-MD5 (patch-av) = 0344b8c994c3ad198a20dadba3c2fe56
-MD5 (patch-ay) = 37bf83f67cb3ba9257fb00bd7a3ecdd3
-MD5 (patch-az) = 3f30c742937b05f12042b5ff0fa7fca8
-MD5 (patch-bd) = 080456979112f42d1f88c9b69c4f9946
-MD5 (patch-be) = 2855039e482b78c31720f3ddc5e8d752
-MD5 (patch-bf) = 8818adb013190eea8648222cc86476c5
-MD5 (patch-bg) = d625bb949765958d9ad60c413a599a38
-MD5 (patch-bh) = 3cac847c3008c633cf8970d9dd46a1be
-MD5 (patch-bi) = 41ca03261490be3b954dfd03bd79f47c
-MD5 (patch-bj) = b7423ddca37dd5d914681690fd0b0563
-MD5 (patch-bk) = 1534d8f7c64d56be11c5e37e8a516b8b
+MD5 (patch-aa) = f9dc5acd38bc7bcfb5f853140cd02cf9
diff --git a/databases/mysql-server/patches/patch-aa b/databases/mysql-server/patches/patch-aa
index 86adf9dfd34..28adfe959d7 100644
--- a/databases/mysql-server/patches/patch-aa
+++ b/databases/mysql-server/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.2 1999/12/13 20:36:22 bad Exp $
+$NetBSD: patch-aa,v 1.3 2000/02/15 04:46:24 bad Exp $
 
---- Makefile.in.orig	Thu Jul  8 06:33:18 1999
-+++ Makefile.in	Tue Aug 17 00:06:35 1999
-@@ -141,7 +141,7 @@
+--- Makefile.in.orig	Sun Feb 13 04:06:45 2000
++++ Makefile.in	Tue Feb 15 04:09:49 2000
+@@ -144,7 +144,7 @@
  # These are built from source in the Docs directory
  EXTRA_DIST = INSTALL-SOURCE-GENERIC README 			PUBLIC INSTALL-SOURCE MIRRORS
  
--SUBDIRS = @docs_dirs@ @readline_dir@ client @sql_server_dirs@ 			scripts include tests man @bench_dirs@ support-files
+-SUBDIRS = include @docs_dirs@ @readline_dir@ client 			@sql_server_dirs@ scripts tests man 			@bench_dirs@ support-files
 +SUBDIRS = @sql_server_dirs@ tests @bench_dirs@
  
  
diff --git a/databases/mysql-server/patches/patch-ah b/databases/mysql-server/patches/patch-ah
deleted file mode 100644
index 088eaf1d353..00000000000
--- a/databases/mysql-server/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.3 1999/12/13 20:36:23 bad Exp $
-
---- mit-pthreads/config/configure.orig	Mon Jun  7 12:34:01 1999
-+++ mit-pthreads/config/configure	Tue Aug 17 00:18:32 1999
-@@ -1313,6 +1313,9 @@
- 	;;
-     m68*-*-netbsd*)
- 	name=m68000-netbsd
-+	sysincludes=netbsd-1.1
-+	except="lseek ftruncate pipe fstat"
-+	available_syscalls="sigsuspend sigprocmask"
- 	;;
-     i386-*-freebsd2.*)
-         name=i386-freebsd-2.0
diff --git a/databases/mysql-server/patches/patch-ar b/databases/mysql-server/patches/patch-ar
deleted file mode 100644
index 9a73e1cf46d..00000000000
--- a/databases/mysql-server/patches/patch-ar
+++ /dev/null
@@ -1,141 +0,0 @@
-$NetBSD: patch-ar,v 1.5 2000/01/17 17:15:30 bad Exp $
-# NOTE:  this one needs to be created with "diff -u2"
-
---- mit-pthreads/machdep/syscall-sparc-netbsd-1.3.S.orig	Mon Jun  7 12:34:23 1999
-+++ mit-pthreads/machdep/syscall-sparc-netbsd-1.3.S	Mon Jan 17 17:56:51 2000
-@@ -10,14 +10,15 @@
- #endif
-  
-+#include <machine/asm.h>
- #include <sys/syscall.h>
- 
- #define	SYSCALL(x)					\
--	.globl _machdep_sys_##x;		\
--									\
--_machdep_sys_##x:;					\
--									\
--	mov SYS_##x, %g1;   			\
--	ta 0;							\
--	bcs,a 2b;						\
-+	.globl _C_LABEL(machdep_sys_##x);		\
-+							\
-+_C_LABEL(machdep_sys_##x):;				\
-+							\
-+	mov SYS_##x, %g1;   				\
-+	ta 0;						\
-+	bcs,a 2b;					\
- 	sub %r0,%o0,%o0;				\
- 	retl							
-@@ -44,7 +45,7 @@
-  * machdep_sys_pipe()
-  */
--    .globl _machdep_sys_pipe
-+    .globl _C_LABEL(machdep_sys_pipe)
- 
--_machdep_sys_pipe:
-+_C_LABEL(machdep_sys_pipe):
-     mov  %o0, %o2
-     mov  SYS_pipe, %g1
-@@ -60,7 +61,7 @@
-  * machdep_sys_fork()
-  */
--    .globl _machdep_sys_fork;
-+    .globl _C_LABEL(machdep_sys_fork);
- 
--_machdep_sys_fork:;
-+_C_LABEL(machdep_sys_fork):;
- 
-     mov SYS_fork, %g1;
-@@ -68,7 +69,7 @@
-     bcs 1b;
-     nop;
--	dec %o1;
-+    dec %o1;
-     retl;
--	and %o0, %o1, %o0;	! return 0 in child, pid in parent
-+    and %o0, %o1, %o0;	! return 0 in child, pid in parent
- 
- #ifndef SYS___sigprocmask14
-@@ -76,9 +77,9 @@
-  * machdep_sys_sigprocmask()
-  */
--    .globl _machdep_sys_sigprocmask;
-+    .globl _C_LABEL(machdep_sys_sigprocmask);
- 
--_machdep_sys_sigprocmask:;
-+_C_LABEL(machdep_sys_sigprocmask):;
- 
--	ld [%o1], %o1; 
-+    ld [%o1], %o1; 
-     mov SYS_sigprocmask, %g1;
-     ta 0;
-@@ -86,5 +87,5 @@
-     nop;
-     retl
--	nop
-+    nop
- #endif
- 
-@@ -93,9 +94,9 @@
-  * machdep_sys_sigsuspend()
-  */
--    .globl _machdep_sys_sigsuspend;
-+    .globl _C_LABEL(machdep_sys_sigsuspend);
- 
--_machdep_sys_sigsuspend:;
-+_C_LABEL(machdep_sys_sigsuspend):;
- 
--	ld [%o0], %o0; 
-+    ld [%o0], %o0; 
-     mov SYS_sigsuspend, %g1;
-     ta 0;
-@@ -103,5 +104,5 @@
-     nop;
-     retl
--	nop
-+    nop
- #endif
- 
-@@ -109,7 +110,7 @@
-  * machdep_sys_fstat()
-  */
--    .globl _machdep_sys_fstat;
-+    .globl _C_LABEL(machdep_sys_fstat);
- 
--_machdep_sys_fstat:;
-+_C_LABEL(machdep_sys_fstat):;
- 
-     mov SYS___fstat13, %g1;
-@@ -118,5 +119,5 @@
-     nop;
-     retl
--	nop
-+    nop
- 
- /* ==========================================================================
-@@ -130,12 +131,12 @@
-     nop;
-     retl
--	nop
-+    nop
- 
- /* ==========================================================================
-  * machdep_sys_lseek()
-  */
--	.global _machdep_sys_lseek
-+	.global _C_LABEL(machdep_sys_lseek)
- 
--_machdep_sys_lseek:
-+_C_LABEL(machdep_sys_lseek):
- 	save %sp,-112,%sp
- 	mov %i1,%o4
-@@ -155,7 +156,7 @@
-  * machdep_sys_ftruncate()
-  */
--	.global _machdep_sys_ftruncate
-+	.global _C_LABEL(machdep_sys_ftruncate)
- 
--_machdep_sys_ftruncate:
-+_C_LABEL(machdep_sys_ftruncate):
- 	save %sp,-104,%sp
- 	mov %i1,%o4
diff --git a/databases/mysql-server/patches/patch-as b/databases/mysql-server/patches/patch-as
deleted file mode 100644
index 7975b7e698a..00000000000
--- a/databases/mysql-server/patches/patch-as
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-as,v 1.2 1999/12/13 20:36:26 bad Exp $
-
---- mit-pthreads/machdep/syscall-template-sparc-netbsd-1.3.S.orig	Mon Jun  7 12:34:23 1999
-+++ mit-pthreads/machdep/syscall-template-sparc-netbsd-1.3.S	Sun Aug 22 03:21:52 1999
-@@ -4,6 +4,7 @@
-  *
-  */
- 
-+#include <machine/asm.h>
- #include <sys/syscall.h>
- 
- #ifdef SYS___sigsuspend14
-@@ -14,15 +15,15 @@
- #endif
- 
- #define	SYSCALL(x)						\
--	.globl _machdep_sys_##x;			\
--										\
--_machdep_sys_##x:;						\
--										\
--	mov SYS_##x, %g1;   				\
--	ta 0;								\
--	bcs,a 2b;							\
-+	.globl _C_LABEL(machdep_sys_##x);			\
-+								\
-+_C_LABEL(machdep_sys_##x):;					\
-+								\
-+	mov SYS_##x, %g1;   					\
-+	ta 0;							\
-+	bcs,a 2b;						\
- 	sub %r0,%o0,%o0;					\
--	retl;								\
-+	retl;							\
- 	nop
- 
- /*
diff --git a/databases/mysql-server/patches/patch-au b/databases/mysql-server/patches/patch-au
deleted file mode 100644
index 2f86ef2d825..00000000000
--- a/databases/mysql-server/patches/patch-au
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-au,v 1.2 1999/12/13 20:36:26 bad Exp $
-
---- mit-pthreads/machdep/syscall-i386-netbsd-1.3.S.orig	Mon Jun  7 12:34:23 1999
-+++ mit-pthreads/machdep/syscall-i386-netbsd-1.3.S	Sun Aug 22 02:17:44 1999
-@@ -65,9 +65,9 @@
- /* ==========================================================================
-  * machdep_sys_fork()
-  */
--	.globl _machdep_sys_fork;		
-+	.globl _C_LABEL(machdep_sys_fork);		
- 									
--_machdep_sys_fork:;				
-+_C_LABEL(machdep_sys_fork):;				
- 									
- 	movl $(SYS_fork), %eax;		
- 	.byte 0x9a; .long 0; .word 7;	
-@@ -92,13 +92,13 @@
- /* ==========================================================================
-  * machdep_sys_sigsuspend()
-  */
--	.globl _machdep_sys_sigsuspend;		
-+	.globl _C_LABEL(machdep_sys_sigsuspend);		
- 
--_machdep_sys_sigsuspend:;
-+_C_LABEL(machdep_sys_sigsuspend):;
- 
- 	movl    4(%esp),%eax            # fetch mask arg
--    movl    (%eax),%eax             # indirect to mask arg
--    movl    %eax,4(%esp)
-+	movl    (%eax),%eax             # indirect to mask arg
-+	movl    %eax,4(%esp)
- 	movl $(SYS_sigsuspend), %eax;		
- 	int $0x80;						
- 	jb 3f;
-@@ -114,9 +114,9 @@
- /* ==========================================================================
-  * machdep_sys_lseek()
-  */
--	.globl _machdep_sys_lseek;		
-+	.globl _C_LABEL(machdep_sys_lseek);		
- 
--_machdep_sys_lseek:;				
-+_C_LABEL(machdep_sys_lseek):;				
- 									
- 	pushl  %ebp;
- 	movl   %esp,%ebp;
-@@ -134,9 +134,9 @@
- /* ==========================================================================
-  * machdep_sys_ftruncate() ; Added by Monty
-  */
--        .globl _machdep_sys_ftruncate;
-+        .globl _C_LABEL(machdep_sys_ftruncate);
-  
--_machdep_sys_ftruncate:;
-+_C_LABEL(machdep_sys_ftruncate):;
-  
-         pushl  %ebp; 
-         movl   %esp,%ebp;
-@@ -154,13 +154,13 @@
- /* ==========================================================================
-  * machdep_sys_sigprocmask()
-  */
--	.globl _machdep_sys_sigprocmask;		
-+	.globl _C_LABEL(machdep_sys_sigprocmask);		
- 
--_machdep_sys_sigprocmask:;				
-+_C_LABEL(machdep_sys_sigprocmask):;				
- 									
- 	movl 8(%esp),%ecx
- 	movl (%ecx),%ecx
--    movl %ecx,8(%esp)
-+	movl %ecx,8(%esp)
- 	movl $(SYS_sigprocmask), %eax;		
- 	int  $0x80;						
- 	jb   3b;
-@@ -170,9 +170,9 @@
- /* ==========================================================================
-  * machdep_sys_pipe()
-  */
--	.globl _machdep_sys_pipe;		
-+	.globl _C_LABEL(machdep_sys_pipe);		
- 
--_machdep_sys_pipe:;	
-+_C_LABEL(machdep_sys_pipe):;	
- 									
- 	movl $(SYS_pipe), %eax;		
- 	int  $0x80;						
-@@ -186,9 +186,9 @@
- /* ==========================================================================
-  * machdep_sys_fstat()
-  */
--	.globl _machdep_sys_fstat;
-+	.globl _C_LABEL(machdep_sys_fstat);
- 
--_machdep_sys_fstat:;
-+_C_LABEL(machdep_sys_fstat):;
- 	movl $(SYS___fstat13), %eax;
- 	int $0x80;
- 	jb 4f;
diff --git a/databases/mysql-server/patches/patch-av b/databases/mysql-server/patches/patch-av
deleted file mode 100644
index f7d3b4a92d0..00000000000
--- a/databases/mysql-server/patches/patch-av
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-av,v 1.2 1999/12/13 20:36:26 bad Exp $
-
---- mit-pthreads/machdep/syscall-template-i386-netbsd-1.3.S.orig	Mon Jun  7 12:34:23 1999
-+++ mit-pthreads/machdep/syscall-template-i386-netbsd-1.3.S	Sun Aug 22 00:59:11 1999
-@@ -11,25 +11,25 @@
- #ifdef __STDC__
- 
- #define	SYSCALL(x)					\
--	.globl _machdep_sys_##x;		\
--									\
--_machdep_sys_##x:;					\
--									\
--	movl $(SYS_##x), %eax;			\
--	int $0x80;						\
--	jb	1b;							\
-+	.globl _C_LABEL(machdep_sys_##x);		\
-+							\
-+_C_LABEL(machdep_sys_##x):;				\
-+							\
-+	movl $(SYS_##x), %eax;				\
-+	int $0x80;					\
-+	jb	1b;					\
- 	ret;							
- 
- #else
- 
--#define	SYSCALL(x)					\
--	.globl _machdep_sys_/**/x;		\
--									\
--_machdep_sys_/**/x:;				\
--									\
--	movl $(SYS_/**/x), %eax;		\
--	int $0x80;						\
--	jb	1b;							\
-+#define	_SYSCALL(x)					\
-+	.globl _C_LABEL(machdep_sys_/**/x);		\
-+							\
-+_C_LABEL(machdep_sys_/**/x):;				\
-+							\
-+	movl $(SYS_/**/x), %eax;			\
-+	int $0x80;					\
-+	jb	1b;					\
- 	ret;							
- 
- #endif
diff --git a/databases/mysql-server/patches/patch-ay b/databases/mysql-server/patches/patch-ay
deleted file mode 100644
index cb3ec4cd94c..00000000000
--- a/databases/mysql-server/patches/patch-ay
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-ay,v 1.2 1999/12/13 20:36:27 bad Exp $
-
---- mit-pthreads/machdep/syscall-arm32-netbsd-1.3.S.orig	Mon Jun  7 12:34:23 1999
-+++ mit-pthreads/machdep/syscall-arm32-netbsd-1.3.S	Sun Aug 22 02:16:09 1999
-@@ -65,9 +65,9 @@
- /* ==========================================================================
-  * machdep_sys_fork()
-  */
--	.globl _machdep_sys_fork;		
-+	.globl _C_LABEL(machdep_sys_fork);		
- 									
--_machdep_sys_fork:;				
-+_C_LABEL(machdep_sys_fork):;				
- 
- 	swi	SYS_fork
- 	bcs	1f
-@@ -80,9 +80,9 @@
- /* ==========================================================================
-  * machdep_sys_fstat()
-  */
--	.globl _machdep_sys_fstat;
-+	.globl _C_LABEL(machdep_sys_fstat);
- 
--_machdep_sys_fstat:;				
-+_C_LABEL(machdep_sys_fstat):;				
- 
- 	swi     SYS___fstat13
- 	bcs     1f
-@@ -103,9 +103,9 @@
- /* ==========================================================================
-  * machdep_sys_sigsuspend()
-  */
--	.globl _machdep_sys_sigsuspend;		
-+	.globl _C_LABEL(machdep_sys_sigsuspend);		
- 
--_machdep_sys_sigsuspend:;
-+_C_LABEL(machdep_sys_sigsuspend):;
- 
- 	ldr     r0, [r0]
- 	swi     SYS_sigsuspend
-@@ -119,9 +119,9 @@
- /* ==========================================================================
-  * machdep_sys_sigprocmask()
-  */
--	.globl _machdep_sys_sigprocmask;		
-+	.globl _C_LABEL(machdep_sys_sigprocmask);		
- 
--_machdep_sys_sigprocmask:;				
-+_C_LABEL(machdep_sys_sigprocmask):;				
- 									
- 	teq     r1, #0x00000000
- 	moveq   r0, #0x00000001
-@@ -138,8 +138,8 @@
- /* ==========================================================================
-  * machdep_sys_ftruncate()
-  */
--	.global	_machdep_sys_ftruncate
--_machdep_sys_ftruncate:
-+	.global	_C_LABEL(machdep_sys_ftruncate)
-+_C_LABEL(machdep_sys_ftruncate):
- 	mov	r12, r13
- 	stmfd	r13!, {r11, r12, r14, r15}
- 	sub	r13, r13, #8
-@@ -155,9 +155,9 @@
- /* ==========================================================================
-  * machdep_sys_lseek()
-  */
--	.global	_machdep_sys_lseek
-+	.global	_C_LABEL(machdep_sys_lseek)
- 
--_machdep_sys_lseek:
-+_C_LABEL(machdep_sys_lseek):
- 	mov	r12, r13
- 	stmfd	r13!, {r11, r12, r14, r15}
- 	str	r3, [r13, #-4]!
-@@ -174,9 +174,9 @@
- /* ==========================================================================
-  * machdep_sys_pipe()
-  */
--	.globl _machdep_sys_pipe;		
-+	.globl _C_LABEL(machdep_sys_pipe);		
- 
--_machdep_sys_pipe:;	
-+_C_LABEL(machdep_sys_pipe):;	
- 
-         mov     r2, r0
- 	swi     SYS_pipe
diff --git a/databases/mysql-server/patches/patch-az b/databases/mysql-server/patches/patch-az
deleted file mode 100644
index b943e8e8a9b..00000000000
--- a/databases/mysql-server/patches/patch-az
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-az,v 1.2 1999/12/13 20:36:27 bad Exp $
-
---- mit-pthreads/machdep/syscall-template-arm32-netbsd-1.3.S.orig	Mon Jun  7 12:34:24 1999
-+++ mit-pthreads/machdep/syscall-template-arm32-netbsd-1.3.S	Sun Aug 22 02:13:21 1999
-@@ -11,23 +11,23 @@
- #ifdef __STDC__
- 
- #define	SYSCALL(x)					\
--	.globl _machdep_sys_##x;		\
--									\
--_machdep_sys_##x:;					\
--									\
--	swi	SYS_##x;			\
--	bcs	1b;						\
-+	.globl _C_LABEL(machdep_sys_##x);		\
-+							\
-+_C_LABEL(machdep_sys_##x):;				\
-+							\
-+	swi	SYS_##x;				\
-+	bcs	1b;					\
- 	mov	r15, r14;							
- 
- #else
- 
- #define	SYSCALL(x)					\
--	.globl _machdep_sys_/**/x;		\
--									\
--_machdep_sys_/**/x:;				\
--									\
--	swi	SYS_/**/x;		\
--	bcs	1b;						\
-+	.globl _C_LABEL(_machdep_sys_/**/x);		\
-+							\
-+_C_LABEL(machdep_sys_/**/x):;				\
-+							\
-+	swi	SYS_/**/x;				\
-+	bcs	1b;					\
- 	mov	r15, r14;							
- 
- #endif
diff --git a/databases/mysql-server/patches/patch-bd b/databases/mysql-server/patches/patch-bd
deleted file mode 100644
index 3b99ca6dd17..00000000000
--- a/databases/mysql-server/patches/patch-bd
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-bd,v 1.3 1999/12/13 20:36:28 bad Exp $
-
---- mit-pthreads/config/configure.in.orig	Mon Jun  7 12:34:24 1999
-+++ mit-pthreads/config/configure.in	Tue Aug 17 01:07:21 1999
-@@ -124,12 +124,14 @@
- name=$host_cpu-$host_os
- 
- case $host in
-+changequote(,)dnl
-     alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.4*)
- 	name=alpha-netbsd-1.3
- 	sysincludes=netbsd-1.1
- 	except="fork lseek pipe fstat"
- 	available_syscalls="sigsuspend sigprocmask"
- 	;;
-+changequote([,])dnl
-     alpha-*-netbsd1.3*)
- 	name=alpha-netbsd-1.3
- 	sysincludes=netbsd-1.1
-@@ -159,6 +161,19 @@
- 	sysincludes=netbsd-1.1
- 	except="fork pipe lseek ftruncate sigsuspend sigprocmask fstat"
- 	;;
-+changequote(,)dnl
-+    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.4*)
-+	name=arm32-netbsd-1.3
-+	sysincludes=netbsd-1.1
-+	except="fork pipe lseek ftruncate fstat"
-+	available_syscalls="sigsuspend sigprocmask"
-+	;;
-+changequote([,])dnl
-+    arm32-*-netbsd1.3*)
-+	name=arm32-netbsd-1.3
-+	sysincludes=netbsd-1.1
-+	except="fork pipe lseek ftruncate sigsuspend sigprocmask fstat"
-+	;;
-     hppa1.0-*-hpux10.20 | hppa1.1-*-hpux10.20)
- 	name=hppa-hpux-10.20
- 	sysincludes=hpux-10.20
-@@ -204,6 +219,19 @@
- 	sysincludes=netbsd-1.1
- 	except="pipe fork lseek ftruncate sigprocmask sigsuspend fstat"
- 	;;
-+changequote(,)dnl
-+    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.4*)
-+	name=sparc-netbsd-1.3
-+	sysincludes=netbsd-1.1
-+	except="pipe fork lseek ftruncate fstat"
-+	available_syscalls="sigprocmask sigsuspend"
-+	;;
-+changequote([,])dnl
-+    sparc-*-netbsd1.3*)
-+	name=sparc-netbsd-1.3
-+	sysincludes=netbsd-1.1
-+	except="pipe fork lseek ftruncate sigprocmask sigsuspend fstat"
-+	;;
-     sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*)
- 	name=sparc-sunos-4.1.3
- 	sysincludes=netbsd-1.0
-@@ -235,6 +263,14 @@
- 	except="fork lseek ftruncate pipe fstat"
- 	available_syscalls="sigsuspend sigprocmask"
- 		;;
-+changequote(,)dnl
-+    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.4*)
-+	name=i386-netbsd-1.3
-+	sysincludes=netbsd-1.1
-+	except="fork lseek ftruncate pipe fstat"
-+	available_syscalls="sigsuspend sigprocmask"
-+		;;
-+changequote([,])dnl
-     i386-*-netbsd1.3*)
- 	name=i386-netbsd-1.3
- 	sysincludes=netbsd-1.1
-@@ -257,6 +293,9 @@
- 	;;
-     m68*-*-netbsd*)
- 	name=m68000-netbsd
-+	sysincludes=netbsd-1.1
-+	except="lseek ftruncate pipe fstat"
-+	available_syscalls="sigsuspend sigprocmask"
- 	;;
-     i386-*-freebsd2.*)
-         name=i386-freebsd-2.0
diff --git a/databases/mysql-server/patches/patch-be b/databases/mysql-server/patches/patch-be
deleted file mode 100644
index 2660d90f3b1..00000000000
--- a/databases/mysql-server/patches/patch-be
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-be,v 1.1 1999/08/03 20:30:41 bad Exp $
-
---- mit-pthreads/machdep/engine-m68000-netbsd.h.orig	Sun Oct 12 14:07:37 1997
-+++ mit-pthreads/machdep/engine-m68000-netbsd.h	Wed Dec 22 16:32:38 1999
-@@ -5,2 +5,5 @@
-  *
-+ * m68k work by Andy Finnell <andyf@vei.net> based off work by
-+ *  David Leonard and Chris Provenzano.
-+ *
-  */
-@@ -18,10 +21,10 @@
- 
--#define SEMAPHORE_TEST_AND_SET(lock)    \
--({										\
--volatile long temp = SEMAPHORE_CLEAR;   \
--										\
--__asm__ volatile("tas (%2);	bpl 0f; movl #1,%0; 0:" \
--        :"=r" (temp)                    \
--        :"0" (temp),"r" (lock));        \
--temp;                                   \
-+#define SEMAPHORE_TEST_AND_SET(lock)            \
-+({                                              \
-+        volatile long temp = SEMAPHORE_CLEAR;   \
-+        __asm__ volatile(                       \
-+          "tas %2; bpl 0f; movl #1,%0; 0:"      \
-+          :"=r" (temp)                          \
-+          :"0" (temp),"m" (*lock));             \
-+        temp;                                   \
- })
-@@ -50,2 +53,3 @@
-     jmp_buf     		machdep_state;
-+    char			machdep_fstate[92];
- };
-@@ -58,2 +62,8 @@
- /*
-+ * Some fd flag defines that are necessary to distinguish between posix
-+ * behavior and bsd4.3 behavior.
-+ */
-+#define __FD_NONBLOCK 		O_NONBLOCK
-+
-+/*
-  * Static machdep_pthread initialization values.
-@@ -72,2 +82,22 @@
- 
-+
-+#ifndef __machdep_stack_get
-+#define __machdep_stack_get(x)      (x)->machdep_stack
-+#endif
-+#ifndef __machdep_stack_set
-+#define __machdep_stack_set(x, y)   (x)->machdep_stack = y
-+#endif
-+#ifndef __machdep_stack_repl
-+#define __machdep_stack_repl(x, y)                          \
-+{                                                           \
-+    if (stack = __machdep_stack_get(x)) {                   \
-+        __machdep_stack_free(stack);                        \
-+    }                                                       \
-+    __machdep_stack_set(x, y);                              \
-+}
-+#endif
-+
-+void *  __machdep_stack_alloc       __P_((size_t));
-+void    __machdep_stack_free        __P_((void *));
-+    
- int machdep_save_state      __P_((void));
diff --git a/databases/mysql-server/patches/patch-bf b/databases/mysql-server/patches/patch-bf
deleted file mode 100644
index 25a7ca35c60..00000000000
--- a/databases/mysql-server/patches/patch-bf
+++ /dev/null
@@ -1,261 +0,0 @@
-$NetBSD: patch-bf,v 1.1 1999/08/03 20:30:41 bad Exp $
-
---- /dev/null	Wed Jul 28 16:32:34 1999
-+++ mit-pthreads/machdep/engine-m68000-netbsd.c	Wed Jul 28 23:54:31 1999
-@@ -0,0 +1,256 @@
-+/* ==== machdep.c ============================================================
-+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu
-+ *
-+ * Copyright (c) 1993 by Chris Provenzano, proven@mit.edu
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *  This product includes software developed by Chris Provenzano.
-+ * 4. The name of Chris Provenzano may not be used to endorse or promote
-+ *      products derived from this software without specific prior written
-+ *      permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY CHRIS PROVENZANO ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL CHRIS PROVENZANO BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ * Description : Machine dependent functions for NetBSD on i386
-+ *
-+ *      1.00 93/08/04 proven
-+ *      -Started coding this file.
-+ *
-+ * m68k work from David Leonard <david.leonard@it.uq.edu.au>.
-+ * updated and NetBSD/m68k work from Andy Finnell <andyf@vei.net>.
-+ *
-+ */
-+
-+#ifndef lint
-+static const char rcsid[] = "$Id: patch-bf,v 1.1 1999/08/03 20:30:41 bad Exp $";
-+#endif
-+
-+#include "pthread.h"
-+#include <sys/syscall.h>
-+#include <sys/stat.h>
-+
-+/* ==========================================================================
-+ * machdep_save_state()
-+ */
-+int machdep_save_state(void)
-+{
-+    return( _setjmp(pthread_run->machdep_data.machdep_state) );
-+}
-+
-+/* ==========================================================================
-+ * machdep_restore_state()
-+ */
-+void machdep_restore_state(void)
-+{
-+    _longjmp(pthread_run->machdep_data.machdep_state, 1);
-+}
-+
-+/* ==========================================================================
-+ * machdep_save_state()
-+ */
-+void machdep_save_float_state(struct pthread * pthread)
-+{
-+    char * fdata = pthread->machdep_data.machdep_fstate;
-+
-+    __asm__ ( "fmovem fp0-fp7,%0"::"m" (*fdata) );
-+    __asm__ ( "fmovem fpcr/fpsr/fpi,%0"::"m" (fdata[80]) );
-+}
-+
-+/* ==========================================================================
-+ * machdep_restore_float_state()
-+ */
-+void machdep_restore_float_state(void)
-+{
-+    char * fdata = pthread_run->machdep_data.machdep_fstate;
-+
-+    __asm__ ( "fmovem %0,fp0-fp7"::"m" (*fdata) );
-+    __asm__ ( "fmovem %0,fpcr/fpsr/fpi"::"m" (fdata[80]) );
-+
-+}
-+
-+/* ==========================================================================
-+ * machdep_set_thread_timer()
-+ */
-+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread)
-+{
-+    if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) {
-+        PANIC();
-+    }
-+}
-+
-+/* ==========================================================================
-+ * machdep_unset_thread_timer()
-+ */
-+void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread)
-+{
-+    struct itimerval zeroval = { { 0, 0 }, { 0, 0 } };
-+
-+    if (setitimer(ITIMER_VIRTUAL, &zeroval, NULL)) {
-+        PANIC();
-+    }
-+}
-+
-+/* ==========================================================================
-+ * __machdep_stack_free()
-+ */
-+void __machdep_stack_free(void * stack)
-+{       
-+    free(stack);
-+}
-+ 
-+/* ==========================================================================
-+ * __machdep_stack_alloc()
-+ */ 
-+void * __machdep_stack_alloc(size_t size)
-+{   
-+    void * stack;
-+    
-+    return((void*)malloc(size));
-+}     
-+
-+/* ==========================================================================
-+ * machdep_pthread_cleanup()
-+ */
-+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread)
-+{
-+    return(machdep_pthread->machdep_stack);
-+}
-+
-+/* ==========================================================================
-+ * machdep_pthread_start()
-+ */
-+void machdep_pthread_start(void)
-+{
-+        context_switch_done();
-+	pthread_sched_resume();
-+
-+    /* Run current thread's start routine with argument */
-+    pthread_exit(
-+        pthread_run->machdep_data.start_routine(
-+            pthread_run->machdep_data.start_argument
-+        )
-+    );
-+
-+    /* should never reach here */
-+    PANIC();
-+}
-+
-+/* ==========================================================================
-+ * __machdep_pthread_create()
-+ */
-+void __machdep_pthread_create(struct machdep_pthread *machdep_pthread,
-+  void *(* start_routine)(), void *start_argument, 
-+  long stack_size, long nsec, long flags)
-+{
-+    machdep_pthread->start_routine = start_routine;
-+    machdep_pthread->start_argument = start_argument;
-+
-+    machdep_pthread->machdep_timer.it_value.tv_sec = 0;
-+    machdep_pthread->machdep_timer.it_interval.tv_sec = 0;
-+    machdep_pthread->machdep_timer.it_interval.tv_usec = 0;
-+    machdep_pthread->machdep_timer.it_value.tv_usec = nsec / 1000;
-+
-+    _setjmp(machdep_pthread->machdep_state);
-+    /*
-+     * Set up new stack frame so that it looks like it
-+     * returned from a longjmp() to the beginning of
-+     * machdep_pthread_start().
-+     *
-+     * state is the set_jmp structure, which for m68k is:
-+     *   long onstack_flag;     // [0]
-+     *   long sigmask;          // [1]
-+     *   long sp;               // [2]
-+     *   long fp;               // [3]
-+     *   long ap;               // [4]
-+     *   long pc;               // [5]
-+     *   long ps;               // [6]
-+     *   long regs[10];         // non scratch registers
-+     */
-+    machdep_pthread->machdep_state[5] = (long)machdep_pthread_start;
-+
-+    /* Stack starts high and builds down. */
-+    machdep_pthread->machdep_state[2] =
-+      (int)machdep_pthread->machdep_stack + stack_size;
-+}
-+
-+/* ==========================================================================
-+ * machdep_sys_wait3() 
-+ */
-+machdep_sys_wait3(int * b, int c, int * d)
-+{
-+        return(machdep_sys_wait4(0, b, c, d));
-+}
-+ 
-+/* ==========================================================================
-+ * machdep_sys_waitpid()
-+ */
-+machdep_sys_waitpid(int a, int * b, int c)
-+{
-+        return(machdep_sys_wait4(a, b, c, NULL));
-+}  
-+
-+/* ==========================================================================
-+ * machdep_sys_getdtablesize()
-+ */
-+machdep_sys_getdtablesize()
-+{
-+        return(sysconf(_SC_OPEN_MAX));
-+}  
-+
-+/* ==========================================================================
-+ * machdep_sys_getdirentries()
-+ */
-+machdep_sys_getdirentries(int fd, char * buf, int len, int * seek)
-+{
-+        return(machdep_sys_getdents(fd, buf, len));
-+}  
-+
-+/* ==========================================================================
-+ * machdep_sys_lseek()
-+ */
-+off_t machdep_sys_lseek(int fd, off_t offset, int whence)
-+{
-+	extern off_t __syscall();
-+
-+	return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence));
-+}
-+
-+int machdep_sys_ftruncate( int fd, off_t length)
-+{
-+	quad_t q;
-+	int rv;
-+
-+	q = __syscall((quad_t)SYS_ftruncate, fd,0, length);
-+	if( /* LINTED constant */ sizeof( quad_t ) == sizeof( register_t ) ||
-+	    /* LINTED constant */ BYTE_ORDER == LITTLE_ENDIAN )
-+		rv = (int)q;
-+	else
-+		rv = (int)((u_quad_t)q >> 32);
-+
-+	return rv;
-+}
-+
-+int machdep_sys_fstat( int f, struct stat* st )
-+{
-+	return __fstat13(f,st);
-+}
diff --git a/databases/mysql-server/patches/patch-bg b/databases/mysql-server/patches/patch-bg
deleted file mode 100644
index 86302d5c36d..00000000000
--- a/databases/mysql-server/patches/patch-bg
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-bg,v 1.1 1999/08/03 20:30:41 bad Exp $
-
---- /dev/null	Fri Jul 30 03:20:45 1999
-+++ mit-pthreads/machdep/syscall-m68000-netbsd.S	Fri Jul 30 23:23:08 1999
-@@ -0,0 +1,83 @@
-+
-+#ifndef lint
-+    .text
-+    .asciz "$Id: patch-bg,v 1.1 1999/08/03 20:30:41 bad Exp $";
-+#endif
-+
-+#include <machine/asm.h>
-+#include <sys/syscall.h>
-+
-+#ifdef __STDC__
-+#define IMM	#
-+#define SYSCALL(x)      .even; ENTRY(machdep_sys_ ## x); \
-+                        movl IMM SYS_ ## x,d0; trap IMM 0; jcs err; rts
-+#else /* !__STDC__ */
-+#define SYSCALL(x)      .even; ENTRY(machdep_sys_/**/x); \
-+                        movl #SYS_/**/x,d0; trap #0; jcs err; rts
-+#endif /* !__STDC__ */
-+
-+/*
-+ * Initial asm stuff for all functions.
-+ */
-+        .text
-+        .even
-+
-+
-+/* ==========================================================================
-+ * error code for all syscalls. The error value is returned as the negative
-+ * of the errno value.
-+ */
-+
-+err:
-+        negl            d0
-+        rts
-+
-+/* ==========================================================================
-+ * machdep_sys_pipe
-+ */
-+	.even
-+ENTRY(machdep_sys_pipe);
-+	movl #SYS_pipe,d0
-+	trap #0
-+	jcs 	err
-+	movl	sp@(4),a0
-+	movl	d0,a0@+
-+	movl	d1,a0@
-+	clrl	d0
-+	rts
-+
-+#ifndef SYS___sigsuspend14
-+	.even
-+ENTRY(machdep_sys_sigsuspend)
-+	movl	sp@(4),a0
-+	movl	a0@,sp@(4)
-+	movl	#SYS_compat_13_sigsuspend13,d0
-+	trap	#0
-+	jcs	err
-+	clrl	d0
-+	rts
-+#endif
-+
-+#ifndef SYS___sigprocmask14
-+	.even
-+ENTRY(machdep_sys_sigprocmask)
-+	tstl	sp@(8)
-+	jne	gotptr
-+/*	movl	#0,sp@(8)	/* null mask pointer; block empty set */
-+	movl	#1,sp@(4)	
-+	jra	doit
-+gotptr:
-+	movl	sp@(8),a0
-+	movl	a0@,sp@(8)
-+doit:
-+	movl	#SYS_compat_13_sigprocmask13,d0
-+	trap	#0
-+	jcs	err
-+	tstl	sp@(12)
-+	jeq	out
-+	movl	sp@(12),a0
-+	movl	d0,a0@
-+out:
-+	clrl	d0
-+	rts
-+#endif
diff --git a/databases/mysql-server/patches/patch-bh b/databases/mysql-server/patches/patch-bh
deleted file mode 100644
index 7005dcd80b1..00000000000
--- a/databases/mysql-server/patches/patch-bh
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-bh,v 1.1 1999/08/03 20:30:41 bad Exp $
-
---- /dev/null	Tue Jul 27 03:18:59 1999
-+++ mit-pthreads/machdep/syscall-template-m68000-netbsd.S	Wed Jul  7 04:29:09 1999
-@@ -0,0 +1,43 @@
-+#include <machine/asm.h>
-+#include <sys/syscall.h>
-+
-+#ifdef SYS___sigsuspend14
-+#define SYS_sigsuspend SYS___sigsuspend14
-+#endif
-+#ifdef SYS___sigprocmask14
-+#define SYS_sigprocmask SYS___sigprocmask14
-+#endif
-+
-+
-+#ifdef __STDC__
-+#define IMM	#
-+#define SYSCALL(x)      .even; \
-+			ENTRY(machdep_sys_ ## x); \
-+                        movl IMM SYS_ ## x,d0; \
-+			trap IMM 0; \
-+			jcs err; \
-+			 rts
-+#else /* !__STDC__ */
-+#define SYSCALL(x)      .even; ENTRY(machdep_sys_/**/x); \
-+                        movl #SYS_/**/x,d0; trap #0; jcs err; rts
-+#endif /* !__STDC__ */
-+
-+/*
-+ * Initial asm stuff for all functions.
-+ */
-+        .text
-+        .even
-+
-+
-+/* ==========================================================================
-+ * error code for all syscalls. The error value is returned as the negative
-+ * of the errno value.
-+ */
-+
-+err:
-+        negl            d0
-+        rts
-+
-+#define XSYSCALL(NAME)	SYSCALL(NAME)
-+
-+XSYSCALL(SYSCALL_NAME)
diff --git a/databases/mysql-server/patches/patch-bi b/databases/mysql-server/patches/patch-bi
deleted file mode 100644
index 22176f4528b..00000000000
--- a/databases/mysql-server/patches/patch-bi
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bi,v 1.2 1999/12/13 20:36:28 bad Exp $
-
---- mit-pthreads/config/config.guess.orig	Sun Jul  7 05:51:23 1996
-+++ mit-pthreads/config/config.guess	Tue Jul 27 16:55:36 1999
-@@ -261,8 +261,29 @@
-     CRAY-2:UNICOS:*:*)
- 	echo cray2-cray-unicos
-         exit 0 ;;
-+    amiga:NetBSD:*:*)
-+	echo m68k-amiga-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    atari:NetBSD:*:*)
-+	echo m68k-atari-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
-     hp3[0-9][05]:NetBSD:*:*)
- 	echo m68k-hp-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mac68k:NetBSD:*:*)
-+	echo m68k-apple-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvme68k:NetBSD:*:*)
-+	echo m68k-motorola-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    next68k:NetBSD:*:*)
-+	echo m68k-next-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    sun3:NetBSD:*:*)
-+	echo m68k-sun-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    x68k:NetBSD:*:*)
-+	echo m68k-sharp-netbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
diff --git a/databases/mysql-server/patches/patch-bj b/databases/mysql-server/patches/patch-bj
deleted file mode 100644
index 26639613f76..00000000000
--- a/databases/mysql-server/patches/patch-bj
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bj,v 1.2 1999/12/28 04:41:25 wiz Exp $
---- mit-pthreads/config/Makefile.in.orig	Mon Mar  2 19:44:34 1998
-+++ mit-pthreads/config/Makefile.in	Sun Dec  5 03:24:04 1999
-@@ -2,8 +2,12 @@
- #
- 
- LIB=pthread
--#NOPIC=
--#NOPROFILE=1
-+NOPIC=1
-+NOPROFILE=1
-+NOLINT=1
-+MKPIC=no
-+MKPROFILE=no
-+MKLINT=no
- CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/include -I${srcdir}/include -DPTHREAD_KERNEL
- CDEBUGFLAGS= @CFLAGS@
- CFLAGS+= ${CDEBUGFLAGS}
diff --git a/databases/mysql-server/patches/patch-bk b/databases/mysql-server/patches/patch-bk
deleted file mode 100644
index 55fc0162f10..00000000000
--- a/databases/mysql-server/patches/patch-bk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bk,v 1.1 1999/12/29 16:06:13 bad Exp $
-
---- mit-pthreads/stdio/Makefile.inc.orig	Wed Apr  2 02:00:48 1997
-+++ mit-pthreads/stdio/Makefile.inc	Wed Dec 29 01:25:28 1999
-@@ -9,7 +9,7 @@
- 
- SRCS+=	clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c fgetc.c \
- 	fgetline.c fgetpos.c fgets.c fileno.c findfp.c flags.c fopen.c \
--	fprintf.c fpurge.c fputc.c fputs.c fread.c freopen.c fscanf.c \
-+	fpurge.c fputc.c fputs.c fread.c freopen.c fscanf.c \
- 	fseek.c fsetpos.c ftell.c funopen.c fvwrite.c fwalk.c fwrite.c \
- 	getc.c getchar.c gets.c getw.c makebuf.c perror.c putc.c \
- 	putchar.c puts.c putw.c refill.c remove.c rewind.c rget.c scanf.c \
diff --git a/databases/mysql-server/pkg/PLIST b/databases/mysql-server/pkg/PLIST
index 458b38e16ab..c9174a5aa0e 100644
--- a/databases/mysql-server/pkg/PLIST
+++ b/databases/mysql-server/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 1999/12/13 20:36:29 bad Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/02/15 04:46:31 bad Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
 bin/mysql_install_db
 bin/perror
+bin/print_defaults
 bin/replace
 bin/resolveip
 bin/safe_mysqld