- remove patch that enables IPv4 mapped IPv6 address

- remove not necessary defines - _REENTRANT & _THREAD_SAFE

4 files changed, 7 insertions, 58 deletions

diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index fa3639c8533..e8d40960426 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2004/01/17 00:04:49 taya Exp $
+$NetBSD: distinfo,v 1.48 2004/02/01 13:04:17 taya Exp $
 
 SHA1 (mozilla-source-1.6.tar.bz2) = baecca0ecec35704049ab6debaec6c96adbade35
 Size (mozilla-source-1.6.tar.bz2) = 31037452 bytes
@@ -8,13 +8,12 @@ SHA1 (patch-ad) = 5408db4b7585dcf5855f64a342cc721a23aec449
 SHA1 (patch-ae) = e10936ff84d8f5b631c5c9f18271f21e902ea351
 SHA1 (patch-af) = 8fcedb0bdd48f9527fff8c9b970a0e6ea68711e4
 SHA1 (patch-ag) = c52586f92fc801571ccaf5a80c081103a99ed4e7
-SHA1 (patch-am) = f34d4b72b1ce2d37871af077c48adbe388f8e0d4
+SHA1 (patch-am) = 6646e8f1e5dbc3532ba45945ad2054756de2186a
 SHA1 (patch-aw) = 5beeefa214a3003a74ccc68776a97a414c6acff1
 SHA1 (patch-ba) = e11ab3e2baa19c9db9e320868a9860fedf5c8cec
 SHA1 (patch-bb) = 0fe99e9a0b0ef7af5b7dbb2ddf53c6f4df3d1c3e
-SHA1 (patch-be) = 93b30edb98b652a32a84c4907de1f1720529ef32
 SHA1 (patch-bm) = f557aa3ce9a25c91884cfd42bb505422e52ac958
 SHA1 (patch-bn) = 07573c79b22821873954d7c70821a382ea42fe4e
-SHA1 (patch-bo) = f4f6f6ac98e0b40cf4d6abb40a9591ed116257d4
+SHA1 (patch-bo) = a6bba31568b60818455911279e7db01c49c94498
 SHA1 (patch-bp) = 5f5eed098d2763ca6a4987d012c9377b81300aa3
 SHA1 (patch-bq) = 50965a09de76d1bba3e202746cbb5b197b036cdc
diff --git a/www/mozilla/patches/patch-am b/www/mozilla/patches/patch-am
index 6dbdf51ef15..0d96fb264f8 100644
--- a/www/mozilla/patches/patch-am
+++ b/www/mozilla/patches/patch-am
@@ -1,17 +1,8 @@
-$NetBSD: patch-am,v 1.12 2004/01/17 00:04:49 taya Exp $
+$NetBSD: patch-am,v 1.13 2004/02/01 13:04:17 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c ./nsprpub/pr/src/pthreads/ptio.c
 --- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c	2003-11-27 10:30:44.000000000 +0900
 +++ ./nsprpub/pr/src/pthreads/ptio.c	2004-01-16 23:17:38.000000000 +0900
-@@ -192,7 +192,7 @@
- #endif
- #endif
- 
--#ifdef DARWIN
-+#if defined(DARWIN) || (defined(__NetBSD__) && defined(IPV6_V6ONLY))
- static PRBool _pr_ipv6_v6only_on_by_default;
- /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- #ifndef IPV6_V6ONLY
 @@ -205,7 +205,7 @@
  #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \
      || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \
@@ -21,21 +12,3 @@ diff -ru ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c ./nsprpub/pr/src/pthread
  #define _PRSockOptVal_t void *
  #else
  #error "Cannot determine architecture"
-@@ -1157,7 +1157,7 @@
-     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
- 
--#ifdef DARWIN
-+#if defined(DARWIN) || (defined(__NetBSD__) && defined(IPV6_V6ONLY))
-     /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
-      * is turned on by default, contrary to what RFC 3493, Section
-      * 5.3 says.  So we have to turn it off.  Find out whether we
-@@ -3477,7 +3477,7 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
--#ifdef DARWIN
-+#if defined(DARWIN) || (defined(__NetBSD__) && defined(IPV6_V6ONLY))
-         if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
-         {
-             int on = 0;
diff --git a/www/mozilla/patches/patch-be b/www/mozilla/patches/patch-be
deleted file mode 100644
index 78922e4d095..00000000000
--- a/www/mozilla/patches/patch-be
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-be,v 1.13 2004/01/17 00:04:49 taya Exp $
-
-diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c ./nsprpub/pr/src/io/prsocket.c
---- ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c	2003-09-16 11:00:50.000000000 +0900
-+++ ./nsprpub/pr/src/io/prsocket.c	2004-01-16 23:17:48.000000000 +0900
-@@ -1299,6 +1299,15 @@
- 	if (osfd == -1) {
- 		return 0;
- 	}
-+#if defined(__NetBSD__) && defined(_PR_INET6) && defined(IPV6_V6ONLY)
-+	if(domain == PR_AF_INET6){
-+		int	opt = 0;
-+		if(setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, &opt, sizeof(opt))){
-+			close(osfd);
-+			return -1;
-+		}
-+	}
-+#endif
- 	if (type == SOCK_STREAM)
- 		fd = PR_AllocFileDesc(osfd, PR_GetTCPMethods());
- 	else
diff --git a/www/mozilla/patches/patch-bo b/www/mozilla/patches/patch-bo
index c83c068e874..6a7369dd321 100644
--- a/www/mozilla/patches/patch-bo
+++ b/www/mozilla/patches/patch-bo
@@ -1,8 +1,8 @@
-$NetBSD: patch-bo,v 1.5 2004/01/17 00:04:49 taya Exp $
+$NetBSD: patch-bo,v 1.6 2004/02/01 13:04:18 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
 --- ../Orig/mozilla/nsprpub/configure.in	2003-12-16 04:58:56.000000000 +0900
-+++ ./nsprpub/configure.in	2004-01-16 23:17:58.000000000 +0900
++++ ./nsprpub/configure.in	2004-01-31 21:30:19.000000000 +0900
 @@ -930,6 +930,9 @@
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
@@ -13,14 +13,12 @@ diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
      ;;
  
  *-hpux*)
-@@ -2182,7 +2185,14 @@
+@@ -2182,7 +2185,12 @@
  	        _PTHREAD_LDFLAGS="-lc_r"
  	    fi
  	    ;;
 -    *-openbsd*|*-bsdi*|*-netbsd*)
 +    *-netbsd*)
-+	    AC_DEFINE(_REENTRANT)
-+	    AC_DEFINE(_THREAD_SAFE)
 +	    if test "$ac_cv_have_dash_pthread" = "yes"; then
 +	        _PTHREAD_LDFLAGS="-pthread"
 +	    fi