Use the new CONFIG_GUESS_OVERRIDE and CONFIG_SUB_OVERRIDE mechanisms.

Patch i386 configuration to recognise netbsdelf - more architecture
changes are necessary here.

4 files changed, 27 insertions, 8 deletions

diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile
index c3087516f57..f9a09f9cc81 100644
--- a/devel/unproven-pthreads/Makefile
+++ b/devel/unproven-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/07/10 21:58:14 skrll Exp $
+# $NetBSD: Makefile,v 1.30 2002/07/18 09:17:26 agc Exp $
 #
 
 DISTNAME=		unproven-pthreads-0.17
@@ -17,6 +17,9 @@ GNU_CONFIGURE=		yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/pthreads
 MAKE_ENV+=		NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT}
 
+CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config/config.guess
+CONFIG_SUB_OVERRIDE=	${WRKSRC}/config/config.sub
+
 post-extract:
 	@${RM} ${WRKSRC}/include/pthread/unistd.h
 
diff --git a/devel/unproven-pthreads/distinfo b/devel/unproven-pthreads/distinfo
index df0e3b55520..349c2ca3368 100644
--- a/devel/unproven-pthreads/distinfo
+++ b/devel/unproven-pthreads/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.6 2002/07/15 15:57:02 skrll Exp $
+$NetBSD: distinfo,v 1.7 2002/07/18 09:17:27 agc Exp $
 
 SHA1 (unproven-pthreads-0.17.tar.gz) = 9f50e31da916b341e0c1ce21012bbd95b1a08a7d
 Size (unproven-pthreads-0.17.tar.gz) = 234180 bytes
 SHA1 (patch-aa) = 21955c9af0fd80b6bd939631d79db7225a392ea1
 SHA1 (patch-ab) = 870977a372b34eecc44f8e32449e8a2e008b35a1
-SHA1 (patch-ac) = 522ef95fe92bacb626d10b414798138a221f9ab2
+SHA1 (patch-ac) = 255e314d9a396aff6de402eba097a7e4fe36a7ff
 SHA1 (patch-ad) = 7821707f34ca6c187ad3ed088b161ff8be249d62
 SHA1 (patch-ae) = 8bf343cd261c3cf25a30f44ffc0b0d0d09bba588
-SHA1 (patch-af) = 6f555c8d2e6fe8b198b3110d0ccf871abc0d25ed
+SHA1 (patch-af) = 2b28ddae7b4bf0a855dbd954f7c366dd1957df1f
 SHA1 (patch-ag) = fa046412dd222dc014768a448a5bd28c639d4aab
 SHA1 (patch-ah) = 123bce3c1730283a847cf0ee65039c73c40b7523
 SHA1 (patch-ai) = dd76c34072a56b2145077aad03f6de49cdf64a8c
diff --git a/devel/unproven-pthreads/patches/patch-ac b/devel/unproven-pthreads/patches/patch-ac
index 35e673652b0..2c080c2805d 100644
--- a/devel/unproven-pthreads/patches/patch-ac
+++ b/devel/unproven-pthreads/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/04/13 12:53:41 fredb Exp $
+$NetBSD: patch-ac,v 1.3 2002/07/18 09:17:27 agc Exp $
 
 --- config/configure.in.orig	Mon Jul 10 14:03:06 2000
 +++ config/configure.in
@@ -39,6 +39,15 @@ $NetBSD: patch-ac,v 1.2 2002/04/13 12:53:41 fredb Exp $
      i386-*-netbsd1.4*)
  #	CFLAGS="$CFLAGS -Werror"
  	name=i386-netbsd-1.3
+@@ -112,7 +126,7 @@
+ 		;;
+ changequote([,])dnl
+ changequote(,)dnl
+-    i386-*-netbsd1.5*)
++    i386-*-netbsd1.5*|i386-*-netbsdelf*)
+ #	CFLAGS="$CFLAGS -Werror"
+ 	name=i386-netbsd-1.3
+ 	except="fork lseek ftruncate pipe fstat"
 @@ -121,6 +135,20 @@
  changequote([,])dnl
  changequote(,)dnl
diff --git a/devel/unproven-pthreads/patches/patch-af b/devel/unproven-pthreads/patches/patch-af
index 1d928b52afd..56bf101ebf3 100644
--- a/devel/unproven-pthreads/patches/patch-af
+++ b/devel/unproven-pthreads/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2002/04/13 12:53:41 fredb Exp $
+$NetBSD: patch-af,v 1.3 2002/07/18 09:17:27 agc Exp $
 
 --- config/configure.orig	Mon Jul 10 14:03:06 2000
 +++ config/configure
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.2 2002/04/13 12:53:41 fredb Exp $
  	name=alpha-netbsd-1.3
  	except="fork lseek ftruncate pipe fstat"
  	available_syscalls="sigsuspend sigaction sigprocmask"
-@@ -1161,11 +1161,21 @@
+@@ -1161,24 +1161,44 @@
  	except="fork lseek ftruncate pipe fstat"
  	available_syscalls="sigsuspend sigaction sigprocmask"
  	;;
@@ -33,7 +33,14 @@ $NetBSD: patch-af,v 1.2 2002/04/13 12:53:41 fredb Exp $
      i386-*-netbsd1.4*)
  #	CFLAGS="$CFLAGS -Werror"
  	name=i386-netbsd-1.3
-@@ -1179,6 +1189,16 @@
+ 	except="fork lseek ftruncate pipe fstat"
+ 	available_syscalls="sigsuspend sigaction sigprocmask"
+ 		;;
+-    i386-*-netbsd1.5*)
++    i386-*-netbsd1.5*|i386-*-netbsdelf*)
+ #	CFLAGS="$CFLAGS -Werror"
+ 	name=i386-netbsd-1.3
+ 	except="fork lseek ftruncate pipe fstat"
  	available_syscalls="sigsuspend sigaction sigprocmask"
  		;;
      m68*-*-netbsd1.4*)