- Update to 2.0

Release notes: http://www.seamonkey-project.org/releases/seamonkey2.0/ SeaMonkey 2 profile migration: http://kb.mozillazine.org/Profile_migration_-_SeaMonkey Thanks to: Andreas Tobler, Florian Smeets, Dan Nelson, gpalmer@, miwi@
svn path=/head/; revision=245767
2024-12-11 02:50:24 +00:00 · 2009-12-14 12:22:22 +00:00 · 2009-12-14 12:22:22 +00:00 · cf7b521864 · 2021-03-31 03:12:20 +00:00
commit cf7b521864
parent f1f79ebfdc
40 changed files with 530 additions and 354 deletions
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@ -3,19 +3,20 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#   $MCom: ports-stable/www/seamonkey/Makefile,v 1.9 2009/01/09 23:41:22 mezz Exp $
 #

 PORTNAME=	seamonkey
-DISTVERSION=	1.1.18
+DISTVERSION=	2.0
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
-DISTNAME=	${PORTNAME}-${DISTVERSION}.source
+MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
+DISTNAME=	seamonkey-${DISTVERSION}.source

 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser

+CONFLICTS=	seamonkey-1* spidermonkey-1.[0-7]*
+LATEST_LINK=	seamonkey2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GECKO=	gecko
@ -27,6 +28,7 @@ MAKE_JOBS_SAFE=	yes
 MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/cairo"
+USE_GCC=	4.2+

 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}

@ -38,9 +40,11 @@ MOZ_OPTIONS+=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 		--enable-application=suite	\
 		--enable-svg-renderer=cairo	\
 		--enable-system-cairo		\
-		--enable-canvas \
-		--with-system-nss
-MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=suite
+		--enable-canvas
+USE_MOZILLA=	-png -dbm -jpeg -xft
+MOZ_TOOLKIT=	cairo-gtk2
+MOZILLA_PLIST_DIRS=	bin lib
+MOZ_PKGCONFIG_FILES=

 NOT_FOR_ARCHS=	ia64

@ -48,12 +52,31 @@ OPTIONS=MAILNEWS "Enable Mail and News modules" on \
 	COMPOSER "Enable the HTML Composer module" on \
 	LDAP "Enable LDAP support for Mailnews" on \
 	CHATZILLA "Enable the Chatzilla IRC module" on \
+	DBUS "Enable D-BUS support" on \
 	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \
 	SMB "Enable smb:// URI support using gnomevfs" off

 .include <bsd.port.pre.mk>

-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+.if ${OSVERSION} < 700000
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
+.else
+EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
+.endif
+
+MOZSRC:=	${WRKDIR}/comm-1.9.1/mozilla
+WRKSRC=		${WRKDIR}/comm-1.9.1
+
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED
+} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_GNOME+=	libgnomeui
+MOZ_OPTIONS+=	--enable-gnomeui
+.else
+MOZ_OPTIONS+=	--disable-gnomeui
+.endif

 .if exists(${LOCALBASE}/include/cairo/cairo-glitz.h)
 # Glitz support can only be enabled if cairo is built with glitz support
@ -61,10 +84,6 @@ MOZ_OPTIONS+=	--enable-glitz
 LIB_DEPENDS+=	glitz.1:${PORTSDIR}/graphics/glitz
 .endif

-.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101
-IGNORE=		core dumps on ${ARCH}, need kern.osreldate>=601101
-.endif
-
 .if defined(WITHOUT_MAILNEWS)
 MOZ_OPTIONS+=	--disable-ldap --disable-mailnews
 .else
@ -79,36 +98,66 @@ MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
 MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
 .endif
 .if defined(WITH_JAVASCRIPT_DEBUGGER)
-MOZ_OPTIONS+=		--enable-jsd \
-			--enable-dtd-debug
+MOZ_OPTIONS+=	--enable-jsd \
+		--enable-dtd-debug
 .else
-MOZ_OPTIONS+=		--disable-jsd \
-			--disable-dtd-debug
+MOZ_OPTIONS+=	--disable-jsd \
+		--disable-dtd-debug
 .endif

 .if defined(WITHOUT_COMPOSER)
 MOZ_OPTIONS+=	--disable-composer
 .endif

+.if defined(WITHOUT_DBUS)
+MOZ_OPTIONS+=	--disable-dbus
+.else
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/security/manager/ssl/src/Makefile.in
+		${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \
+		${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
-		${WRKSRC}/storage/build/Makefile.in
+		${WRKSRC}/mozilla/storage/build/Makefile.in
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
-		${WRKSRC}/modules/libpref/src/init/all.js
+		${WRKSRC}/mozilla/modules/libpref/src/init/all.js
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
 		${WRKSRC}/configure \
-		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
-		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+		${WRKSRC}/mozilla/configure \
+		${WRKSRC}/mozilla/intl/uconv/native/nsNativeUConvService.cpp \
+		${WRKSRC}/mozilla/xpcom/io/nsNativeCharsetUtils.cpp
+	@${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \
+		${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \
+		${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+	@${REINPLACE_CMD} -e 's|libgnomeui-2.so.0|libgnomeui-2.so|' \
+		${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \
+		${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+	@${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \
+		${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|echo aout|echo elf|g ; \
+		s|/usr/X11R6|${LOCALBASE}|g' \
+		${WRKSRC}/mozilla/js/src/configure \
+		${WRKSRC}/mozilla/configure \
+		${WRKSRC}/configure
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
 		${WRKDIR}/seamonkey.desktop
+	${LN} -s  ${WRKSRC}/suite ${WRKSRC}/mozilla/suite
+
+port-pre-install:
+	@${REINPLACE_CMD} -e 's|seamonkey-2.0|seamonkey|' \
+		${FAKEDIR}/bin/seamonkey
+	@${RM} -f ${FAKEDIR}/bin/seamonkey.bak
+	${MV} ${FAKEDIR}/lib/seamonkey-2.0 ${FAKEDIR}/lib/seamonkey

 pre-install:
 	${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${CP} ${WRKSRC}/suite/branding/icons/gtk/default.xpm \
+	${CP} ${WRKSRC}/other-licenses/branding/sunbird/default.xpm \
 		${FAKEDIR}/lib/${MOZILLA}/chrome/icons/default/

 do-install:
--- a/www/seamonkey2/distinfo
+++ b/www/seamonkey2/distinfo
@ -1,3 +1,3 @@
-MD5 (seamonkey-1.1.18.source.tar.bz2) = ef4455becf3a12833dca7dd92854aeaa
-SHA256 (seamonkey-1.1.18.source.tar.bz2) = fa7f2b8a94297027cf0151847e52f6dbe031b21599218888c4629f08daec910f
-SIZE (seamonkey-1.1.18.source.tar.bz2) = 36466846
+MD5 (seamonkey-2.0.source.tar.bz2) = 494608587e3ba4e4cc2e754d95154435
+SHA256 (seamonkey-2.0.source.tar.bz2) = 3ef2084262cd2f91863da6aa752bad73397f1a60363137d529ab8e8dfb020f1b
+SIZE (seamonkey-2.0.source.tar.bz2) = 60180430
--- a/www/seamonkey2/files/libsydney_oss
+++ b/www/seamonkey2/files/libsydney_oss
@ -0,0 +1,15 @@
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-08-26 20:30:30.000000000 +0200
+++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-08-26 20:31:01.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME	= sydneyaudio
+ FORCE_STATIC_LIB= 1
+ 
+ifeq ($(OS_ARCH),FreeBSD)
+CSRCS		= \
+			sydney_audio_oss.c \
+			$(NULL)
+endif
+
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS		= \
+ 		sydney_audio_alsa.c \
--- a/www/seamonkey2/files/patch-build_unix_run-mozilla.sh
+++ b/www/seamonkey2/files/patch-build_unix_run-mozilla.sh
@ -1,21 +0,0 @@
--- build/unix/run-mozilla.sh.orig	Sat Oct  1 01:36:47 2005
-+++ build/unix/run-mozilla.sh	Thu Dec 22 17:51:10 2005
-@@ -328,7 +328,7 @@
- fi
- ##
- ## Set LD_LIBRARY_PATH
-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- if [ -n "$LD_LIBRARYN32_PATH" ]
- then
- 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
-@@ -415,6 +415,9 @@
- #
- export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
- export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
-+
-+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey
-+export MOZ_PLUGIN_PATH
- 
- if [ $moz_debug -eq 1 ]
- then
--- a/www/seamonkey2/files/patch-config_autoconf.mk.in
+++ b/www/seamonkey2/files/patch-config_autoconf.mk.in
@ -1,6 +1,6 @@
--- config/autoconf.mk.in.orig	Mon Mar 15 22:56:25 2004
-+++ config/autoconf.mk.in	Fri Mar 19 15:17:50 2004
-@@ -31,13 +31,13 @@
+--- config/autoconf.mk.in.orig	2009-07-17 15:18:04.000000000 +0200
+++ config/autoconf.mk.in	2009-08-25 01:15:47.000000000 +0200
+@@ -61,7 +61,7 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
@ -9,10 +9,3 @@
 libdir		= @libdir@
 datadir		= @datadir@
 mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
--- a/www/seamonkey2/files/patch-configure
+++ b/www/seamonkey2/files/patch-configure
@ -1,33 +1,24 @@
--- configure.orig	2008-10-30 23:05:30.000000000 +0100
-+++ configure	2009-07-22 15:14:23.000000000 +0200
-@@ -1047,7 +1047,7 @@
- 
- MOZJPEG=62
- MOZPNG=10217
-MOZZLIB=1.2.3
-+MOZZLIB=1.2.2
- NSPR_VERSION=4
- NSS_VERSION=3
- 
-@@ -5408,7 +5408,7 @@
+--- configure.orig	2009-10-08 04:03:59.000000000 +0200
+++ configure	2009-10-10 19:56:41.000000000 +0200
+@@ -5794,7 +5794,7 @@
     CPU_ARCH=sparc
     ;;
 
-x86_64 | sparc | ppc | ia64)
-+amd64 | x86_64 | sparc | ppc | ia64)
+-x86_64 | ia64)
+amd64 | x86_64 | ia64)
     CPU_ARCH="$OS_TEST"
     ;;
 esac
-@@ -10442,7 +10442,7 @@
+@@ -10890,7 +10890,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 10448 "configure"
+ #line 10896 "configure"
 #include "confdefs.h"
-@@ -10473,7 +10473,7 @@
+@@ -10921,7 +10921,7 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
@ -36,16 +27,16 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10483,7 +10483,7 @@
+@@ -10931,7 +10931,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 10489 "configure"
+ #line 10937 "configure"
 #include "confdefs.h"
-@@ -10514,7 +10514,7 @@
+@@ -10962,7 +10962,7 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
--- a/www/seamonkey2/files/patch-db-sqlite3-src-Makefile.in
+++ b/www/seamonkey2/files/patch-db-sqlite3-src-Makefile.in
@ -1,13 +0,0 @@
--- db/sqlite3/src/Makefile.in.orig	2009-08-22 00:49:32.000000000 +0200
-+++ db/sqlite3/src/Makefile.in	2009-08-22 00:51:29.000000000 +0200
-@@ -113,6 +113,10 @@
- ##SIMPLE_PROGRAMS = sqlite-shell
- endif
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+EXTRA_LIBS	+= -lpthread
-+endif
-+
- include $(topsrcdir)/config/rules.mk
- 
- sqlite-shell.$(OBJ_SUFFIX): shell.c
--- a/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
+++ b/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
@ -0,0 +1,13 @@
+--- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2009-11-10 09:56:42.000000000 +0100
+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-11-10 09:58:15.000000000 +0100
+@@ -254,6 +254,10 @@
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
+ endif
+ 
+ifeq ($(OS_ARCH), FreeBSD)
+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
+endif
+
+ ifeq ($(OS_ARCH), NetBSD)
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
+ endif
--- a/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in
+++ b/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in
@ -0,0 +1,14 @@
+--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	2008-09-11 16:38:35.000000000 +0200
+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in	2009-12-01 10:18:43.000000000 +0100
+@@ -147,6 +147,11 @@
+ CUSTOM_LIBS=1
+ endif
+ 
+ifeq ($(OS_ARCH), FreeBSD)
+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
+CUSTOM_LIBS=1
+endif
+
+ # no extra libs on HP-UX
+ ifeq ($(OS_ARCH), HP-UX)
+ CUSTOM_LIBS=1
--- a/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in
+++ b/www/seamonkey2/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in
@ -0,0 +1,22 @@
+--- directory/c-sdk/ldap/libraries/libssldap/Makefile.in.orig	2009-09-10 17:36:39.000000000 +0200
+++ directory/c-sdk/ldap/libraries/libssldap/Makefile.in	2009-09-10 17:37:28.000000000 +0200
+@@ -42,7 +42,7 @@
+ NSPR_LIBS   = @NSPR_LIBS@
+ NSPR_CFLAGS = @NSPR_CFLAGS@
+ NSS_LIBS   = @NSS_LIBS@
+-NSS_CFLAGS = @NSS_CFLAGS@
+NSS_CFLAGS = @NSS_CFLAGS@ -I/usr/local/include/nss/nss
+ 
+ include $(MOD_DEPTH)/config/autoconf.mk
+ include $(topsrcdir)/build.mk
+@@ -180,6 +180,10 @@
+ CUSTOM_LIBS=1
+ endif
+ 
+ifeq ($(OS_ARCH), FreeBSD)
+CUSTOM_LIBS=1
+endif
+
+ ifndef CUSTOM_LIBS
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME)
+ EXTRA_LIBS += $(NSSLINK) 
--- a/www/seamonkey2/files/patch-directory-xpcom-base-src-Makefile.in
+++ b/www/seamonkey2/files/patch-directory-xpcom-base-src-Makefile.in
@ -0,0 +1,13 @@
+--- directory/xpcom/base/src/Makefile.in.orig	2009-11-22 03:44:31.000000000 +0100
+++ directory/xpcom/base/src/Makefile.in	2009-11-26 13:06:53.000000000 +0100
+@@ -97,6 +97,10 @@
+ 		$(NULL)
+ endif
+ 
+ifeq ($(OS_ARCH), FreeBSD)
+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
+endif
+
+ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS)
+ 
+ include $(topsrcdir)/config/rules.mk
--- a/www/seamonkey2/files/patch-extensions_transformiix_source_base_Double.cpp
+++ b/www/seamonkey2/files/patch-extensions_transformiix_source_base_Double.cpp
@ -1,23 +0,0 @@
--- extensions/transformiix/source/base/Double.cpp.orig	Mon Feb  6 15:40:52 2006
-+++ extensions/transformiix/source/base/Double.cpp	Mon Feb  6 15:51:01 2006
-@@ -52,11 +52,16 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
-#ifdef __alpha__
-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-#else
-fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#if !defined(FP_X_DNML)
-+#define FP_X_DNML 0
- #endif
-+#if !defined(FP_X_STK)
-+#define FP_X_STK 0
-+#endif
-+#if !defined(FP_X_IOV)
-+#define FP_X_IOV 0
-+#endif
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV;
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
- 
--- a/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
+++ b/www/seamonkey2/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
@ -1,12 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig	Wed Mar 17 02:08:01 2004
-+++ gfx/src/gtk/nsFontMetricsXft.cpp	Wed Mar 17 02:08:15 2004
-@@ -65,7 +65,8 @@
- 
- #include <gdk/gdkx.h>
- #include <freetype/tttables.h>
-#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #define FORCE_PR_LOG
- #include "prlog.h"
--- a/www/seamonkey2/files/patch-js_src_Makefile.in
+++ b/www/seamonkey2/files/patch-js_src_Makefile.in
@ -1,10 +0,0 @@
--- js/src/Makefile.in.orig	Wed Oct 18 09:23:09 2006
-+++ js/src/Makefile.in	Wed Oct 18 09:27:27 2006
-@@ -244,6 +244,7 @@
- endif
- 
- LDFLAGS		+= $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
-+LDFLAGS		+= -lc
- 
- # BeOS and HP-UX do not require the extra linking of "-lm"
- ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))
--- a/www/seamonkey2/files/patch-js_src_liveconnect_nsISecureLiveconnect.h
+++ b/www/seamonkey2/files/patch-js_src_liveconnect_nsISecureLiveconnect.h
@ -1,14 +0,0 @@
--- js/src/liveconnect/nsISecureLiveconnect.h.orig	2007-10-09 20:03:00.000000000 -0400
-+++ js/src/liveconnect/nsISecureLiveconnect.h	2007-10-09 20:03:50.000000000 -0400
-@@ -51,7 +51,11 @@
- #include "nsIFactory.h"
- #include "jni.h"
- 
-+#if JS_BYTES_PER_WORD == 8
-+typedef jlong jsobject;
-+#else
- typedef jint jsobject;
-+#endif
- 
- class nsISecureLiveconnect : public nsISupports {
- public:
--- a/www/seamonkey2/files/patch-libm
+++ b/www/seamonkey2/files/patch-libm
@ -1,9 +0,0 @@
--- js/Makefile.in	Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in	Thu Aug  4 23:08:06 2005
-@@ -46,5 +46,5 @@
- #
- 
-DIRS		= src/fdlibm src
-+DIRS		= src
- 
- include $(topsrcdir)/config/rules.mk
--- a/www/seamonkey2/files/patch-mozilla-build-unix-run-mozilla.sh
+++ b/www/seamonkey2/files/patch-mozilla-build-unix-run-mozilla.sh
@ -0,0 +1,21 @@
+--- mozilla/build/unix/run-mozilla.sh.orig	2009-08-24 19:18:11.000000000 +0200
+++ mozilla/build/unix/run-mozilla.sh	2009-08-24 19:22:10.000000000 +0200
+@@ -310,7 +310,7 @@
+ }
+ if moz_should_set_ld_library_path
+ then
+-	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+ fi 
+ 
+ if [ -n "$LD_LIBRARYN32_PATH" ]
+@@ -391,6 +391,9 @@
+ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+ export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
+ 
+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey
+export MOZ_PLUGIN_PATH
+
+ if [ $moz_debug -eq 1 ]
+ then
+ 	moz_debug_program ${1+"$@"}
--- a/www/seamonkey2/files/patch-mozilla-config-autoconf.mk.in
+++ b/www/seamonkey2/files/patch-mozilla-config-autoconf.mk.in
@ -0,0 +1,11 @@
+--- mozilla/config/autoconf.mk.in.orig	2009-09-17 19:09:10.000000000 +0200
+++ mozilla/config/autoconf.mk.in	2009-09-17 19:09:26.000000000 +0200
+@@ -275,7 +275,7 @@
+ OS_CPPFLAGS	= @CPPFLAGS@
+ OS_CFLAGS	= $(OS_CPPFLAGS) @CFLAGS@
+ OS_CXXFLAGS	= $(OS_CPPFLAGS) @CXXFLAGS@
+-OS_LDFLAGS	= @LDFLAGS@
+OS_LDFLAGS	= @LDFLAGS@ -lc
+ 
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
--- a/www/seamonkey2/files/patch-mozilla-config-mkdepend-Makefile.in
+++ b/www/seamonkey2/files/patch-mozilla-config-mkdepend-Makefile.in
@ -1,5 +1,5 @@
--- config/mkdepend/Makefile.in.orig	Sun Apr 18 14:17:26 2004
-+++ config/mkdepend/Makefile.in	Sun Dec 12 09:42:11 2004
+--- mozilla/config/mkdepend/Makefile.in.orig	2009-09-11 19:30:23.000000000 +0200
+++ mozilla/config/mkdepend/Makefile.in	2009-09-11 19:29:53.000000000 +0200
@@ -73,6 +73,7 @@
 include $(topsrcdir)/config/rules.mk
 
--- a/www/seamonkey2/files/patch-mozilla-config-mkdepend-imakemdep.h
+++ b/www/seamonkey2/files/patch-mozilla-config-mkdepend-imakemdep.h
@ -1,5 +1,5 @@
--- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
+--- mozilla/config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
+++ mozilla/config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
@@ -278,4 +278,7 @@
 	"-D__i386__",
 # endif
--- a/www/seamonkey2/files/patch-mozilla-content-xslt-public-txDouble.h
+++ b/www/seamonkey2/files/patch-mozilla-content-xslt-public-txDouble.h
@ -0,0 +1,23 @@
+--- mozilla/content/xslt/public/txDouble.h.orig	2009-08-25 01:35:47.000000000 +0200
+++ mozilla/content/xslt/public/txDouble.h	2009-08-25 01:37:41.000000000 +0200
+@@ -43,11 +43,16 @@
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+-#ifdef __alpha__
+-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+-#else
+-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
+#if !defined(FP_X_DNML)
+#define FP_X_DNML 0
+#endif
+#if !defined(FP_X_STK)
+#define FP_X_STK 0
+#endif
+#if !defined(FP_X_IOV)
+#define FP_X_IOV 0
+ #endif
+static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV;
+ static fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+ 
--- a/www/seamonkey2/files/patch-mozilla-embedding-base_nsEmbedAPI.cpp
+++ b/www/seamonkey2/files/patch-mozilla-embedding-base_nsEmbedAPI.cpp
@ -1,5 +1,5 @@
--- embedding/base/nsEmbedAPI.cpp.orig	2007-10-09 20:00:30.000000000 -0400
-+++ embedding/base/nsEmbedAPI.cpp	2007-10-09 20:01:45.000000000 -0400
+--- mozilla/embedding/base/nsEmbedAPI.cpp.orig	2007-10-09 20:00:30.000000000 -0400
+++ mozilla/embedding/base/nsEmbedAPI.cpp	2007-10-09 20:01:45.000000000 -0400
@@ -53,7 +53,12 @@ static PRBool             sRegistryIniti
 static PRUint32           sInitCounter = 0;
 
--- a/www/seamonkey2/files/patch-mozilla-js-src-Makefile.in
+++ b/www/seamonkey2/files/patch-mozilla-js-src-Makefile.in
@ -0,0 +1,10 @@
+--- mozilla/js/src/Makefile.in.orig	2009-08-25 18:58:30.000000000 +0200
+++ mozilla/js/src/Makefile.in	2009-08-25 18:58:47.000000000 +0200
+@@ -428,6 +428,7 @@
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+ EXTRA_LIBS	+= -pthread
+LDFLAGS		+= -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
--- a/www/seamonkey2/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
+++ b/www/seamonkey2/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
@ -0,0 +1,11 @@
+--- mozilla/js/src/config/mkdepend/Makefile.in.orig	2009-09-14 13:17:15.000000000 +0200
+++ mozilla/js/src/config/mkdepend/Makefile.in	2009-09-14 13:17:34.000000000 +0200
+@@ -72,7 +72,7 @@
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
--- a/www/seamonkey2/files/patch-mozilla-js-src-configure
+++ b/www/seamonkey2/files/patch-mozilla-js-src-configure
@ -0,0 +1,13 @@
+--- mozilla/js/src/configure.orig	2009-09-17 16:34:18.000000000 +0200
+++ mozilla/js/src/configure	2009-09-17 16:34:46.000000000 +0200
+@@ -6916,10 +6916,6 @@
+     ENABLE_JIT=1
+     NANOJIT_ARCH=ARM
+     ;;
+-sparc*-*)
+-    ENABLE_JIT=1
+-    NANOJIT_ARCH=Sparc
+-    ;;
+ esac
+ 
+ # Check whether --enable-jit or --disable-jit was given.
--- a/www/seamonkey2/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
+++ b/www/seamonkey2/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
@ -0,0 +1,11 @@
+--- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-09-03 19:49:16.000000000 +0200
+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	2009-09-14 19:59:18.000000000 +0200
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (__FreeBSD__)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;
--- a/www/seamonkey2/files/patch-mozilla-security-coreconf-FreeBSD.mk
+++ b/www/seamonkey2/files/patch-mozilla-security-coreconf-FreeBSD.mk
@ -0,0 +1,38 @@
+--- mozilla/security/coreconf/FreeBSD.mk.orig	2009-07-30 17:30:28.000000000 +0200
+++ mozilla/security/coreconf/FreeBSD.mk	2009-08-17 22:29:03.510890513 +0200
+@@ -45,8 +45,20 @@
+ ifeq ($(OS_TEST),alpha)
+ CPU_ARCH		= alpha
+ else
+ifeq ($(OS_TEST),amd64)
+CPU_ARCH		= amd64
+else
+ifeq ($(OS_TEST),powerpc)
+CPU_ARCH		= powerpc
+else
+ifeq ($(OS_TEST),sparc64)
+CPU_ARCH		= sparc64
+else
+ CPU_ARCH		= x86
+ endif
+endif
+endif
+endif
+ 
+ OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+ 
+@@ -73,7 +85,7 @@
+ DLL_SUFFIX		= so.1.0
+ endif
+ 
+-MKSHLIB			= $(CC) $(DSO_LDOPTS)
+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+ ifdef MAPFILE
+ 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ endif
+@@ -82,4 +94,4 @@
+ 
+ G++INCLUDES		= -I/usr/include/g++
+ 
+-INCLUDES		+= -I/usr/X11R6/include
+#INCLUDES		+= -I/usr/X11R6/include
--- a/www/seamonkey2/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
+++ b/www/seamonkey2/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
@ -1,5 +1,5 @@
--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
+--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
@@ -110,6 +110,7 @@
 #include "nss.h"
 #include "pk11func.h"
--- a/www/seamonkey2/files/patch-mozilla-storage-build-Makefile.in
+++ b/www/seamonkey2/files/patch-mozilla-storage-build-Makefile.in
@ -1,5 +1,5 @@
--- storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
+--- mozilla/storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
+++ mozilla/storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
@@ -77,6 +77,7 @@
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
--- a/www/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ b/www/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
@ -1,5 +1,5 @@
--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Fri Mar 19 15:58:14 2004
+--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Fri Mar 19 15:58:14 2004
@@ -8,7 +8,7 @@
 *  1 is AddRef
 *  2 is Release
--- a/www/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ b/www/seamonkey2/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
@ -0,0 +1,76 @@
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2009-09-17 17:14:19.000000000 +0200
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2009-09-17 17:20:22.000000000 +0200
+@@ -70,6 +70,9 @@
+ ifeq (Darwin,$(OS_ARCH))
+ DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
+ endif
+ifeq (x86_64,$(OS_TEST))
+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
+endif
+ endif
+ endif
+ #
+@@ -87,7 +90,7 @@
+ endif
+ endif
+ # IA64 Linux
+-ifneq (,$(filter Linux,$(OS_ARCH)))
+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
+ ifneq (,$(findstring ia64,$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
+ ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
+@@ -100,6 +103,12 @@
+ CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+ endif
+ #
+# FreeBSD/amd64
+#
+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
+CPPSRCS         := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+endif
+#
+ # BeOS/Intel (uses the same unixish_x86 code)
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -150,9 +159,15 @@
+ ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
+ endif
+ #
+# FreeBSD/Alpha
+#
+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
+endif
+#
+ # Linux/Alpha
+ #
+-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
+ CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
+ endif
+ #
+@@ -307,7 +322,7 @@
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
+ AS		:= $(CC) -c -x assembler-with-cpp
+@@ -385,6 +400,15 @@
+ ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
+ endif
+ #
+# FreeBSD/SPARC64
+#
+ifeq ($(OS_ARCH),FreeBSD)
+ifneq (,$(findstring sparc,$(OS_TEST)))
+CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+endif
+endif
+#
+ # OpenBSD/SPARC
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
--- a/www/seamonkey2/files/patch-security-coreconf-FreeBSD.mk
+++ b/www/seamonkey2/files/patch-security-coreconf-FreeBSD.mk
@ -1,24 +0,0 @@
--- security/coreconf/FreeBSD.mk.orig	Mon Sep 25 18:26:23 2006
-+++ security/coreconf/FreeBSD.mk	Mon Sep 25 18:27:03 2006
-@@ -45,8 +45,12 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
- CPU_ARCH		= x86
- endif
-+endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -73,7 +77,7 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
-MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
--- a/www/seamonkey2/files/patch-sysnss
+++ b/www/seamonkey2/files/patch-sysnss
@ -1,49 +1,9 @@
--- Makefile.in	Tue Sep 14 16:59:40 2004
-+++ Makefile.in	Tue Aug  2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 -  3rd party individual libraries
- #
-tier_1_dirs	+= dbm
-
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs	+= jpeg
--- security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
-+++ security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
-@@ -124,19 +124,19 @@
- 		  pipboot \
- 		  $(NULL)
+--- mozilla/security/manager/Makefile.in.orig	2009-10-08 04:03:28.000000000 +0200
+++ mozilla/security/manager/Makefile.in	2009-10-11 00:38:00.000000000 +0200
+@@ -46,16 +46,8 @@
+ MODULE = psm
 
-EXTRA_DEPS = $(NSS_DEP_LIBS)
- 
- DEFINES += -DNSS_ENABLE_ECC
- 
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
- 
- EXTRA_DSO_LDOPTS += \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
- 		$(NSS_LIBS) \
-+		$(LOCAL_INCLUDES) \
- 		$(NULL)
- 
- include $(topsrcdir)/config/rules.mk
--- security/manager/Makefile.in.orig	2009-08-07 22:37:51.000000000 +0200
-+++ security/manager/Makefile.in	2009-08-21 10:41:53.000000000 +0200
-@@ -56,24 +56,13 @@
- 	SOFTOKEN3_LIB \
- 	SOFTOKEN3_CHK \
- 	NSSDBM3_LIB \
-	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_LIBS \
- 	HAVE_FREEBL_LIBS_32 \
- 	HAVE_FREEBL_LIBS_32INT64 \
- 	HAVE_FREEBL_LIBS_64 \
- 	$(NULL)
-
+ ifndef MOZ_NATIVE_NSS
 -LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
 endif
 
@ -53,12 +13,11 @@
 -SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
 -SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
 -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
 -
- # Default
- HAVE_FREEBL_LIBS = 1
- 
-@@ -222,11 +211,6 @@
+ ifndef NSS_DISABLE_DBM
+ NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
+ NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk
+@@ -249,11 +241,6 @@
 .nss.cleaned: .nss.checkout
 ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
@ -70,13 +29,25 @@
 	touch $@
 endif
 
-@@ -253,49 +237,6 @@
- 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
- endif
+@@ -274,76 +261,8 @@
+ 
+ libs::
 ifndef MOZ_NATIVE_NSS
+-	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+-ifndef NSS_DISABLE_DBM
+-	$(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
+-endif
 -	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-ifndef SKIP_CHK
+-ifdef ENABLE_TESTS
+-	# Need certutil binary for mochitest certificates generation
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS)
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS)
+-endif
+-ifndef SKIP_CHK
+-ifndef ENABLE_TESTS # Just avoid secondary compile
+-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+-endif
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
 -endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
@ -84,11 +55,17 @@
 -	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
 -endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+-ifndef NSS_DISABLE_DBM
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
+-endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
 -ifdef HAVE_FREEBL_LIBS
 -ifndef SKIP_CHK
 -	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
@ -117,10 +94,20 @@
 -	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
 -endif
+-endif
+-ifndef MOZ_NATIVE_NSS
+-# NSS installs headers to dist/public and we want them in dist/include
+-	$(NSINSTALL) -D $(DIST)/include/nss
+-	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
+-	  (cd $(DIST)/include/nss && tar -xf -)
+-	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
+-	  (cd $(DIST)/sdk/include && tar -xf -)
 endif
+	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
-@@ -306,44 +247,6 @@
+ 	$(MAKE) -C locales $@
+@@ -356,47 +275,6 @@
 
 install::
 ifndef MOZ_NATIVE_NSS
@ -129,9 +116,12 @@
 -	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
 -endif
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
+-ifndef SKIP_CHK
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir)
+-endif
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
 -ifdef HAVE_FREEBL_LIBS
@ -165,7 +155,7 @@
 endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
-@@ -360,12 +263,6 @@
+@@ -413,12 +291,6 @@
 	$(MAKE) -C pki $@
 endif
 ifndef MOZ_NATIVE_NSS
@ -178,3 +168,21 @@
 endif
 
 echo-requires-recursive::
+--- mozilla/security/manager/ssl/src/Makefile.in.orig	2009-08-26 19:05:39.000000000 +0200
+++ mozilla/security/manager/ssl/src/Makefile.in	2009-08-26 19:06:17.000000000 +0200
+@@ -138,13 +138,14 @@
+ 
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+-LOCAL_INCLUDES += $(NSS_CFLAGS)
+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
+ 
+ EXTRA_DSO_LDOPTS += \
+ 		$(MOZ_UNICHARUTIL_LIBS) \
+ 		$(MOZ_COMPONENT_LIBS) \
+ 		$(MOZ_JS_LIBS) \
+ 		$(NSS_LIBS) \
+		$(LOCAL_INCLUDES) \
+ 		$(NULL)
+ 
+ include $(topsrcdir)/config/rules.mk
--- a/www/seamonkey2/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ b/www/seamonkey2/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
@ -1,29 +0,0 @@
--- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig	Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
-     PR_END_MACRO
- 
-   // Attempt to open libgconf
-  gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+  gconfLib = PR_LoadLibrary("libgconf-2.so");
-   ENSURE_LIB(gconfLib);
- 
-   GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
-   GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
- 
-   // Attempt to open libgnome
-  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  gnomeLib = PR_LoadLibrary("libgnome-2.so");
-   ENSURE_LIB(gnomeLib);
- 
-   GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
-   GET_LIB_FUNCTION(gnome, gnome_program_get);
- 
-   // Attempt to open libgnomevfs
-  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
-   ENSURE_LIB(vfsLib);
- 
-   GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
--- a/www/seamonkey2/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
+++ b/www/seamonkey2/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
@ -1,56 +0,0 @@
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 14:31:25 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -59,8 +62,8 @@
- CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
- endif
- endif
-# IA64 Linux
-ifneq (,$(filter Linux,$(OS_ARCH)))
-+# IA64 Linux & FreeBSD
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -106,9 +109,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
--- a/www/seamonkey2/files/patch-xptcall-alpha
+++ b/www/seamonkey2/files/patch-xptcall-alpha
@ -1,5 +1,5 @@
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
@@ -0,0 +1,184 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@ -185,8 +185,8 @@
 +    ".end XPTC_InvokeByIndex"
 +    );
 +
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
@@ -0,0 +1,269 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
--- a/www/seamonkey2/files/patch-xptcall-amd64
+++ b/www/seamonkey2/files/patch-xptcall-amd64
@ -1,5 +1,5 @@
 --- /dev/null	Wed Dec 31 16:00:00 1969
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	Thu Oct 16 22:59:43 2003
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	Thu Oct 16 22:59:43 2003
@@ -0,0 +1,174 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +// Platform specific code to invoke XPCOM methods on native objects
@ -176,7 +176,7 @@
 +    return result;
 +}
 --- /dev/null	Wed Dec 31 16:00:00 1969
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	Thu Oct 16 23:01:08 2003
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	Thu Oct 16 23:01:08 2003
@@ -0,0 +1,206 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +
--- a/www/seamonkey2/files/patch-xptcall-ia64
+++ b/www/seamonkey2/files/patch-xptcall-ia64
@ -1,24 +1,24 @@
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig	Sun Jul 20 00:05:32 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s	Sun Jul 20 00:06:37 2003
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig	2009-08-26 18:47:07.000000000 +0200
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s	2009-08-26 18:49:39.000000000 +0200
@@ -8,6 +8,7 @@
 // Section has executable code
         .section .text, "ax","progbits"
- // procedure named 'XPTC_InvokeByIndex'
-+	.global	XPTC_InvokeByIndex
-         .proc   XPTC_InvokeByIndex
+ // procedure named 'NS_InvokeByIndex_P'
+	.global XPTC_InvokeByIndex
+         .proc   NS_InvokeByIndex_P
 // manual bundling
         .explicit
@@ -24,7 +25,7 @@
 
 // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
 //   PRUint32 paramCount, nsXPTCVariant* params);
-XPTC_InvokeByIndex::
-+XPTC_InvokeByIndex:
+-NS_InvokeByIndex_P::
+NS_InvokeByIndex_P:
         .prologue
         .save ar.pfs, r37
 // allocate 4 input args, 6 local args, and 8 output args
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	Tue May 24 11:30:54 2005
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	Fri Sep 16 15:50:20 2005
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	2009-08-26 18:47:07.000000000 +0200
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	2009-08-26 18:47:34.000000000 +0200
@@ -6,6 +6,7 @@
 // Section has executable code
         .section .text, "ax","progbits"
--- a/www/seamonkey2/files/patch-xptcall-sparc64
+++ b/www/seamonkey2/files/patch-xptcall-sparc64
@ -1,5 +1,5 @@
 --- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
@@ -0,0 +1,123 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
@ -125,7 +125,7 @@
 +
 +#endif /* sparc || __sparc__ */
 --- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
@@ -0,0 +1,104 @@
 +/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
@ -232,7 +232,7 @@
 +
 +        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
 --- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
@@ -0,0 +1,91 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
--- a/www/seamonkey2/files/releng6_pulseaudio
+++ b/www/seamonkey2/files/releng6_pulseaudio
@ -0,0 +1,55 @@
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-08-11 17:22:08.000000000 +0200
+++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-08-11 17:22:36.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME	= sydneyaudio
+ FORCE_STATIC_LIB= 1
+ 
+ifeq ($(OS_ARCH),FreeBSD)
+CSRCS		= \
+		sydney_audio_pulseaudio.c \
+		$(NULL)
+endif
+
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS		= \
+ 		sydney_audio_alsa.c \
+--- mozilla/toolkit/library/Makefile.in.orig	2009-09-03 19:49:34.000000000 +0200
+++ mozilla/toolkit/library/Makefile.in	2009-09-17 17:30:42.000000000 +0200
+@@ -228,12 +228,12 @@
+ endif
+ 
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
+ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+ endif
+ 
+ ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread
+ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+ endif
+ 
+--- mozilla/layout/build/Makefile.in.orig	2009-09-17 23:07:56.000000000 +0200
+++ mozilla/layout/build/Makefile.in	2009-09-17 23:15:53.000000000 +0200
+@@ -269,6 +269,10 @@
+ endif
+ endif
+ 
+ifeq ($(OS_ARCH),FreeBSD)
+EXTRA_DSO_LDOPTS += -lpulse -lpthread
+endif
+
+ include $(topsrcdir)/config/rules.mk
+ 
+ LOCAL_INCLUDES	+= -I$(srcdir)/../base \
+--- mozilla/xpcom/base/nsStackWalk.cpp.orig	2009-11-30 22:47:52.000000000 +0100
+++ mozilla/xpcom/base/nsStackWalk.cpp	2009-11-30 22:48:09.000000000 +0100
+@@ -1115,6 +1115,7 @@
+ #include "nscore.h"
+ #include <stdio.h>
+ #include "plstr.h"
+#include <dlfcn.h>
+ 
+ // On glibc 2.1, the Dl_info api defined in <dlfcn.h> is only exposed
+ // if __USE_GNU is defined.  I suppose its some kind of standards