Date: Fri, 8 Jun 2012 14:21:12 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r739 - in branches/experimental/www/firefox-nightly: . files Message-ID: <201206081421.q58ELCX4007879@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jun 8 14:21:12 2012
New Revision: 739
Log:
add Nightly
Added:
branches/experimental/www/firefox-nightly/
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox-nightly/Makefile.webplugins
branches/experimental/www/firefox-nightly/distinfo
branches/experimental/www/firefox-nightly/files/
branches/experimental/www/firefox-nightly/files/extra-libevent2-patch-configure.in
branches/experimental/www/firefox-nightly/files/firefox.desktop.in
branches/experimental/www/firefox-nightly/files/mozconfig-profile_guided_optimization.in
branches/experimental/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp
branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in
branches/experimental/www/firefox-nightly/files/patch-build_unix_run-mozilla.sh
branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in
branches/experimental/www/firefox-nightly/files/patch-config_config.mk
branches/experimental/www/firefox-nightly/files/patch-config_mkdepend_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-configure.in
branches/experimental/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h
branches/experimental/www/firefox-nightly/files/patch-db_sqlite3_src_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-gfx-qcms-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h
branches/experimental/www/firefox-nightly/files/patch-gfx-thebes-gfxPlatform.cpp
branches/experimental/www/firefox-nightly/files/patch-gfx-ycbcr-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-dir_reader_linux.h
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-file_util_linux.cc
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-file_util_posix.cc
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-platform_file_posix.cc
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-platform_thread_posix.cc
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-time_posix.cc
branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-build-build_config.h
branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-js-src-config-mkdepend_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk
branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in
branches/experimental/www/firefox-nightly/files/patch-js-src-jscpucfg.h
branches/experimental/www/firefox-nightly/files/patch-js_src_jsnum.cpp
branches/experimental/www/firefox-nightly/files/patch-layout_generic_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-libcxx-revert-bug519601
branches/experimental/www/firefox-nightly/files/patch-media-libsydneyaudio-include-sydney_audio.h
branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.c
branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.h
branches/experimental/www/firefox-nightly/files/patch-nsprpub-pr-include-md_freebsd.cfg
branches/experimental/www/firefox-nightly/files/patch-nsprpub-pr-include-md_freebsd.h
branches/experimental/www/firefox-nightly/files/patch-revert-bug736066
branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-Makefile
branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
branches/experimental/www/firefox-nightly/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-toolkit_xre_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-tools-profiler-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-tools-profiler-platform-linux.cc
branches/experimental/www/firefox-nightly/files/patch-webapprt-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp
branches/experimental/www/firefox-nightly/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
branches/experimental/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp
branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp
branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
branches/experimental/www/firefox-nightly/pkg-descr
branches/experimental/www/firefox-nightly/pkg-message
Added: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/Makefile Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,163 @@
+# New ports collection makefile for: phoenix
+# Date created: 2002/10/21
+# Whom: Alan Eldridge <alane@FreeBSD.org>
+#
+# $FreeBSD: ports/www/firefox/Makefile,v 1.269 2012/06/06 07:55:46 beat Exp $
+#
+
+PORTNAME= firefox
+PORTVERSION= 16.0.${HGREV:C/:.*//}
+PORTEPOCH= 1
+CATEGORIES= www ipv6
+MASTER_SITES= http://hg.mozilla.org/mozilla-central/archive/
+PKGNAMESUFFIX= ${MOZILLA_SUFX}
+DISTNAME= ${HGREV:C/.*://}
+DIST_SUBDIR= ${MOZILLA}
+
+MAINTAINER= gecko@FreeBSD.org
+COMMENT= Web browser based on the browser portion of Mozilla
+
+BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
+ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
+ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+ unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
+
+CONFLICTS_BUILD= spidermonkey-*
+
+USE_AUTOTOOLS= autoconf213
+USE_PYTHON_BUILD=yes
+USE_GECKO= gecko
+MOZ_PKGCONFIG_FILES= # empty
+USE_MOZILLA= -nss -dbm -vpx
+MOZILLA_NAME= Nightly
+MOZILLA_SUFX= -nightly
+MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
+MOZ_TOOLKIT= cairo-gtk2
+
+MAKE_JOBS_SAFE= yes
+WANT_GNOME= yes
+ALL_TARGET= default
+CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
+EXTRA_CFLAGS= -O2
+HAS_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GL= gl
+NO_MOZPKGINSTALL=yes
+
+FIREFOX_ICON= ${MOZILLA}.png
+FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
+MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
+ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+ --enable-application=browser \
+ --disable-updater \
+ --disable-necko-wifi
+
+OPTIONS_DEFINE= PGO
+PGO_DESC= Enable Profile-Guided Optimization
+
+HGREV= 96037:7e4c2abb9fc9
+
+.include <bsd.port.pre.mk>
+
+.if empty(CXX:M*clang++*) && ${OSVERSION} > 900000
+USE_GCC= 4.6+
+.endif
+
+WRKSRC:= ${WRKSRC}-central-${HGREV:C/.*://}
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_GNOME+= libgnomeui
+MOZ_OPTIONS+= --enable-gnomeui
+.else
+MOZ_OPTIONS+= --disable-gnomeui
+.endif
+
+.if ${PORT_OPTIONS:MPGO}
+BROKEN= does not build with PGO option enabled
+USE_DISPLAY= yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+
+MAKEFILE= client.mk
+ALL_TARGET= profiledbuild
+.endif
+
+.if ${ARCH} == amd64 || ${ARCH} == i386
+BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
+.endif
+
+.if ${CXXFLAGS:M-stdlib=libc++}
+CXXABI= -lcxxrt
+.else
+CXXABI= # implied
+.endif
+
+pre-extract:
+.if ${PORT_OPTIONS:MPGO}
+ @${ECHO} "*****************************************************************"
+ @${ECHO} "**************************** attention **************************"
+ @${ECHO} "*****************************************************************"
+ @${ECHO} "To build Firefox with PGO support you need a running X server and"
+ @${ECHO} " build this port with an user who could access the X server! "
+ @${ECHO} ""
+ @${ECHO} "During the build a Firefox instance will start and run some test."
+ @${ECHO} " Do not interrupt or close Firefox during this tests! "
+ @${ECHO} "*****************************************************************"
+ @sleep 10
+.endif
+
+post-extract:
+ @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
+ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
+ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
+
+post-patch:
+ @${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
+ -e 's|/proc/self/fd|/dev/fd|' \
+ -e 's|/proc["/]|/compat/linux&|'
+ ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ -e 's|%%CXXABI%%|${CXXABI}|' \
+ ${WRKSRC}/storage/build/Makefile.in \
+ ${WRKSRC}/toolkit/library/Makefile.in \
+ ${WRKSRC}/db/sqlite3/src/Makefile.in
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/browser/app/nsBrowserApp.cpp \
+ ${WRKSRC}/security/manager/ssl/src/Makefile.in \
+ ${WRKSRC}/js/src/config/mkdepend/Makefile.in \
+ ${WRKSRC}/js/src/config/config.mk \
+ ${WRKSRC}/config/mkdepend/Makefile.in \
+ ${WRKSRC}/config/config.mk \
+ ${WRKSRC}/xpcom/io/nsAppFileLocationProvider.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}/js/src/configure.in
+
+pre-configure:
+ (cd ${WRKSRC} && ${AUTOCONF})
+ (cd ${WRKSRC}/js/src/ && ${AUTOCONF})
+
+post-configure:
+.if ${PORT_OPTIONS:MPGO}
+ @${SED} -e 's|@PYTHON@|${PYTHON_CMD}|' \
+ <${FILESDIR}/mozconfig-profile_guided_optimization.in \
+ >> ${BUILD_WRKSRC}/.mozconfig
+ (cd ${WRKSRC} && ${GMAKE} distclean)
+.endif
+
+port-pre-install:
+ ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
+ ${ECHO_CMD} "@exec mkdir -p %D/include/firefox/nss" >> ${PLISTD}
+ ${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
+ ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
+
+post-install:
+ ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
+ ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default
+ ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
+ @${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>
Added: branches/experimental/www/firefox-nightly/Makefile.webplugins
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/Makefile.webplugins Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,226 @@
+#-*- mode: makefile; tab-width: 4; -*
+# ex:ts=4
+#
+# New ports collection makefile for: npapi infrastructure
+# Date created: 27 June 2006
+# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
+#
+# $FreeBSD: ports/www/firefox/Makefile.webplugins,v 1.1 2009/01/10 02:45:41 mezz Exp $
+# $MCom: ports-stable/www/firefox/Makefile.webplugins,v 1.14 2008/11/12 17:55:09 mezz Exp $
+#
+
+# MAINTAINER= gnome@FreeBSD.org
+#
+# Documentation and examples:
+#
+# Makefile.webplugins will create symlinks automatically for each supported
+# applications that supports the webplugins framework. Also, it will remove
+# these symlinks when the plug-in port is uninstalled.
+#
+# USE_WEBPLUGINS - Specify a list of application(s) that this plug-in
+# port supports. For each of these applications, a
+# symlink will be created in
+# lib/browser_plugins/symlinks. See
+# WEBPLUGINS_APPS_ALL_* below for the list of
+# supported applications.
+# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all
+# applications)
+#
+# WEBPLUGINS_NAME - If your port installs file(s) in ${WEBPLUGINS_DIR},
+# then you can tweak WEBPLUGINS_NAME to change the
+# name of the directory
+# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME).
+# Default: WEBPLUGINS_NAME=${PKGBASE}
+#
+# WEBPLUGINS_FILES - The plug-in file(s) that are going to be linked
+# in lib/browser_plugins/symlinks/*/. It cannot
+# be empty or the port will set IGNORE.
+#
+# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be
+# found. Each plug-in file in WEBPLUGINS_FILES
+# must be found in WEBPLUGINS_DIR. If your port
+# does not install in WEBPLUGINS_DIR, but in its own
+# path. You will need to specify that here or
+# symlinks will be created to non-existent files.
+# Default: WEBPLUGINS_DIR?=${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME}
+#
+#
+# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any
+# of the following:
+#
+# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.)
+# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2)
+# USE_WEBPLUGINS=linux (Supports linux-*)
+# USE_WEBPLUGINS=opera webkit-gtk2
+#
+# Example to add in Makefile and pkg-plist if the plug-in file(s) install in
+# WEBPLUGINS_DIR, and if your port does this manually:
+#
+# Makefile:
+# ------------------------------------------------------
+# [...]
+# USE_WEBPLUGINS=gecko*
+# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi
+#
+# .include <bsd.port.pre.mk>
+# .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
+#
+# post-install:
+# ${MKDIR} ${WEBPLUGINS_DIR}
+# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \
+# ${WEBPLUGINS_DIR}
+#
+# .include <bsd.port.post.mk>
+# ------------------------------------------------------
+#
+# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks
+# in pkg-plist, because they will be removed automatically.
+#
+# pkg-plist:
+# ------------------------------------------------------
+# [...]
+# %%WEBPLUGINS_DIR%%/fooplugin.so
+# %%WEBPLUGINS_DIR%%/fooplugin.xpi
+# @dirrmtry %%WEBPLUGINS_DIR%%
+# ------------------------------------------------------
+#
+# Here is what it will look like when it creates the symlinks:
+#
+# ------------------------------------------------------
+# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so
+# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi
+# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so
+# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi
+# ------------------------------------------------------
+#
+# If your port uses libtool, and installs any *.a and *.la files, do not add
+# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and
+# *.xpi ONLY.
+#
+# Example to add in Makefile and pkg-plist if your port installs plug-ins in
+# its own directory, and you need to set WEBPLUGINS_DIR.
+#
+# Makefile:
+# ------------------------------------------------------
+# [...]
+# USE_WEBPLUGINS=gecko*
+# WEBPLUGINS_DIR=#{PREFIX}/lib/application
+# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi
+#
+# .include <bsd.port.pre.mk>
+# .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
+#
+# [...]
+#
+# .include <bsd.port.post.mk>
+# ------------------------------------------------------
+#
+# As for the pkg-plist, it should only include the actual files your
+# port installs:
+#
+# pkg-plist:
+# ------------------------------------------------------
+# [...]
+# lib/application/fooplugin.a
+# lib/application/fooplugin.la
+# lib/application/fooplugin.so
+# lib/application/fooplugin.xpi
+# @dirrm lib/application
+# ------------------------------------------------------
+#
+# Here is what it will look like when it creates symlinks:
+#
+# ------------------------------------------------------
+# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so
+# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi
+# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so
+# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi
+# ------------------------------------------------------
+
+WEBPLUGINS_NAME?= ${PKGBASE}
+WEBPLUGINS_FILES?= empty
+WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \
+ linux-flock-devel linux-mozilla \
+ linux-nvu linux-opera linux-opera-devel \
+ linux-seamonkey linux-seamonkey-devel \
+ linux-sunbird linux-sunbird-devel
+WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2
+WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \
+ ${WEBPLUGINS_APPS_ALL_NATIVE}
+
+.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \
+ ${USE_WEBPLUGINS} == "*"
+USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL}
+.endif
+
+.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \
+ ${WEBPLUGINS_FILES} == ""
+IGNORE= cannot install: the WEBPLUGINS_FILES is empty, please add plugins file in it and see in www/firefox/Makefile.webplugins for document
+.endif
+
+.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL}
+_TEMP_APP_=${_TEMP_APP__}
+_TEMP_FLAG_=0
+. for _TEMP_USE__ in ${USE_WEBPLUGINS}
+_TEMP_USE_=${_TEMP_USE__}
+. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \
+ ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \
+ ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} )
+_TEMP_FLAG_=1
+. endif
+. endfor
+. if ${_TEMP_FLAG_}
+USE_WEBPLUGINS_EXP+= ${_TEMP_APP__}
+. endif
+.endfor
+
+WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*}
+WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.}
+WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS}
+
+WEBPLUGINS_LIBDIR= ${PREFIX}/lib/browser_plugins
+WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks
+WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME}
+
+PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}"
+
+_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,}
+_Q= 2>/dev/null || true
+_WLD= ${WEBPLUGINS_LIBDIR:S,^${PREFIX},%D,}
+_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,}
+_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,}
+
+webplugins-post-install:
+ @if [ ! -d ${WEBPLUGINS_DIR} ]; then \
+ ${ECHO_CMD}; \
+ ${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \
+ ${ECHO_CMD}; \
+ else \
+ for _f in ${WEBPLUGINS_FILES}; do \
+ if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \
+ ${ECHO_CMD}; \
+ ${ECHO_CMD} "ERROR: The \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \
+ ${ECHO_CMD}; \
+ fi; \
+ done; \
+ fi; \
+ for _d in ${WEBPLUGINS_LINKFARMS}; do \
+ ${INSTALL} -d $${_d}; \
+ for _l in ${_LNWF}; do \
+ ${LN} -sf $${_l} $${_d}/ ${_Q}; \
+ done; \
+ done; \
+ for _d in ${_WLF}; do \
+ ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \
+ for _l in ${_LNWF}; do \
+ ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \
+ done; \
+ for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \
+ ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \
+ done; \
+ ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \
+ done
+ @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST}
+ @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST}
+
+post-install: webplugins-post-install
Added: branches/experimental/www/firefox-nightly/distinfo
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/distinfo Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,2 @@
+SHA256 (firefox-nightly/7e4c2abb9fc9.tar.bz2) = 5f7e8662ca72b9d71737d23dd50371c6d8beac952cab40ad6c068470f4b3407f
+SIZE (firefox-nightly/7e4c2abb9fc9.tar.bz2) = 81757412
Added: branches/experimental/www/firefox-nightly/files/extra-libevent2-patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/extra-libevent2-patch-configure.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,27 @@
+--- configure.in.orig 2010-11-04 21:05:18.000000000 +0100
++++ configure.in 2010-11-09 12:59:28.000000000 +0100
+@@ -4019,17 +4019,17 @@ else
+ if test "${LIBEVENT_DIR}" = "yes"; then
+ LIBEVENT_DIR=/usr
+ fi
+- CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
+- LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
++ CFLAGS="-I${LIBEVENT_DIR}/include/event2 -I${LIBEVENT_DIR}/include/event2/compat $CFLAGS"
++ LDFLAGS="-L${LIBEVENT_DIR}/lib/event2 $LDFLAGS"
+ MOZ_CHECK_HEADER(event.h,
+- [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then
+- AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include])
++ [if test ! -f "${LIBEVENT_DIR}/include/event2/event.h"; then
++ AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include/event2])
+ fi],
+ AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+- AC_CHECK_LIB(event, event_init,
++ AC_CHECK_LIB(event-2.0, event_init,
+ [MOZ_NATIVE_LIBEVENT=1
+- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
+- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
++ MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include/event2 ${LIBEVENT_DIR}/include/event2/compat"
++ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib/event2 -levent-2.0"],
+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
+ CFLAGS=$_SAVE_CFLAGS
Added: branches/experimental/www/firefox-nightly/files/firefox.desktop.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/firefox.desktop.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,191 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=@MOZILLA_NAME@ Web Browser
+Name[am]=
+Name[ar]=
+Name[az]=@MOZILLA_NAME@ Veb Səyyahı
+Name[be]=
+Name[bg]=Интернет браузър @MOZILLA_NAME@
+Name[bn]=
+Name[bs]=@MOZILLA_NAME@ web preglednik
+Name[ca]=Navegador web @MOZILLA_NAME@
+Name[cs]=Prohlížeč WWW @MOZILLA_NAME@
+Name[cy]=Y Porwr Gwe @MOZILLA_NAME@
+Name[da]=@MOZILLA_NAME@ - internetsurfning
+Name[de]=@MOZILLA_NAME@ Webbrowser
+Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@
+Name[en_CA]=@MOZILLA_NAME@ Web Browser
+Name[en_GB]=@MOZILLA_NAME@ Web Browser
+Name[es]=Navegador Web @MOZILLA_NAME@
+Name[et]=@MOZILLA_NAME@ veebibrauser
+Name[eu]=@MOZILLA_NAME@ web arakatzailea
+Name[fi]=@MOZILLA_NAME@, WWW-selain
+Name[fr]=Navigateur Web @MOZILLA_NAME@
+Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@
+Name[gu]=એપીફની વૅબ બ્રાઉઝર
+Name[he]=דפדפן @MOZILLA_NAME@
+Name[hi]=
+Name[hr]=@MOZILLA_NAME@ Web preglednik
+Name[hu]=@MOZILLA_NAME@ webböngésző
+Name[id]=Web Browser @MOZILLA_NAME@
+Name[it]=Browser web @MOZILLA_NAME@
+Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ
+Name[ko]=@MOZILLA_NAME@ 웹 브라우저
+Name[li]=@MOZILLA_NAME@ Web Browser
+Name[lt]=@MOZILLA_NAME@ web naršyklė
+Name[mk]=@MOZILLA_NAME@ веб прелистувач
+Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസര്
+Name[mn]=@MOZILLA_NAME@ веб хөтөч
+Name[ms]=Pelungsur Web @MOZILLA_NAME@
+Name[nb]=@MOZILLA_NAME@ nettleser
+Name[nl]=@MOZILLA_NAME@ Webbrowser
+Name[nn]=@MOZILLA_NAME@ nettlesar
+Name[no]=@MOZILLA_NAME@ nettleser
+Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+Name[pl]=Przeglądarka WWW @MOZILLA_NAME@
+Name[pt]=Navegador Web @MOZILLA_NAME@
+Name[pt_BR]=Navegador Web @MOZILLA_NAME@
+Name[ro]=Navigatorul @MOZILLA_NAME@
+Name[ru]=Веб-браузер @MOZILLA_NAME@
+Name[sk]=
+Name[sl]=Spletni brskalnik @MOZILLA_NAME@
+Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web
+Name[sr]=
+Name[sr@Latn]=Veb čitač Spoznaja
+Name[sv]=Webbläsaren @MOZILLA_NAME@
+Name[ta]=எபிபனி வலை உலாவி
+Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi
+Name[tr]=@MOZILLA_NAME@ Web Tarayıcı
+Name[uk]=Переглядач web @MOZILLA_NAME@
+Name[vi]=Trình Duyệt Web @MOZILLA_NAME@
+Name[wa]=Betchteu waibe epiphany
+Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器
+Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器
+GenericName=Web Browser
+GenericName[ar]=متصفّح الانترنت
+GenericName[az]=Veb Səyyahı
+GenericName[be]=Вандроўнік па павуціньню
+GenericName[bg]=Браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[bs]=Web preglednik
+GenericName[ca]=Navegador web
+GenericName[cs]=Prohlížeč WWW
+GenericName[cy]=Porwr Gwe
+GenericName[da]=Internetsurfning
+GenericName[de]=Webbrowser
+GenericName[el]=Περιηγητής Ιστοσελίδων
+GenericName[en_CA]=Web Browser
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebilehitseja
+GenericName[eu]=Web arakatzailea
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web @MOZILLA_NAME@
+GenericName[ga]=Brabhsálaí Lín
+GenericName[gu]=વેબ બ્રાઉઝર
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[id]=Browser Web
+GenericName[it]=Browser web
+GenericName[ja]=GNOME ウェブ・ブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[li]=Wèb Browser
+GenericName[lt]=Web naršyklė
+GenericName[mk]=Веб прелистувач
+GenericName[mn]=Веб хөтөч
+GenericName[ms]=Pelungsur Web
+GenericName[nb]=Nettleser
+GenericName[nl]=Web-browser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ro]=Navigator Internet
+GenericName[ru]=Веб-браузер
+GenericName[sk]=WWW prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sq]=Shfletuesi Web
+GenericName[sr]=Веб читач
+GenericName[sr@Latn]=Veb čitač
+GenericName[sv]=Webbläsare
+GenericName[ta]=வலை உலாவி
+GenericName[th]=เว็บบราวเซอร์
+GenericName[tk]=Web Ahtarçysy
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Переглядач web-сторінок
+GenericName[vi]=Trình duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[zh_CN]=Web 浏览器
+GenericName[zh_TW]=網頁瀏覽器
+Comment=Browse the web
+Comment[ar]=تصفح الانترنت
+Comment[az]=Vebi gəzin
+Comment[be]=Вандраваць па павуціньню
+Comment[bg]=Сърфиране в интернет
+Comment[bn]=ওয়েব ব্রাউজ করুন
+Comment[bs]=Pregledaj na internetu
+Comment[ca]=Navegueu per la web
+Comment[cs]=Prohlížet WWW
+Comment[cy]=Pori'r we
+Comment[da]=Surf på internettet
+Comment[de]=Im Web surfen
+Comment[el]=Περιήγηση στον παγκόσμιο ιστό
+Comment[en_CA]=Browse the web
+Comment[en_GB]=Browse the web
+Comment[es]=Navegar por la web
+Comment[et]=Sirvi veebi
+Comment[eu]=Arakatu web-a
+Comment[fi]=Selaa WWW:tä
+Comment[fr]=Naviguer sur Internet
+Comment[ga]=Brabhsáil an Líon
+Comment[gu]=વેબમાં શોધો
+Comment[he]=גלוש ברשת
+Comment[hi]=वेब ब्राउज़ करें
+Comment[hr]=Pregledaj Web
+Comment[hu]=A világháló böngészése
+Comment[id]=Jelajah web
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[li]=Blajere op internet
+Comment[lt]=Naršyti internete
+Comment[mk]=Прелистувајте на веб
+Comment[ml]=വലക്കെട്ട് തിരയുക
+Comment[mn]=Веб броузе хийх
+Comment[ms]=Layari web
+Comment[nb]=Surf på nettet
+Comment[nl]=Websurfen
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼
+Comment[pl]=Przeglądanie stron WWW
+Comment[pt]=Navegar na web
+Comment[pt_BR]=Navegar na web
+Comment[ro]=Navigare Internet
+Comment[ru]=Веб-браузер
+Comment[sk]=Prehliadať internet
+Comment[sl]=Brskaj po spletu
+Comment[sq]=Eksploro web-in
+Comment[sr]=Прегледај веб
+Comment[sr@Latn]=Pregledaj veb
+Comment[sv]=Surfa på nätet
+Comment[ta]=வலையில் உலாவு
+Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@
+Comment[tk]=Webi Ahtar
+Comment[tr]=Web'e Gözat
+Comment[uk]=Програма перегляду web-сторінок
+Comment[vi]=Duyệt web
+Comment[wa]=Naivyî avå les waibes
+Comment[zh_CN]=浏览 Web
+Comment[zh_TW]=瀏覽網頁
+Exec=@MOZILLA@ %u
+Icon=@FIREFOX_ICON@
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Application;Network;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
Added: branches/experimental/www/firefox-nightly/files/mozconfig-profile_guided_optimization.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/mozconfig-profile_guided_optimization.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1 @@
+mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ $(OBJDIR)/_profile/pgo/profileserver.py'
Added: branches/experimental/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,10 @@
+--- browser/app/nsBrowserApp.cpp~
++++ browser/app/nsBrowserApp.cpp
+@@ -197,6 +197,7 @@ int main(int argc, char* argv[])
+ TriggerQuirks();
+ #endif
+
++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0);
+ nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
+ if (NS_FAILED(rv)) {
+ Output("Couldn't calculate the application directory.\n");
Added: branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,24 @@
+--- browser/installer/package-manifest.in~
++++ browser/installer/package-manifest.in
+@@ -58,9 +58,11 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Added: branches/experimental/www/firefox-nightly/files/patch-build_unix_run-mozilla.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-build_unix_run-mozilla.sh Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,12 @@
+--- build/unix/run-mozilla.sh.orig Tue Feb 14 19:56:54 2006
++++ build/unix/run-mozilla.sh Fri Dec 8 15:49:48 2006
+@@ -443,6 +443,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/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox
++export MOZ_PLUGIN_PATH
++
+ if [ $moz_debug -eq 1 ]
+ then
+ moz_debug_program ${1+"$@"}
Added: branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,30 @@
+--- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200
++++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200
+@@ -57,14 +57,14 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir = @includedir@/%%MOZILLA%%
+ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = $(datadir)/idl/%%MOZILLA%%
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/%%MOZILLA%%
++sdkdir = $(libdir)/%%MOZILLA%%
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
+@@ -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@
Added: branches/experimental/www/firefox-nightly/files/patch-config_config.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-config_config.mk Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,10 @@
+--- config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200
++++ config/config.mk 2009-08-09 20:50:05.000000000 +0200
+@@ -506,6 +506,7 @@
+ -I$(srcdir) \
+ -I. \
+ -I$(DIST)/include -I$(DIST)/include/nsprpub \
++ -I%%LOCALBASE%%/include \
+ $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
+ $(OS_INCLUDES) \
+ $(NULL)
Added: branches/experimental/www/firefox-nightly/files/patch-config_mkdepend_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-config_mkdepend_Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,12 @@
+--- config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100
++++ config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100
+@@ -71,7 +71,8 @@
+
+ include $(topsrcdir)/config/rules.mk
+
+-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += $(XCFLAGS)
+
+ ifdef GNU_CC
+ _GCCDIR = $(shell $(CC) -print-file-name=include)
Added: branches/experimental/www/firefox-nightly/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-configure.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,69 @@
+--- configure.in.orig 2010-11-04 21:05:18.000000000 +0100
++++ configure.in 2010-11-09 12:59:28.000000000 +0100
+@@ -1549,7 +1549,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+
+@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+- x86_64|i?86)
++ amd64|x86_64|i?86)
+ INTEL_ARCHITECTURE=1
+ esac
+
+@@ -4218,6 +4218,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
+@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
+ ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
+ ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
+ fi
+@@ -6022,6 +6024,14 @@
+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+ ;;
++ FreeBSD:i386)
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ ;;
+ SunOS:x86)
+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+ VPX_X86_ASM=1
+@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+ LIBJPEG_TURBO_X64_ASM=1
+ ;;
++ FreeBSD:i386)
++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++ LIBJPEG_TURBO_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++ LIBJPEG_TURBO_X64_ASM=1
++ ;;
+ SunOS:i?86)
+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+ LIBJPEG_TURBO_X86_ASM=1
Added: branches/experimental/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200
++++ content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200
+@@ -54,7 +54,7 @@
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+-#ifdef __alpha__
++#if !defined(__amd64__) && !defined(__i386__)
+ 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;
Added: branches/experimental/www/firefox-nightly/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-db_sqlite3_src_Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000
++++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000
+@@ -45,6 +45,8 @@
+
+ include $(DEPTH)/config/autoconf.mk
+
++OS_CFLAGS = -I../../../dist/include/sqlite3
++OS_LIBS = %%PTHREAD_LIBS%% -lc
+ MODULE = sqlite3
+ LIBRARY_NAME = sqlite3
+ FORCE_SHARED_LIB = 1
Added: branches/experimental/www/firefox-nightly/files/patch-gfx-qcms-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-gfx-qcms-Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100
++++ gfx/qcms/Makefile.in 2011-01-27 18:16:39.000000000 +0100
+@@ -15,7 +15,7 @@
+
+ CSRCS = iccread.c transform.c
+
+-ifeq (86,$(findstring 86,$(OS_TEST)))
++ifneq (,$(INTEL_ARCHITECTURE))
+ CSRCS += transform-sse2.c
+ ifdef _MSC_VER
+ ifneq ($(OS_ARCH)_$(OS_TEST),WINNT_x86_64)
Added: branches/experimental/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100
++++ 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 <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
++#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED)
+ typedef PRUptrdiff uintptr_t;
+ #endif
+ #endif
Added: branches/experimental/www/firefox-nightly/files/patch-gfx-thebes-gfxPlatform.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-gfx-thebes-gfxPlatform.cpp Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,34 @@
+--- gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000
++++ gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000
+@@ -446,6 +446,7 @@
+ static_cast<SourceSurface*>(srcBuffer)->Release();
+ }
+
++#ifdef MOZ_TREE_CAIRO
+ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+ {
+ gfxImageSurface* origSurf =
+@@ -453,6 +454,7 @@
+
+ origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
++#endif
+
+ RefPtr<SourceSurface>
+ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
+@@ -522,6 +524,7 @@
+ imgSurface->Stride(),
+ format);
+
++ #ifdef MOZ_TREE_CAIRO
+ cairo_surface_t *nullSurf =
+ cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
+ cairo_surface_set_user_data(nullSurf,
+@@ -530,6 +533,7 @@
+ NULL);
+ cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+ cairo_surface_destroy(nullSurf);
++ #endif
+ }
+
+ srcBuffer->AddRef();
Added: branches/experimental/www/firefox-nightly/files/patch-gfx-ycbcr-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-gfx-ycbcr-Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,21 @@
+--- gfx/ycbcr/Makefile.in~
++++ gfx/ycbcr/Makefile.in
+@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux)
+ CPPSRCS += yuv_row_posix.cpp \
+ $(NULL)
+ else
++ifeq ($(OS_ARCH),FreeBSD)
++CPPSRCS += yuv_row_posix.cpp \
++ $(NULL)
++else
+ ifeq ($(OS_ARCH),SunOS)
+ CPPSRCS += yuv_row_posix.cpp \
+ $(NULL)
+@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \
+ $(NULL)
+ endif # Darwin
+ endif # SunOS
++endif # FreeBSD
+ endif # linux
+ endif # windows
+
\ No newline at end of file
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,10 @@
+--- ipc/chromium/src/base/atomicops_internals_mutex.cc~
++++ ipc/chromium/src/base/atomicops_internals_mutex.cc
+@@ -39,6 +39,7 @@
+ * ***** END LICENSE BLOCK ***** */
+
+ #include "base/atomicops.h"
++#include "base/lock.h"
+
+ namespace base {
+ namespace subtle {
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-dir_reader_linux.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-dir_reader_linux.h Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,45 @@
+--- ipc/chromium/src/base/dir_reader_linux.h.orig 2011-12-16 21:29:22.000000000 +0100
++++ ipc/chromium/src/base/dir_reader_linux.h 2011-12-19 21:00:27.000000000 +0100
+@@ -9,6 +9,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdint.h>
++#include <sys/dirent.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+
+@@ -19,6 +20,8 @@
+
+ namespace base {
+
++#define linux_dirent struct dirent
++#if 0
+ struct linux_dirent {
+ uint64_t d_ino;
+ int64_t d_off;
+@@ -26,11 +29,16 @@
+ unsigned char d_type;
+ char d_name[0];
+ };
++#endif
+
+ class DirReaderLinux {
+ public:
+ explicit DirReaderLinux(const char* directory_path)
++#ifdef O_DIRECTORY
+ : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)),
++#else
++ : fd_(open(directory_path, O_RDONLY)),
++#endif
+ offset_(0),
+ size_(0) {
+ memset(buf_, 0, sizeof(buf_));
+@@ -57,7 +65,7 @@
+ if (offset_ != size_)
+ return true;
+
+- const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
++ const int r = syscall(SYS_getdents, fd_, buf_, sizeof(buf_));
+ if (r == 0)
+ return false;
+ if (r == -1) {
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-file_util_linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-file_util_linux.cc Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- ipc/chromium/src/base/file_util_linux.cc~
++++ ipc/chromium/src/base/file_util_linux.cc
+@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) {
+ #ifdef ANDROID
+ return GetTempDir(path);
+ #else
+- *path = FilePath("/dev/shm");
++ *path = FilePath("/tmp");
+ return true;
+ #endif
+ }
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-file_util_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-file_util_posix.cc Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- ipc/chromium/src/base/file_util_posix.cc~
++++ ipc/chromium/src/base/file_util_posix.cc
+@@ -30,6 +30,8 @@
+ #include "base/string_util.h"
+ #include "base/time.h"
+
++#define stat64 stat
++
+ namespace file_util {
+
+ #if defined(GOOGLE_CHROME_BUILD)
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-platform_file_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-platform_file_posix.cc Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,10 @@
+--- ipc/chromium/src/base/platform_file_posix.cc~
++++ ipc/chromium/src/base/platform_file_posix.cc
+@@ -9,6 +9,7 @@
+ #ifdef ANDROID
+ #include <linux/stat.h>
+ #endif
++#include <sys/stat.h>
+
+ #include "base/logging.h"
+ #include "base/string_util.h"
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-platform_thread_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,17 @@
+--- ipc/chromium/src/base/platform_thread_posix.cc~
++++ ipc/chromium/src/base/platform_thread_posix.cc
+@@ -38,7 +38,13 @@ PlatformThreadId PlatformThread::Current
+ // into the kernel.
+ #if defined(OS_MACOSX)
+ return mach_thread_self();
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) && __FreeBSD_version > 900030
++ return pthread_getthreadid_np();
++#elif defined(__FreeBSD__)
++ long tid;
++ syscall(SYS_thr_self, &tid);
++ return tid;
++#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ // TODO(BSD): find a better thread ID
+ return (intptr_t)(pthread_self());
+ #elif defined(OS_LINUX)
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-time_posix.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-time_posix.cc Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,10 @@
+--- ipc/chromium/src/base/time_posix.cc~
++++ ipc/chromium/src/base/time_posix.cc
+@@ -8,6 +9,7 @@
+ #include <mach/mach_time.h>
+ #endif
+ #include <sys/time.h>
++#include <unistd.h>
+ #ifdef ANDROID
+ #include <time64.h>
+ #else
Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-build-build_config.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-build-build_config.h Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- ipc/chromium/src/build/build_config.h~
++++ ipc/chromium/src/build/build_config.h
+@@ -17,7 +17,7 @@
+ // A set of macros to use for platform detection.
+ #if defined(__APPLE__)
+ #define OS_MACOSX 1
+-#elif defined(__linux__) || defined(ANDROID)
++#elif defined(__FreeBSD__) || defined(ANDROID)
+ #define OS_LINUX 1
+ #elif defined(_WIN32)
+ #define OS_WIN 1
Added: branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,30 @@
+--- js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100
++++ js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100
+@@ -358,7 +358,7 @@ CPPSRCS += ExecutableAllocatorOS2.cpp \
+ $(NONE)
+ endif
+
+-ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
++ifneq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU)))
+ ENABLE_YARR_JIT = 1
+
+ VPATH += $(srcdir)/assembler/assembler \
+@@ -418,6 +418,9 @@
+ else
+ #CPPSRCS += only_on_x86.cpp
+ endif
++ifeq (amd64, $(TARGET_CPU))
++#CPPSRCS += only_on_x86_64.cpp
++endif
+ endif
+ ifeq (arm, $(TARGET_CPU))
+ #CPPSRCS += only_on_arm.cpp
+@@ -737,7 +740,7 @@
+ endif # WINNT
+
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS += -pthread
++EXTRA_LIBS += -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),Linux)
+ EXTRA_LIBS += -ldl
Added: branches/experimental/www/firefox-nightly/files/patch-js-src-config-mkdepend_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-js-src-config-mkdepend_Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,12 @@
+--- js/src/config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100
++++ js/src/config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100
+@@ -71,7 +71,8 @@
+
+ include $(topsrcdir)/config/rules.mk
+
+-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += $(XCFLAGS)
+
+ ifdef GNU_CC
+ _GCCDIR = $(shell $(CC) -print-file-name=include)
Added: branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,10 @@
+--- js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200
++++ js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200
+@@ -506,6 +506,7 @@
+ -I$(srcdir) \
+ -I. \
+ -I$(DIST)/include -I$(DIST)/include/nsprpub \
++ -I%%LOCALBASE%%/include \
+ $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
+ $(OS_INCLUDES) \
+ $(NULL)
Added: branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,36 @@
+--- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100
++++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100
+@@ -1470,7 +1470,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-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
+
+@@ -2798,6 +2798,6 @@ i?86-*)
+ AC_DEFINE(JS_CPU_X86)
+ AC_DEFINE(JS_NUNBOX32)
+ ;;
+-x86_64*-*)
++amd64*-*|x86_64*-*)
+ ENABLE_METHODJIT=1
+ ENABLE_MONOIC=1
+@@ -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. */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+
+ #endif /* _JS_CONFDEFS_H_ */
+
Added: branches/experimental/www/firefox-nightly/files/patch-js-src-jscpucfg.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-js-src-jscpucfg.h Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,22 @@
+--- js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100
++++ js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100
+@@ -77,6 +77,19 @@
+ #define IS_BIG_ENDIAN 1
+ #endif
+
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++
++#if defined(BYTE_ORDER)
++#if BYTE_ORDER == LITTLE_ENDIAN
++#define IS_LITTLE_ENDIAN 1
++#undef IS_BIG_ENDIAN
++#elif BYTE_ORDER == BIG_ENDIAN
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#endif
++#endif
++
+ #elif defined(JS_HAVE_ENDIAN_H)
+ #include <endian.h>
+
Added: branches/experimental/www/firefox-nightly/files/patch-js_src_jsnum.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-js_src_jsnum.cpp Fri Jun 8 14:21:12 2012 (r739)
@@ -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
+@@ -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
Added: branches/experimental/www/firefox-nightly/files/patch-layout_generic_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-layout_generic_Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,15 @@
+--- layout/generic/Makefile.in~
++++ layout/generic/Makefile.in
+@@ -123,10 +123,11 @@ LOCAL_INCLUDES += \
+ -I$(srcdir)/../../dom/base \
+ -I$(srcdir)/../../dom/plugins/base \
+ -I$(srcdir)/../svg/base/src \
+- $(MOZ_CAIRO_CFLAGS) \
+ $(MOZ_PIXMAN_CFLAGS) \
+ $(NULL)
+
++CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++
+ ifdef MOZ_ENABLE_GTK2
+ CXXFLAGS += $(MOZ_GTK2_CFLAGS)
+ endif
Added: branches/experimental/www/firefox-nightly/files/patch-libcxx-revert-bug519601
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-libcxx-revert-bug519601 Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,118 @@
+changeset: 40752:cc5ace5d6ade
+user: Karl Tomlinson <karlt@mozbugz.karlt.net> and Chris Jones <jones.chris.g@gmail.com>
+date: Wed Apr 14 02:04:52 2010 -0500
+summary: Bug 519601: s/netscape/netsc@pe/ for plugin dso paths passed on the command line on linux. r=karlt
+
+diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp
+--- dom/plugins/ipc/PluginMessageUtils.cpp
++++ dom/plugins/ipc/PluginMessageUtils.cpp
+@@ -13,8 +13,6 @@
+ #include "PluginScriptableObjectParent.h"
+ #include "PluginScriptableObjectChild.h"
+
+-using std::string;
+-
+ using mozilla::ipc::RPCChannel;
+
+ namespace {
+@@ -82,44 +80,6 @@ MediateRace(const RPCChannel::Message& p
+ }
+ }
+
+-#if defined(OS_LINUX)
+-static string
+-ReplaceAll(const string& haystack, const string& needle, const string& with)
+-{
+- string munged = haystack;
+- string::size_type i = 0;
+-
+- while (string::npos != (i = munged.find(needle, i))) {
+- munged.replace(i, needle.length(), with);
+- i += with.length();
+- }
+-
+- return munged;
+-}
+-#endif
+-
+-string
+-MungePluginDsoPath(const string& path)
+-{
+-#if defined(OS_LINUX)
+- // https://bugzilla.mozilla.org/show_bug.cgi?id=519601
+- return ReplaceAll(path, "netscape", "netsc@pe");
+-#else
+- return path;
+-#endif
+-}
+-
+-string
+-UnmungePluginDsoPath(const string& munged)
+-{
+-#if defined(OS_LINUX)
+- return ReplaceAll(munged, "netsc@pe", "netscape");
+-#else
+- return munged;
+-#endif
+-}
+-
+-
+ PRLogModuleInfo* gPluginLog = PR_NewLogModule("IPCPlugins");
+
+ void
+diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h
+--- dom/plugins/ipc/PluginMessageUtils.h
++++ dom/plugins/ipc/PluginMessageUtils.h
+@@ -48,11 +48,6 @@ mozilla::ipc::RPCChannel::RacyRPCPolicy
+ MediateRace(const mozilla::ipc::RPCChannel::Message& parent,
+ const mozilla::ipc::RPCChannel::Message& child);
+
+-std::string
+-MungePluginDsoPath(const std::string& path);
+-std::string
+-UnmungePluginDsoPath(const std::string& munged);
+-
+ extern PRLogModuleInfo* gPluginLog;
+
+ const uint32_t kAllowAsyncDrawing = 0x1;
+diff --git a/dom/plugins/ipc/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp
+--- dom/plugins/ipc/PluginProcessChild.cpp
++++ dom/plugins/ipc/PluginProcessChild.cpp
+@@ -95,7 +95,7 @@ PluginProcessChild::Init()
+ std::vector<std::string> values = CommandLine::ForCurrentProcess()->argv();
+ NS_ABORT_IF_FALSE(values.size() >= 2, "not enough args");
+
+- pluginFilename = UnmungePluginDsoPath(values[1]);
++ pluginFilename = values[1];
+
+ #elif defined(OS_WIN)
+ std::vector<std::wstring> values =
+diff --git a/dom/plugins/ipc/PluginProcessParent.cpp b/dom/plugins/ipc/PluginProcessParent.cpp
+--- dom/plugins/ipc/PluginProcessParent.cpp
++++ dom/plugins/ipc/PluginProcessParent.cpp
+@@ -10,10 +10,6 @@
+ #include "base/process_util.h"
+
+ #include "mozilla/ipc/BrowserProcessSubThread.h"
+-#include "mozilla/plugins/PluginMessageUtils.h"
+-
+-using std::vector;
+-using std::string;
+
+ using mozilla::ipc::BrowserProcessSubThread;
+ using mozilla::ipc::GeckoChildProcessHost;
+@@ -73,8 +69,12 @@ PluginProcessParent::Launch(PRInt32 time
+ }
+ }
+
+- vector<string> args;
+- args.push_back(MungePluginDsoPath(mPluginFilePath));
++ std::vector<std::string> args;
++#if defined(XP_WIN)
++ args.push_back("\""+ mPluginFilePath +"\"");
++#else
++ args.push_back(mPluginFilePath);
++#endif
+ return SyncLaunch(args, timeoutMs, selectedArchitecture);
+ }
+
Added: branches/experimental/www/firefox-nightly/files/patch-media-libsydneyaudio-include-sydney_audio.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-media-libsydneyaudio-include-sydney_audio.h Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200
++++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200
+@@ -73,7 +73,7 @@
+ # endif
+ #elif defined(WIN32)
+ # define SA_LITTLE_ENDIAN 1
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ # if defined(__BIG_ENDIAN__)
+ # define SA_BIG_ENDIAN 1
+ # else
Added: branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.c Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,16 @@
+--- media/libvpx/vpx_config_c.c~
++++ media/libvpx/vpx_config_c.c
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
Added: branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-media-libvpx-vpx_config.h Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,16 @@
+--- media/libvpx/vpx_config.h~
++++ media/libvpx/vpx_config.h
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
Added: branches/experimental/www/firefox-nightly/files/patch-nsprpub-pr-include-md_freebsd.cfg
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-nsprpub-pr-include-md_freebsd.cfg Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,100 @@
+--- nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100
++++ nsprpub/pr/include/md/_freebsd.cfg 2010-12-23 17:34:44.000000000 +0100
+@@ -283,6 +283,97 @@
+ #define PR_ALIGN_OF_POINTER 8
+ #define PR_ALIGN_OF_WORD 8
+
++#elif defined(__powerpc64__)
++
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#define IS_64
++
++#define PR_BYTES_PER_BYTE 1
++#define PR_BYTES_PER_SHORT 2
++#define PR_BYTES_PER_INT 4
++#define PR_BYTES_PER_INT64 8
++#define PR_BYTES_PER_LONG 8
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 8
++#define PR_BYTES_PER_DWORD 8
++
++#define PR_BITS_PER_BYTE 8
++#define PR_BITS_PER_SHORT 16
++#define PR_BITS_PER_INT 32
++#define PR_BITS_PER_INT64 64
++#define PR_BITS_PER_LONG 64
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 64
++
++#define PR_BITS_PER_BYTE_LOG2 3
++#define PR_BITS_PER_SHORT_LOG2 4
++#define PR_BITS_PER_INT_LOG2 5
++#define PR_BITS_PER_INT64_LOG2 6
++#define PR_BITS_PER_LONG_LOG2 6
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 6
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 8
++#define PR_ALIGN_OF_INT64 8
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD 8
++
++#define PR_BYTES_PER_WORD_LOG2 3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#elif defined(__powerpc__)
++
++#undef IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++
++#define PR_BYTES_PER_BYTE 1
++#define PR_BYTES_PER_SHORT 2
++#define PR_BYTES_PER_INT 4
++#define PR_BYTES_PER_INT64 8
++#define PR_BYTES_PER_LONG 4
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 4
++#define PR_BYTES_PER_DWORD 8
++
++#define PR_BITS_PER_BYTE 8
++#define PR_BITS_PER_SHORT 16
++#define PR_BITS_PER_INT 32
++#define PR_BITS_PER_INT64 64
++#define PR_BITS_PER_LONG 32
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 32
++
++#define PR_BITS_PER_BYTE_LOG2 3
++#define PR_BITS_PER_SHORT_LOG2 4
++#define PR_BITS_PER_INT_LOG2 5
++#define PR_BITS_PER_INT64_LOG2 6
++#define PR_BITS_PER_LONG_LOG2 5
++#define PR_BITS_PER_FLOAT_LOG2 5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2 5
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 4
++#define PR_ALIGN_OF_INT64 8
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 8
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD 4
++
++#define PR_BYTES_PER_WORD_LOG2 2
++#define PR_BYTES_PER_DWORD_LOG2 3
++
+ #else
+
+ #error "Unknown CPU architecture"
Added: branches/experimental/www/firefox-nightly/files/patch-nsprpub-pr-include-md_freebsd.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-nsprpub-pr-include-md_freebsd.h Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,30 @@
+--- nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100
++++ nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100
+@@ -57,6 +57,10 @@
+ #define _PR_SI_ARCHITECTURE "ia64"
+ #elif defined(__amd64__)
+ #define _PR_SI_ARCHITECTURE "amd64"
++#elif defined(__powerpc64__)
++#define _PR_SI_ARCHITECTURE "powerpc64"
++#elif defined(__powerpc__)
++#define _PR_SI_ARCHITECTURE "powerpc"
+ #else
+ #error "Unknown CPU architecture"
+ #endif
+@@ -106,6 +110,16 @@
+ #define _PR_IPV6_V6ONLY_PROBE
+ #endif
+
++#if (__FreeBSD_version >= 700016)
++#if defined(_PR_PTHREADS)
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_5_ARG_GETPROTO_R
++#define _PR_HAVE_GETHOST_R
++#define _PR_HAVE_GETHOST_R_INT
++#define _PR_HAVE_THREADSAFE_GETHOST
++#endif
++#endif
++
+ #define USE_SETJMP
+
+ #ifndef _PR_PTHREADS
Added: branches/experimental/www/firefox-nightly/files/patch-revert-bug736066
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-revert-bug736066 Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,218 @@
+changeset: 92705:5bc899138eb4
+user: Mike Hommey <mh+mozilla@glandium.org>
+date: Sat Mar 31 09:25:23 2012 +0200
+summary: Bug 736066 - Build NSS object files more like the rest of the tree, and simplify security/manager/Makefile.in. r=ted
+
+diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
+--- security/manager/Makefile.in
++++ security/manager/Makefile.in
+@@ -184,10 +184,9 @@
+ DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
+ endif
+ ABS_topsrcdir := $(call core_abspath,$(topsrcdir))
+-# Hack to force NSS build system to use "normal" object directories
+-DEFAULT_GMAKE_FLAGS += BUILD='$(MOZ_BUILD_ROOT)/security/$$(subst $(shell cd $(topsrcdir); pwd)/security/,,$$(CURDIR))'
+-DEFAULT_GMAKE_FLAGS += BUILD_TREE='$$(BUILD)' OBJDIR='$$(BUILD)' DEPENDENCIES='$$(BUILD)/.deps' SINGLE_SHLIB_DIR='$$(BUILD)'
+-DEFAULT_GMAKE_FLAGS += SOURCE_XP_DIR=$(ABS_DIST)
++ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
++DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
++endif
+ ifndef MOZ_DEBUG
+ DEFAULT_GMAKE_FLAGS += BUILD_OPT=1 OPT_CODE_SIZE=1
+ endif
+@@ -287,6 +286,10 @@
+ DEFAULT_GMAKE_FLAGS += DARWIN_DYLIB_VERSIONS="-compatibility_version 1 -current_version 1 $(LDFLAGS)"
+ endif
+
++SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile
++
++include $(topsrcdir)/config/rules.mk
++
+ ifdef MOZ_NSS_PATCH
+ # If we're applying a patch, we'll copy the NSS source to the objdir
+ # and build it from there.
+@@ -308,81 +311,118 @@
+ NSS_SRCDIR = $(topsrcdir)
+ endif
+
+-NSS_DIRS =
+-ifndef NSS_DISABLE_DBM
+-NSS_DIRS += dbm
+-endif
+-NSS_DIRS += \
+- nss/lib \
+- nss/cmd/lib \
+- nss/cmd/shlibsign \
+- $(NULL)
+-
+-ifdef ENABLE_TESTS
+-NSS_DIRS += \
+- nss/cmd/certutil \
+- nss/cmd/pk12util \
+- nss/cmd/modutil \
+- $(NULL)
++dependclean export packages chrome::
++ $(MAKE) -C boot $@
++ $(MAKE) -C ssl $@
++ $(MAKE) -C locales $@
++ifdef MOZ_XUL
++ $(MAKE) -C pki $@
+ endif
+
+-ifndef MOZ_NATIVE_NSS
+-define build_rules
+ libs::
+- $$(NSSMAKE) -C $$(NSS_SRCDIR)/security/$(1) $$(DEFAULT_GMAKE_FLAGS)
+-
+-clean clobber clobber_all realclean distclean depend::
+- $$(NSSMAKE) -C $$(NSS_SRCDIR)/security/$(1) $$(DEFAULT_GMAKE_FLAGS) clean
+-endef
+-$(foreach dir,$(NSS_DIRS),$(eval $(call build_rules,$(dir))))
+-
+-NSS_LIBS = \
+- $(LOADABLE_ROOT_MODULE) \
+- $(SOFTOKEN3_LIB) \
+- $(NSSDBM3_LIB) \
+- $(NSS3_LIB) \
+- $(NSSUTIL3_LIB) \
+- $(SSL3_LIB) \
+- $(SMIME3_LIB) \
+- $(FREEBL_LIB) \
+- $(FREEBL_32INT_LIB) \
+- $(FREEBL_32FPU_LIB) \
+- $(FREEBL_32INT64_LIB) \
+- $(FREEBL_64INT_LIB) \
+- $(FREEBL_64FPU_LIB) \
+- $(NULL)
+-
+-define install_rules
+-libs::
+-ifeq ($(OS_ARCH)_$(1), SunOS_$(SOFTOKEN3_LIB))
+-# has to use copy mode on Solaris, see #665509
+- $$(NSINSTALL) -t -m 755 $$(DIST)/lib/$(1) $$(DIST)/bin
+-else
+- $$(INSTALL) -m 755 $$(DIST)/lib/$(1) $$(DIST)/bin
++ifndef MOZ_NATIVE_NSS
++ifndef NSS_DISABLE_DBM
++ $(NSSMAKE) -C $(NSS_SRCDIR)/security/dbm $(DEFAULT_GMAKE_FLAGS)
+ endif
+-
+-install::
+- $$(SYSINSTALL) -m 755 $$(DIST)/lib/$(1) $$(DESTDIR)$$(mozappdir)
+-endef
+-$(foreach lib,$(NSS_LIBS),$(eval $(call install_rules,$(lib))))
+-
+-libs::
++ $(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 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)
++ $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
++ifeq ($(OS_ARCH), SunOS)
++# has to use copy mode on Solaris, see #665509
++ $(NSINSTALL) -t -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
++else
++ $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
++endif
++ifndef NSS_DISABLE_DBM
++ $(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/$(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
++ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
++endif
++ifdef HAVE_FREEBL_LIBS_32
++ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
++ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
++endif
++ifdef HAVE_FREEBL_LIBS_32INT64
++ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
++endif
++ifdef HAVE_FREEBL_LIBS_64
++ $(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 # MOZ_NATIVE_NSS
+-
+-DIRS = \
+- boot \
+- ssl \
+- locales \
+- $(NULL)
+-
++endif
++ $(MAKE) -C boot $@
++ $(MAKE) -C ssl $@
++ $(MAKE) -C locales $@
+ ifdef MOZ_XUL
+-DIRS += pki
++ $(MAKE) -C pki $@
+ endif
+
+-include $(topsrcdir)/config/rules.mk
++check::
++ $(MAKE) -C ssl $@
++
++install::
++ifndef MOZ_NATIVE_NSS
++ $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
++ $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
++ $(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/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
++ $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
++ifdef HAVE_FREEBL_LIBS
++ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
++endif
++ifdef HAVE_FREEBL_LIBS_32
++ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
++ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
++endif
++ifdef HAVE_FREEBL_LIBS_32INT64
++ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
++endif
++ifdef HAVE_FREEBL_LIBS_64
++ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
++ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
++endif
++endif
++ $(MAKE) -C boot $@
++ $(MAKE) -C ssl $@
++ $(MAKE) -C locales $@
++ifdef MOZ_XUL
++ $(MAKE) -C pki $@
++endif
++
++clean clobber clobber_all realclean distclean depend::
++ $(MAKE) -C boot $@
++ $(MAKE) -C ssl $@
++ $(MAKE) -C locales $@
++ifdef MOZ_XUL
++ $(MAKE) -C pki $@
++endif
++ifndef MOZ_NATIVE_NSS
++ $(NSSMAKE) -C $(NSS_SRCDIR)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
++ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(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
Added: branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,46 @@
+--- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
++++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
+@@ -49,8 +49,24 @@
+ 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),powerpc64)
++CPU_ARCH = powerpc
++USE_64 = 1
++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,6 @@
+
+ G++INCLUDES = -I/usr/include/g++
+
+-INCLUDES += -I/usr/X11R6/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-Makefile Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- security/nss/lib/Makefile~
++++ security/nss/lib/Makefile
+@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc
+ endif
+
+ ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
++ifndef MOZ_NATIVE_SQLITE
+ SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS.
+ endif
+ endif
Added: branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,45 @@
+--- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100
++++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100
+@@ -733,6 +733,34 @@
+ #endif
+
+ #if defined(__ppc64__)
++#if defined(__FreeBSD__)
++#include <sys/stddef.h>
++#include <sys/sysctl.h>
++
++#include <machine/cpu.h>
++#include <machine/md_var.h>
++
++unsigned long
++s_mpi_getProcessorLineSize()
++{
++ static int cacheline_size = 0;
++ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
++ int clen;
++
++ if (cacheline_size > 0)
++ return cacheline_size;
++
++ clen = sizeof(cacheline_size);
++ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
++ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size)
++ return 128; /* guess */
++
++ return cacheline_size;
++}
++#else /* __FreeBSD__ */
++
++
++
+ /*
+ * Sigh, The PPC has some really nice features to help us determine cache
+ * size, since it had lots of direct control functions to do so. The POWER
+@@ -786,6 +814,7 @@
+ return 0;
+ }
+
++#endif /* __FreeBSD__ */
+ #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1
+ #endif
+
Added: branches/experimental/www/firefox-nightly/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-security_manager_ssl_src_nsNSSComponent.cpp Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,10 @@
+--- 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"
Added: branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500
++++ toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500
+@@ -132,7 +132,7 @@ else
+ SDK_LIBRARY = $(SHARED_LIBRARY)
+ endif
+
+-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
+
+ ifndef MOZ_ENABLE_LIBXUL
+ EXTRA_DSO_LDOPTS += \
Added: branches/experimental/www/firefox-nightly/files/patch-toolkit_xre_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-toolkit_xre_Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,8 @@
+--- toolkit/xre/Makefile.in.orig 2007-09-10 10:31:53.000000000 -0400
++++ toolkit/xre/Makefile.in 2007-09-10 10:35:00.000000000 -0400
+@@ -263,5 +263,3 @@
+ libs:: platform.ini
+ $(INSTALL) $^ $(DIST)/bin
+
+-install::
+- $(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
Added: branches/experimental/www/firefox-nightly/files/patch-tools-profiler-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-tools-profiler-Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- tools/profiler/Makefile.in~
++++ tools/profiler/Makefile.in
+@@ -78,7 +78,7 @@ EXTRA_JS_MODULES = \
+ Profiler.jsm \
+ $(NULL)
+
+-ifneq (,$(filter Android Linux,$(OS_TARGET)))
++ifneq (,$(filter Android Linux FreeBSD,$(OS_TARGET)))
+ CPPSRCS += \
+ shared-libraries-linux.cc \
+ platform-linux.cc \
Added: branches/experimental/www/firefox-nightly/files/patch-tools-profiler-platform-linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-tools-profiler-platform-linux.cc Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,43 @@
+--- tools/profiler/platform-linux.cc~
++++ tools/profiler/platform-linux.cc
+@@ -133,7 +133,7 @@ static void ProfilerSignalHandler(int si
+ sActiveSampler->Tick(sample);
+ }
+
+-#ifndef XP_MACOSX
++#if !defined(XP_MACOSX) && !defined(__FreeBSD__)
+ void tgkill(pid_t tgid, pid_t tid, int signalno) {
+ syscall(SYS_tgkill, tgid, tid, signalno);
+ }
+@@ -145,11 +145,11 @@ class Sampler::PlatformData : public Mal
+ : sampler_(sampler),
+ signal_handler_installed_(false),
+ vm_tgid_(getpid()),
+-#ifndef XP_MACOSX
++#if !defined(XP_MACOSX) && !defined(__FreeBSD__)
+ vm_tid_(gettid()),
+ #endif
+ signal_sender_launched_(false)
+-#ifdef XP_MACOSX
++#if defined(XP_MACOSX) || defined(__FreeBSD__)
+ , signal_receiver_(pthread_self())
+ #endif
+ {
+@@ -140,7 +140,7 @@ class Sampler::PlatformData : public Mal
+ sampler_->HandleSaveRequest();
+
+ if (!sampler_->IsPaused()) {
+-#ifdef XP_MACOSX
++#ifdef XP_MACOSX || defined(__FreeBSD__)
+ pthread_kill(signal_receiver_, SIGPROF);
+ #else
+ // Glibc doesn't provide a wrapper for tgkill(2).
+@@ -192,7 +192,7 @@ class Sampler::PlatformData : public Mal
+ pid_t vm_tid_;
+ bool signal_sender_launched_;
+ pthread_t signal_sender_thread_;
+-#ifdef XP_MACOSX
++#if defined(XP_MACOSX) || defined(__FreeBSD__)
+ pthread_t signal_receiver_;
+ #endif
+ };
Added: branches/experimental/www/firefox-nightly/files/patch-webapprt-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-webapprt-Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,16 @@
+--- webapprt/Makefile.in~
++++ webapprt/Makefile.in
+@@ -24,9 +24,13 @@ else
+ ifeq ($(OS_ARCH),Darwin)
+ DIRS += mac
+ else
++ifeq ($(OS_ARCH),FreeBSD)
++DIRS += linux
++else
+ ifeq ($(OS_ARCH),Linux)
+ DIRS += linux
+ endif # linux
++endif # freebsd
+ endif # mac
+ endif # windows
+
Added: branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,10 @@
+--- webapprt/linux/webapprt.cpp~
++++ webapprt/linux/webapprt.cpp
+@@ -8,6 +8,7 @@
+ #include <gtk/gtk.h>
+
+ // Linux headers
++#include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+
Added: branches/experimental/www/firefox-nightly/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-xpcom-io-nsAppFileLocationProvider.cpp Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- xpcom/io/nsAppFileLocationProvider.cpp.orig 2011-09-30 15:52:07.000000000 +0200
++++ xpcom/io/nsAppFileLocationProvider.cpp 2011-09-30 15:52:40.000000000 +0200
+@@ -238,7 +238,7 @@
+ #if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
+ "/usr/lib64/mozilla/plugins";
+ #else
+- "/usr/lib/mozilla/plugins";
++ "%%LOCALBASE%%/lib/npapi/symlinks/firefox";
+ #endif
+ rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
+ PR_FALSE, getter_AddRefs(localFile));
Added: branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,11 @@
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 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();
Added: branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,20 @@
+--- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800
++++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800
+@@ -45,7 +45,7 @@
+
+ class xptiInterfaceEntry;
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64)
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
+@@ -62,7 +62,7 @@
+ #undef STUB_ENTRY
+ #undef SENTINEL_ENTRY
+
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64)
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
+ #else
+ #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Added: branches/experimental/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp Fri Jun 8 14:21:12 2012 (r739)
@@ -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
+@@ -57,6 +57,11 @@
+ nsresult
+ nsThreadManager::Init()
+ {
++#ifdef 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)
Added: branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,19 @@
+--- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 02:03:41.000000000 +0100
++++ xpcom/base/nsStackWalk.cpp 2010-12-15 11:28:20.000000000 +0100
+@@ -1137,7 +1137,7 @@
+ #define __USE_GNU
+ #endif
+
+-#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
++#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__)
+ #include <dlfcn.h>
+ #endif
+
+@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
+
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+
++#define _GNU_SOURCE
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+ #include <unwind.h>
+
Added: branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,67 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
+@@ -83,6 +83,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
++#
+ # Neutrino/Intel (uses the same unixish_x86 code)
+ #
+ ifeq ($(OS_TARGET),NTO)
+@@ -94,6 +94,9 @@
+ DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED
+ CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+ endif
++ifeq (x86_64,$(OS_TEST))
++CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
++endif
+ endif
+ endif
+
+@@ -184,9 +193,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
+ #
+@@ -341,7 +356,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
+@@ -419,6 +434,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)
Added: branches/experimental/www/firefox-nightly/pkg-descr
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/pkg-descr Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,13 @@
+Mozilla Firefox is a free and open source web browser descended from the
+Mozilla Application Suite. It is small, fast and easy to use, and offers
+many advanced features:
+
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
+
+WWW: http://www.mozilla.com/firefox
Added: branches/experimental/www/firefox-nightly/pkg-message
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/pkg-message Fri Jun 8 14:21:12 2012 (r739)
@@ -0,0 +1,48 @@
+======================================================================
+
+SMB issues:
+Network group, machine, and share browsing does not work correctly.
+
+SFTP:
+Only sftp access using public key authentication works. To easily
+setup public key authentication to "remote_host":
+
+ssh-keygen -t dsa
+cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys"
+
+The SSH server on remote_host must allow pub key authentication.
+
+======================================================================
+
+Firefox and HTML5
+
+Certain functions used to display HTML5 elements need the sem module.
+
+If your Firefox crashes with the following message while viewing a
+HTML5 page:
+"Bad system call (core dumped)"
+
+you need to load the sem module (kldload sem).
+
+To load sem on every boot put the following into your
+/boot/loader.conf:
+sem_load="YES"
+
+======================================================================
+
+Any bug reports should be addressed to the maintainers at:
+ gecko@FreeBSD.org
+You may also Cc: freebsd-ports@FreeBSD.org. Please do not send
+bug reports to any other addresses.
+
+Please include the following information with any bug report:
+* Output from 'uname -a'.
+* Output from 'ident /usr/ports/www/firefox/Makefile'
+* Where/when did the problem occur: configuring, building, or
+ running firefox
+* How can you reproduce the problem?
+
+Thank you for your help in testing and reporting bugs, and we hope you
+enjoy using Firefox.
+The Maintainers (gecko@)
+======================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206081421.q58ELCX4007879>