From fdfcd30ddcf17e8aca8ddde54ad0bdc1a037cd84 Mon Sep 17 00:00:00 2001
From: Alan Eldridge <alane@FreeBSD.org>
Date: Fri, 13 Dec 2002 09:41:38 +0000
Subject: Finally, a release Phoenix that works and does not crash all the
 time.

Approved by:	kris (a long time ago)
---
 www/firefox36/files/mozconfig.in                   |  8 ++++++--
 .../files/patch-nsprpub-pr-src-pthrads-ptio.c      | 22 ----------------------
 2 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c

(limited to 'www/firefox36/files')

diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/firefox36/files/mozconfig.in
+++ b/www/firefox36/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
-- 
cgit v1.2.3