Update to 0.7 with patch-config_preprocess.pl updated by obraun.

De-support GTK+ 1.2 (requested by marcus).  Trim COMMENT.

www/firefox-devel/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/firefox-devel/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/firefox-devel/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

www/firefox-devel/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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {

www/firefox-esr/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/firefox-esr/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/firefox-esr/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

www/firefox-esr/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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {

www/firefox/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/firefox/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/firefox/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {

www/firefox10/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/firefox10/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/firefox10/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

www/firefox10/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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {

www/firefox15/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/firefox15/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/firefox15/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

www/firefox15/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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {

www/firefox3-devel/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/firefox3-devel/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/firefox3-devel/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

www/firefox3-devel/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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {

www/firefox35/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/firefox35/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/firefox35/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

www/firefox35/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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {

www/firefox36/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/firefox36/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/firefox36/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

www/firefox36/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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {

www/flock/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/flock/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/flock/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

www/flock/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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {

www/mozilla-firebird/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firebird
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -15,7 +14,7 @@ PKGNAMEPREFIX=	mozilla-
 DISTNAME=	MozillaFirebird-source-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Mozilla Firebird is the next generation browser from the mozilla.org project
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -26,23 +25,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
-USE_BZIP2=	yes
+ALL_TARGET=	default
 USE_GMAKE=	yes
+USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	default
-
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20 libidl
-PKGNAMESUFFIX=	-gtk2
-PLIST=		${PKGDIR}/pkg-plist.gtk2
-.else
-USE_GNOME=	gtk12 orbit
-PLIST=		${PKGDIR}/pkg-plist.gtk1
-.endif
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
@@ -81,10 +72,6 @@ CONFIGURE_ENV+=	WITHOUT_XFT=yes
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
-.if defined(WITH_GTK2)
-CONFIGURE_ENV+=	WITH_GTK2=yes
-.endif # defined(WITH_GTK2)
-
 CPPFLAGS+=		-I${X11BASE}/include
 CFLAGS+=		${PTHREAD_CFLAGS}
 LDFLAGS+=		-L${X11BASE}/lib

www/mozilla-firebird/distinfo

@@ -1 +1,2 @@
-MD5 (MozillaFirebird-source-0.6.1.tar.bz2) = 35191de0d02601f7a190b5065a26de85
+$FreeBSD$
+MD5 (MozillaFirebird-source-0.7.tar.gz) = 35112566a3dca5bdf363972056afc462

www/mozilla-firebird/files/patch-config_preprocess.pl

@@ -1,6 +1,8 @@
---- config/preprocessor.pl.orig	Wed Jun 18 17:40:48 2003
+$FreeBSD$
-+++ config/preprocessor.pl	Wed Jun 18 18:55:28 2003
+
-@@ -71,15 +71,39 @@
+--- 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'});
+-        $filename = File::Spec->rel2abs($filename, $directory);
--        my($volume, $directory) = File::Spec->splitpath($filename);
+-        my($volume, $path) = File::Spec->splitpath($filename);
--        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catpath($volume, $directory, '');
+-        $directory = File::Spec->catpath($volume, $path, '');
-+        $filename = rel2abs($filename, $stack->{'variables'}->{'DIRECTORY'});
++        $filename = rel2abs($filename, $directory);
-+	my ($directory) = dirname($filename);
++        $directory = File::Spec->catdir(File::Basename::dirname($filename));
-+        local $stack->{'variables'}->{'DIRECTORY'} = File::Spec->catdir($directory);
      }
+     local $stack->{'variables'}->{'DIRECTORY'} = $directory;
      local $stack->{'variables'}->{'FILE'} = $filename;
-     local $stack->{'variables'}->{'LINE'} = 0;
+@@ -376,7 +399,7 @@
-@@ -372,7 +396,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 {

www/mozilla-firebird/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
+$FreeBSD$
-+++ nsprpub/pr/src/pthreads/ptio.c	Wed Jul 23 00:53:15 2003
+
-@@ -3370,7 +3370,7 @@
+--- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 21:59:47 2003
- PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
++++ nsprpub/pr/src/pthreads/ptio.c	Fri Oct 17 05:25:43 2003
- #if defined(_PR_INET6_PROBE)
+@@ -189,7 +189,7 @@
- PR_EXTERN(PRBool) _pr_ipv6_is_present;
+ #endif
+ #endif
+ 
 -#ifdef DARWIN
 +#if defined(DARWIN) || defined(FREEBSD)
  static PRBool _pr_ipv6_v6only_on_by_default;
- #endif
+ /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
- PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
+ #ifndef IPV6_V6ONLY
-@@ -3385,7 +3385,7 @@
+@@ -1154,7 +1154,7 @@
-      */
+     _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
-     osfd = socket(AF_INET6, SOCK_STREAM, 0);
+     PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
-     if (osfd != -1) {
+ 
 -#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 @@
+@@ -3462,7 +3462,7 @@
      if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
      else
      {