Recognize 1.5 systems; add an #include <errno.h> (still some warnings left,

though).
Addresses pkg/10881 & pkg/10882.

4 files changed, 76 insertions, 2 deletions

diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 9fd56e5365b..70529ead5d0 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/08/18 22:46:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2000/08/23 14:46:52 wiz Exp $
 #
 
 DISTNAME=		mysql-3.22.32
@@ -10,6 +10,7 @@ MASTER_SITES=		ftp://ftp.mysql.com/MySQL-3.22/ \
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.mysql.com/
 
+BUILD_DEPENDS=		autoconf:../../devel/autoconf
 DEPENDS=		${DISTNAME:S/-/-client-/}:../../databases/mysql-client
 
 RESTRICTED=		"Restrictive license."
@@ -42,6 +43,9 @@ post-extract:
 		${SED} -e '/^install-exec:/s/install-pkglibLIBRARIES//' $$dir/Makefile.in.orig >$$dir/Makefile.in; \
 	done
 
+pre-configure:
+	@cd ${WRKSRC}/mit-pthreads/config && autoconf
+
 post-configure:
 	@cd ${WRKSRC} && ${CP} config.h include/my_config.h
 
diff --git a/databases/mysql-server/files/patch-sum b/databases/mysql-server/files/patch-sum
index a982c32f0f4..38dc15dd2d0 100644
--- a/databases/mysql-server/files/patch-sum
+++ b/databases/mysql-server/files/patch-sum
@@ -1,3 +1,5 @@
-$NetBSD: patch-sum,v 1.10 2000/02/15 04:46:24 bad Exp $
+$NetBSD: patch-sum,v 1.11 2000/08/23 14:46:52 wiz Exp $
 
 MD5 (patch-aa) = f9dc5acd38bc7bcfb5f853140cd02cf9
+MD5 (patch-ab) = d6cde586e7f7eb2daaee47e201cc4fbf
+MD5 (patch-ac) = 90ea5395eaac74614946b001661f6e81
diff --git a/databases/mysql-server/patches/patch-ab b/databases/mysql-server/patches/patch-ab
new file mode 100644
index 00000000000..8ecfca7d0ea
--- /dev/null
+++ b/databases/mysql-server/patches/patch-ab
@@ -0,0 +1,40 @@
+$NetBSD: patch-ab,v 1.3 2000/08/23 14:46:52 wiz Exp $
+
+--- mit-pthreads/config/configure.in.orig	Fri Dec 31 01:15:51 1999
++++ mit-pthreads/config/configure.in
+@@ -125,7 +125,7 @@
+ 
+ case $host in
+ changequote(,)dnl
+-    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.4*)
++    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[45]*)
+ 	name=alpha-netbsd-1.3
+ 	sysincludes=netbsd-1.1
+ 	except="fork lseek pipe fstat"
+@@ -151,7 +151,7 @@
+ 	fi
+ 	;;
+ changequote(,)dnl
+-    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.4*)
++    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[45]*)
+ 	name=arm32-netbsd-1.3
+ 	sysincludes=netbsd-1.1
+ 	except="fork pipe lseek ftruncate fstat"
+@@ -198,7 +198,7 @@
+ 	AC_DEFINE(BROKEN_SIGNALS)
+ 	;;
+ changequote(,)dnl
+-    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.4*)
++    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[45]*)
+ 	name=sparc-netbsd-1.3
+ 	sysincludes=netbsd-1.1
+ 	except="pipe fork lseek ftruncate fstat"
+@@ -236,7 +236,7 @@
+         except="fork lseek ftruncate sigsuspend"
+ 		;;
+ changequote(,)dnl
+-    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.4*)
++    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[45]*)
+ 	name=i386-netbsd-1.3
+ 	sysincludes=netbsd-1.1
+ 	except="fork lseek ftruncate pipe fstat"
diff --git a/databases/mysql-server/patches/patch-ac b/databases/mysql-server/patches/patch-ac
new file mode 100644
index 00000000000..7af2752909a
--- /dev/null
+++ b/databases/mysql-server/patches/patch-ac
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.3 2000/08/23 14:46:52 wiz Exp $
+
+--- mit-pthreads/stdio/strerror.c.orig	Mon Aug  8 05:48:21 1994
++++ mit-pthreads/stdio/strerror.c
+@@ -36,13 +36,12 @@
+ #endif /* LIBC_SCCS and not lint */
+ 
+ #include <string.h>
++#include <errno.h>
+ 
+ char *
+ strerror(num)
+ 	int num;
+ {
+-	extern int sys_nerr;
+-	extern char *sys_errlist[];
+ #define	UPREFIX	"Unknown error: "
+ 	static char ebuf[40] = UPREFIX;		/* 64-bit number + slop */
+ 	register unsigned int errnum;
+@@ -51,7 +50,7 @@
+ 
+ 	errnum = num;				/* convert to unsigned */
+ 	if (errnum < sys_nerr)
+-		return(sys_errlist[errnum]);
++		return((char *)sys_errlist[errnum]);
+ 
+ 	/* Do this by hand, so we don't include stdio(3). */
+ 	t = tmp;