Make Mozilla products build on DragonFly master.

6 files changed, 81 insertions, 20 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 14df17149b8..cd57169cd6a 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.84 2008/12/17 17:05:52 ghen Exp $
+$NetBSD: distinfo,v 1.85 2009/04/07 08:01:01 hasso Exp $
 
 SHA1 (firefox-2.0.0.19-source.tar.bz2) = 8c4f87c50a0ecf78530b6fbfaac3123196a260a9
 RMD160 (firefox-2.0.0.19-source.tar.bz2) = e5bba299e7bc012a70956bcb253517b696a519b1
@@ -26,7 +26,7 @@ SHA1 (patch-bb) = 4ade97ffe2c8b16262dfa992e47ad7c9a666d037
 SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85
 SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
 SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
-SHA1 (patch-br) = 943b38fef5e7070de7af8a055f05e576039ad8bb
+SHA1 (patch-br) = 968645e0934ec5c61f8a08c4d5a6a2c7745f8fe2
 SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
 SHA1 (patch-bu) = 0714f658001c363f4abbfb248ac77c4862e3ccf9
 SHA1 (patch-bv) = ef06a6a774c9d4da7b3fbf6f4e274ab042926e49
diff --git a/www/firefox/patches/patch-br b/www/firefox/patches/patch-br
index 87604a29eb2..995c2177b53 100644
--- a/www/firefox/patches/patch-br
+++ b/www/firefox/patches/patch-br
@@ -1,9 +1,29 @@
-$NetBSD: patch-br,v 1.7 2007/05/12 13:53:09 ghen Exp $
+$NetBSD: patch-br,v 1.8 2009/04/07 08:01:01 hasso Exp $
 
-diff -ruN ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
---- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c	2005-08-19 02:24:38.000000000 +0900
-+++ ./nsprpub/pr/src/misc/prnetdb.c	2005-12-04 19:18:10.000000000 +0900
-@@ -2110,7 +2110,17 @@
+--- nsprpub/pr/src/misc/prnetdb.c.orig	2006-11-14 19:41:59 +0200
++++ nsprpub/pr/src/misc/prnetdb.c	2009-04-04 18:10:55 +0300
+@@ -113,6 +113,11 @@ PRLock *_pr_dnsLock = NULL;
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif
+ 
++#if __DragonFly_version >= 200202
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_5_ARG_GETPROTO_R
++#endif
++
+ #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+@@ -329,7 +334,7 @@ _pr_QueryNetIfs(void)
+ }
+ 
+ #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
+-    || defined(NETBSD) || defined(OPENBSD)
++    || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
+ 
+ /*
+  * Use the BSD getifaddrs function.
+@@ -2115,7 +2120,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  
diff --git a/www/firefox3/distinfo b/www/firefox3/distinfo
index 1b1e098872c..f0c32a3e4da 100644
--- a/www/firefox3/distinfo
+++ b/www/firefox3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2009/03/28 16:51:45 tnn Exp $
+$NetBSD: distinfo,v 1.19 2009/04/07 08:01:01 hasso Exp $
 
 SHA1 (firefox-3.0.8-source.tar.bz2) = 93f82c64ae9c805964fb6459223a1061e2d328fd
 RMD160 (firefox-3.0.8-source.tar.bz2) = 2b56dbb881e169ad0a3acad30b8aa0677c03a5e5
@@ -15,7 +15,7 @@ SHA1 (patch-bb) = c7286542a9fe97ac9819a00c345272efb7e90e9c
 SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85
 SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
 SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
-SHA1 (patch-br) = 943b38fef5e7070de7af8a055f05e576039ad8bb
+SHA1 (patch-br) = 66940666497e82bfb39dcc9381ecd85942ab222c
 SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
 SHA1 (patch-bu) = 0714f658001c363f4abbfb248ac77c4862e3ccf9
 SHA1 (patch-bv) = ef06a6a774c9d4da7b3fbf6f4e274ab042926e49
diff --git a/www/firefox3/patches/patch-br b/www/firefox3/patches/patch-br
index 6557e0c480e..d243b5f5a55 100644
--- a/www/firefox3/patches/patch-br
+++ b/www/firefox3/patches/patch-br
@@ -1,9 +1,29 @@
-$NetBSD: patch-br,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
+$NetBSD: patch-br,v 1.2 2009/04/07 08:01:01 hasso Exp $
 
-diff -ruN ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
---- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c	2005-08-19 02:24:38.000000000 +0900
-+++ ./nsprpub/pr/src/misc/prnetdb.c	2005-12-04 19:18:10.000000000 +0900
-@@ -2110,7 +2110,17 @@
+--- nsprpub/pr/src/misc/prnetdb.c.orig	2008-05-02 11:18:14 +0300
++++ nsprpub/pr/src/misc/prnetdb.c	2009-04-04 19:53:32 +0300
+@@ -114,6 +114,11 @@ PRLock *_pr_dnsLock = NULL;
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif
+ 
++#if __DragonFly_version >= 200202
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_5_ARG_GETPROTO_R
++#endif
++
+ /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
+ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
+ #define _PR_HAVE_GETPROTO_R
+@@ -331,7 +336,7 @@ _pr_QueryNetIfs(void)
+ }
+ 
+ #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
+-    || defined(NETBSD) || defined(OPENBSD)
++    || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
+ 
+ /*
+  * Use the BSD getifaddrs function.
+@@ -2023,7 +2028,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 15a75a6a106..bea0241e86d 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2009/03/19 15:09:45 ghen Exp $
+$NetBSD: distinfo,v 1.38 2009/04/07 08:01:01 hasso Exp $
 
 SHA1 (seamonkey-1.1.15.source.tar.bz2) = 483beb2b77b48ca405daa71dc9508d46d4795dc6
 RMD160 (seamonkey-1.1.15.source.tar.bz2) = 498a88ee57725ba95e49705dd2c2a1b5e8f31429
@@ -26,7 +26,7 @@ SHA1 (patch-bb) = 02739e33cc1f35294257125c39a1223e0e1b07a6
 SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7
 SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
 SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
-SHA1 (patch-br) = 17c64ca592a5482a780ad3bc6d5f835ed2c91588
+SHA1 (patch-br) = ff781a96f356185947451deaddf6f9ad2acacd9d
 SHA1 (patch-bs) = 3263560fed55d5c7075f28d405d9d705608bfb67
 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
 SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
diff --git a/www/seamonkey/patches/patch-br b/www/seamonkey/patches/patch-br
index 1c2199e2173..fc31e582929 100644
--- a/www/seamonkey/patches/patch-br
+++ b/www/seamonkey/patches/patch-br
@@ -1,8 +1,29 @@
-$NetBSD: patch-br,v 1.1.1.1 2006/03/30 19:15:49 ghen Exp $
+$NetBSD: patch-br,v 1.2 2009/04/07 08:01:01 hasso Exp $
 
---- nsprpub/pr/src/misc/prnetdb.c.orig	2005-08-18 19:24:38.000000000 +0200
-+++ nsprpub/pr/src/misc/prnetdb.c
-@@ -2110,7 +2110,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+--- nsprpub/pr/src/misc/prnetdb.c.orig	2006-11-14 19:41:59 +0200
++++ nsprpub/pr/src/misc/prnetdb.c	2009-04-04 18:10:55 +0300
+@@ -113,6 +113,11 @@ PRLock *_pr_dnsLock = NULL;
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif
+ 
++#if __DragonFly_version >= 200202
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_5_ARG_GETPROTO_R
++#endif
++
+ #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+@@ -329,7 +334,7 @@ _pr_QueryNetIfs(void)
+ }
+ 
+ #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
+-    || defined(NETBSD) || defined(OPENBSD)
++    || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
+ 
+ /*
+  * Use the BSD getifaddrs function.
+@@ -2115,7 +2120,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;