diff -Naur seamonkey.orig/Makefile seamonkey/Makefile --- seamonkey.orig/Makefile 2011-03-17 01:11:52.000000000 +0100 +++ seamonkey/Makefile 2011-05-27 11:36:01.000000000 +0200 @@ -3,23 +3,20 @@ # Whom: eivind/dima/jseger # # $FreeBSD: ports/www/seamonkey/Makefile,v 1.299 2011/03/17 00:11:52 beat Exp $ -# $MCom: ports-stable/www/seamonkey/Makefile,v 1.9 2009/01/09 23:41:22 mezz Exp $ # PORTNAME= seamonkey -DISTVERSION= 1.1.19 -PORTREVISION= 1 +DISTVERSION= 2.1rc1 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 -DEPRECATED= Upstream support dropped. Please consider using www/seamonkey2 instead. -FORBIDDEN= several security vulnerabilities -CONFLICTS= seamonkey-2* +CONFLICTS_BUILD= spidermonkey-1.[0-7]* +CONFLICTS_INSTALL= seamonkey-2.0* USE_BZIP2= yes USE_GMAKE= yes USE_GECKO= gecko @@ -27,24 +24,31 @@ WANT_PERL= yes HAS_CONFIGURE= yes ALL_TARGET= default +USE_GL= gl 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} -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm - +MOZILLA= ${PORTNAME}-${PORTVERSION} +MOZILLA_EXEC_NAME= ${PORTNAME} MOZ_EXTENSIONS= default MOZ_OPTIONS+= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-svg \ --enable-application=suite \ --enable-svg-renderer=cairo \ --enable-system-cairo \ - --enable-canvas \ - --with-system-nss -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=suite + --enable-canvas \ + --disable-necko-wifi \ + --disable-updater \ + --disable-ipc +USE_MOZILLA= -png -dbm -jpeg -xft +MOZ_TOOLKIT= cairo-gtk2 +MOZILLA_PLIST_DIRS= bin lib +MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 @@ -52,12 +56,23 @@ COMPOSER "Enable the HTML Composer module" on \ LDAP "Enable LDAP support for Mailnews" on \ CHATZILLA "Enable the Chatzilla IRC module" on \ - JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \ + DBUS "Enable D-BUS support" on \ SMB "Enable smb:// URI support using gnomevfs" off .include -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} +MOZSRC:= ${WRKDIR}/comm-2.0/mozilla +WRKSRC= ${WRKDIR}/comm-2.0 + +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 @@ -65,16 +80,13 @@ 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 # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) MOZ_OPTIONS+= --disable-ldap --enable-mailnews +BROKEN= Does not build .else MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif @@ -82,29 +94,46 @@ .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif -.if defined(WITH_JAVASCRIPT_DEBUGGER) -MOZ_OPTIONS+= --enable-jsd \ - --enable-dtd-debug -.else -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 --disable-libnotify +.else +LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + notify.1:${PORTSDIR}/devel/libnotify +.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||\"${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 @@ -112,8 +141,6 @@ 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 \ - ${FAKEDIR}/lib/${MOZILLA}/chrome/icons/default/ do-install: ${MKDIR} ${PREFIX}/share/applications diff -Naur seamonkey.orig/distinfo seamonkey/distinfo --- seamonkey.orig/distinfo 2011-03-19 13:36:48.000000000 +0100 +++ seamonkey/distinfo 2011-05-27 11:30:59.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (seamonkey-1.1.19.source.tar.bz2) = 665e0998e7af516826b12d943206de9d9ed6d341503660b72251821fccf1932e -SIZE (seamonkey-1.1.19.source.tar.bz2) = 36272561 +SHA256 (seamonkey-2.1rc1.source.tar.bz2) = d5c60822b3dcef814de768fa8b9e76e5520e003d3a3d23ebd8c3c1c75c993831 +SIZE (seamonkey-2.1rc1.source.tar.bz2) = 83956672 diff -Naur seamonkey.orig/files/patch-bugzilla-449453 seamonkey/files/patch-bugzilla-449453 --- seamonkey.orig/files/patch-bugzilla-449453 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-bugzilla-449453 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,99 @@ +Index: ldap/sdks/c-sdk/ldap/include/portable.h +=================================================================== +RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/portable.h,v +retrieving revision 5.15 +diff -u -8 -p -r5.15 portable.h +--- ldap/sdks/c-sdk/ldap/include/portable.h 3 Oct 2006 20:43:40 -0000 5.15 ++++ ldap/sdks/c-sdk/ldap/include/portable.h 6 Oct 2010 19:06:58 -0000 +@@ -117,17 +117,17 @@ + #else + #define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT ) + #endif + + /* + * some systems don't have the BSD re_comp and re_exec routines + */ + #ifndef NEED_BSDREGEX +-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) ++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) + #define NEED_BSDREGEX + #endif + #endif + + /* + * many systems do not have the setpwfile() library routine... we just + * enable use for those systems we know have it. + */ +Index: ldap/sdks/c-sdk/ldap/include/regex.h +=================================================================== +RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/regex.h,v +retrieving revision 5.2 +diff -u -8 -p -r5.2 regex.h +--- ldap/sdks/c-sdk/ldap/include/regex.h 15 Oct 2003 17:26:00 -0000 5.2 ++++ ldap/sdks/c-sdk/ldap/include/regex.h 6 Oct 2010 19:06:59 -0000 +@@ -68,18 +68,18 @@ extern "C" { + #define LDAP_CALL + #endif + #endif + + #ifdef NEEDPROTOS + int re_init( void ); + void re_lock( void ); + int re_unlock( void ); +-char * LDAP_CALL re_comp( char *pat ); +-int LDAP_CALL re_exec( char *lp ); ++char * LDAP_CALL re_comp( const char *pat ); ++int LDAP_CALL re_exec( const char *lp ); + void LDAP_CALL re_modw( char *s ); + int LDAP_CALL re_subs( char *src, char *dst ); + #else /* NEEDPROTOS */ + int re_init(); + void re_lock(); + int re_unlock(); + char * LDAP_CALL re_comp(); + int LDAP_CALL re_exec(); +Index: ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c +=================================================================== +RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c,v +retrieving revision 5.2 +diff -u -8 -p -r5.2 regex.c +--- ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 15 Oct 2003 17:26:03 -0000 5.2 ++++ ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 6 Oct 2010 19:06:59 -0000 +@@ -262,17 +262,17 @@ chset(REGEXCHAR c) + bittab[((c) & (unsigned)BLKIND) >> 3] |= bitarr[(c) & BITIND]; + } + + #define badpat(x) (*nfa = END, x) + #define store(x) *mp++ = x + + char * + LDAP_CALL +-re_comp( char *pat ) ++re_comp( const char *pat ) + { + register REGEXCHAR *p; /* pattern pointer */ + register REGEXCHAR *mp=nfa; /* nfa pointer */ + register REGEXCHAR *lp; /* saved pointer.. */ + register REGEXCHAR *sp=nfa; /* another one.. */ + + register int tagi = 0; /* tag stack index */ + register int tagc = 1; /* actual tag count */ +@@ -508,17 +508,17 @@ static REGEXCHAR *pmatch(); + * If a match is found, bopat[0] and eopat[0] are set + * to the beginning and the end of the matched fragment, + * respectively. + * + */ + + int + LDAP_CALL +-re_exec( char *lp ) ++re_exec( const char *lp ) + { + register REGEXCHAR c; + register REGEXCHAR *ep = 0; + register REGEXCHAR *ap = nfa; + + bol = (REGEXCHAR*)lp; + + bopat[0] = 0; diff -Naur seamonkey.orig/files/patch-build_unix_run-mozilla.sh seamonkey/files/patch-build_unix_run-mozilla.sh --- seamonkey.orig/files/patch-build_unix_run-mozilla.sh 2009-01-10 03:45:45.000000000 +0100 +++ seamonkey/files/patch-build_unix_run-mozilla.sh 1970-01-01 01:00:00.000000000 +0100 @@ -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 diff -Naur seamonkey.orig/files/patch-config-mkdepend-imakemdep.h seamonkey/files/patch-config-mkdepend-imakemdep.h --- seamonkey.orig/files/patch-config-mkdepend-imakemdep.h 2003-12-14 17:47:57.000000000 +0100 +++ seamonkey/files/patch-config-mkdepend-imakemdep.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff -Naur seamonkey.orig/files/patch-config_autoconf.mk.in seamonkey/files/patch-config_autoconf.mk.in --- seamonkey.orig/files/patch-config_autoconf.mk.in 2005-11-30 01:44:58.000000000 +0100 +++ seamonkey/files/patch-config_autoconf.mk.in 2011-05-27 11:30:53.000000000 +0200 @@ -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 - diff -Naur seamonkey.orig/files/patch-config_mkdepend_Makefile.in seamonkey/files/patch-config_mkdepend_Makefile.in --- seamonkey.orig/files/patch-config_mkdepend_Makefile.in 2005-11-30 01:44:58.000000000 +0100 +++ seamonkey/files/patch-config_mkdepend_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff -Naur seamonkey.orig/files/patch-configure seamonkey/files/patch-configure --- seamonkey.orig/files/patch-configure 2009-07-23 09:46:42.000000000 +0200 +++ seamonkey/files/patch-configure 2011-05-27 11:30:53.000000000 +0200 @@ -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 2010-05-11 17:47:16.000000000 +0000 ++++ configure 2010-05-11 17:51:00.000000000 +0000 +@@ -5956,7 +5956,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 @@ + +@@ -10972,7 +10972,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 <&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 @@ +@@ -11013,7 +11013,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 <&6 diff -Naur seamonkey.orig/files/patch-db-sqlite3-src-Makefile.in seamonkey/files/patch-db-sqlite3-src-Makefile.in --- seamonkey.orig/files/patch-db-sqlite3-src-Makefile.in 2009-09-04 10:18:31.000000000 +0200 +++ seamonkey/files/patch-db-sqlite3-src-Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -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 diff -Naur seamonkey.orig/files/patch-embedding_base_nsEmbedAPI.cpp seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp --- seamonkey.orig/files/patch-embedding_base_nsEmbedAPI.cpp 2007-10-10 02:15:33.000000000 +0200 +++ seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ ---- 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 -@@ -53,7 +53,12 @@ static PRBool sRegistryIniti - static PRUint32 sInitCounter = 0; - - #define HACK_AROUND_THREADING_ISSUES --//#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#ifdef __FreeBSD__ -+#include -+#if __FreeBSD_version < 700042 -+#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#endif -+#endif - - #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM - // XXX hack class to clean up XPCOM when this module is unloaded diff -Naur seamonkey.orig/files/patch-extensions_transformiix_source_base_Double.cpp seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp --- seamonkey.orig/files/patch-extensions_transformiix_source_base_Double.cpp 2007-02-06 17:43:45.000000000 +0100 +++ seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -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 --#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 - diff -Naur seamonkey.orig/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp --- seamonkey.orig/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp 2004-03-17 08:12:34.000000000 +0100 +++ seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -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 - #include --#include -+#include -+#include FT_FREETYPE_H - - #define FORCE_PR_LOG - #include "prlog.h" diff -Naur seamonkey.orig/files/patch-js_src_Makefile.in seamonkey/files/patch-js_src_Makefile.in --- seamonkey.orig/files/patch-js_src_Makefile.in 2007-02-06 17:43:45.000000000 +0100 +++ seamonkey/files/patch-js_src_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -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))) diff -Naur seamonkey.orig/files/patch-js_src_liveconnect_nsISecureLiveconnect.h seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h --- seamonkey.orig/files/patch-js_src_liveconnect_nsISecureLiveconnect.h 2007-10-10 02:15:33.000000000 +0200 +++ seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h 1970-01-01 01:00:00.000000000 +0100 @@ -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: diff -Naur seamonkey.orig/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in --- seamonkey.orig/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,13 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ ldap/sdks/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 diff -Naur seamonkey.orig/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in --- seamonkey.orig/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,14 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 ++++ ldap/sdks/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 diff -Naur seamonkey.orig/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in --- seamonkey.orig/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,22 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200 ++++ ldap/sdks/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) diff -Naur seamonkey.orig/files/patch-ldap-xpcom-src-Makefile.in seamonkey/files/patch-ldap-xpcom-src-Makefile.in --- seamonkey.orig/files/patch-ldap-xpcom-src-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-ldap-xpcom-src-Makefile.in 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,13 @@ +--- ldap/xpcom/src/Makefile.in.orig 2009-11-22 03:44:31.000000000 +0100 ++++ ldap/xpcom/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 diff -Naur seamonkey.orig/files/patch-libm seamonkey/files/patch-libm --- seamonkey.orig/files/patch-libm 2007-02-06 17:43:45.000000000 +0100 +++ seamonkey/files/patch-libm 1970-01-01 01:00:00.000000000 +0100 @@ -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 diff -Naur seamonkey.orig/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp --- seamonkey.orig/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp 2010-03-30 03:59:10.000000000 +0200 +++ seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ ---- modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-03-28 13:48:53.000000000 +0200 -+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-03-28 13:46:50.000000000 +0200 -@@ -111,9 +111,9 @@ - - // initialize - png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -- png_error_ptr_NULL, -- png_error_ptr_NULL); -+ NULL, -+ NULL, -+ NULL); - if (! png_ptr) - return NS_ERROR_OUT_OF_MEMORY; - png_info* info_ptr = png_create_info_struct(png_ptr); diff -Naur seamonkey.orig/files/patch-mozilla-build-autoconf-config.sub seamonkey/files/patch-mozilla-build-autoconf-config.sub --- seamonkey.orig/files/patch-mozilla-build-autoconf-config.sub 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-build-autoconf-config.sub 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,12 @@ +--- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 ++++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100 +@@ -403,9 +403,6 @@ + amd64) + basic_machine=x86_64-pc + ;; +- amd64-*) +- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; + amdahl) + basic_machine=580-amdahl + os=-sysv diff -Naur seamonkey.orig/files/patch-mozilla-build-unix-run-mozilla.sh seamonkey/files/patch-mozilla-build-unix-run-mozilla.sh --- seamonkey.orig/files/patch-mozilla-build-unix-run-mozilla.sh 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-build-unix-run-mozilla.sh 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,21 @@ +--- mozilla/build/unix/run-mozilla.sh.orig 2010-10-08 21:51:26.000000000 +0200 ++++ mozilla/build/unix/run-mozilla.sh 2010-10-10 21:45:33.000000000 +0200 +@@ -308,7 +308,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" ] +@@ -390,6 +390,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+"$@"} diff -Naur seamonkey.orig/files/patch-mozilla-config-autoconf.mk.in seamonkey/files/patch-mozilla-config-autoconf.mk.in --- seamonkey.orig/files/patch-mozilla-config-autoconf.mk.in 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-config-autoconf.mk.in 2011-05-27 11:30:53.000000000 +0200 @@ -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@ diff -Naur seamonkey.orig/files/patch-mozilla-config-gcc-stl-wrapper.template.h seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h --- seamonkey.orig/files/patch-mozilla-config-gcc-stl-wrapper.template.h 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,11 @@ +--- mozilla/config/gcc-stl-wrapper.template.h.orig 2010-05-12 13:56:18.000000000 +0000 ++++ mozilla/config/gcc-stl-wrapper.template.h 2010-05-12 13:56:52.000000000 +0000 +@@ -89,7 +89,7 @@ + // -fshort-wchar). We don't want that and so define our own inlined + // __throw_*(). + #ifndef mozilla_throw_gcc_h +-# include "mozilla/throw_gcc.h" ++# include "../../memory/mozalloc/throw_gcc.h" + #endif + + #endif // if mozilla_${HEADER}_h diff -Naur seamonkey.orig/files/patch-mozilla-config-mkdepend-Makefile.in seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in --- seamonkey.orig/files/patch-mozilla-config-mkdepend-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,10 @@ +--- 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 + + HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" ++HOST_CFLAGS += $(XCFLAGS) + + ifdef GNU_CC + _GCCDIR = $(shell $(CC) -print-file-name=include) diff -Naur seamonkey.orig/files/patch-mozilla-config-mkdepend-imakemdep.h seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h --- seamonkey.orig/files/patch-mozilla-config-mkdepend-imakemdep.h 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,10 @@ +--- 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 ++# if defined(__amd64__) || defined(__x86_64__) ++ "-D__amd64__ -D__x86_64__", ++# endif + # ifdef __GNUC__ + "-traditional", diff -Naur seamonkey.orig/files/patch-mozilla-configure seamonkey/files/patch-mozilla-configure --- seamonkey.orig/files/patch-mozilla-configure 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-configure 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,11 @@ +--- mozilla/configure.orig 2010-01-08 09:53:05.000000000 +0100 ++++ mozilla/configure 2010-01-08 09:53:34.000000000 +0100 +@@ -5502,7 +5502,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + esac diff -Naur seamonkey.orig/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp --- seamonkey.orig/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,15 @@ +--- mozilla/content/svg/content/src/nsSVGElement.cpp.orig 2010-05-12 16:46:09.000000000 +0200 ++++ mozilla/content/svg/content/src/nsSVGElement.cpp 2010-05-12 16:49:33.000000000 +0200 +@@ -102,7 +102,11 @@ + // vararg-list methods in this file: + // nsSVGElement::GetAnimated{Length,Number,Integer}Values + // See bug 547964 for details: +-PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); ++// I really try to get the details but I'm not allowed to ++// access this bug in bugzilla: ++// You are not authorized to access bug #547964. ++// So disable this ASSERT as it breaks build. ++//PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); + + + nsSVGEnumMapping nsSVGElement::sSVGUnitTypesMap[] = { diff -Naur seamonkey.orig/files/patch-mozilla-content-xslt-public-txDouble.h seamonkey/files/patch-mozilla-content-xslt-public-txDouble.h --- seamonkey.orig/files/patch-mozilla-content-xslt-public-txDouble.h 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-content-xslt-public-txDouble.h 2011-05-27 11:30:53.000000000 +0200 @@ -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 +-#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 + diff -Naur seamonkey.orig/files/patch-mozilla-gfx-qcms-qcmstypes.h seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h --- seamonkey.orig/files/patch-mozilla-gfx-qcms-qcmstypes.h 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100 ++++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100 +@@ -25,7 +25,7 @@ + #ifdef __OS2__ + /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ + #include +-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED) ++#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED) + typedef PRUptrdiff uintptr_t; + #endif + #endif diff -Naur seamonkey.orig/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp seamonkey/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp --- seamonkey.orig/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,36 @@ +diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp +--- mozilla/gfx/thebes/gfxTeeSurface.cpp ++++ mozilla/gfx/thebes/gfxTeeSurface.cpp +@@ -47,4 +47,5 @@ gfxTeeSurface::gfxTeeSurface(cairo_surfa + gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount) + { ++#ifdef MOZ_TREE_CAIRO + NS_ASSERTION(aSurfaceCount > 0, "Must have a least one surface"); + cairo_surface_t *csurf = cairo_tee_surface_create(aSurfaces[0]->CairoSurface()); +@@ -54,4 +55,5 @@ gfxTeeSurface::gfxTeeSurface(gfxASurface + cairo_tee_surface_add(csurf, aSurfaces[i]->CairoSurface()); + } ++#endif + } + +@@ -59,6 +61,8 @@ const gfxIntSize + gfxTeeSurface::GetSize() const + { ++#ifdef MOZ_TREE_CAIRO + nsRefPtr master = Wrap(cairo_tee_surface_index(mSurface, 0)); + return master->GetSize(); ++#endif + } + +@@ -66,4 +70,5 @@ void + gfxTeeSurface::GetSurfaces(nsTArray >* aSurfaces) + { ++#ifdef MOZ_TREE_CAIRO + for (PRInt32 i = 0; ; ++i) { + cairo_surface_t *csurf = cairo_tee_surface_index(mSurface, i); +@@ -75,3 +80,4 @@ gfxTeeSurface::GetSurfaces(nsTArray> confdefs.h <<\EOF +-#define JS_CPU_SPARC 1 +-EOF +- +- ;; + esac + + # Check whether --enable-methodjit or --disable-methodjit was given. diff -Naur seamonkey.orig/files/patch-mozilla-security-coreconf-FreeBSD.mk seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk --- seamonkey.orig/files/patch-mozilla-security-coreconf-FreeBSD.mk 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,40 @@ +--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 ++++ mozilla/security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 +@@ -49,8 +49,20 @@ + ifeq ($(CPU_ARCH),pc98) + CPU_ARCH = x86 + endif +-ifeq ($(CPU_ARCH),amd64) +-CPU_ARCH = x86_64 ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++endif ++ifeq ($(OS_TEST),amd64) ++CPU_ARCH = amd64 ++endif ++ifeq ($(OS_TEST),ia64) ++CPU_ARCH = ia64 ++endif ++ifeq ($(OS_TEST),powerpc) ++CPU_ARCH = powerpc ++endif ++ifeq ($(OS_TEST),sparc64) ++CPU_ARCH = sparc64 + endif + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK +@@ -78,7 +90,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 +@@ -87,4 +99,4 @@ + + G++INCLUDES = -I/usr/include/g++ + +-INCLUDES += -I/usr/X11R6/include ++#INCLUDES += -I/usr/local/include diff -Naur seamonkey.orig/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp seamonkey/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp --- seamonkey.orig/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,10 @@ +--- 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" + #include "ssl.h" ++#define NSS_ENABLE_ECC 1 + #include "sslproto.h" + #include "secmod.h" + #include "sechash.h" diff -Naur seamonkey.orig/files/patch-mozilla-storage-build-Makefile.in seamonkey/files/patch-mozilla-storage-build-Makefile.in --- seamonkey.orig/files/patch-mozilla-storage-build-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-storage-build-Makefile.in 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,10 @@ +--- 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) \ + $(MOZ_JS_LIBS) \ ++ %%PTHREAD_LIBS%% \ + $(NULL) + + include $(topsrcdir)/config/rules.mk diff -Naur seamonkey.orig/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc --- seamonkey.orig/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc 2011-05-27 11:30:53.000000000 +0200 @@ -0,0 +1,11 @@ +--- 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 + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); diff -Naur seamonkey.orig/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in --- seamonkey.orig/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in 2011-05-27 11:30:53.000000000 +0200 @@ -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) diff -Naur seamonkey.orig/files/patch-security-coreconf-FreeBSD.mk seamonkey/files/patch-security-coreconf-FreeBSD.mk --- seamonkey.orig/files/patch-security-coreconf-FreeBSD.mk 2007-02-06 17:43:45.000000000 +0100 +++ seamonkey/files/patch-security-coreconf-FreeBSD.mk 1970-01-01 01:00:00.000000000 +0100 @@ -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 diff -Naur seamonkey.orig/files/patch-security_manager_ssl_src_nsNSSComponent.cpp seamonkey/files/patch-security_manager_ssl_src_nsNSSComponent.cpp --- seamonkey.orig/files/patch-security_manager_ssl_src_nsNSSComponent.cpp 2007-02-06 17:43:45.000000000 +0100 +++ seamonkey/files/patch-security_manager_ssl_src_nsNSSComponent.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- 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 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff -Naur seamonkey.orig/files/patch-storage_build_Makefile.in seamonkey/files/patch-storage_build_Makefile.in --- seamonkey.orig/files/patch-storage_build_Makefile.in 2007-02-06 17:43:45.000000000 +0100 +++ seamonkey/files/patch-storage_build_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006 -+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006 -@@ -77,6 +77,7 @@ - $(EXTRA_DSO_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ -+ %%PTHREAD_LIBS%% \ - $(NULL) - - include $(topsrcdir)/config/rules.mk diff -Naur seamonkey.orig/files/patch-sysnss seamonkey/files/patch-sysnss --- seamonkey.orig/files/patch-sysnss 2009-09-04 10:18:31.000000000 +0200 +++ seamonkey/files/patch-sysnss 2011-05-27 11:30:53.000000000 +0200 @@ -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) - --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) +--- mozilla/security/manager/Makefile.in.orig 2011-02-09 21:07:24.000000000 +0100 ++++ mozilla/security/manager/Makefile.in 2011-02-15 23:30:11.000000000 +0100 +@@ -49,16 +49,8 @@ + MODULE = psm - 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,42 +13,71 @@ -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 + ifndef NSS_DISABLE_DBM + NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) + NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk +@@ -68,23 +60,6 @@ + endif -@@ -222,11 +211,6 @@ - .nss.cleaned: .nss.checkout ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH))) +-SDK_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ +- $(NULL) +-else +-SDK_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \ +- $(NULL) -endif - 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 + # Default +@@ -339,74 +314,8 @@ + + libs:: ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) +-ifndef NSS_DISABLE_DBM +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/dbm $(DEFAULT_GMAKE_FLAGS) +-endif +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) +-ifdef ENABLE_TESTS +-# Need certutil binary for mochitest certificates generation +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/modutil $(DEFAULT_GMAKE_FLAGS) +-endif -ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) +-ifndef ENABLE_TESTS # Just avoid secondary compile +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +-endif +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -endif - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin -ifndef SKIP_CHK - $(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 +106,18 @@ - $(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 && tar -xf -) endif ++ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) $(MAKE) -C boot $@ $(MAKE) -C ssl $@ -@@ -306,44 +247,6 @@ + $(MAKE) -C locales $@ +@@ -419,47 +328,6 @@ install:: ifndef MOZ_NATIVE_NSS @@ -129,9 +126,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,16 +165,32 @@ endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ -@@ -360,12 +263,6 @@ +@@ -476,10 +344,4 @@ $(MAKE) -C pki $@ endif ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif endif +--- 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 - echo-requires-recursive:: + EXTRA_DSO_LDOPTS += \ + $(MOZ_UNICHARUTIL_LIBS) \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ + $(NSS_LIBS) \ ++ $(LOCAL_INCLUDES) \ + $(NULL) + + include $(topsrcdir)/config/rules.mk diff -Naur seamonkey.orig/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp --- seamonkey.orig/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp 2004-12-24 19:25:45.000000000 +0100 +++ seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -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); diff -Naur seamonkey.orig/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc --- seamonkey.orig/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc 2005-11-30 01:44:58.000000000 +0100 +++ seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff -Naur seamonkey.orig/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in --- seamonkey.orig/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in 2005-11-30 01:44:58.000000000 +0100 +++ seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -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 diff -Naur seamonkey.orig/files/patch-xptcall-alpha seamonkey/files/patch-xptcall-alpha --- seamonkey.orig/files/patch-xptcall-alpha 2003-12-14 17:47:57.000000000 +0100 +++ seamonkey/files/patch-xptcall-alpha 2011-05-27 11:30:53.000000000 +0200 @@ -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 ***** diff -Naur seamonkey.orig/files/patch-xptcall-amd64 seamonkey/files/patch-xptcall-amd64 --- seamonkey.orig/files/patch-xptcall-amd64 2003-12-14 17:47:57.000000000 +0100 +++ seamonkey/files/patch-xptcall-amd64 2011-05-27 11:30:53.000000000 +0200 @@ -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 -*- */ + diff -Naur seamonkey.orig/files/patch-xptcall-ia64 seamonkey/files/patch-xptcall-ia64 --- seamonkey.orig/files/patch-xptcall-ia64 2005-11-30 01:44:58.000000000 +0100 +++ seamonkey/files/patch-xptcall-ia64 2011-05-27 11:30:53.000000000 +0200 @@ -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" diff -Naur seamonkey.orig/files/patch-xptcall-sparc64 seamonkey/files/patch-xptcall-sparc64 --- seamonkey.orig/files/patch-xptcall-sparc64 2003-07-23 07:40:42.000000000 +0200 +++ seamonkey/files/patch-xptcall-sparc64 2011-05-27 11:30:53.000000000 +0200 @@ -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 -*- + * diff -Naur seamonkey.orig/files/seamonkey.desktop.in seamonkey/files/seamonkey.desktop.in --- seamonkey.orig/files/seamonkey.desktop.in 2005-11-30 01:44:58.000000000 +0100 +++ seamonkey/files/seamonkey.desktop.in 2011-05-27 11:30:53.000000000 +0200 @@ -164,6 +164,6 @@ StartupNotify=true Terminal=false Type=Application -Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default.xpm +Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default48.png Categories=Application;Network; MimeType=text/html;text/xml;application/xhtml+xml;