Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/seamonkey/Makefile,v retrieving revision 1.326 diff -u -r1.326 Makefile --- Makefile 1 Jun 2012 05:25:02 -0000 1.326 +++ Makefile 19 Jun 2012 05:41:06 -0000 @@ -6,8 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.9.1 -PORTREVISION= 1 +DISTVERSION= 2.10.1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -16,7 +15,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ event-1.4:${PORTSDIR}/devel/libevent @@ -34,6 +33,7 @@ MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin +EXTRA_CFLAGS= -O0 CPPFLAGS+= -I${LOCALBASE}/include/cairo USE_GCC= 4.2+ Index: distinfo =================================================================== RCS file: /home/pcvs/ports/www/seamonkey/distinfo,v retrieving revision 1.129 diff -u -r1.129 distinfo --- distinfo 11 May 2012 01:57:58 -0000 1.129 +++ distinfo 18 Jun 2012 16:47:16 -0000 @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.9.1.source.tar.bz2) = 1d6e65569bb2d9643c746a1aff3b3515ff56565014e95316b19e0731df9c65ac -SIZE (seamonkey-2.9.1.source.tar.bz2) = 102164308 +SHA256 (seamonkey-2.10.1.source.tar.bz2) = 96e9542393d14a7522d05993b54239b2d45bc7198389a56e1e56af97038cac8f +SIZE (seamonkey-2.10.1.source.tar.bz2) = 103439433 Index: files/patch-bugzilla-736961 =================================================================== RCS file: files/patch-bugzilla-736961 diff -N files/patch-bugzilla-736961 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-bugzilla-736961 9 Jun 2012 00:26:59 -0000 @@ -0,0 +1,111 @@ +--- mozilla/config/rules.mk.orig Wed May 2 05:16:35 2012 ++++ mozilla/config/rules.mk Fri May 11 08:42:50 2012 +@@ -1479,7 +1487,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + @if test -n "$(findstring $*.h, $(EXPORTS))"; \ + then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi + +@@ -1492,7 +1500,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ + -I$(topsrcdir)/xpcom/typelib/xpt/tools \ +- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + + # no need to link together if XPIDLSRCS contains only XPIDL_MODULE + ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) +--- mozilla/js/src/config/rules.mk.orig Fri May 11 08:42:57 2012 ++++ mozilla/js/src/config/rules.mk Fri May 11 08:43:15 2012 +@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + @if test -n "$(findstring $*.h, $(EXPORTS))"; \ + then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi + +@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ + -I$(topsrcdir)/xpcom/typelib/xpt/tools \ +- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + + # no need to link together if XPIDLSRCS contains only XPIDL_MODULE + ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) +--- mozilla/js/xpconnect/src/Makefile.in.orig Fri May 11 08:43:27 2012 ++++ mozilla/js/xpconnect/src/Makefile.in Fri May 11 08:44:03 2012 +@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \ + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/qsgen.py \ + --idlpath=$(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output dom_quickstubs.h \ + --stub-output dom_quickstubs.cpp \ + --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \ +@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \ + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dombindingsgen.py \ + --idlpath=$(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output dombindings_gen.h \ + $(srcdir)/dombindings.conf + +@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \ + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dombindingsgen.py \ + --idlpath=$(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --stub-output dombindings_gen.cpp \ + --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \ + $(srcdir)/dombindings.conf +@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.c + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dictionary_helper_gen.py \ + -I $(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output DictionaryHelpers.h \ + $(srcdir)/dictionary_helper_gen.conf + +@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dictionary_helper_gen.py \ + -I $(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output DictionaryHelpers.h \ + --stub-output DictionaryHelpers.cpp \ + --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \ +--- mozilla/xpcom/idl-parser/Makefile.in.orig Fri May 11 08:44:10 2012 ++++ mozilla/xpcom/idl-parser/Makefile.in Fri May 11 08:44:29 2012 +@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS) + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen + + check:: + $(PYTHON_PATH) \ +--- mozilla/xpcom/typelib/xpidl/Makefile.in.orig Fri May 11 08:44:51 2012 ++++ mozilla/xpcom/typelib/xpidl/Makefile.in Fri May 11 08:45:09 2012 +@@ -48,8 +48,8 @@ SDK_BINARY = \ + $(topsrcdir)/xpcom/idl-parser/xpidl.py \ + $(topsrcdir)/xpcom/idl-parser/header.py \ + $(topsrcdir)/xpcom/idl-parser/typelib.py \ +- $(DEPTH)/xpcom/idl-parser/xpidllex.py \ +- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \ ++ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \ ++ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \ + $(NULL) + + ifndef MOZ_SYSTEM_PLY Index: files/patch-mozilla-configure.in =================================================================== RCS file: /home/pcvs/ports/www/seamonkey/files/patch-mozilla-configure.in,v retrieving revision 1.1 diff -u -r1.1 patch-mozilla-configure.in --- files/patch-mozilla-configure.in 1 Aug 2011 23:31:53 -0000 1.1 +++ files/patch-mozilla-configure.in 8 Jun 2012 23:22:23 -0000 @@ -1,6 +1,6 @@ ---- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -1549,7 +1549,7 @@ +--- mozilla/configure.in.orig 2012-05-23 20:56:34.000000000 +0200 ++++ mozilla/configure.in 2012-05-27 18:18:25.000000000 +0200 +@@ -1517,7 +1517,7 @@ CPU_ARCH=sparc ;; @@ -9,7 +9,7 @@ CPU_ARCH="$OS_TEST" ;; -@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp +@@ -1539,7 +1539,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= case "$OS_TEST" in @@ -18,34 +18,7 @@ INTEL_ARCHITECTURE=1 esac -@@ -3803,19 +3803,21 @@ - AC_CHECK_FUNCS(localtime_r strtok_r) - - dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt --_SAVE_LDFLAGS=$LDFLAGS --LDFLAGS="$LDFLAGS -lrt" --AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, -+_SAVE_LIBS=$LIBS -+AC_SEARCH_LIBS(clock_gettime, rt) -+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), - ac_cv_have_clock_monotonic, - [AC_TRY_LINK([#include ], - [ struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); ], - ac_cv_have_clock_monotonic=yes, - ac_cv_have_clock_monotonic=no)]) --LDFLAGS=$_SAVE_LDFLAGS -+LIBS=$_SAVE_LIBS - if test "$ac_cv_have_clock_monotonic" = "yes"; then - HAVE_CLOCK_MONOTONIC=1 -- REALTIME_LIBS=-lrt -+ if test "$ac_cv_search_clock_gettime" != "none required"; then -+ REALTIME_LIBS=$ac_cv_search_clock_gettime -+ fi - AC_DEFINE(HAVE_CLOCK_MONOTONIC) - AC_SUBST(HAVE_CLOCK_MONOTONIC) - AC_SUBST(REALTIME_LIBS) -@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS +@@ -4580,7 +4580,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS @@ -54,7 +27,7 @@ ZLIB_CFLAGS="-I${ZLIB_DIR}/include" ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi -@@ -6022,6 +6024,14 @@ +@@ -5903,6 +5903,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 ;; @@ -69,7 +42,7 @@ SunOS:x86) VPX_ASFLAGS="-f elf32 -rnasm -pnasm" VPX_X86_ASM=1 -@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then +@@ -6297,6 +6305,14 @@ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" LIBJPEG_TURBO_X64_ASM=1 ;; Index: files/patch-mozilla-js-src-configure.in =================================================================== RCS file: /home/pcvs/ports/www/seamonkey/files/patch-mozilla-js-src-configure.in,v retrieving revision 1.3 diff -u -r1.3 patch-mozilla-js-src-configure.in --- files/patch-mozilla-js-src-configure.in 14 Mar 2012 15:50:04 -0000 1.3 +++ files/patch-mozilla-js-src-configure.in 8 Jun 2012 23:23:12 -0000 @@ -1,17 +1,37 @@ ---- mozilla/js/src/configure.in.orig 2012-03-12 10:27:55.000000000 +0100 -+++ mozilla/js/src/configure.in 2012-03-12 10:28:22.000000000 +0100 -@@ -2831,12 +2831,14 @@ - AC_DEFINE(JS_NUNBOX32) +--- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 ++++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 +@@ -1470,7 +1470,7 @@ + CPU_ARCH=sparc ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 - ENABLE_POLYIC=1 - ENABLE_METHODJIT_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) - AC_DEFINE(JS_NUNBOX32) -+ fi + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" ;; + +@@ -1492,7 +1492,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 esac +@@ -2814,6 +2814,16 @@ + AC_DEFINE(JS_CPU_X86) + AC_DEFINE(JS_NUNBOX32) + ;; ++amd64*-*) ++ ENABLE_TRACEJIT=1 ++ NANOJIT_ARCH=X64 ++ ENABLE_METHODJIT=1 ++ ENABLE_MONOIC=1 ++ ENABLE_POLYIC=1 ++ ENABLE_POLYIC_TYPED_ARRAY=1 ++ AC_DEFINE(JS_CPU_X64) ++ AC_DEFINE(JS_PUNBOX64) ++ ;; + x86_64*-*) + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 Index: files/patch-mozilla-toolkit-library-Makefile.in =================================================================== RCS file: /home/pcvs/ports/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-mozilla-toolkit-library-Makefile.in --- files/patch-mozilla-toolkit-library-Makefile.in 1 Aug 2011 23:31:53 -0000 1.1 +++ files/patch-mozilla-toolkit-library-Makefile.in 19 Jun 2012 19:57:24 -0000 @@ -1,12 +1,11 @@ ---- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 -+++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 -@@ -181,7 +181,7 @@ - export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) - $(INSTALL) $^ . +--- mozilla/toolkit/library/Makefile.in.orig 2012-06-15 14:04:29.000000000 +0200 ++++ mozilla/toolkit/library/Makefile.in 2012-06-19 20:48:15.000000000 +0200 +@@ -438,7 +443,7 @@ + endif + endif -EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) +EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% - ifdef MOZ_ENABLE_LIBXUL - include $(srcdir)/libxul-rules.mk - + DEFINES += -DIMPL_XREAPI + Index: files/patch-suite-installer-Makefile.in =================================================================== RCS file: files/patch-suite-installer-Makefile.in diff -N files/patch-suite-installer-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-suite-installer-Makefile.in 19 Jun 2012 18:43:21 -0000 @@ -0,0 +1,11 @@ +--- suite/installer/Makefile.in.orig 2012-06-19 20:42:29.000000000 +0200 ++++ suite/installer/Makefile.in 2012-06-19 20:42:54.000000000 +0200 +@@ -49,7 +49,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Be fatal, except when building with XULRunner which already bundles some files. + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \