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

2 files changed, 22 insertions, 70 deletions

diff --git a/devel/mit-pthreads/patches/patch-aj b/devel/mit-pthreads/patches/patch-aj
index 775e8beacd5..7f9928e44ed 100644
--- a/devel/mit-pthreads/patches/patch-aj
+++ b/devel/mit-pthreads/patches/patch-aj
@@ -1,18 +1,12 @@
-$NetBSD: patch-aj,v 1.4 1999/04/08 20:08:56 bad Exp $
+$NetBSD: patch-aj,v 1.5 1999/04/16 16:32:11 bad Exp $
 
 --- config/configure.orig	Wed Nov 13 22:03:02 1996
-+++ config/configure	Thu Apr  8 21:52:11 1999
-@@ -1049,6 +1049,23 @@
++++ config/configure	Fri Apr 16 18:09:45 1999
+@@ -1049,6 +1049,17 @@
  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"
@@ -26,17 +20,11 @@ $NetBSD: patch-aj,v 1.4 1999/04/08 20:08:56 bad Exp $
      alpha-*-netbsd1.1* | alpha-*-netbsd1.2*)
  	name=alpha-netbsd-1.1
  	sysincludes=netbsd-1.1
-@@ -1062,6 +1079,23 @@
+@@ -1062,6 +1073,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"
@@ -50,17 +38,11 @@ $NetBSD: patch-aj,v 1.4 1999/04/08 20:08:56 bad Exp $
      hppa1.1-*-hpux*)
  	name=hppa-hpux-9.03
  	sysincludes=hpux-9.03
-@@ -1092,6 +1126,23 @@
+@@ -1092,6 +1114,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"
@@ -74,17 +56,11 @@ $NetBSD: patch-aj,v 1.4 1999/04/08 20:08:56 bad Exp $
  	sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*)
      name=sparc-sunos-4.1.3
      sysincludes=netbsd-1.0
-@@ -1112,6 +1163,23 @@
+@@ -1112,6 +1145,17 @@
          syscall=i386-bsdi-2.0
          except="fork lseek 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"
@@ -98,7 +74,7 @@ $NetBSD: patch-aj,v 1.4 1999/04/08 20:08:56 bad Exp $
      i386-*-netbsd1.1* | i386-*-netbsd1.2*)
  	name=i386-netbsd-1.0
  	sysincludes=netbsd-1.1
-@@ -1697,6 +1765,39 @@
+@@ -1697,6 +1741,39 @@
  if test $pthreads_cv_timespec_in_time = yes ; then
    cat >> confdefs.h <<\EOF
  #define _OS_HAS_TIMESPEC 1
diff --git a/devel/mit-pthreads/patches/patch-ak b/devel/mit-pthreads/patches/patch-ak
index d2ed7862f9c..1cd5732d97b 100644
--- a/devel/mit-pthreads/patches/patch-ak
+++ b/devel/mit-pthreads/patches/patch-ak
@@ -1,18 +1,12 @@
-$NetBSD: patch-ak,v 1.4 1999/04/08 20:08:56 bad Exp $
+$NetBSD: patch-ak,v 1.5 1999/04/16 16:32:11 bad Exp $
 
 --- config/configure.in.orig	Wed Nov 13 22:03:08 1996
-+++ config/configure.in	Thu Apr  8 21:53:21 1999
-@@ -124,6 +124,23 @@
++++ config/configure.in	Fri Apr 16 18:09:29 1999
+@@ -124,6 +124,17 @@
  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"
@@ -26,17 +20,11 @@ $NetBSD: patch-ak,v 1.4 1999/04/08 20:08:56 bad Exp $
      alpha-*-netbsd1.1* | alpha-*-netbsd1.2*)
  	name=alpha-netbsd-1.1
  	sysincludes=netbsd-1.1
-@@ -137,6 +154,23 @@
+@@ -137,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"
@@ -50,17 +38,11 @@ $NetBSD: patch-ak,v 1.4 1999/04/08 20:08:56 bad Exp $
      hppa1.1-*-hpux*)
  	name=hppa-hpux-9.03
  	sysincludes=hpux-9.03
-@@ -158,6 +192,23 @@
+@@ -158,6 +180,17 @@
  	AC_DEFINE(LD_LINKS_STATIC_DATA)
  	AC_DEFINE(BROKEN_SIGNALS)
  	;;
-+    sparc-*-netbsd1.3*)
-+	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.3*)
 +	name=sparc-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="pipe fork lseek ftruncate fstat"
@@ -74,17 +56,11 @@ $NetBSD: patch-ak,v 1.4 1999/04/08 20:08:56 bad Exp $
  	sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*)
      name=sparc-sunos-4.1.3
      sysincludes=netbsd-1.0
-@@ -178,6 +229,23 @@
+@@ -178,6 +211,17 @@
          syscall=i386-bsdi-2.0
          except="fork lseek 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"
@@ -98,7 +74,7 @@ $NetBSD: patch-ak,v 1.4 1999/04/08 20:08:56 bad Exp $
      i386-*-netbsd1.1* | i386-*-netbsd1.2*)
  	name=i386-netbsd-1.0
  	sysincludes=netbsd-1.1
-@@ -304,6 +372,16 @@
+@@ -304,6 +348,16 @@
  AC_MSG_RESULT($pthreads_cv_timespec_in_time)
  if test $pthreads_cv_timespec_in_time = yes ; then
    AC_DEFINE(_OS_HAS_TIMESPEC)