Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Sep 2012 22:10:02 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r303831 - in head: Mk devel/nspr mail/thunderbird-esr/files mail/thunderbird/files security/nss security/nss/files www/firefox www/firefox-esr/files www/firefox-i18n www/firefox/files w...
Message-ID:  <201209072210.q87MA2po071935@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: flo
Date: Fri Sep  7 22:10:01 2012
New Revision: 303831
URL: http://svn.freebsd.org/changeset/ports/303831

Log:
  - Update firefox to 15.0.1
  - Sync changes from gecko repository@r995
   general
   - don't specify prefix for libevent when using pkg-config
   - ia64 and sparc64 use 8k pagesize by default
   - add visibility hack for clang 3.2 with libc++
   - fix build using clang 3.2 (on FreeBSD 10-CURRENT)
   - rename a few more patches to ease tracking of bugzilla bugs
   www/seamonkey
   - unbreak unsetting LDAP and MAILNEWS options after bug 707305
   - use compile time debugging WITH_DEBUG
   security/nss
   - unbreak install WITH_DEBUG
   - unbreak powerpc64
   devel/nspr
   - use absolute paths when specifiying srcdir to make gdb(1) happy
  
  In collaboration with:	andreast, zeising, Jan Beich <jbeich@tormail.org>

Added:
     - copied unchanged from r303794, head/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp
  head/mail/thunderbird-esr/files/patch-bug543241
     - copied unchanged from r303794, head/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
  head/mail/thunderbird-esr/files/patch-bug653551   (contents, props changed)
  head/mail/thunderbird-esr/files/patch-bug728968   (contents, props changed)
  head/mail/thunderbird-esr/files/patch-bug788039   (contents, props changed)
  head/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack   (contents, props changed)
  head/mail/thunderbird/files/patch-bug351181
     - copied unchanged from r303794, head/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp
  head/mail/thunderbird/files/patch-bug543241
     - copied unchanged from r303794, head/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
  head/mail/thunderbird/files/patch-bug732340
     - copied, changed from r303794, head/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
  head/mail/thunderbird/files/patch-bug774671   (contents, props changed)
  head/mail/thunderbird/files/patch-bug787904   (contents, props changed)
  head/mail/thunderbird/files/patch-bug788039   (contents, props changed)
  head/mail/thunderbird/files/patch-clang32-libc++-visibility-hack   (contents, props changed)
     - copied unchanged from r303794, head/www/firefox-esr/files/patch-js_src_jsnum.cpp
  head/www/firefox-esr/files/patch-bug543241
     - copied unchanged from r303794, head/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp
  head/www/firefox-esr/files/patch-bug653551   (contents, props changed)
  head/www/firefox-esr/files/patch-bug728968   (contents, props changed)
  head/www/firefox-esr/files/patch-bug788039   (contents, props changed)
  head/www/firefox-esr/files/patch-clang32-libc++-visibility-hack   (contents, props changed)
  head/www/firefox/files/patch-bug351181
     - copied unchanged from r303794, head/www/firefox/files/patch-js_src_jsnum.cpp
  head/www/firefox/files/patch-bug543241
     - copied unchanged from r303794, head/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
  head/www/firefox/files/patch-bug732340   (contents, props changed)
  head/www/firefox/files/patch-bug774671   (contents, props changed)
  head/www/firefox/files/patch-bug787904   (contents, props changed)
  head/www/firefox/files/patch-bug788039   (contents, props changed)
  head/www/firefox/files/patch-clang32-libc++-visibility-hack   (contents, props changed)
     - copied unchanged from r303795, head/www/libxul/files/patch-js_src_jsnum.cpp
  head/www/libxul/files/patch-bug653551   (contents, props changed)
  head/www/seamonkey/files/patch-bug351181
     - copied unchanged from r303794, head/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp
  head/www/seamonkey/files/patch-bug543241
     - copied unchanged from r303794, head/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
  head/www/seamonkey/files/patch-bug732340
     - copied, changed from r303794, head/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
  head/www/seamonkey/files/patch-bug774671   (contents, props changed)
  head/www/seamonkey/files/patch-bug787904   (contents, props changed)
  head/www/seamonkey/files/patch-bug788039   (contents, props changed)
  head/www/seamonkey/files/patch-clang32-libc++-visibility-hack   (contents, props changed)
Directory Properties:
  head/mail/thunderbird-esr/files/patch-bug351181   (props changed)
  head/www/firefox-esr/files/patch-bug351181   (props changed)
  head/www/libxul/files/patch-bug351181   (props changed)
Deleted:
  head/mail/thunderbird-esr/files/patch-mozilla-configure.in
  head/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp
  head/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
  head/mail/thunderbird/files/patch-mozilla-configure.in
  head/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
  head/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp
  head/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
  head/www/firefox-esr/files/patch-configure.in
  head/www/firefox-esr/files/patch-js_src_jsnum.cpp
  head/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp
  head/www/firefox/files/patch-configure.in
  head/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc
  head/www/firefox/files/patch-js_src_jsnum.cpp
  head/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
  head/www/libxul/files/patch-js-src-configure.in
  head/www/libxul/files/patch-js_src_jsnum.cpp
  head/www/seamonkey/files/extra-patch-bridge-bridge.mk
  head/www/seamonkey/files/patch-mozilla-configure.in
  head/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc
  head/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp
  head/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
Modified:
  head/Mk/bsd.gecko.mk
  head/devel/nspr/Makefile
  head/mail/thunderbird-esr/files/patch-bug753046
  head/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in
  head/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
  head/mail/thunderbird/files/patch-bug753046
  head/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
  head/security/nss/Makefile
  head/security/nss/files/patch-..::coreconf::FreeBSD.mk
  head/www/firefox-esr/files/patch-bug753046
  head/www/firefox-esr/files/patch-ipc-chromium-Makefile.in
  head/www/firefox-esr/files/patch-js-src-configure.in
  head/www/firefox-i18n/Makefile
  head/www/firefox-i18n/distinfo
  head/www/firefox/Makefile
  head/www/firefox/distinfo
  head/www/firefox/files/patch-bug753046
  head/www/firefox/files/patch-ipc-chromium-Makefile.in
  head/www/seamonkey-i18n/Makefile
  head/www/seamonkey-i18n/Makefile.lang
  head/www/seamonkey-i18n/Makefile.option
  head/www/seamonkey/Makefile
  head/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk   (contents, props changed)
  head/www/seamonkey/files/patch-bug753046
  head/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/Mk/bsd.gecko.mk	Fri Sep  7 22:10:01 2012	(r303831)
@@ -560,7 +560,7 @@ cairo_EXTRACT_AFTER_ARGS=	--exclude mozi
 dbm_EXTRACT_AFTER_ARGS=		--exclude mozilla*/dbm
 
 event_LIB_DEPENDS=	event-2.0:${PORTSDIR}/devel/libevent2
-event_MOZ_OPTIONS=	--with-system-libevent=${LOCALBASE}
+event_MOZ_OPTIONS=	--with-system-libevent
 event_EXTRACT_AFTER_ARGS=	--exclude mozilla*/ipc/chromium/src/third_party/libevent
 
 ffi_LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi

Modified: head/devel/nspr/Makefile
==============================================================================
--- head/devel/nspr/Makefile	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/devel/nspr/Makefile	Fri Sep  7 22:10:01 2012	(r303831)
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=../configure
-CONFIGURE_ARGS=	--disable-debug \
+CONFIGURE_ARGS=	--srcdir=${WRKSRC:H} \
 		--with-pthreads
 CONFIGURE_ENV=	BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
@@ -31,8 +31,8 @@ LIBS=		libnspr4.so.1 libplc4.so.1 libpld
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "arm"
-BROKEN=		Does not compile on arm
+.if !defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--disable-debug
 .endif
 
 post-patch:

Copied: head/mail/thunderbird-esr/files/patch-bug351181 (from r303794, head/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird-esr/files/patch-bug351181	Fri Sep  7 22:10:01 2012	(r303831, copy of r303794, head/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp)
@@ -0,0 +1,28 @@
+--- mozilla/js/src/jsnum.cpp.orig	Sun Nov  5 18:37:07 2006
++++ mozilla/js/src/jsnum.cpp	Sun Nov  5 18:42:31 2006
+@@ -45,6 +45,9 @@
+ #if defined(XP_WIN) || defined(XP_OS2)
+ #include <float.h>
+ #endif
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ #include <locale.h>
+ #include <limits.h>
+ #include <math.h>
+@@ -532,7 +535,15 @@ static jsdouble NaN;
+ 
+ #else
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#include <fenv.h>
++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
++
++#else
++
+ #define FIX_FPU() ((void)0)
++
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
+ 
+ #endif
+ 

Copied: head/mail/thunderbird-esr/files/patch-bug543241 (from r303794, head/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird-esr/files/patch-bug543241	Fri Sep  7 22:10:01 2012	(r303831, copy of r303794, head/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp)
@@ -0,0 +1,14 @@
+--- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
++++ ./mozilla/xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
+@@ -89,6 +89,11 @@
+ nsresult
+ nsThreadManager::Init()
+ {
++#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
++  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
++  if (!gTLSThreadID)
++    gTLSThreadID = mozilla::threads::Generic;
++#endif
+   if (!mThreadsByPRThread.Init())
+     return NS_ERROR_OUT_OF_MEMORY;
+ 

Added: head/mail/thunderbird-esr/files/patch-bug653551
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird-esr/files/patch-bug653551	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,29 @@
+commit 47ea30f
+Author: Landry Breuil <landry@openbsd.org>
+Date:   Thu Feb 2 15:31:56 2012 +0900
+
+    Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
+---
+ js/src/configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git mozilla/js/src/configure.in mozilla/js/src/configure.in
+index 84390cf..d663c46 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -2806,13 +2806,15 @@ arm*-*)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
+ sparc*-*)
++    if test ! "$HAVE_64BIT_OS" ; then
+     NANOJIT_ARCH=Sparc
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+     ENABLE_METHODJIT_TYPED_ARRAY=1
+     AC_DEFINE(JS_CPU_SPARC)
+     AC_DEFINE(JS_NUNBOX32)
++    fi
+     ;;
+ mips*-*)
+     ENABLE_METHODJIT=1

Added: head/mail/thunderbird-esr/files/patch-bug728968
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird-esr/files/patch-bug728968	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,50 @@
+commit 4075972
+Author: Mike Hommey <mh+mozilla@glandium.org>
+Date:   Thu Feb 23 11:00:46 2012 +0100
+
+    Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey
+---
+ configure.in | 29 ++++++++++++++++-------------
+ 1 file changed, 16 insertions(+), 13 deletions(-)
+
+diff --git mozilla/configure.in mozilla/configure.in
+index 3ba7e2f..3d0614c 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -3728,20 +3728,23 @@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6
+ AC_CHECK_FUNCS(flockfile getpagesize)
+ 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,
+-               ac_cv_have_clock_monotonic,
+-               [AC_TRY_LINK([#include <time.h>],
+-                            [ struct timespec ts;
+-                              clock_gettime(CLOCK_MONOTONIC, &ts); ],
+-                            ac_cv_have_clock_monotonic=yes,
+-                            ac_cv_have_clock_monotonic=no)])
+-LDFLAGS=$_SAVE_LDFLAGS
+-if test "$ac_cv_have_clock_monotonic" = "yes"; then
++dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
++               ac_cv_clock_monotonic,
++               [for libs in "" -lrt; do
++                    _SAVE_LDFLAGS="$LDFLAGS"
++                    LDFLAGS="$LDFLAGS $libs"
++                    AC_TRY_LINK([#include <time.h>],
++                                 [ struct timespec ts;
++                                   clock_gettime(CLOCK_MONOTONIC, &ts); ],
++                                 ac_cv_clock_monotonic=$libs
++                                 break,
++                                 ac_cv_clock_monotonic=no)
++                    LDFLAGS="$_SAVE_LDFLAGS"
++                done])
++if test "$ac_cv_clock_monotonic" != "no"; then
+     HAVE_CLOCK_MONOTONIC=1
+-    REALTIME_LIBS=-lrt
++    REALTIME_LIBS=$ac_cv_clock_monotonic
+     AC_DEFINE(HAVE_CLOCK_MONOTONIC)
+     AC_SUBST(HAVE_CLOCK_MONOTONIC)
+     AC_SUBST(REALTIME_LIBS)

Modified: head/mail/thunderbird-esr/files/patch-bug753046
==============================================================================
--- head/mail/thunderbird-esr/files/patch-bug753046	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/mail/thunderbird-esr/files/patch-bug753046	Fri Sep  7 22:10:01 2012	(r303831)
@@ -264,7 +264,7 @@ new file mode 100644
 index 0000000..3fc1a87
 --- /dev/null
 +++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,112 @@
 +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -316,7 +316,11 @@ index 0000000..3fc1a87
 +  bool Next() {
 +    if (size_) {
 +      struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]);
++#ifdef OS_DRAGONFLY
++      offset_ += _DIRENT_DIRSIZ(dirent);
++#else
 +      offset_ += dirent->d_reclen;
++#endif
 +    }
 +
 +    if (offset_ != size_)

Added: head/mail/thunderbird-esr/files/patch-bug788039
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird-esr/files/patch-bug788039	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,59 @@
+# Bug 788039 - With no prefix search libevent via pkg-config.
+
+--- mozilla/config/autoconf.mk.in~
++++ mozilla/config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+ 
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+ 
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[  --with-system-libevent=[PFX]
++[  --with-system-libevent[=PFX]
+                           Use system libevent [installed at prefix PFX]],
+     LIBEVENT_DIR=$withval)
+ 
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+     MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++    PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++        MOZ_NATIVE_LIBEVENT=1,
++        AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
+ else
+-    if test "${LIBEVENT_DIR}" = "yes"; then
+-        LIBEVENT_DIR=/usr
+-    fi
+     CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+     LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+     MOZ_CHECK_HEADER(event.h,
+@@ -3876,16 +3877,16 @@ else
+         AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+     AC_CHECK_LIB(event, event_init,
+                  [MOZ_NATIVE_LIBEVENT=1
+-                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++                  MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+                   MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+-                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
++                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
+ fi
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+ 
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+ 
+ dnl ========================================================

Added: head/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,57 @@
+--- configure.in~
++++ configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then
+--- mozilla/js/src/configure.in~
++++ mozilla/js/src/configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then

Modified: head/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- head/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in	Fri Sep  7 22:10:01 2012	(r303831)
@@ -22,7 +22,7 @@
 -# message_pump_libevent.cc includes third_party/libevent/event.h,
 -# which we put in $(DIST), see export rule below
 -LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
  endif # }
  
  vpath %.cc \

Modified: head/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
==============================================================================
--- head/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in	Fri Sep  7 22:10:01 2012	(r303831)
@@ -1,21 +1,5 @@
 --- mozilla/js/src/configure.in.orig	2012-01-29 15:44:24.000000000 +0100
 +++ mozilla/js/src/configure.in	2012-01-30 23:37:46.541060008 +0100
-@@ -2732,6 +2742,7 @@
-     AC_DEFINE(JS_NUNBOX32)
-     ;;
- sparc*-*)
-+    if test ! "$HAVE_64BIT_OS" ; then
-     NANOJIT_ARCH=Sparc
-     ENABLE_METHODJIT=1
-     ENABLE_MONOIC=1
-@@ -2739,6 +2750,7 @@
-     ENABLE_METHODJIT_TYPED_ARRAY=1
-     AC_DEFINE(JS_CPU_SPARC)
-     AC_DEFINE(JS_NUNBOX32)
-+    fi
-     ;;
- esac
- 
 @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
   * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
   * is defined before <stdint.h> is included. */

Copied: head/mail/thunderbird/files/patch-bug351181 (from r303794, head/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug351181	Fri Sep  7 22:10:01 2012	(r303831, copy of r303794, head/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp)
@@ -0,0 +1,31 @@
+--- mozilla/js/src/jsnum.cpp.orig	2010-01-05 22:35:17.000000000 -0500
++++ mozilla/js/src/jsnum.cpp	2010-01-11 05:10:19.000000000 -0500
+@@ -49,6 +49,9 @@
+ // Avoid warnings about ASSERT being defined by the assembler as well.
+ #undef ASSERT
+ 
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ #ifdef XP_OS2
+ #define _PC_53  PC_53
+ #define _MCW_EM MCW_EM
+@@ -691,8 +694,18 @@
+ 
+ #else
+ 
++#if defined(__FreeBSD__)
++#if __BSD_VISIBLE == 0
++#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
++#endif
++#include <fenv.h>
++#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
++#else
++
+ #define FIX_FPU() ((void)0)
+ 
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++
+ #endif
+ 
+ JSBool

Copied: head/mail/thunderbird/files/patch-bug543241 (from r303794, head/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug543241	Fri Sep  7 22:10:01 2012	(r303831, copy of r303794, head/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp)
@@ -0,0 +1,14 @@
+--- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
++++ ./mozilla/xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
+@@ -57,6 +57,11 @@
+ nsresult
+ nsThreadManager::Init()
+ {
++#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
++  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
++  if (!gTLSThreadID)
++    gTLSThreadID = mozilla::threads::Generic;
++#endif
+   mThreadsByPRThread.Init();
+ 
+   if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE)

Copied and modified: head/mail/thunderbird/files/patch-bug732340 (from r303794, head/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc)
==============================================================================
--- head/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc	Thu Sep  6 21:58:21 2012	(r303794, copy source)
+++ head/mail/thunderbird/files/patch-bug732340	Fri Sep  7 22:10:01 2012	(r303831)
@@ -1,11 +1,14 @@
 --- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig	2012-06-24 22:14:46.463741874 -0400
 +++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc	2012-06-24 22:15:06.784770042 -0400
-@@ -540,4 +540,8 @@
+@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t 
    GPOS::position_finish (buffer);
  }
  
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
 +template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
 +template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
 +template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
 +template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
++#endif
+ 
  

Modified: head/mail/thunderbird/files/patch-bug753046
==============================================================================
--- head/mail/thunderbird/files/patch-bug753046	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/mail/thunderbird/files/patch-bug753046	Fri Sep  7 22:10:01 2012	(r303831)
@@ -264,7 +264,7 @@ new file mode 100644
 index 0000000..3fc1a87
 --- /dev/null
 +++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,112 @@
 +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -316,7 +316,11 @@ index 0000000..3fc1a87
 +  bool Next() {
 +    if (size_) {
 +      struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]);
++#ifdef OS_DRAGONFLY
++      offset_ += _DIRENT_DIRSIZ(dirent);
++#else
 +      offset_ += dirent->d_reclen;
++#endif
 +    }
 +
 +    if (offset_ != size_)

Added: head/mail/thunderbird/files/patch-bug774671
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug774671	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,15 @@
+--- mozilla/js/src/jsprvtd.h.orig	2012-08-25 02:31:13.000000000 +0200
++++ mozilla/js/src/jsprvtd.h	2012-09-06 17:14:09.000000000 +0200
+@@ -149,9 +149,9 @@
+ class UpvarCookie;
+ 
+ class Proxy;
+-class BaseProxyHandler;
+-class DirectWrapper;
+-class CrossCompartmentWrapper;
++class JS_FRIEND_API(BaseProxyHandler);
++class JS_FRIEND_API(DirectWrapper);
++class JS_FRIEND_API(CrossCompartmentWrapper);
+ 
+ class TempAllocPolicy;
+ class RuntimeAllocPolicy;

Added: head/mail/thunderbird/files/patch-bug787904
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug787904	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,12 @@
+--- mozilla/js/src/gc/Heap.h
++++ mozilla/js/src/gc/Heap.h
+@@ -108,7 +108,8 @@ struct Cell
+  * Bug 692267: Move page size definition to gc/Memory.h and include it
+  *             directly once jsgc.h is no longer an installed header.
+  */
+-#if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9))
++#if (defined(SOLARIS) || defined(__FreeBSD__)) && \
++    (defined(__sparc) || defined(__sparcv9) || defined(__ia64))
+ const size_t PageShift = 13;
+ #else
+ const size_t PageShift = 12;

Added: head/mail/thunderbird/files/patch-bug788039
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug788039	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,59 @@
+# Bug 788039 - With no prefix search libevent via pkg-config.
+
+--- mozilla/config/autoconf.mk.in~
++++ mozilla/config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+ 
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+ 
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[  --with-system-libevent=[PFX]
++[  --with-system-libevent[=PFX]
+                           Use system libevent [installed at prefix PFX]],
+     LIBEVENT_DIR=$withval)
+ 
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+     MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++    PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++        MOZ_NATIVE_LIBEVENT=1,
++        AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
+ else
+-    if test "${LIBEVENT_DIR}" = "yes"; then
+-        LIBEVENT_DIR=/usr
+-    fi
+     CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+     LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+     MOZ_CHECK_HEADER(event.h,
+@@ -3876,16 +3877,16 @@ else
+         AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+     AC_CHECK_LIB(event, event_init,
+                  [MOZ_NATIVE_LIBEVENT=1
+-                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++                  MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+                   MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+-                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
++                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
+ fi
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+ 
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+ 
+ dnl ========================================================

Added: head/mail/thunderbird/files/patch-clang32-libc++-visibility-hack
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-clang32-libc++-visibility-hack	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,57 @@
+--- configure.in~
++++ configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then
+--- mozilla/configure.in~
++++ mozilla/configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then
+--- mozilla/js/src/configure.in~
++++ mozilla/js/src/configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then

Modified: head/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- head/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in	Fri Sep  7 22:10:01 2012	(r303831)
@@ -22,7 +22,7 @@
 -# message_pump_libevent.cc includes third_party/libevent/event.h,
 -# which we put in $(DIST), see export rule below
 -LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
  endif # }
  
  vpath %.cc \

Modified: head/security/nss/Makefile
==============================================================================
--- head/security/nss/Makefile	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/security/nss/Makefile	Fri Sep  7 22:10:01 2012	(r303831)
@@ -31,7 +31,7 @@ USE_LDCONFIG=	${PREFIX}/lib/nss
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 MAKE_ENV=	BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		BUILD_OPT=1 NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1
+		NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1
 ALL_TARGET=	nss_build_all
 CFLAGS+=	-I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib
 
@@ -41,13 +41,18 @@ EXTERNALS=	CVS dbm security/nss/lib/zlib
 EXTRACT_AFTER_ARGS=| ${TAR} -xf -	\
 	${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,}
 
-BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ
-
 INSTALL_BINS=	certcgi certutil checkcert cmsutil crlutil derdump makepqg \
 		mangle modutil ocspclnt oidcalc p7content p7env p7sign \
 		p7verify pk12util rsaperf shlibsign signtool signver \
 		ssltap strsclnt symkeyutil vfychain vfyserv
 
+.if !defined(WITH_DEBUG)
+MAKE_ENV+=	BUILD_OPT=1
+BINS=		${DIST}/${OPSYS}${OSREL}_OPT.OBJ
+.else
+BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
+.endif
+
 check regression-test test:
 	cd ${WRKSRC}/tests;	\
 		${SETENV} PATH="${BINS}/bin:${PATH}" \
@@ -87,15 +92,15 @@ do-install:
 	${MKDIR} ${PREFIX}/include/nss/nss ${PREFIX}/lib/nss
 	${FIND} ${DIST}/public/nss -type l \
 	    	-exec ${INSTALL_DATA} {} ${PREFIX}/include/nss/nss \;
-	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/*.so.1 \
+	${INSTALL_DATA} ${BINS}/lib/*.so.1 \
 		${PREFIX}/lib/nss
-	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/libcrmf.a \
+	${INSTALL_DATA} ${BINS}/lib/libcrmf.a \
 	    	${PREFIX}/lib/nss
 .for bin in ${INSTALL_BINS}
-	${INSTALL_PROGRAM} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/${bin} \
+	${INSTALL_PROGRAM} ${BINS}/bin/${bin} \
 		${PREFIX}/bin
 .endfor
-	cd ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib && \
+	cd ${BINS}/lib && \
 	    	${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib/nss -xf -
 	${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig

Modified: head/security/nss/files/patch-..::coreconf::FreeBSD.mk
==============================================================================
--- head/security/nss/files/patch-..::coreconf::FreeBSD.mk	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/security/nss/files/patch-..::coreconf::FreeBSD.mk	Fri Sep  7 22:10:01 2012	(r303831)
@@ -13,14 +13,15 @@
  RANLIB			= ranlib
  
  CPU_ARCH		= $(OS_TEST)
-@@ -52,6 +52,12 @@ endif
+@@ -52,6 +52,13 @@ endif
  ifeq ($(CPU_ARCH),amd64)
  CPU_ARCH		= x86_64
  endif
 +ifneq (,$(filter powerpc%, $(CPU_ARCH)))
 +CPU_ARCH		= ppc
 +endif
-+ifneq (,$(filter %64, $(CPU_ARCH)))
++
++ifneq (,$(filter %64, $(OS_TEST)))
 +USE_64			= 1
 +endif
  

Copied: head/www/firefox-esr/files/patch-bug351181 (from r303794, head/www/firefox-esr/files/patch-js_src_jsnum.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug351181	Fri Sep  7 22:10:01 2012	(r303831, copy of r303794, head/www/firefox-esr/files/patch-js_src_jsnum.cpp)
@@ -0,0 +1,31 @@
+--- js/src/jsnum.cpp.orig	2010-01-05 22:35:17.000000000 -0500
++++ js/src/jsnum.cpp	2010-01-11 05:10:19.000000000 -0500
+@@ -43,6 +43,9 @@
+ /*
+  * JS number type and wrapper class.
+  */
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ #ifdef XP_OS2
+ #define _PC_53  PC_53
+ #define _MCW_EM MCW_EM
+@@ -691,8 +694,18 @@
+ 
+ #else
+ 
++#if defined(__FreeBSD__)
++#if __BSD_VISIBLE == 0
++#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
++#endif
++#include <fenv.h>
++#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
++#else
++
+ #define FIX_FPU() ((void)0)
+ 
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++
+ #endif
+ 
+ JSBool

Copied: head/www/firefox-esr/files/patch-bug543241 (from r303794, head/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug543241	Fri Sep  7 22:10:01 2012	(r303831, copy of r303794, head/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp)
@@ -0,0 +1,14 @@
+--- ./xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
++++ ./xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
+@@ -89,6 +89,11 @@
+ nsresult
+ nsThreadManager::Init()
+ {
++#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
++  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
++  if (!gTLSThreadID)
++    gTLSThreadID = mozilla::threads::Generic;
++#endif
+   if (!mThreadsByPRThread.Init())
+     return NS_ERROR_OUT_OF_MEMORY;
+ 

Added: head/www/firefox-esr/files/patch-bug653551
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug653551	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,29 @@
+commit 47ea30f
+Author: Landry Breuil <landry@openbsd.org>
+Date:   Thu Feb 2 15:31:56 2012 +0900
+
+    Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
+---
+ js/src/configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git js/src/configure.in js/src/configure.in
+index 84390cf..d663c46 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2806,13 +2806,15 @@ arm*-*)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
+ sparc*-*)
++    if test ! "$HAVE_64BIT_OS" ; then
+     NANOJIT_ARCH=Sparc
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+     ENABLE_METHODJIT_TYPED_ARRAY=1
+     AC_DEFINE(JS_CPU_SPARC)
+     AC_DEFINE(JS_NUNBOX32)
++    fi
+     ;;
+ mips*-*)
+     ENABLE_METHODJIT=1

Added: head/www/firefox-esr/files/patch-bug728968
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug728968	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,50 @@
+commit 4075972
+Author: Mike Hommey <mh+mozilla@glandium.org>
+Date:   Thu Feb 23 11:00:46 2012 +0100
+
+    Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey
+---
+ configure.in | 29 ++++++++++++++++-------------
+ 1 file changed, 16 insertions(+), 13 deletions(-)
+
+diff --git configure.in configure.in
+index 3ba7e2f..3d0614c 100644
+--- configure.in
++++ configure.in
+@@ -3728,20 +3728,23 @@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6
+ AC_CHECK_FUNCS(flockfile getpagesize)
+ 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,
+-               ac_cv_have_clock_monotonic,
+-               [AC_TRY_LINK([#include <time.h>],
+-                            [ struct timespec ts;
+-                              clock_gettime(CLOCK_MONOTONIC, &ts); ],
+-                            ac_cv_have_clock_monotonic=yes,
+-                            ac_cv_have_clock_monotonic=no)])
+-LDFLAGS=$_SAVE_LDFLAGS
+-if test "$ac_cv_have_clock_monotonic" = "yes"; then
++dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
++               ac_cv_clock_monotonic,
++               [for libs in "" -lrt; do
++                    _SAVE_LDFLAGS="$LDFLAGS"
++                    LDFLAGS="$LDFLAGS $libs"
++                    AC_TRY_LINK([#include <time.h>],
++                                 [ struct timespec ts;
++                                   clock_gettime(CLOCK_MONOTONIC, &ts); ],
++                                 ac_cv_clock_monotonic=$libs
++                                 break,
++                                 ac_cv_clock_monotonic=no)
++                    LDFLAGS="$_SAVE_LDFLAGS"
++                done])
++if test "$ac_cv_clock_monotonic" != "no"; then
+     HAVE_CLOCK_MONOTONIC=1
+-    REALTIME_LIBS=-lrt
++    REALTIME_LIBS=$ac_cv_clock_monotonic
+     AC_DEFINE(HAVE_CLOCK_MONOTONIC)
+     AC_SUBST(HAVE_CLOCK_MONOTONIC)
+     AC_SUBST(REALTIME_LIBS)

Modified: head/www/firefox-esr/files/patch-bug753046
==============================================================================
--- head/www/firefox-esr/files/patch-bug753046	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/www/firefox-esr/files/patch-bug753046	Fri Sep  7 22:10:01 2012	(r303831)
@@ -264,7 +264,7 @@ new file mode 100644
 index 0000000..3fc1a87
 --- /dev/null
 +++ ipc/chromium/src/base/dir_reader_bsd.h
-@@ -0,0 +1,108 @@
+@@ -0,0 +1,112 @@
 +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -316,7 +316,11 @@ index 0000000..3fc1a87
 +  bool Next() {
 +    if (size_) {
 +      struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]);
++#ifdef OS_DRAGONFLY
++      offset_ += _DIRENT_DIRSIZ(dirent);
++#else
 +      offset_ += dirent->d_reclen;
++#endif
 +    }
 +
 +    if (offset_ != size_)

Added: head/www/firefox-esr/files/patch-bug788039
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug788039	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,59 @@
+# Bug 788039 - With no prefix search libevent via pkg-config.
+
+--- config/autoconf.mk.in~
++++ config/autoconf.mk.in
+@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
+ 
+ MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
+ MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
+-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
+ 
+ MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
+ MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
+--- configure.in~
++++ configure.in
+@@ -3854,7 +3854,7 @@ fi
+ dnl system libevent Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-libevent,
+-[  --with-system-libevent=[PFX]
++[  --with-system-libevent[=PFX]
+                           Use system libevent [installed at prefix PFX]],
+     LIBEVENT_DIR=$withval)
+ 
+@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
+ _SAVE_LIBS=$LIBS
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+     MOZ_NATIVE_LIBEVENT=
++elif test "$LIBEVENT_DIR" = yes; then
++    PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
++        MOZ_NATIVE_LIBEVENT=1,
++        AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
+ else
+-    if test "${LIBEVENT_DIR}" = "yes"; then
+-        LIBEVENT_DIR=/usr
+-    fi
+     CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+     LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
+     MOZ_CHECK_HEADER(event.h,
+@@ -3876,16 +3877,16 @@ else
+         AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+     AC_CHECK_LIB(event, event_init,
+                  [MOZ_NATIVE_LIBEVENT=1
+-                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++                  MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
+                   MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+-                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
++                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
+ fi
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+ 
+ AC_SUBST(MOZ_NATIVE_LIBEVENT)
+-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
++AC_SUBST(MOZ_LIBEVENT_CFLAGS)
+ AC_SUBST(MOZ_LIBEVENT_LIBS)
+ 
+ dnl ========================================================

Added: head/www/firefox-esr/files/patch-clang32-libc++-visibility-hack
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-clang32-libc++-visibility-hack	Fri Sep  7 22:10:01 2012	(r303831)
@@ -0,0 +1,38 @@
+--- configure.in~
++++ configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then
+--- js/src/configure.in~
++++ js/src/configure.in
+@@ -2855,6 +2855,7 @@ EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
++#include <iterator>
+ #pragma GCC visibility pop
+ 
+ __attribute__ ((visibility ("default"))) void Func() {
+@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
+ }
+ EOF
+                        ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+                          ac_cv_have_visibility_builtin_bug=yes
+                        else
+                          if test `grep -c "@PLT" conftest.S` = 0; then

Modified: head/www/firefox-esr/files/patch-ipc-chromium-Makefile.in
==============================================================================
--- head/www/firefox-esr/files/patch-ipc-chromium-Makefile.in	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/www/firefox-esr/files/patch-ipc-chromium-Makefile.in	Fri Sep  7 22:10:01 2012	(r303831)
@@ -22,7 +22,7 @@
 -# message_pump_libevent.cc includes third_party/libevent/event.h,
 -# which we put in $(DIST), see export rule below
 -LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES))
++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
  endif # }
  
  vpath %.cc \

Modified: head/www/firefox-esr/files/patch-js-src-configure.in
==============================================================================
--- head/www/firefox-esr/files/patch-js-src-configure.in	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/www/firefox-esr/files/patch-js-src-configure.in	Fri Sep  7 22:10:01 2012	(r303831)
@@ -1,21 +1,5 @@
 --- js/src/configure.in.orig	2012-01-29 11:24:33.000000000 +0100
 +++ js/src/configure.in	2012-01-30 23:30:02.051087215 +0100
-@@ -2732,6 +2742,7 @@
-     AC_DEFINE(JS_NUNBOX32)
-     ;;
- sparc*-*)
-+    if test ! "$HAVE_64BIT_OS" ; then
-     NANOJIT_ARCH=Sparc
-     ENABLE_METHODJIT=1
-     ENABLE_MONOIC=1
-@@ -2739,6 +2750,7 @@
-     ENABLE_METHODJIT_TYPED_ARRAY=1
-     AC_DEFINE(JS_CPU_SPARC)
-     AC_DEFINE(JS_NUNBOX32)
-+    fi
-     ;;
- esac
- 
 @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
   * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
   * is defined before <stdint.h> is included. */

Modified: head/www/firefox-i18n/Makefile
==============================================================================
--- head/www/firefox-i18n/Makefile	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/www/firefox-i18n/Makefile	Fri Sep  7 22:10:01 2012	(r303831)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox-i18n
-PORTVERSION=	15.0
+PORTVERSION=	15.0.1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	firefox/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=

Modified: head/www/firefox-i18n/distinfo
==============================================================================
--- head/www/firefox-i18n/distinfo	Fri Sep  7 21:34:03 2012	(r303830)
+++ head/www/firefox-i18n/distinfo	Fri Sep  7 22:10:01 2012	(r303831)
@@ -1,164 +1,164 @@
-SHA256 (xpi/firefox-i18n-15.0/af.xpi) = f652460b46fff68cd30838f0cb74238ed8f5030c800cad9583b679300baceaff
-SIZE (xpi/firefox-i18n-15.0/af.xpi) = 268863
-SHA256 (xpi/firefox-i18n-15.0/ak.xpi) = 9ce143f0898729fdc59e93a48933c5214b07c757260c7d5aa59203220cbacb77
-SIZE (xpi/firefox-i18n-15.0/ak.xpi) = 271019
-SHA256 (xpi/firefox-i18n-15.0/ar.xpi) = 12bd8823d685addefd89717b27c8c764755f90b63e9a349aa603874fd047aa2e
-SIZE (xpi/firefox-i18n-15.0/ar.xpi) = 298350
-SHA256 (xpi/firefox-i18n-15.0/ast.xpi) = 3ad8dc0d1759ba552a21a558b2aeab1dc5cd0a36a1fe5eb92a0903ccf1c74895
-SIZE (xpi/firefox-i18n-15.0/ast.xpi) = 248048
-SHA256 (xpi/firefox-i18n-15.0/be.xpi) = 847b04a2dd75175a973a8652073825a11a15cef99800bb6f61d1607eaedec0ff
-SIZE (xpi/firefox-i18n-15.0/be.xpi) = 271387
-SHA256 (xpi/firefox-i18n-15.0/bg.xpi) = 76ce8f9da1900639e6dff04657e303051ba62471a23b47ee7cd171ae5e95ee14
-SIZE (xpi/firefox-i18n-15.0/bg.xpi) = 312374
-SHA256 (xpi/firefox-i18n-15.0/bn-BD.xpi) = 2ad67707b0c9142e24af31ec0acc499dd20dabd04be785254f07e0f4d71458ec

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209072210.q87MA2po071935>