From fb08755edd643069deeee5479e4f04683dc44f14 Mon Sep 17 00:00:00 2001
From: salo <salo>
Date: Sat, 24 Mar 2007 18:46:56 +0000
Subject: Pullup ticket 2043 - requested by joerg portability fixes for firefox
 and thunderbird

Revisions pulled up:
- pkgsrc/mail/thunderbird/distinfo			1.36
- pkgsrc/mail/thunderbird/patches/patch-dw		1.1
- pkgsrc/www/firefox/distinfo				1.63
- pkgsrc/www/firefox/patches/patch-dw			1.3

   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Wed Mar  7 22:02:26 UTC 2007

   Modified Files:
   	pkgsrc/mail/thunderbird: distinfo
   Added Files:
   	pkgsrc/mail/thunderbird/patches: patch-dw

   Log Message:
   Fix build on DragonFly as RNG_RNGInit was calling itself due to bad
   linkage. I love platform dependent magic in each Makefile.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Wed Mar  7 22:05:22 UTC 2007

   Modified Files:
   	pkgsrc/www/firefox: distinfo
   Added Files:
   	pkgsrc/www/firefox/patches: patch-dw

   Log Message:
   Merge patch-dw from thunderbird to fix build on DragonFly.
---
 mail/thunderbird/distinfo         |  3 ++-
 mail/thunderbird/patches/patch-dw | 13 +++++++++++++
 www/firefox/distinfo              |  3 ++-
 www/firefox/patches/patch-dw      | 13 +++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 mail/thunderbird/patches/patch-dw
 create mode 100644 www/firefox/patches/patch-dw

diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index a8f4a4bff00..748298f3fbb 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32.2.1 2007/03/05 19:16:33 salo Exp $
+$NetBSD: distinfo,v 1.32.2.2 2007/03/24 18:46:56 salo Exp $
 
 SHA1 (thunderbird-1.5.0.10-source.tar.bz2) = a6467c946f9e668bcf7b3a06dcaeceb601b98fce
 RMD160 (thunderbird-1.5.0.10-source.tar.bz2) = 926484cd1880e7921bf10ba0774064e43acc9283
@@ -52,3 +52,4 @@ SHA1 (patch-dm) = eb86aee54fd213eb64a89e5bc2754971db9648f4
 SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3
 SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
 SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
+SHA1 (patch-dw) = eb4acb8c6c59ef3c73a7ba7e6d6956e325de9d85
diff --git a/mail/thunderbird/patches/patch-dw b/mail/thunderbird/patches/patch-dw
new file mode 100644
index 00000000000..c4203ecd361
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dw
@@ -0,0 +1,13 @@
+$NetBSD: patch-dw,v 1.1.2.2 2007/03/24 18:46:57 salo Exp $
+
+--- security/nss/lib/freebl/Makefile.orig	2007-03-07 20:19:17.000000000 +0000
++++ security/nss/lib/freebl/Makefile
+@@ -192,7 +192,7 @@ endif
+ # to bind the blapi function references in FREEBLVector vector
+ # (ldvector.c) to the blapi functions defined in the freebl
+ # shared libraries.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
++ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_TARGET)))
+     MKSHLIB += -Wl,-Bsymbolic
+ endif
+ 
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index e9af3304c78..b706faf4faf 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59.2.1 2007/03/02 20:17:01 salo Exp $
+$NetBSD: distinfo,v 1.59.2.2 2007/03/24 18:46:57 salo Exp $
 
 SHA1 (firefox-1.5.0.10-source.tar.bz2) = c341958ca46d04a4dad6266cb8c11b534f5f758e
 RMD160 (firefox-1.5.0.10-source.tar.bz2) = 6d190be0fa5c38cdbf637af49a351731d4a68d06
@@ -58,6 +58,7 @@ SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
 SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
 SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf
 SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
+SHA1 (patch-dw) = eb4acb8c6c59ef3c73a7ba7e6d6956e325de9d85
 SHA1 (patch-ea) = 14e31d17c2493e468cd01f99abfc996853a11032
 SHA1 (patch-eb) = dc9232b10075d17f7ed742e7be8ea036db2f0241
 SHA1 (patch-ec) = 925a6f76bbfa77661256d46b0d14e847c16a865f
diff --git a/www/firefox/patches/patch-dw b/www/firefox/patches/patch-dw
new file mode 100644
index 00000000000..70cf29ec14b
--- /dev/null
+++ b/www/firefox/patches/patch-dw
@@ -0,0 +1,13 @@
+$NetBSD: patch-dw,v 1.2.8.1 2007/03/24 18:46:58 salo Exp $
+
+--- security/nss/lib/freebl/Makefile.orig	2007-03-07 20:19:17.000000000 +0000
++++ security/nss/lib/freebl/Makefile
+@@ -192,7 +192,7 @@ endif
+ # to bind the blapi function references in FREEBLVector vector
+ # (ldvector.c) to the blapi functions defined in the freebl
+ # shared libraries.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
++ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_TARGET)))
+     MKSHLIB += -Wl,-Bsymbolic
+ endif
+ 
-- 
cgit v1.2.3