Don't patch one file multiple times - merge the changes into one

patch file.

Use the new CONFIG_SUB_OVERRIDE and CONFIG_GUESS_OVERRIDE mechanisms.

Recognise netbsdelf on i386 platforms - more mods will be necessary for
different platforms.

8 files changed, 51 insertions, 94 deletions

diff --git a/devel/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile
index c86d1578cd9..a4161d3bca2 100644
--- a/devel/mit-pthreads/Makefile
+++ b/devel/mit-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/06/23 03:44:49 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2002/07/18 09:08:27 agc Exp $
 #
 
 DISTNAME=		pthreads-1_60_beta6
@@ -20,6 +20,9 @@ MAKE_ENV+=		NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT}
 
 PATCH_FUZZ_FACTOR=	# empty
 
+CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config/config.guess
+CONFIG_SUB_OVERRIDE=	${WRKSRC}/config/config.sub
+
 post-patch:
 	@${RM} ${WRKSRC}/include/endian.h
 	@${RM} ${WRKSRC}/include/math.h
diff --git a/devel/mit-pthreads/distinfo b/devel/mit-pthreads/distinfo
index 0bc5887b908..96c3a4e5181 100644
--- a/devel/mit-pthreads/distinfo
+++ b/devel/mit-pthreads/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/04/11 17:11:34 fredb Exp $
+$NetBSD: distinfo,v 1.8 2002/07/18 09:08:27 agc Exp $
 
 SHA1 (pthreads-1_60_beta6.tar.gz) = 238e410f372dd1615c0e82ec9c6ff47699c558ee
 Size (pthreads-1_60_beta6.tar.gz) = 382562 bytes
@@ -11,8 +11,8 @@ SHA1 (patch-af) = aec81f8020d85ae15b0a216a89e5f91bb3e6729c
 SHA1 (patch-ag) = 00d261c6a95bfb0243bca1c19a494259b46b2d15
 SHA1 (patch-ah) = 74765981190d7cc80e4eba435309925a32fc6122
 SHA1 (patch-ai) = cbee1589c4df9a44b8e28f9483b82463eafbc919
-SHA1 (patch-aj) = 4e9fd07155720c59c93673fd329ed9113d2cbfd8
-SHA1 (patch-ak) = 81f865e7a971f4090ca008a6244e7d886e830559
+SHA1 (patch-aj) = ef5f7da2e6e3add9b7b17e1bec3e94fb947a045d
+SHA1 (patch-ak) = 0aca619f64c58200120de62c3597737461971e10
 SHA1 (patch-al) = b8bd36bdf63cd64405f097d5d0833ff23627ac70
 SHA1 (patch-am) = a7595558394c8c3726983c1e7ef466f8f6f4c4f3
 SHA1 (patch-an) = 20d987a2592f89bdd5e6390ec9d9d5cef4d3bd44
@@ -47,16 +47,12 @@ SHA1 (patch-bq) = 2c371a32d649f0a1e6279bc6d58c5da79d26b36c
 SHA1 (patch-br) = eb0f281bf24ec9286308e7b4c9741993a3e11289
 SHA1 (patch-bs) = 1428348b488e51c03c12f87ae822e4ffbb272183
 SHA1 (patch-bt) = a4d80cc5baaf276133dd06f221b5852a5d11efdb
-SHA1 (patch-bu) = bc37cee1ffc83aed1b76c29a834ea9d6be4ff628
-SHA1 (patch-bv) = ba7436d401adc26640ec848b4f9ae5d4dd638c43
 SHA1 (patch-bw) = a80df1fdbdbf9ccf9f3e24c0541ecaf98679a4f1
 SHA1 (patch-bx) = ffe0815bafd4dac7453759f2713562a5f4bef7a8
 SHA1 (patch-by) = b3863f34209f7df8a23959736c0bc4355e484009
 SHA1 (patch-bz) = 0b9fe777ce5d4ac3c4194ed3b81d4951877c2bda
 SHA1 (patch-ca) = 1e83812ceef45c015335c2f023c4e5bae6963113
 SHA1 (patch-cb) = 870977a372b34eecc44f8e32449e8a2e008b35a1
-SHA1 (patch-cd) = 3111636fcbce7797b77cca2f88eca012aefbce8a
-SHA1 (patch-ce) = eadbbf7253b0062d572ab385e557bfa75af48286
 SHA1 (patch-cf) = 29a315c5b13b35dffaf2ff4aed31352d62b965a1
 SHA1 (patch-cg) = ee24b07059ec88469aa88331e01c69e27592053d
 SHA1 (patch-ch) = 7d53f7f625366c64a4db7ffcb71e28e633231c61
diff --git a/devel/mit-pthreads/patches/patch-aj b/devel/mit-pthreads/patches/patch-aj
index a538a7f8627..bfa8477d77c 100644
--- a/devel/mit-pthreads/patches/patch-aj
+++ b/devel/mit-pthreads/patches/patch-aj
@@ -1,12 +1,12 @@
-$NetBSD: patch-aj,v 1.9 2000/08/06 19:55:47 fredb Exp $
+$NetBSD: patch-aj,v 1.10 2002/07/18 09:08:28 agc Exp $
 
---- config/configure.orig	Wed Nov 13 22:03:02 1996
-+++ config/configure	Fri Sep 10 20:51:21 1999
+--- config/configure	2002/07/18 08:54:37	1.1
++++ config/configure	2002/07/18 08:54:54
 @@ -1049,6 +1049,17 @@
  name=$host_cpu-$host_os
  
  case $host in
-+    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[45]*) 
++    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[456789]*) 
 +	name=alpha-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork lseek pipe fstat"
@@ -20,11 +20,11 @@ $NetBSD: patch-aj,v 1.9 2000/08/06 19:55:47 fredb Exp $
      alpha-*-netbsd1.1* | alpha-*-netbsd1.2*)
  	name=alpha-netbsd-1.1
  	sysincludes=netbsd-1.1
-@@ -1062,6 +1073,17 @@
+@@ -1062,12 +1073,29 @@
  	  CFLAGS="$CFLAGS -std"
  	fi
  	;;
-+    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[45]*)
++    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[456789]*)
 +	name=arm32-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork pipe lseek ftruncate fstat"
@@ -38,11 +38,23 @@ $NetBSD: patch-aj,v 1.9 2000/08/06 19:55:47 fredb Exp $
      hppa1.1-*-hpux*)
  	name=hppa-hpux-9.03
  	sysincludes=hpux-9.03
-@@ -1092,6 +1114,17 @@
+ 	# hpux-9.03.mk seems to be missing; what should this be?
+ 	except="fork"
+ 	;;
++    powerpc-*-netbsd1.*)
++	name=powerpc-netbsd
++ 	sysincludes=netbsd-1.1
++	except="fork lseek ftruncate pipe fstat"
++	available_syscalls="sigprocmask sigaction sigsuspend"
++	;;
+     sparc-*-sunos4.1.3* | sparc-*-sunos4.1.4*)
+ 	name=sparc-sunos-4.1.3
+ 	sysincludes=sunos-4.1.3
+@@ -1092,6 +1120,17 @@
  EOF
  
  	;;
-+    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[45]*)
++    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[456789]*)
 +	name=sparc-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="pipe fork lseek ftruncate fstat"
@@ -56,15 +68,15 @@ $NetBSD: patch-aj,v 1.9 2000/08/06 19:55:47 fredb Exp $
  	sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*)
      name=sparc-sunos-4.1.3
      sysincludes=netbsd-1.0
-@@ -1112,6 +1145,17 @@
+@@ -1112,6 +1151,17 @@
          syscall=i386-bsdi-2.0
          except="fork lseek sigsuspend"
  		;;
-+    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[45]*)
++    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[456789]*|i386-*-netbsdelf*)
 +	name=i386-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork lseek ftruncate pipe fstat"
-+	available_syscalls="sigsuspend sigprocmask"
++	available_syscalls="sigsuspend sigprocmask sigaction"
 +		;;
 +    i386-*-netbsd1.3*)
 +        name=i386-netbsd-1.3
@@ -74,12 +86,12 @@ $NetBSD: patch-aj,v 1.9 2000/08/06 19:55:47 fredb Exp $
      i386-*-netbsd1.1* | i386-*-netbsd1.2*)
  	name=i386-netbsd-1.0
  	sysincludes=netbsd-1.1
-@@ -1127,8 +1171,16 @@
+@@ -1127,8 +1177,16 @@
  	name=i386-netbsd-0.9
  	sysincludes=netbsd-0.9
  	;;
 -    m68*-*-netbsd*)
-+    m68*-*-netbsd1.3[H-Z]|m68*-*-netbsd1.[45]*)
++    m68*-*-netbsd1.3[H-Z]|m68*-*-netbsd1.[456789]*)
  	name=m68000-netbsd
 +	sysincludes=netbsd-1.1
 +	except="lseek ftruncate pipe fstat"
@@ -92,7 +104,7 @@ $NetBSD: patch-aj,v 1.9 2000/08/06 19:55:47 fredb Exp $
  	;;
      i386-*-freebsd2.*)
          name=i386-freebsd-2.0
-@@ -1697,6 +1749,39 @@
+@@ -1697,6 +1755,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 689746059a5..8337b584525 100644
--- a/devel/mit-pthreads/patches/patch-ak
+++ b/devel/mit-pthreads/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.9 2000/08/06 19:55:47 fredb Exp $
+$NetBSD: patch-ak,v 1.10 2002/07/18 09:08:28 agc Exp $
 
---- config/configure.in.orig	Wed Nov 13 22:03:08 1996
-+++ config/configure.in	Fri Sep 10 20:54:50 1999
+--- config/configure.in	2002/07/18 08:54:37	1.1
++++ config/configure.in	2002/07/18 08:54:54
 @@ -124,6 +124,19 @@
  name=$host_cpu-$host_os
  
  case $host in
 +changequote(,)dnl
-+    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[45]*) 
++    alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[456789]*) 
 +	name=alpha-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork lseek pipe fstat"
@@ -27,7 +27,7 @@ $NetBSD: patch-ak,v 1.9 2000/08/06 19:55:47 fredb Exp $
  	fi
  	;;
 +changequote(,)dnl
-+    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[45]*)
++    arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[456789]*)
 +	name=arm32-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork pipe lseek ftruncate fstat"
@@ -42,12 +42,17 @@ $NetBSD: patch-ak,v 1.9 2000/08/06 19:55:47 fredb Exp $
      hppa1.1-*-hpux*)
  	name=hppa-hpux-9.03
  	sysincludes=hpux-9.03
-@@ -158,6 +184,19 @@
+@@ -158,6 +184,24 @@
  	AC_DEFINE(LD_LINKS_STATIC_DATA)
  	AC_DEFINE(BROKEN_SIGNALS)
  	;;
 +changequote(,)dnl
-+    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[45]*)
++    powerpc-*-netbsd1.*)
++	name=powerpc-netbsd
++	except="fork lseek ftruncate pipe fstat"
++	available_syscalls="sigprocmask sigaction sigsuspend"
++	;;
++    sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[456789]*)
 +	name=sparc-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="pipe fork lseek ftruncate fstat"
@@ -62,16 +67,16 @@ $NetBSD: patch-ak,v 1.9 2000/08/06 19:55:47 fredb Exp $
  	sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*)
      name=sparc-sunos-4.1.3
      sysincludes=netbsd-1.0
-@@ -178,6 +217,19 @@
+@@ -178,6 +222,19 @@
          syscall=i386-bsdi-2.0
          except="fork lseek sigsuspend"
  		;;
 +changequote(,)dnl
-+    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[45]*)
++    i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[456789]*|i386-*-netbsdelf*)
 +	name=i386-netbsd-1.3
 +	sysincludes=netbsd-1.1
 +	except="fork lseek ftruncate pipe fstat"
-+	available_syscalls="sigsuspend sigprocmask"
++	available_syscalls="sigsuspend sigaction sigprocmask"
 +		;;
 +changequote([,])dnl
 +    i386-*-netbsd1.3*)
@@ -82,13 +87,13 @@ $NetBSD: patch-ak,v 1.9 2000/08/06 19:55:47 fredb Exp $
      i386-*-netbsd1.1* | i386-*-netbsd1.2*)
  	name=i386-netbsd-1.0
  	sysincludes=netbsd-1.1
-@@ -193,8 +245,18 @@
+@@ -193,8 +250,18 @@
  	name=i386-netbsd-0.9
  	sysincludes=netbsd-0.9
  	;;
 -    m68*-*-netbsd*)
 +changequote(,)dnl
-+    m68*-*-netbsd1.3[H-Z]|m68*-*-netbsd1.[45]*)
++    m68*-*-netbsd1.3[H-Z]|m68*-*-netbsd1.[456789]*)
  	name=m68000-netbsd
 +	sysincludes=netbsd-1.1
 +	except="lseek ftruncate pipe fstat"
@@ -102,7 +107,7 @@ $NetBSD: patch-ak,v 1.9 2000/08/06 19:55:47 fredb Exp $
  	;;
      i386-*-freebsd2.*)
          name=i386-freebsd-2.0
-@@ -304,6 +366,16 @@
+@@ -304,6 +371,16 @@
  AC_MSG_RESULT($pthreads_cv_timespec_in_time)
  if test $pthreads_cv_timespec_in_time = yes ; then
    AC_DEFINE(_OS_HAS_TIMESPEC)
diff --git a/devel/mit-pthreads/patches/patch-bu b/devel/mit-pthreads/patches/patch-bu
deleted file mode 100644
index 34562c05893..00000000000
--- a/devel/mit-pthreads/patches/patch-bu
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bu,v 1.2 1999/12/28 05:08:11 wiz Exp $
-diff -ur config/configure config/configure
---- config/configure	Wed Nov  3 12:15:27 1999
-+++ config/configure	Wed Nov  3 19:26:53 1999
-@@ -1149,7 +1149,7 @@
- 	name=i386-netbsd-1.3
- 	sysincludes=netbsd-1.1
- 	except="fork lseek ftruncate pipe fstat"
--	available_syscalls="sigsuspend sigprocmask"
-+	available_syscalls="sigsuspend sigprocmask sigaction"
- 		;;
-     i386-*-netbsd1.3*)
-         name=i386-netbsd-1.3
diff --git a/devel/mit-pthreads/patches/patch-bv b/devel/mit-pthreads/patches/patch-bv
deleted file mode 100644
index a5cc961fd43..00000000000
--- a/devel/mit-pthreads/patches/patch-bv
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bv,v 1.2 1999/12/28 05:08:11 wiz Exp $
-diff -ur config/configure.in config/configure.in
---- config/configure.in	Wed Nov  3 12:15:27 1999
-+++ config/configure.in	Wed Nov  3 19:23:27 1999
-@@ -222,7 +222,7 @@
- 	name=i386-netbsd-1.3
- 	sysincludes=netbsd-1.1
- 	except="fork lseek ftruncate pipe fstat"
--	available_syscalls="sigsuspend sigprocmask"
-+	available_syscalls="sigsuspend sigaction sigprocmask"
- 		;;
- changequote([,])dnl
-     i386-*-netbsd1.3*)
diff --git a/devel/mit-pthreads/patches/patch-cd b/devel/mit-pthreads/patches/patch-cd
deleted file mode 100644
index 6b58d65af8d..00000000000
--- a/devel/mit-pthreads/patches/patch-cd
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2001/01/10 01:28:50 briggs Exp $
-
---- config/configure.orig	Tue Jan  9 16:23:56 2001
-+++ config/configure	Tue Jan  9 16:26:17 2001
-@@ -1090,6 +1090,12 @@
- 	# hpux-9.03.mk seems to be missing; what should this be?
- 	except="fork"
- 	;;
-+    powerpc-*-netbsd1.*)
-+	name=powerpc-netbsd
-+ 	sysincludes=netbsd-1.1
-+	except="fork lseek ftruncate pipe fstat"
-+	available_syscalls="sigprocmask sigaction sigsuspend"
-+	;;
-     sparc-*-sunos4.1.3* | sparc-*-sunos4.1.4*)
- 	name=sparc-sunos-4.1.3
- 	sysincludes=sunos-4.1.3
diff --git a/devel/mit-pthreads/patches/patch-ce b/devel/mit-pthreads/patches/patch-ce
deleted file mode 100644
index 953e65df836..00000000000
--- a/devel/mit-pthreads/patches/patch-ce
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2001/01/10 01:28:51 briggs Exp $
-
---- config/configure.in.orig	Tue Jan  9 16:27:44 2001
-+++ config/configure.in	Tue Jan  9 16:28:44 2001
-@@ -185,6 +185,11 @@
- 	AC_DEFINE(BROKEN_SIGNALS)
- 	;;
- changequote(,)dnl
-+    powerpc-*-netbsd1.*)
-+	name=powerpc-netbsd
-+	except="fork lseek ftruncate pipe fstat"
-+	available_syscalls="sigprocmask sigaction sigsuspend"
-+	;;
-     sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[45]*)
- 	name=sparc-netbsd-1.3
- 	sysincludes=netbsd-1.1