- adopt patch from pkg/24517

Thanks to Kouichirou Hiratsuka
This also fixes pkg/24503

- enable usage of getprotobyname_r() if __NetBSD_Version__ >= 106370000

3 files changed, 37 insertions, 6 deletions

diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 315464a22c3..f730cdc2409 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2004/02/05 17:29:06 jmmv Exp $
+$NetBSD: distinfo,v 1.50 2004/02/22 12:02:55 taya Exp $
 
 SHA1 (mozilla-source-1.6.tar.bz2) = baecca0ecec35704049ab6debaec6c96adbade35
 Size (mozilla-source-1.6.tar.bz2) = 31037452 bytes
@@ -12,9 +12,10 @@ SHA1 (patch-ag) = c52586f92fc801571ccaf5a80c081103a99ed4e7
 SHA1 (patch-am) = 6646e8f1e5dbc3532ba45945ad2054756de2186a
 SHA1 (patch-aw) = 5beeefa214a3003a74ccc68776a97a414c6acff1
 SHA1 (patch-ba) = e11ab3e2baa19c9db9e320868a9860fedf5c8cec
-SHA1 (patch-bb) = 0fe99e9a0b0ef7af5b7dbb2ddf53c6f4df3d1c3e
+SHA1 (patch-bb) = c5350823464250546f95d1c0962ba7ba6a16aa2f
 SHA1 (patch-bm) = f557aa3ce9a25c91884cfd42bb505422e52ac958
 SHA1 (patch-bn) = 07573c79b22821873954d7c70821a382ea42fe4e
 SHA1 (patch-bo) = a6bba31568b60818455911279e7db01c49c94498
 SHA1 (patch-bp) = 5f5eed098d2763ca6a4987d012c9377b81300aa3
 SHA1 (patch-bq) = 50965a09de76d1bba3e202746cbb5b197b036cdc
+SHA1 (patch-br) = 560d738c648b864711d663323bdd1478b7d28103
diff --git a/www/mozilla/patches/patch-bb b/www/mozilla/patches/patch-bb
index 9b11017b6ed..ce4346ac25a 100644
--- a/www/mozilla/patches/patch-bb
+++ b/www/mozilla/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.15 2004/01/17 00:04:49 taya Exp $
+$NetBSD: patch-bb,v 1.16 2004/02/22 12:02:55 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
 --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h	2003-09-12 02:24:53.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.h	2004-01-16 23:17:47.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.h	2004-02-21 16:47:07.000000000 +0900
 @@ -48,12 +48,20 @@
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
@@ -24,7 +24,20 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
  #endif
  
  #if defined(__ELF__)
-@@ -108,7 +116,17 @@
+@@ -86,6 +94,12 @@
+ #define _PR_INET6_PROBE
+ #endif
+ 
++#if __NetBSD_Version__ >= 106370000
++/* NetBSD 1.6ZK */
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_GETPROTO_R_INT
++#endif
++
+ #define USE_SETJMP
+ 
+ #ifndef _PR_PTHREADS
+@@ -108,7 +122,17 @@
  }
  #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
  #endif
@@ -43,7 +56,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
  #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
  {									\
      sigsetjmp(CONTEXT(_thread), 1);					\
-@@ -150,7 +168,7 @@
+@@ -150,7 +174,7 @@
  }
  #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[32]
  #endif
diff --git a/www/mozilla/patches/patch-br b/www/mozilla/patches/patch-br
new file mode 100644
index 00000000000..ac87bdfa7e2
--- /dev/null
+++ b/www/mozilla/patches/patch-br
@@ -0,0 +1,17 @@
+$NetBSD: patch-br,v 1.3 2004/02/22 12:02:55 taya Exp $
+
+--- nsprpub/pr/src/misc/prnetdb.c.orig	2004-02-19 21:45:15.000000000 +0900
++++ nsprpub/pr/src/misc/prnetdb.c	2004-02-19 21:50:57.000000000 +0900
+@@ -2094,7 +2094,12 @@
+          */
+         hints.ai_socktype = SOCK_STREAM;
+ 
++        LOCK_DNS();
++
+         rv = GETADDRINFO(hostname, NULL, &hints, &res);
++
++        UNLOCK_DNS();
++
+         if (rv == 0)
+             return (PRAddrInfo *) res;
+