Fix linkage on DragonFly, a segfault in library signing tool and disable

sqlite3 pthread lock test on NetBSD and DragonFly.

5 files changed, 68 insertions, 2 deletions

diff --git a/www/firefox2/Makefile-firefox.common b/www/firefox2/Makefile-firefox.common
index 32cb730be63..2fb2b44b80e 100644
--- a/www/firefox2/Makefile-firefox.common
+++ b/www/firefox2/Makefile-firefox.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.2 2006/11/03 07:53:05 joerg Exp $
+# $NetBSD: Makefile-firefox.common,v 1.3 2006/12/06 20:37:00 joerg Exp $
 
 MOZILLA_BIN=		firefox-bin
 MOZ_VER=		2.0
@@ -28,6 +28,12 @@ MOZILLA_EXTENSIONS=	default
 CONFIGURE_ARGS+=	--enable-extensions=${MOZILLA_EXTENSIONS:Q}
 CONFIGURE_ENV+=	ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
+CPPFLAGS+=		-DSQLITE_THREAD_OVERRIDE_LOCK=0
+.endif
+
 USE_LANGUAGES+=		c++
 BUILD_SVG=		# yes
 BUILD_MATHML=		# yes
diff --git a/www/firefox2/distinfo b/www/firefox2/distinfo
index 6f3fe5829f0..84987a14e97 100644
--- a/www/firefox2/distinfo
+++ b/www/firefox2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/12/06 07:55:04 ghen Exp $
+$NetBSD: distinfo,v 1.5 2006/12/06 20:37:00 joerg Exp $
 
 SHA1 (firefox-2.0-source.tar.bz2) = 2bbc6b80cf184bf27101ec4315a19023547c85d4
 RMD160 (firefox-2.0-source.tar.bz2) = 88b284b236f29fa5e483a32cd75ceaadebd2f6c3
@@ -44,9 +44,11 @@ SHA1 (patch-ck) = 18e6c412399c8b5b89941d818cf2589711f35472
 SHA1 (patch-cl) = a08ba37aa7ac7806123aa21b6ff8055c6ded6449
 SHA1 (patch-cm) = 7da6e9da803407b25bf4b707562777e8429a37a4
 SHA1 (patch-cn) = 54d21a622dee6b7edf3ca9fb44bd4f5e02ada974
+SHA1 (patch-da) = 356e37429832ffd296fa79b9aa7ef20c05d851e0
 SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f
 SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
 SHA1 (patch-dd) = de9d705fdc3cb9879a19d58dfd170d104ca379f7
+SHA1 (patch-de) = 1d845fd60ecd85554fa82f6c5f3cc7edc7d377a5
 SHA1 (patch-df) = 17912d183f754ab6661d2be8092e6a07d142632b
 SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
 SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
@@ -59,6 +61,7 @@ SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
 SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
 SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf
 SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
+SHA1 (patch-dw) = ab7606171564b6879effc3b37d9eadc6565cb74b
 SHA1 (patch-ea) = 14e31d17c2493e468cd01f99abfc996853a11032
 SHA1 (patch-eb) = dc9232b10075d17f7ed742e7be8ea036db2f0241
 SHA1 (patch-ec) = 8235af6634306b2a5725754cd5a32285b311b714
diff --git a/www/firefox2/patches/patch-da b/www/firefox2/patches/patch-da
new file mode 100644
index 00000000000..6e241dfb3b5
--- /dev/null
+++ b/www/firefox2/patches/patch-da
@@ -0,0 +1,12 @@
+$NetBSD: patch-da,v 1.1 2006/12/06 20:37:00 joerg Exp $
+
+--- layout/build/Makefile.in.orig	2006-12-06 17:28:45.000000000 +0000
++++ layout/build/Makefile.in
+@@ -282,6 +282,7 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
+ endif
+ endif
+ 
++LDFLAGS+= -lX11 -lXrender
+ 
+ export:: $(BUILD_DATE)
+ 
diff --git a/www/firefox2/patches/patch-de b/www/firefox2/patches/patch-de
new file mode 100644
index 00000000000..b6fd6d0d3cd
--- /dev/null
+++ b/www/firefox2/patches/patch-de
@@ -0,0 +1,13 @@
+$NetBSD: patch-de,v 1.1 2006/12/06 20:37:00 joerg Exp $
+
+--- security/nss/lib/freebl/Makefile.orig	2006-12-06 18:01:13.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 DragonFly FreeBSD Linux NetBSD, $(OS_TARGET)))
+     MKSHLIB += -Wl,-Bsymbolic
+ endif
+ 
diff --git a/www/firefox2/patches/patch-dw b/www/firefox2/patches/patch-dw
new file mode 100644
index 00000000000..d9e3d4edeb5
--- /dev/null
+++ b/www/firefox2/patches/patch-dw
@@ -0,0 +1,32 @@
+$NetBSD: patch-dw,v 1.1 2006/12/06 20:37:00 joerg Exp $
+
+--- db/sqlite3/src/os_unix.c.orig	2006-05-22 19:12:32.000000000 +0000
++++ db/sqlite3/src/os_unix.c
+@@ -443,6 +443,7 @@ static int lockTrace(int fd, int op, str
+ #define fcntl lockTrace
+ #endif /* SQLITE_LOCK_TRACE */
+ 
++#if SQLITE_THREAD_OVERRIDE_LOCK == -1
+ /*
+ ** The testThreadLockingBehavior() routine launches two separate
+ ** threads on this routine.  This routine attempts to lock a file
+@@ -483,6 +484,7 @@ static void testThreadLockingBehavior(in
+   close(fd);
+   threadsOverrideEachOthersLocks =  d[0].result==0 && d[1].result==0;
+ }
++#endif
+ #endif /* SQLITE_UNIX_THREADS */
+ 
+ /*
+@@ -536,9 +538,11 @@ static int findLockInfo(
+   key1.dev = statbuf.st_dev;
+   key1.ino = statbuf.st_ino;
+ #ifdef SQLITE_UNIX_THREADS
++#if SQLITE_THREAD_OVERRIDE_LOCK == -1
+   if( threadsOverrideEachOthersLocks<0 ){
+     testThreadLockingBehavior(fd);
+   }
++#endif
+   key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self();
+ #endif
+   memset(&key2, 0, sizeof(key2));