From bafe7031d8c10a3555a1d9faf7c6620c293e42c5 Mon Sep 17 00:00:00 2001
From: trevor <trevor@FreeBSD.org>
Date: Sat, 18 Oct 2003 21:45:26 +0000
Subject: Update to 0.7 with patch-config_preprocess.pl updated by obraun.
 De-support GTK+ 1.2 (requested by marcus).  Trim COMMENT.

---
 www/firefox/files/patch-config_preprocess.pl       | 26 +++++++++--------
 .../files/patch-nsprpub-pr-src-pthreads-ptio.c     | 34 ++++++++++++----------
 2 files changed, 32 insertions(+), 28 deletions(-)

(limited to 'www/firefox/files')

diff --git a/www/firefox/files/patch-config_preprocess.pl b/www/firefox/files/patch-config_preprocess.pl
index 0ae1465f6e3c..a5c17665d9e9 100644
--- a/www/firefox/files/patch-config_preprocess.pl
+++ b/www/firefox/files/patch-config_preprocess.pl
@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
-@@ -71,15 +71,39 @@
+$FreeBSD$
+
+--- config/preprocessor.pl.orig	Tue Sep  2 17:53:55 2003
++++ config/preprocessor.pl	Sat Oct 18 23:00:35 2003
+@@ -73,16 +73,39 @@
  ########################################################################
  
  package main;
@@ -34,22 +36,22 @@
  
  sub include {
      my($stack, $filename) = @_;
+     my $directory = $stack->{'variables'}->{'DIRECTORY'};
      if ($filename ne '-') {
--        $filename = File::Spec->rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
--        my($volume, $directory) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
-+	my ($directory) = dirname($filename);
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
+-        $filename = File::Spec->rel2abs($filename, $directory);
+-        my($volume, $path) = File::Spec->splitpath($filename);
+-        $directory = File::Spec->catpath($volume, $path, '');
++        $filename = rel2abs($filename, $directory);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
-@@ -372,7 +396,7 @@
+@@ -376,7 +399,7 @@
      my $stack = shift;
      return if $stack->disabled;
      die "argument expected\n" unless @_;
 -    main::include($stack, File::Spec->catpath(File::Spec::Unix->splitpath(@_)));
-+    main::include($stack, File::Spec->catfile(dirname(@_), basename(@_)));
++    main::include($stack, File::Spec->catfile(File::Basename::dirname(@_), File::Basename::basename(@_)));
  }
  
  sub filter {
diff --git a/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c
index 4243bc8a8193..c015c3d19d27 100644
--- a/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c
+++ b/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c
@@ -1,24 +1,26 @@
---- nsprpub/pr/src/pthreads/ptio.c.orig	Tue Jul  8 23:37:46 2003
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
-@@ -3370,7 +3370,7 @@
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
- #if defined(_PR_INET6_PROBE)
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+$FreeBSD$
+
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
+@@ -189,7 +189,7 @@
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
-@@ -3385,7 +3385,7 @@
-      */
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
-     if (osfd != -1) {
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
+ #ifndef IPV6_V6ONLY
+@@ -1154,7 +1154,7 @@
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
-         /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
-          * is turned on by default, contrary to what RFC 3493, Section
-          * 5.3 says.  So we have to turn it off.  Find out whether we
-@@ -3452,7 +3452,7 @@
+     /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
+      * is turned on by default, contrary to what RFC 3493, Section
+      * 5.3 says.  So we have to turn it off.  Find out whether we
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {
-- 
cgit