Update to 1.8a6. They merged a bunch of FreeBSD changes. Neat.

7 files changed, 38 insertions, 195 deletions

diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index ee7cdba893c4..9d54be6e95ee 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME?=	mozilla
-PORTVERSION=	1.8.a5
-PORTREVISION?=	2
+PORTVERSION=	1.8.a6
+PORTREVISION?=	0
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.a5/a5/}/source
-DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.a5/a5/}${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.a6/a6/}/source
+DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.a6/a6/}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -73,7 +73,8 @@ CONFIGURE_ARGS=					\
 		--with-system-png=${LOCALBASE}	\
 		--with-gssapi=/usr		\
 		--prefix=${FAKEDIR}		\
-		--with-pthreads
+		--with-pthreads			\
+		--enable-application=suite
 
 PLIST=		${WRKDIR}/pkg-plist
 MOZ_EXTENSIONS=	default
diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo
index 2064ca61c477..475e6e526e26 100644
--- a/www/seamonkey2/distinfo
+++ b/www/seamonkey2/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.8a5.tar.bz2) = fa3e7a19b3ef455609ea0803b26e6e74
-SIZE (mozilla-source-1.8a5.tar.bz2) = 33195559
+MD5 (mozilla-source-1.8a6.tar.bz2) = ea5d925b7e2e047f7791781d6a121c26
+SIZE (mozilla-source-1.8a6.tar.bz2) = 31842532
diff --git a/www/seamonkey2/files/patch-nsprpub-pr-include-md-_pth.h b/www/seamonkey2/files/patch-nsprpub-pr-include-md-_pth.h
index 1f8159c70b1f..8d274924400f 100644
--- a/www/seamonkey2/files/patch-nsprpub-pr-include-md-_pth.h
+++ b/www/seamonkey2/files/patch-nsprpub-pr-include-md-_pth.h
@@ -1,11 +1,11 @@
---- nsprpub/pr/include/md/_pth.h.orig	Mon Jul 26 07:23:42 2004
-+++ nsprpub/pr/include/md/_pth.h	Mon Jul 26 07:18:37 2004
-@@ -90,7 +90,7 @@
- #define _PT_PTHREAD_MUTEXATTR_INIT        pthread_mutexattr_init
- #define _PT_PTHREAD_MUTEXATTR_DESTROY     pthread_mutexattr_destroy
- #define _PT_PTHREAD_MUTEX_INIT(m, a)      pthread_mutex_init(&(m), &(a))
+--- nsprpub/pr/include/md/_pth.h.orig	Sun Jan 16 16:09:10 2005
++++ nsprpub/pr/include/md/_pth.h	Sun Jan 16 16:10:06 2005
+@@ -84,7 +84,7 @@
+ #define _PT_PTHREAD_MUTEXATTR_DESTROY(x)  /* */
+ #define _PT_PTHREAD_MUTEX_INIT(m, a)      (memset(&(m), 0, sizeof(m)), \
+                                       pthread_mutex_init(&(m), NULL))
 -#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))
 +#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (0 != pthread_mutex_trylock(&(m)))
- #if defined(DARWIN)
  #define _PT_PTHREAD_CONDATTR_INIT(x)      0
- #else
+ #define _PT_PTHREAD_CONDATTR_DESTROY(x)   /* */
+ #define _PT_PTHREAD_COND_INIT(m, a)       (memset(&(m), 0, sizeof(m)), \
diff --git a/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg
index b66fea57cd33..cb309ac983e6 100644
--- a/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg
+++ b/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg
@@ -1,124 +1,11 @@
---- nsprpub/pr/include/md/_freebsd.cfg.orig	Sat Nov 15 15:36:12 2003
-+++ nsprpub/pr/include/md/_freebsd.cfg	Sun Feb  1 13:36:44 2004
-@@ -91,7 +91,7 @@
- #define PR_ALIGN_OF_DOUBLE  4
- #define PR_ALIGN_OF_POINTER 4
- 
--#elif defined(__alpha)
-+#elif defined(__alpha__)
- 
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
-@@ -138,8 +138,7 @@
+--- nsprpub/pr/include/md/_freebsd.cfg.orig	Sun Jan 16 16:13:08 2005
++++ nsprpub/pr/include/md/_freebsd.cfg	Sun Jan 16 16:16:34 2005
+@@ -141,7 +141,7 @@
  #define PR_ALIGN_OF_DOUBLE  8
  #define PR_ALIGN_OF_POINTER 8
  
 -#elif defined(__sparc__)
--
 +#elif defined(__sparc64__)
- #undef IS_LITTLE_ENDIAN
- #define IS_BIG_ENDIAN 1
- #define	HAVE_LONG_LONG
-@@ -185,6 +184,102 @@
- #define PR_ALIGN_OF_DOUBLE  8
- #define PR_ALIGN_OF_POINTER 8
- 
-+#elif defined(__ia64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#elif defined(__amd64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
- #else
  
- #error "Unknown CPU architecture"
+ #undef  IS_LITTLE_ENDIAN
+ #define IS_BIG_ENDIAN 1
diff --git a/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.h b/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.h
deleted file mode 100644
index fca34102ffb0..000000000000
--- a/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- nsprpub/pr/include/md/_freebsd.h.orig	Sat Nov 15 18:36:13 2003
-+++ nsprpub/pr/include/md/_freebsd.h	Sun Dec 14 11:40:08 2003
-@@ -50,6 +50,10 @@
- #define _PR_SI_ARCHITECTURE "alpha"
- #elif defined(__sparc__)
- #define _PR_SI_ARCHITECTURE "sparc"
-+#elif defined(__ia64__)
-+#define _PR_SI_ARCHITECTURE "ia64"
-+#elif defined(__amd64__)
-+#define _PR_SI_ARCHITECTURE "amd64"
- #else
- #error "Unknown CPU architecture"
- #endif
diff --git a/www/seamonkey2/files/patch-nsprpub::pr::src::pthreads::ptio.c b/www/seamonkey2/files/patch-nsprpub::pr::src::pthreads::ptio.c
deleted file mode 100644
index 08346f235416..000000000000
--- a/www/seamonkey2/files/patch-nsprpub::pr::src::pthreads::ptio.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- nsprpub/pr/src/pthreads/ptio.c.orig	Mon Jul 14 17:59:47 2003
-+++ nsprpub/pr/src/pthreads/ptio.c	Fri Aug 29 15:39:46 2003
-@@ -189,7 +189,7 @@
- #endif
- #endif
- 
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(FREEBSD)
- static PRBool _pr_ipv6_v6only_on_by_default;
- /* 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
-@@ -3462,7 +3462,7 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
--#ifdef DARWIN
-+#if defined(DARWIN) || defined(FREEBSD)
-         if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
-         {
-             int on = 0;
diff --git a/www/seamonkey2/files/patch-qt b/www/seamonkey2/files/patch-qt
index b0568b3fe04d..bf90908127a3 100644
--- a/www/seamonkey2/files/patch-qt
+++ b/www/seamonkey2/files/patch-qt
@@ -1,33 +1,33 @@
---- configure.orig	Fri Jul  9 18:15:54 2004
-+++ configure	Thu Jul 15 17:55:43 2004
-@@ -9370,7 +9370,7 @@
+--- configure.orig	Wed Dec 22 19:34:26 2004
++++ configure	Sun Jan 16 16:30:16 2005
+@@ -9446,7 +9446,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 9376 "configure"
+ #line 9452 "configure"
  #include "confdefs.h"
-@@ -9401,7 +9401,7 @@
+@@ -9477,7 +9477,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  _ICONV_LIBS="$_ICONV_LIBS -liconv"
-+  _ICONV_LIBS="$_ICONV_LIBS $LOCALBASE/lib -liconv"
++  _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -9411,7 +9411,7 @@
+@@ -9487,7 +9487,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 9417 "configure"
+ #line 9493 "configure"
  #include "confdefs.h"
-@@ -9442,7 +9442,7 @@
+@@ -9518,7 +9518,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -36,15 +36,12 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -12487,9 +12487,9 @@
- 
- 
- 
--MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming"
-+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming"
- 
--MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks sql"
-+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks sql"
+@@ -11847,7 +11847,7 @@
+   MOZ_COMPOSER=1
+   MOZ_PROFILESHARING=1
+   MOZ_APP_VERSION=$MOZILLA_VERSION
+-  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming permissions"
++  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming permissions"
+   ;;
  
- # Check whether --enable-extensions or --disable-extensions was given.
- if test "${enable_extensions+set}" = set; then
+ browser)