Redo enabling of IPv6 support in a different way.

Instead of using pkgsrc makefile magic to select between IPv6 support
and non-support do so by the NetBSD version number: on 1.5 and newer
systems, compile IPv6 support and detect kernel support for it at runtime.

This has the additional benefits of being easy to feed back and additionaly
brings IPv6 to mozilla on NetBSD even if build outside of pkgsrc.

3 files changed, 30 insertions, 15 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index b84a368cff4..1935f9319d5 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2000/12/19 13:58:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.51 2000/12/25 02:16:07 martin Exp $
 
 DISTNAME=	mozilla-source
 PKGNAME=	mozilla-0.6
@@ -69,10 +69,6 @@ post-extract:
 .include "../../mk/bsd.prefs.mk"
 
 pre-configure:
-.if defined(USE_INET6) && ${USE_INET6} == YES
-	${ECHO} "USE_IPV6 = 1" >>${WRKSRC}/nsprpub/config/NetBSD.mk
-	${ECHO} "DEFINES += -D_PR_INET6 -D_PR_HAVE_GETHOSTBYNAME2" >>${WRKSRC}/nsprpub/config/NetBSD.mk
-.endif
 	(cd ${WRKSRC} && autoconf)
 
 post-build:
diff --git a/www/mozilla/files/patch-sum b/www/mozilla/files/patch-sum
index ccdf77cef3a..cdcf259f80c 100644
--- a/www/mozilla/files/patch-sum
+++ b/www/mozilla/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.40 2000/12/17 14:29:09 enami Exp $
+$NetBSD: patch-sum,v 1.41 2000/12/25 02:16:07 martin Exp $
 
 MD5 (patch-aa) = a07a4956a8c6a91fce0ef653b59c902f
 MD5 (patch-ab) = 2f3494ebc4c115ce359fee85fb6da34e
 MD5 (patch-ac) = 37c5e93a87f43262c38c9fe46a513740
-MD5 (patch-ad) = 20c5cd3f70cae6cca5b1f3eff4421f8b
+MD5 (patch-ad) = fc1c16d8b3148f9d6aec5982c1a38400
 MD5 (patch-ae) = 576be09ebce960ac0d970c3a80b8591e
 MD5 (patch-af) = 316103ca86d2a079d940cff8102849f1
 MD5 (patch-ag) = 37e370b4c51c8ffb5fc4c9dd2f1ace98
diff --git a/www/mozilla/patches/patch-ad b/www/mozilla/patches/patch-ad
index ad41078cf96..df6d2bb9441 100644
--- a/www/mozilla/patches/patch-ad
+++ b/www/mozilla/patches/patch-ad
@@ -1,8 +1,25 @@
-$NetBSD: patch-ad,v 1.16 2000/10/31 16:11:42 mycroft Exp $
+$NetBSD: patch-ad,v 1.17 2000/12/25 02:16:07 martin Exp $
 
---- nsprpub/pr/include/md/_netbsd.h.orig	Thu Jul  6 20:46:02 2000
-+++ nsprpub/pr/include/md/_netbsd.h	Thu Oct 26 07:32:35 2000
-@@ -70,39 +70,88 @@
+--- nsprpub/pr/include/md/_netbsd.h.orig	Thu Jul  6 22:46:02 2000
++++ nsprpub/pr/include/md/_netbsd.h	Sat Dec 23 23:17:43 2000
+@@ -59,52 +59,107 @@
+ #define _PR_POLL_AVAILABLE
+ #define _PR_USE_POLL
+ #define _PR_HAVE_SYSV_SEMAPHORES
+ #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
+ 
++#if __NetBSD_Version__ >= 105000000
++#define _PR_INET6
++#define _PR_HAVE_GETHOSTBYNAME2
++#define _PR_INET6_PROBE
++#endif
++
+ #define USE_SETJMP
+ 
+ #ifndef _PR_PTHREADS
+ #include <setjmp.h>
+ 
+ #define PR_CONTEXT_TYPE	sigjmp_buf
  
  #define CONTEXT(_th) ((_th)->md.context)
  
@@ -62,7 +79,9 @@ $NetBSD: patch-ad,v 1.16 2000/10/31 16:11:42 mycroft Exp $
 +    *status = PR_TRUE;							\
 +}
 +#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
-+#endif
+ #endif
+-#else
+-#error "Need to define SP index in jmp_buf here"
 +#ifdef __mips__
 +#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
 +{									\
@@ -95,9 +114,7 @@ $NetBSD: patch-ad,v 1.16 2000/10/31 16:11:42 mycroft Exp $
 +    *status = PR_TRUE;							\
 +}
 +#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[34]
- #endif
--#else
--#error "Need to define SP index in jmp_buf here"
++#endif
 +#ifndef _MD_INIT_CONTEXT
 +#error "Need to define _MD_INIT_CONTEXT for this platform"
  #endif
@@ -119,3 +136,5 @@ $NetBSD: patch-ad,v 1.16 2000/10/31 16:11:42 mycroft Exp $
  
  #define _MD_SWITCH_CONTEXT(_thread)  \
      if (!sigsetjmp(CONTEXT(_thread), 1)) {  \
+         (_thread)->md.errcode = errno;  \
+         _PR_Schedule();  \