Fix thinko in previous commit. Correctly recognise 1.4ish systems.

2 files changed, 22 insertions, 70 deletions

diff --git a/databases/mysql/patches/patch-ah b/databases/mysql/patches/patch-ah
index 331c3a60842..5525c18aead 100644
--- a/databases/mysql/patches/patch-ah
+++ b/databases/mysql/patches/patch-ah
@@ -1,18 +1,12 @@
-$NetBSD: patch-ah,v 1.3 1999/04/08 23:13:23 bad Exp $
+$NetBSD: patch-ah,v 1.4 1999/04/16 16:21:27 bad Exp $
 
 --- mit-pthreads/config/configure.orig	Tue Mar 10 10:11:25 1998
-+++ mit-pthreads/config/configure	Thu Apr  8 23:58:29 1999
-@@ -1165,6 +1165,18 @@
++++ mit-pthreads/config/configure	Fri Apr 16 18:16:36 1999
+@@ -1165,6 +1165,12 @@
  name=$host_cpu-$host_os
  
  case $host in
-+    alpha-*-netbsd1.4*)
-+	name=alpha-netbsd-1.4
-+	sysincludes=netbsd-1.1
-+	except="fork lseek pipe fstat"
-+	available_syscalls="sigsuspend sigprocmask"
-+	;;
-+    alpha-*-netbsd1.3[H-Z])
++    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.4*)
 +	name=alpha-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork lseek pipe fstat"
@@ -21,17 +15,11 @@ $NetBSD: patch-ah,v 1.3 1999/04/08 23:13:23 bad Exp $
      alpha-*-netbsd1.3*)
  	name=alpha-netbsd-1.3
  	sysincludes=netbsd-1.1
-@@ -1183,6 +1195,23 @@
+@@ -1183,6 +1189,17 @@
  	  CFLAGS="$CFLAGS -std"
  	fi
  	;;
-+    arm32-*-netbsd1.4*)
-+	name=arm32-netbsd-1.4
-+	sysincludes=netbsd-1.1
-+	except="fork pipe lseek ftruncate fstat"
-+	available_syscalls="sigsuspend sigprocmask"
-+	;;
-+    arm32-*-netbsd1.3[H-Z])
++    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.4*)
 +	name=arm32-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork pipe lseek ftruncate fstat"
@@ -45,17 +33,11 @@ $NetBSD: patch-ah,v 1.3 1999/04/08 23:13:23 bad Exp $
      hppa1.0-*-hpux10.20 | hppa1.1-*-hpux10.20)
  	name=hppa-hpux-10.20
  	sysincludes=hpux-10.20
-@@ -1232,6 +1261,23 @@
+@@ -1232,6 +1249,17 @@
  EOF
  
  	;;
-+    sparc-*-netbsd1.4*)
-+	name=sparc-netbsd-1.4
-+	sysincludes=netbsd-1.1
-+	except="pipe fork lseek ftruncate fstat"
-+	available_syscalls="sigprocmask sigsuspend"
-+	;;
-+    sparc-*-netbsd1.3[H-Z])
++    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.4*)
 +	name=sparc-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="pipe fork lseek ftruncate fstat"
@@ -69,17 +51,11 @@ $NetBSD: patch-ah,v 1.3 1999/04/08 23:13:23 bad Exp $
      sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*)
  	name=sparc-sunos-4.1.3
  	sysincludes=netbsd-1.0
-@@ -1257,6 +1303,18 @@
+@@ -1257,6 +1285,12 @@
          syscall=i386-bsdi-2.0
          except="fork lseek ftruncate sigsuspend"
  		;;
-+    i386-*-netbsd1.4*)
-+	name=i386-netbsd-1.4
-+	sysincludes=netbsd-1.1
-+	except="fork lseek ftruncate pipe fstat"
-+	available_syscalls="sigsuspend sigprocmask"
-+		;;
-+    i386-*-netbsd1.3[H-Z])
++    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.4*)
 +	name=i386-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork lseek ftruncate pipe fstat"
@@ -88,7 +64,7 @@ $NetBSD: patch-ah,v 1.3 1999/04/08 23:13:23 bad Exp $
      i386-*-netbsd1.3*)
  	name=i386-netbsd-1.3
  	sysincludes=netbsd-1.1
-@@ -1898,6 +1956,38 @@
+@@ -1898,6 +1932,38 @@
  if test $pthreads_cv_timespec_in_time = yes ; then
    cat >> confdefs.h <<\EOF
  #define _OS_HAS_TIMESPEC 1
diff --git a/databases/mysql/patches/patch-bd b/databases/mysql/patches/patch-bd
index c53e813090f..1736392a0f5 100644
--- a/databases/mysql/patches/patch-bd
+++ b/databases/mysql/patches/patch-bd
@@ -1,18 +1,12 @@
-$NetBSD: patch-bd,v 1.2 1999/04/08 23:13:23 bad Exp $
+$NetBSD: patch-bd,v 1.3 1999/04/16 16:21:27 bad Exp $
 
 --- mit-pthreads/config/configure.in.orig	Mon Mar  9 11:30:59 1998
-+++ mit-pthreads/config/configure.in	Thu Apr  8 23:59:26 1999
-@@ -124,6 +124,18 @@
++++ mit-pthreads/config/configure.in	Fri Apr 16 18:17:12 1999
+@@ -124,6 +124,12 @@
  name=$host_cpu-$host_os
  
  case $host in
-+    alpha-*-netbsd1.4*)
-+	name=alpha-netbsd-1.4
-+	sysincludes=netbsd-1.1
-+	except="fork lseek pipe fstat"
-+	available_syscalls="sigsuspend sigprocmask"
-+	;;
-+    alpha-*-netbsd1.3[H-Z])
++    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.4*)
 +	name=alpha-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork lseek pipe fstat"
@@ -21,17 +15,11 @@ $NetBSD: patch-bd,v 1.2 1999/04/08 23:13:23 bad Exp $
      alpha-*-netbsd1.3*)
  	name=alpha-netbsd-1.3
  	sysincludes=netbsd-1.1
-@@ -142,6 +154,23 @@
+@@ -142,6 +148,17 @@
  	  CFLAGS="$CFLAGS -std"
  	fi
  	;;
-+    arm32-*-netbsd1.4*)
-+	name=arm32-netbsd-1.4
-+	sysincludes=netbsd-1.1
-+	except="fork pipe lseek ftruncate fstat"
-+	available_syscalls="sigsuspend sigprocmask"
-+	;;
-+    arm32-*-netbsd1.3[H-Z])
++    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.4*)
 +	name=arm32-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork pipe lseek ftruncate fstat"
@@ -45,17 +33,11 @@ $NetBSD: patch-bd,v 1.2 1999/04/08 23:13:23 bad Exp $
      hppa1.0-*-hpux10.20 | hppa1.1-*-hpux10.20)
  	name=hppa-hpux-10.20
  	sysincludes=hpux-10.20
-@@ -176,6 +205,23 @@
+@@ -176,6 +193,17 @@
  	AC_DEFINE(LD_LINKS_STATIC_DATA)
  	AC_DEFINE(BROKEN_SIGNALS)
  	;;
-+    sparc-*-netbsd1.4*)
-+	name=sparc-netbsd-1.3
-+	sysincludes=netbsd-1.1
-+	except="pipe fork lseek ftruncate fstat"
-+	available_syscalls="sigprocmask sigsuspend"
-+	;;
-+    sparc-*-netbsd1.3[H-Z])
++    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.4*)
 +	name=sparc-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="pipe fork lseek ftruncate fstat"
@@ -69,17 +51,11 @@ $NetBSD: patch-bd,v 1.2 1999/04/08 23:13:23 bad Exp $
      sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*)
  	name=sparc-sunos-4.1.3
  	sysincludes=netbsd-1.0
-@@ -201,6 +247,18 @@
+@@ -201,6 +229,12 @@
          syscall=i386-bsdi-2.0
          except="fork lseek ftruncate sigsuspend"
  		;;
-+    i386-*-netbsd1.4*)
-+	name=i386-netbsd-1.4
-+	sysincludes=netbsd-1.1
-+	except="fork lseek ftruncate pipe fstat"
-+	available_syscalls="sigsuspend sigprocmask"
-+		;;
-+    i386-*-netbsd1.3[H-Z])
++    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.4*)
 +	name=i386-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork lseek ftruncate pipe fstat"
@@ -88,7 +64,7 @@ $NetBSD: patch-bd,v 1.2 1999/04/08 23:13:23 bad Exp $
      i386-*-netbsd1.3*)
  	name=i386-netbsd-1.3
  	sysincludes=netbsd-1.1
-@@ -339,6 +397,16 @@
+@@ -339,6 +373,16 @@
  AC_MSG_RESULT($pthreads_cv_timespec_in_time)
  if test $pthreads_cv_timespec_in_time = yes ; then
    AC_DEFINE(_OS_HAS_TIMESPEC)