Date: Tue, 26 Jun 2012 06:00:45 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r803 - in branches/experimental: mail/thunderbird-beta mail/thunderbird-beta/files www/firefox-beta www/firefox-beta/files www/seamonkey-beta www/seamonkey-beta/files Message-ID: <201206260600.q5Q60jZZ069407@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Jun 26 06:00:44 2012 New Revision: 803 Log: nuke obsolete -betas Deleted: branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-beta/distinfo branches/experimental/mail/thunderbird-beta/files/moz_pis_S50cleanhome branches/experimental/mail/thunderbird-beta/files/patch-bug741737 branches/experimental/mail/thunderbird-beta/files/patch-config-autoconf.mk.in branches/experimental/mail/thunderbird-beta/files/patch-configure.in branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-time_posix.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-build-build_config.h branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mail-app-nsMailApp.cpp branches/experimental/mail/thunderbird-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp branches/experimental/mail/thunderbird-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-browser-installer-package-manifest.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-build-autoconf-config.sub branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config-mkdepend-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config_autoconf.mk.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-db-sqlite3-src-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-qcms-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-qcms-qcmstypes.h branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-config-mkdepend-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-config_config.mk branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-jscpucfg.h branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-jsnum.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-layout-generic-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-media-libvpx-vpx_config.c branches/experimental/mail/thunderbird-beta/files/patch-mozilla-media-libvpx-vpx_config.h branches/experimental/mail/thunderbird-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-nss-lib-Makefile branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla__content__base__public__nsContentUtils.h branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla_toolkit_xre_glxtest.cpp branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.cfg branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.h branches/experimental/mail/thunderbird-beta/files/thunderbird.desktop.in branches/experimental/mail/thunderbird-beta/pkg-descr branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox-beta/Makefile.webplugins branches/experimental/www/firefox-beta/distinfo branches/experimental/www/firefox-beta/files/firefox.desktop.in branches/experimental/www/firefox-beta/files/mozconfig-profile_guided_optimization.in branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp branches/experimental/www/firefox-beta/files/patch-browser-installer-package-manifest.in branches/experimental/www/firefox-beta/files/patch-bug741737 branches/experimental/www/firefox-beta/files/patch-build-pgo-profileserver.py branches/experimental/www/firefox-beta/files/patch-config_autoconf.mk.in branches/experimental/www/firefox-beta/files/patch-config_config.mk branches/experimental/www/firefox-beta/files/patch-config_mkdepend_Makefile.in branches/experimental/www/firefox-beta/files/patch-configure.in branches/experimental/www/firefox-beta/files/patch-content__base__public__nsContentUtils.h branches/experimental/www/firefox-beta/files/patch-db_sqlite3_src_Makefile.in branches/experimental/www/firefox-beta/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/www/firefox-beta/files/patch-gfx-qcms-Makefile.in branches/experimental/www/firefox-beta/files/patch-gfx-qcms-qcmstypes.h branches/experimental/www/firefox-beta/files/patch-gfx-thebes-gfxPlatform.cpp branches/experimental/www/firefox-beta/files/patch-gfx-ycbcr-Makefile.in branches/experimental/www/firefox-beta/files/patch-ipc-chromium-Makefile.in branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-time_posix.cc branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-build-build_config.h branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in branches/experimental/www/firefox-beta/files/patch-js-src-config-mkdepend_Makefile.in branches/experimental/www/firefox-beta/files/patch-js-src-config_config.mk branches/experimental/www/firefox-beta/files/patch-js-src-configure.in branches/experimental/www/firefox-beta/files/patch-js-src-jscpucfg.h branches/experimental/www/firefox-beta/files/patch-js-src-methodjit-MethodJIT.cpp branches/experimental/www/firefox-beta/files/patch-js_src_jsnum.cpp branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in branches/experimental/www/firefox-beta/files/patch-media-libvpx-vpx_config.c branches/experimental/www/firefox-beta/files/patch-media-libvpx-vpx_config.h branches/experimental/www/firefox-beta/files/patch-memory-mozalloc-mozalloc.cpp branches/experimental/www/firefox-beta/files/patch-nsprpub-pr-include-md_freebsd.cfg branches/experimental/www/firefox-beta/files/patch-nsprpub-pr-include-md_freebsd.h branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox-beta/files/patch-security-nss-lib-Makefile branches/experimental/www/firefox-beta/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c branches/experimental/www/firefox-beta/files/patch-security_manager_ssl_src_nsNSSComponent.cpp branches/experimental/www/firefox-beta/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox-beta/files/patch-toolkit_library_Makefile.in branches/experimental/www/firefox-beta/files/patch-toolkit_xre_Makefile.in branches/experimental/www/firefox-beta/files/patch-widget-qt-nsNativeThemeQt.cpp branches/experimental/www/firefox-beta/files/patch-xpcom-io-nsAppFileLocationProvider.cpp branches/experimental/www/firefox-beta/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc branches/experimental/www/firefox-beta/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h branches/experimental/www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp branches/experimental/www/firefox-beta/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in branches/experimental/www/firefox-beta/pkg-descr branches/experimental/www/firefox-beta/pkg-message branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey-beta/distinfo branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk branches/experimental/www/seamonkey-beta/files/extra-patch-bridge-bridge.mk branches/experimental/www/seamonkey-beta/files/extra-patch-configure.in branches/experimental/www/seamonkey-beta/files/extra-patch-security_manager_Makefile.in branches/experimental/www/seamonkey-beta/files/moz_pis_S50cleanhome branches/experimental/www/seamonkey-beta/files/mozconfig-generic.in branches/experimental/www/seamonkey-beta/files/patch-bug741737 branches/experimental/www/seamonkey-beta/files/patch-config-rules.mk branches/experimental/www/seamonkey-beta/files/patch-config_autoconf.mk.in branches/experimental/www/seamonkey-beta/files/patch-configure.in branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-time_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-build-build_config.h branches/experimental/www/seamonkey-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp branches/experimental/www/seamonkey-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-browser-installer-package-manifest.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-build-autoconf-config.sub branches/experimental/www/seamonkey-beta/files/patch-mozilla-build-unix-run-mozilla.sh branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-autoconf.mk.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-gcc-stl-wrapper.template.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-mkdepend-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-mkdepend-imakemdep.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-qcmstypes.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-ycbcr-chromium_types.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-build-autoconf-config.sub branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-config-mkdepend-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-jscpucfg.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.c branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-nss-lib-Makefile branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla__content__base__public__nsContentUtils.h branches/experimental/www/seamonkey-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp branches/experimental/www/seamonkey-beta/files/patch-suite-build-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-xptcall-amd64 branches/experimental/www/seamonkey-beta/files/patch-xptcall-ia64 branches/experimental/www/seamonkey-beta/files/patch-xptcall-sparc64 branches/experimental/www/seamonkey-beta/files/seamonkey.desktop.in branches/experimental/www/seamonkey-beta/pkg-deinstall.in branches/experimental/www/seamonkey-beta/pkg-descr branches/experimental/www/seamonkey-beta/pkg-install.in Deleted: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,178 +0,0 @@ -# New ports collection makefile for: mozilla-thunderbird -# Date created: 4 September 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.146 2012/03/14 09:49:01 beat Exp $ -# - -PORTNAME= thunderbird -DISTVERSION= 12.0b4 -CATEGORIES= mail ipv6 -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}.source - -MAINTAINER= gecko@FreeBSD.org -COMMENT= Mozilla Thunderbird is standalone mail and news that stands above - -BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ - nss>=3.13.2:${PORTSDIR}/security/nss \ - sqlite3>=3.7.10:${PORTSDIR}/databases/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:env -USE_GECKO= gecko -CONFLICTS= thunderbird-10.* -USE_MOZILLA= # empty - -MAKE_JOBS_SAFE= yes -WANT_GNOME= yes -USE_QT4= # empty -QT_NONSTANDARD= yes -ALL_TARGET= default -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -GNU_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_GL= gl - -MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket -MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-single-profile --disable-profilesharing \ - --enable-application=mail --enable-official-branding \ - --disable-updater --disable-necko-wifi -MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 -MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 -MOZ_PKGCONFIG_FILES= - -PORTNAME_ICON= ${MOZILLA}.png -PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png - -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js -MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome - -OPTIONS_DEFAULT=DBUS -OPTIONS= LIGHTNING "Enable calendar extension" off - -.include <bsd.port.pre.mk> - -WRKSRC= ${WRKDIR}/comm-beta -MOZSRC:= ${WRKSRC}/mozilla - -.if ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -CONFIGURE_ENV+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - -.if ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -CONFIGURE_ENV+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - -.if ${ARCH} == amd64 || ${ARCH} == i386 -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm -.endif - -.if !empty(CXX:M*clang++*) -CFLAGS+= -Wno-return-type-c-linkage -.endif - -.if ${CXXFLAGS:M-stdlib=libc++} -CXXABI= -lcxxrt -.else -CXXABI= # implied -.endif - -.if defined(WITH_LIGHTNING) -MOZ_OPTIONS+= --enable-calendar -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar -LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi -XPI_LIBDIR= ${PREFIX}/lib/xpi -XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} -XPI_ID= lightning@thunderbird.mozilla.org -.else -MOZ_OPTIONS+= --disable-calendar -.endif - -post-extract: - @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ - <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop - -post-patch: - @${GREP} -Flr -e MSG_LINEBREAK -e CRLF ${WRKSRC}/mailnews \ - | ${XARGS} ${REINPLACE_CMD} -Ee 's/"(MSG_|CRLF)/" \1/g' \ - -e 's/(BREAK|CRLF)"/\1 "/g' - @${GREP} -Flr \"/proc ${MOZSRC}/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}|' \ - ${MOZSRC}/storage/build/Makefile.in \ - ${MOZSRC}/toolkit/library/Makefile.in \ - ${MOZSRC}/db/sqlite3/src/Makefile.in - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/mail/app/nsMailApp.cpp \ - ${MOZSRC}/security/manager/ssl/src/Makefile.in \ - ${MOZSRC}/js/src/config/mkdepend/Makefile.in \ - ${MOZSRC}/js/src/config/config.mk - -pre-configure: - (cd ${WRKSRC} && ${AUTOCONF}) - (cd ${MOZSRC} && ${AUTOCONF}) - (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) - -port-pre-install: - ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults - -pre-install: - @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} - @${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST} - @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST} - -post-install: - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications - ${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON} -.if defined(WITH_LIGHTNING) - @${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird - @(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE}) - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID} - @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_LIBDIR}/${XPI_ID}/install.rdf - @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID} - @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true - @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true - @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \ - ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} 'lib/xpi/symlinks/thunderbird/${XPI_ID}' >> ${TMPPLIST} - @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST} - @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \ - ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/thunderbird 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST} -.endif - -.include <bsd.port.post.mk> Deleted: branches/experimental/mail/thunderbird-beta/distinfo ============================================================================== --- branches/experimental/mail/thunderbird-beta/distinfo Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,2 +0,0 @@ -SHA256 (thunderbird-12.0b4.source.tar.bz2) = 1f7d75f0f33c2f60f93ca03349953d34dfd9c1a0057050cf2c5e4655f45068df -SIZE (thunderbird-12.0b4.source.tar.bz2) = 101721253 Deleted: branches/experimental/mail/thunderbird-beta/files/moz_pis_S50cleanhome ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/moz_pis_S50cleanhome Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,34 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to polite ${HOME}/${MOZ_PIS_USER_DIR} - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to polite ${HOME}/${MOZ_PIS_USER_DIR} - -# This must be really needed? -# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat" - -# Try to polite profile dirs -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # at last, debian do this, we do for new builds - # rm -f "${dir}/XUL.mfasl" - # make reclaculate compreg.dat, xpti.dat for new builds - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi Deleted: branches/experimental/mail/thunderbird-beta/files/patch-bug741737 ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-bug741737 Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,93 +0,0 @@ -changeset: 91900:eee73897136b -user: Martin Stransky <stransky@redhat.com> -date: Tue Apr 17 19:57:40 2012 -0400 -summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb - -diff --git a/configure.in b/configure.in ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm, - - dnl system libvpx Support - dnl ======================================================== --MOZ_ARG_WITH_STRING(system-libvpx, --[ --with-system-libvpx=[PFX] -- Use system libvpx [installed at prefix PFX]], -- LIBVPX_DIR=$withval) -- --MOZ_NATIVE_LIBVPX= -+MOZ_ARG_WITH_BOOL(system-libvpx, -+[ --with-system-libvpx Use system libvpx (located with pkgconfig)], -+ MOZ_NATIVE_LIBVPX=1) -+ - MOZ_LIBVPX_INCLUDES= - MOZ_LIBVPX_LIBS= - -@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then - AC_DEFINE(MOZ_VP8_ENCODER) - fi - -- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then -- _SAVE_CFLAGS=$CFLAGS -- _SAVE_LDFLAGS=$LDFLAGS -- _SAVE_LIBS=$LIBS -- if test "${LIBVPX_DIR}" = "yes"; then -- LIBVPX_DIR=/usr -- fi -- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" -- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" -- MOZ_NATIVE_LIBVPX_DEC_TEST= -- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, -- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then -- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) -- fi], -- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) -- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, -- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], -- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) -- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then -- AC_MSG_CHECKING([for libvpx version >= v1.0.0]) -- dnl We need at least v1.0.0 to fix several crash bugs (for which we -- dnl had local patches prior to v1.0.0). -- dnl -- dnl This is a terrible test for the library version, but we don't -- dnl have a good one. There is no version number in a public header, -- dnl and testing the headers still doesn't guarantee we link against -- dnl the right version. While we could call vpx_codec_version() at -- dnl run-time, that would break cross-compiling. There are no -- dnl additional exported decoder symbols between the v1.0.0 release -- dnl and the v0.9.7 one to check for. -- AC_TRY_COMPILE([ -- #include <vpx/vpx_decoder.h> -- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) -- #error "test failed." -- #endif -- ], -- [return 0;], -- [AC_MSG_RESULT([yes]) -- MOZ_NATIVE_LIBVPX=1 -- AC_DEFINE(MOZ_NATIVE_LIBVPX) -- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" -- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], -- [AC_MSG_RESULT([no]) -- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) -- fi -- CFLAGS=$_SAVE_CFLAGS -- LDFLAGS=$_SAVE_LDFLAGS -- LIBS=$_SAVE_LIBS -+ if test -n "$MOZ_NATIVE_LIBVPX"; then -+ dnl ============================ -+ dnl === libvpx Version check === -+ dnl ============================ -+ dnl Check to see if we have a system libvpx package. -+ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0) -+ -+ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], -+ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) -+ -+ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], -+ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) - fi - fi - - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-config-autoconf.mk.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-config-autoconf.mk.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- 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@ Deleted: branches/experimental/mail/thunderbird-beta/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-configure.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,122 +0,0 @@ ---- configure.in.orig 2011-12-19 14:48:06.000000000 +0100 -+++ configure.in 2011-12-19 15:51:19.000000000 +0100 -@@ -1410,7 +1410,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1430,7 +1430,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -1753,7 +1753,7 @@ - esac - - case "${host_cpu}" in -- x86_64) -+ amd64 | x86_64) - HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" - ;; - esac -@@ -2415,6 +2415,9 @@ - x86_64-*) - AC_DEFINE(_AMD64_) - ;; -+ amd64*) -+ AC_DEFINE(_AMD64_) -+ ;; - *) - AC_DEFINE(_CPU_ARCH_NOT_DEFINED) - ;; -@@ -2486,7 +2489,7 @@ - else - DLL_SUFFIX=".so.1.0" - fi -- MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib' -+ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib' - DSO_CFLAGS='' - DSO_PIC_CFLAGS='-fPIC' - DSO_LDOPTS='-shared -fPIC' -@@ -3304,11 +3307,11 @@ - ;; - *) - MOZ_CHECK_PTHREADS(pthreads, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads", - MOZ_CHECK_PTHREADS(pthread, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", - MOZ_CHECK_PTHREADS(c_r, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", - MOZ_CHECK_PTHREADS(c, - USE_PTHREADS=1 - ) -@@ -3383,18 +3386,18 @@ - *-*-freebsd*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) -- dnl -pthread links in -lc_r, so don't specify it explicitly. -+ dnl -pthread links in -pthread, so don't specify it explicitly. - if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="-pthread" - else -- _PTHREAD_LDFLAGS="-lc_r" -+ _PTHREAD_LDFLAGS="-pthread" - fi - ;; - - *-*-openbsd*|*-*-bsdi*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) -- dnl -pthread links in -lc_r, so don't specify it explicitly. -+ dnl -pthread links in -pthread, so don't specify it explicitly. - if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="-pthread" - fi -@@ -3569,7 +3572,7 @@ - ac_cv_func_iconv, - [AC_TRY_LINK([ - #include <stdlib.h> -- #include <iconv.h> -+ #include "/usr/local/include/iconv.h" - ], - [ - iconv_t h = iconv_open("", ""); -@@ -3590,7 +3593,7 @@ - ac_cv_func_const_iconv, - [AC_TRY_COMPILE([ - #include <stdlib.h> -- #include <iconv.h> -+ #include "/usr/local/include/iconv.h" - ], - [ - const char *input = "testing"; -@@ -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 ======================================================== -@@ -4383,7 +4386,7 @@ - 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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~ -+++ mozilla/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 { Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,19 +0,0 @@ ---- mozilla/ipc/chromium/src/base/file_util_linux.cc~ -+++ mozilla/ipc/chromium/src/base/file_util_linux.cc -@@ -5,6 +5,7 @@ - #include "base/file_util.h" - - #include <fcntl.h> -+#include <unistd.h> - - #include <string> - #include <vector> -@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) { - #ifdef ANDROID - return GetTempDir(path); - #else -- *path = FilePath("/dev/shm"); -+ *path = FilePath("/tmp"); - return true; - #endif - } Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/ipc/chromium/src/base/file_util_posix.cc~ -+++ mozilla/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) Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/ipc/chromium/src/base/platform_file_posix.cc~ -+++ mozilla/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" Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 -+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 -@@ -34,7 +33,8 @@ - #if defined(OS_MACOSX) - return mach_thread_self(); - #elif defined(OS_LINUX) -- return syscall(__NR_gettid); -+ // TODO(BSD): find a better thread ID -+ return reinterpret_cast<int64>(pthread_self()); - #endif - } - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ -+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h -@@ -34,7 +34,7 @@ - #include "base/third_party/nspr/prcpucfg_win.h" - #elif defined(__APPLE__) - #include "base/third_party/nspr/prcpucfg_mac.h" --#elif defined(__linux__) || defined(ANDROID) -+#elif defined(__FreeBSD__) || defined(ANDROID) - #include "base/third_party/nspr/prcpucfg_linux.h" - #else - #error Provide a prcpucfg.h appropriate for your platform Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-time_posix.cc ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-time_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/ipc/chromium/src/base/time_posix.cc~ -+++ mozilla/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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-build-build_config.h ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-build-build_config.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/ipc/chromium/src/build/build_config.h~ -+++ mozilla/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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 -+++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 -@@ -254,6 +254,10 @@ - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+endif -+ - ifeq ($(OS_ARCH), NetBSD) - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) - endif Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 -+++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 -@@ -147,6 +147,11 @@ - CUSTOM_LIBS=1 - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+CUSTOM_LIBS=1 -+endif -+ - # no extra libs on HP-UX - ifeq ($(OS_ARCH), HP-UX) - CUSTOM_LIBS=1 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~ -+++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in -@@ -188,6 +188,9 @@ endif - - OBJDEST = $(OBJDIR_NAME) - -+# accept -pthread with MOZ_NATIVE_NSS -+LINK_DLL = $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS) -+ - ########################################################################### - - ifeq ($(USE_DLL_EXPORTS_FILE), 1) Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mail-app-nsMailApp.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mail-app-nsMailApp.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mail/app/nsMailApp.cpp~ -+++ mail/app/nsMailApp.cpp -@@ -154,6 +154,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"); Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- mailnews/addrbook/src/nsDirPrefs.cpp~ -+++ mailnews/addrbook/src/nsDirPrefs.cpp -@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid - DIR_Server *s=nsnull; - - switch (position) { -- case DIR_POS_APPEND: -+ case (PRInt32)DIR_POS_APPEND: - /* Do nothing if the request is to append a server that is already - * in the list. - */ -@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid - wholeList->AppendElement(server); - break; - -- case DIR_POS_DELETE: -+ case (PRInt32)DIR_POS_DELETE: - /* Remove the prefs corresponding to the given server. If the prefName - * value is nsnull, the server has never been saved and there are no - * prefs to remove. Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- mailnews/compose/src/nsSmtpProtocol.cpp~ -+++ mailnews/compose/src/nsSmtpProtocol.cpp -@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr - - switch (code) - { -- case NS_ERROR_SMTP_SERVER_ERROR: -- case NS_ERROR_TCP_READ_ERROR: -- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: -- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: -- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: -- case NS_ERROR_SENDING_FROM_COMMAND: -- case NS_ERROR_SENDING_RCPT_COMMAND: -- case NS_ERROR_SENDING_DATA_COMMAND: -- case NS_ERROR_SENDING_MESSAGE: -- case NS_ERROR_SMTP_GREETING: -+ case (int)NS_ERROR_SMTP_SERVER_ERROR: -+ case (int)NS_ERROR_TCP_READ_ERROR: -+ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: -+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: -+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: -+ case (int)NS_ERROR_SENDING_FROM_COMMAND: -+ case (int)NS_ERROR_SENDING_RCPT_COMMAND: -+ case (int)NS_ERROR_SENDING_DATA_COMMAND: -+ case (int)NS_ERROR_SENDING_MESSAGE: -+ case (int)NS_ERROR_SMTP_GREETING: - bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg)); - msg = nsTextFormatter::vsmprintf(eMsg.get(), args); - break; Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-browser-installer-package-manifest.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- mozilla/browser/installer/package-manifest.in~ -+++ mozilla/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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-build-autoconf-config.sub ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-build-autoconf-config.sub Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 -+++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config-mkdepend-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config-mkdepend-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 -+++ mozilla/config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 -@@ -57,6 +57,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config_autoconf.mk.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config_autoconf.mk.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,31 +0,0 @@ ---- mozilla/config/autoconf.mk.in.orig 2007-08-28 12:02:43.000000000 -0400 -+++ mozilla/config/autoconf.mk.in 2007-09-26 14:21:51.000000000 -0400 -@@ -58,14 +58,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@ - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,109 +0,0 @@ ---- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -1549,7 +1549,7 @@ - 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 - -@@ -3803,19 +3803,21 @@ - AC_CHECK_FUNCS(localtime_r strtok_r) - - dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt --_SAVE_LDFLAGS=$LDFLAGS --LDFLAGS="$LDFLAGS -lrt" --AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, -+_SAVE_LIBS=$LIBS -+AC_SEARCH_LIBS(clock_gettime, rt) -+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), - ac_cv_have_clock_monotonic, - [AC_TRY_LINK([#include <time.h>], - [ struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); ], - ac_cv_have_clock_monotonic=yes, - ac_cv_have_clock_monotonic=no)]) --LDFLAGS=$_SAVE_LDFLAGS -+LIBS=$_SAVE_LIBS - if test "$ac_cv_have_clock_monotonic" = "yes"; then - HAVE_CLOCK_MONOTONIC=1 -- REALTIME_LIBS=-lrt -+ if test "$ac_cv_search_clock_gettime" != "none required"; then -+ REALTIME_LIBS=$ac_cv_search_clock_gettime -+ fi - AC_DEFINE(HAVE_CLOCK_MONOTONIC) - AC_SUBST(HAVE_CLOCK_MONOTONIC) - AC_SUBST(REALTIME_LIBS) -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS -@@ -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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-db-sqlite3-src-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-db-sqlite3-src-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/db/sqlite3/src/Makefile.in.orig 2008-06-19 11:03:17.000000000 -0500 -+++ mozilla/db/sqlite3/src/Makefile.in 2008-06-19 11:04:15.000000000 -0500 -@@ -45,6 +45,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+OS_CFLAGS = -I../../../dist/include/sqlite3 -+OS_LIBS = %%PTHREAD_LIBS%% - MODULE = sqlite3 - LIBRARY_NAME = sqlite3 - FORCE_SHARED_LIB = 1 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~ -+++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp -@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const - i += with.length(); - } - -- return munged; -+ return munged.c_str(); - } - #endif - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-qcms-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/gfx/qcms/Makefile.in.orig 2010-11-25 20:10:32.000000000 +0100 -+++ mozilla/gfx/qcms/Makefile.in 2010-11-25 20:10:06.000000000 +0100 -@@ -44,6 +44,11 @@ - endif - endif - endif -+ifeq ($(OS_TEST),amd64) -+ CSRCS += transform-sse2.c transform-sse1.c -+ SSE1_FLAGS=-msse -+ SSE2_FLAGS=-msse2 -+endif - - FORCE_STATIC_LIB = 1 - # This library is used by other shared libs Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-qcms-qcmstypes.h ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-qcms-qcmstypes.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100 -+++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100 -@@ -25,7 +25,7 @@ - #ifdef __OS2__ - /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ - #include <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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,34 +0,0 @@ ---- mozilla/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000 -+++ mozilla/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(); Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- mozilla/gfx/ycbcr/Makefile.in~ -+++ mozilla/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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- mozilla/ipc/chromium/Makefile.in~ -+++ mozilla/ipc/chromium/Makefile.in -@@ -23,9 +23,7 @@ vpath %.c \ - $(srcdir)/src/third_party/libevent \ - $(NULL) - else # } else { --# message_pump_libevent.cc includes third_party/libevent/event.h, --# which we put in $(DIST), see export rule below --LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) - endif # } - - vpath %.cc \ Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- mozilla/ipc/chromium/src/base/dir_reader_linux.h.orig 2011-12-16 21:29:22.000000000 +0100 -+++ mozilla/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) { Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,19 +0,0 @@ ---- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ -+++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc -@@ -6,6 +6,7 @@ - - #include <errno.h> - #include <fcntl.h> -+#include <unistd.h> - - #include "eintr_wrapper.h" - #include "base/logging.h" -@@ -15,7 +15,7 @@ - #include "base/scoped_nsautorelease_pool.h" - #include "base/scoped_ptr.h" - #include "base/time.h" --#include "third_party/libevent/event.h" -+#include "event.h" - - // Lifecycle of struct event - // Libevent uses two main data structures: Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,30 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 -+++ mozilla/js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -352,7 +352,7 @@ - # For architectures without YARR JIT, PCRE is faster than the YARR - # interpreter (bug 684559). - --ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) -+ifeq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU))) - - VPATH += $(srcdir)/yarr/pcre \ - $(NULL) -@@ -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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-config-mkdepend-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/js/src/config/mkdepend/Makefile.in.orig 2010-01-19 21:27:45.000000000 +0100 -+++ mozilla/js/src/config/mkdepend/Makefile.in 2010-01-20 21:55:56.000000000 +0100 -@@ -71,7 +71,7 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-config_config.mk ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-config_config.mk Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 -+++ mozilla/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) Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 -+++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -1470,7 +1470,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1492,7 +1492,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -2814,6 +2814,16 @@ - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; -+amd64*-*) -+ ENABLE_TRACEJIT=1 -+ NANOJIT_ARCH=X64 -+ ENABLE_METHODJIT=1 -+ ENABLE_MONOIC=1 -+ ENABLE_POLYIC=1 -+ ENABLE_POLYIC_TYPED_ARRAY=1 -+ AC_DEFINE(JS_CPU_X64) -+ AC_DEFINE(JS_PUNBOX64) -+ ;; - x86_64*-*) - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 -@@ -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_ */ - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-jscpucfg.h ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-jscpucfg.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ ---- mozilla/js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100 -+++ mozilla/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> - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-jsnum.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-jsnum.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig Sun Nov 5 18:37:07 2006 -+++ mozilla/js/src/jsnum.cpp Sun Nov 5 18:42:31 2006 -@@ -45,6 +45,9 @@ - #if defined(XP_WIN) || defined(XP_OS2) - #include <float.h> - #endif -+#if defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #include <locale.h> - #include <limits.h> - #include <math.h> -@@ -532,7 +535,15 @@ static jsdouble NaN; - - #else - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 -+#include <fenv.h> -+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT)) -+ -+#else -+ - #define FIX_FPU() ((void)0) -+ -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ - - #endif - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- mozilla/js/src/methodjit/MethodJIT.cpp~ -+++ mozilla/js/src/methodjit/MethodJIT.cpp -@@ -171,7 +171,7 @@ - - JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); - --#if defined(__linux__) && defined(JS_CPU_X64) -+#if defined(__ELF__) && defined(JS_CPU_X64) - # define SYMBOL_STRING_RELOC(name) #name "@plt" - #else - # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) -@@ -149,7 +149,7 @@ - - #if defined(XP_MACOSX) - # define HIDE_SYMBOL(name) ".private_extern _" #name --#elif defined(__linux__) -+#elif defined(__ELF__) - # define HIDE_SYMBOL(name) ".hidden" #name - #else - # define HIDE_SYMBOL(name) Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-layout-generic-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-layout-generic-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200 -+++ mozilla/layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200 -@@ -159,9 +159,10 @@ - -I$(srcdir)/../../content/html/content/src \ - -I$(srcdir)/../../dom/base \ - -I$(srcdir)/../../dom/plugins/base \ -- $(MOZ_CAIRO_CFLAGS) \ - $(NULL) - -+ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) -+ - ifdef MOZ_ENABLE_GTK2 - CXXFLAGS += $(MOZ_GTK2_CFLAGS) - endif - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-media-libvpx-vpx_config.c ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-media-libvpx-vpx_config.c Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- mozilla/media/libvpx/vpx_config_c.c~ -+++ mozilla/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" - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-media-libvpx-vpx_config.h ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-media-libvpx-vpx_config.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- mozilla/media/libvpx/vpx_config.h~ -+++ mozilla/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" - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- mozilla/memory/mozalloc/mozalloc.cpp~ -+++ mozilla/memory/mozalloc/mozalloc.cpp -@@ -52,6 +52,9 @@ - #if defined(XP_UNIX) - # include <unistd.h> // for valloc on *BSD - #endif //if defined(XP_UNIX) -+#ifdef __FreeBSD__ -+# include <malloc_np.h> // for malloc_usable_size -+#endif - - #if defined(MOZ_MEMORY) - // jemalloc.h doesn't redeclare symbols if they're provided by the OS -@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || defined(XP_LINUX) -+#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__) - // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations - // might use a libc that doesn't have malloc_usable_size. Let's fix this - // if/when it happens. Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ mozilla/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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-nss-lib-Makefile Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/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 Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #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 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 -+++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 -@@ -181,7 +181,7 @@ - export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) - $(INSTALL) $^ . - --EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%% - - ifdef MOZ_ENABLE_LIBXUL - include $(srcdir)/libxul-rules.mk - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,8 +0,0 @@ ---- mozilla/toolkit/xre/Makefile.in.orig 2007-09-10 10:31:53.000000000 -0400 -+++ mozilla/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) Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/toolkit/xre/nsAppRunner.cpp~ -+++ mozilla/toolkit/xre/nsAppRunner.cpp -@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n - gQtOnlyArgv[gQtOnlyArgc] = nsnull; - #endif - #if defined(MOZ_WIDGET_GTK2) --#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) - // Disable the slice allocator, since jemalloc already uses similar layout - // algorithms, and using a sub-allocator tends to increase fragmentation. - // This must be done before g_thread_init() is called. Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/widget/qt/nsNativeThemeQt.cpp~ -+++ mozilla/widget/qt/nsNativeThemeQt.cpp -@@ -25,7 +25,9 @@ - #include "nsThemeConstants.h" - #include "nsIServiceManager.h" - #include "nsIDOMHTMLInputElement.h" -+#ifdef __GLIBC__ - #include <malloc.h> -+#endif - - - #include "gfxASurface.h" Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,18 +0,0 @@ ---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2010-09-12 19:34:04.012503905 +0300 -+++ mozilla/xpcom/base/nsStackWalk.cpp 2010-09-12 19:34:41.294462134 +0300 -@@ -41,6 +41,7 @@ - /* API for getting a stack trace of the C/C++ stack on the current thread */ - - #include "nsStackWalk.h" -+#include <dlfcn.h> - - #if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code - -@@ -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> - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ mozilla/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(); Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,85 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 -@@ -74,6 +74,9 @@ - # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk - MODULE_OPTIMIZE_FLAGS=-O3 - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -117,7 +120,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -129,6 +132,12 @@ - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) - 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) - # -@@ -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 -@@ -350,7 +365,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_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) Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla__content__base__public__nsContentUtils.h ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla__content__base__public__nsContentUtils.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200 -+++ mozilla/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; Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 -+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,11 @@ - nsresult - nsThreadManager::Init() - { -+#ifdef NS_TLS && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla_toolkit_xre_glxtest.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla_toolkit_xre_glxtest.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- mozilla/toolkit/xre/glxtest.cpp.orig 2011-08-19 18:57:10.604870746 +0300 -+++ mozilla/toolkit/xre/glxtest.cpp 2011-08-19 18:59:43.620447963 +0300 -@@ -51,6 +51,8 @@ - // which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that - // to the 'write' end of the pipe. - -+#include <sys/types.h> -+#include <sys/wait.h> - #include <cstdio> - #include <cstdlib> - #include <unistd.h> -@@ -224,6 +226,7 @@ - void fire_glxtest_process() - { - int pfd[2]; -+ int status; - if (pipe(pfd) == -1) { - perror("pipe"); - exit(EXIT_FAILURE); -@@ -244,4 +247,5 @@ - close(pfd[1]); - mozilla::widget::glxtest_pipe = pfd[0]; - mozilla::widget::glxtest_pid = pid; -+ waitpid(pid, &status, 0); - } Deleted: branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.cfg ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.cfg Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,100 +0,0 @@ ---- mozilla/nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100 -+++ mozilla/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" Deleted: branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.h ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,30 +0,0 @@ ---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100 -+++ mozilla/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) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103) -+#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 Deleted: branches/experimental/mail/thunderbird-beta/files/thunderbird.desktop.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/thunderbird.desktop.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Thunderbird -GenericName=Mail Client -Comment=Mail client and News Reader -Exec=@MOZILLA@ %U -Icon=@PORTNAME_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; Deleted: branches/experimental/mail/thunderbird-beta/pkg-descr ============================================================================== --- branches/experimental/mail/thunderbird-beta/pkg-descr Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,6 +0,0 @@ -Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal -of becoming a cross-platform stand alone mail application using the XUL -user interface language. See the Mozilla Thunderbird project page for -more details. - -WWW: http://www.mozilla.com/thunderbird/ Deleted: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,166 +0,0 @@ -# New ports collection makefile for: phoenix -# Date created: 2002/10/21 -# Whom: Alan Eldridge <alane@FreeBSD.org> -# -# $FreeBSD: ports/www/firefox/Makefile,v 1.267 2012/04/30 09:18:04 beat Exp $ -# - -PORTNAME= firefox -DISTVERSION= 12.0 -PORTEPOCH= 1 -CATEGORIES= www ipv6 -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}.source - -MAINTAINER= gecko@FreeBSD.org -COMMENT= Web browser based on the browser portion of Mozilla - -BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ - nss>=3.13.2:${PORTSDIR}/security/nss \ - sqlite3>=3.7.10:${PORTSDIR}/databases/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:env -USE_GECKO= gecko -CONFLICTS= firefox-10.* -MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= # empty -MOZILLA_NAME= Firefox - -MAKE_JOBS_SAFE= yes -WANT_GNOME= yes -USE_QT4= # empty -QT_NONSTANDARD= yes -ALL_TARGET= default -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -GNU_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 \ - --enable-official-branding \ - --disable-updater \ - --disable-necko-wifi - -OPTIONS_DEFAULT=DBUS -OPTIONS= PGO "Enable Profile-Guided Optimization" off - -.include <bsd.port.pre.mk> - -WRKSRC:= ${WRKDIR}/mozilla-release - -.if ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -CONFIGURE_ENV+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - -.if defined(WITH_PGO) -BROKEN= does not build with PGO option enabled -BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 -USE_PYTHON_BUILD= yes -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 !empty(CXX:M*clang++*) -CXXFLAGS+= -Wno-return-type-c-linkage -.endif - -.if ${CXXFLAGS:M-stdlib=libc++} -CXXABI= -lcxxrt -.else -CXXABI= # implied -.endif - -pre-extract: -.if defined(WITH_PGO) - @${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 - -pre-configure: - (cd ${WRKSRC} && ${AUTOCONF}) - (cd ${WRKSRC}/js/src/ && ${AUTOCONF}) - -post-configure: -.if defined(WITH_PGO) - @${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> Deleted: branches/experimental/www/firefox-beta/Makefile.webplugins ============================================================================== --- branches/experimental/www/firefox-beta/Makefile.webplugins Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,226 +0,0 @@ -#-*- 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 Deleted: branches/experimental/www/firefox-beta/distinfo ============================================================================== --- branches/experimental/www/firefox-beta/distinfo Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,2 +0,0 @@ -SHA256 (firefox-12.0.source.tar.bz2) = 9a232a10e5803b0e4a85bd986e3e88b87ccde7bdc3363ea7022d5761944dbb1d -SIZE (firefox-12.0.source.tar.bz2) = 78956707 Deleted: branches/experimental/www/firefox-beta/files/firefox.desktop.in ============================================================================== --- branches/experimental/www/firefox-beta/files/firefox.desktop.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,191 +0,0 @@ -[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; Deleted: branches/experimental/www/firefox-beta/files/mozconfig-profile_guided_optimization.in ============================================================================== --- branches/experimental/www/firefox-beta/files/mozconfig-profile_guided_optimization.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1 +0,0 @@ -mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ $(OBJDIR)/_profile/pgo/profileserver.py' Deleted: branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- 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"); Deleted: branches/experimental/www/firefox-beta/files/patch-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-browser-installer-package-manifest.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- 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 Deleted: branches/experimental/www/firefox-beta/files/patch-bug741737 ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-bug741737 Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,93 +0,0 @@ -changeset: 91900:eee73897136b -user: Martin Stransky <stransky@redhat.com> -date: Tue Apr 17 19:57:40 2012 -0400 -summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb - -diff --git a/configure.in b/configure.in ---- configure.in -+++ configure.in -@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm, - - dnl system libvpx Support - dnl ======================================================== --MOZ_ARG_WITH_STRING(system-libvpx, --[ --with-system-libvpx=[PFX] -- Use system libvpx [installed at prefix PFX]], -- LIBVPX_DIR=$withval) -- --MOZ_NATIVE_LIBVPX= -+MOZ_ARG_WITH_BOOL(system-libvpx, -+[ --with-system-libvpx Use system libvpx (located with pkgconfig)], -+ MOZ_NATIVE_LIBVPX=1) -+ - MOZ_LIBVPX_INCLUDES= - MOZ_LIBVPX_LIBS= - -@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then - AC_DEFINE(MOZ_VP8_ENCODER) - fi - -- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then -- _SAVE_CFLAGS=$CFLAGS -- _SAVE_LDFLAGS=$LDFLAGS -- _SAVE_LIBS=$LIBS -- if test "${LIBVPX_DIR}" = "yes"; then -- LIBVPX_DIR=/usr -- fi -- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" -- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" -- MOZ_NATIVE_LIBVPX_DEC_TEST= -- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, -- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then -- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) -- fi], -- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) -- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, -- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], -- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) -- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then -- AC_MSG_CHECKING([for libvpx version >= v1.0.0]) -- dnl We need at least v1.0.0 to fix several crash bugs (for which we -- dnl had local patches prior to v1.0.0). -- dnl -- dnl This is a terrible test for the library version, but we don't -- dnl have a good one. There is no version number in a public header, -- dnl and testing the headers still doesn't guarantee we link against -- dnl the right version. While we could call vpx_codec_version() at -- dnl run-time, that would break cross-compiling. There are no -- dnl additional exported decoder symbols between the v1.0.0 release -- dnl and the v0.9.7 one to check for. -- AC_TRY_COMPILE([ -- #include <vpx/vpx_decoder.h> -- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) -- #error "test failed." -- #endif -- ], -- [return 0;], -- [AC_MSG_RESULT([yes]) -- MOZ_NATIVE_LIBVPX=1 -- AC_DEFINE(MOZ_NATIVE_LIBVPX) -- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" -- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], -- [AC_MSG_RESULT([no]) -- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) -- fi -- CFLAGS=$_SAVE_CFLAGS -- LDFLAGS=$_SAVE_LDFLAGS -- LIBS=$_SAVE_LIBS -+ if test -n "$MOZ_NATIVE_LIBVPX"; then -+ dnl ============================ -+ dnl === libvpx Version check === -+ dnl ============================ -+ dnl Check to see if we have a system libvpx package. -+ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0) -+ -+ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], -+ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) -+ -+ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], -+ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) - fi - fi - - Deleted: branches/experimental/www/firefox-beta/files/patch-build-pgo-profileserver.py ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-build-pgo-profileserver.py Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,18 +0,0 @@ ---- build/pgo/profileserver.py.orig 2011-02-24 21:49:47.000000000 +0100 -+++ build/pgo/profileserver.py 2011-02-24 21:50:30.000000000 +0100 -@@ -77,13 +77,13 @@ - t.setDaemon(True) # don't hang on exit - t.start() - -- automation.setServerInfo("localhost", PORT) -+ automation.setServerInfo("127.0.0.1", PORT) - automation.initializeProfile(PROFILE_DIRECTORY) - browserEnv = automation.environment() - browserEnv["XPCOM_DEBUG_BREAK"] = "warn" - browserEnv["MOZ_JAR_LOG_DIR"] = MOZ_JAR_LOG_DIR - -- url = "http://localhost:%d/index.html" % PORT -+ url = "http://127.0.0.1:%d/index.html" % PORT - appPath = os.path.join(SCRIPT_DIR, automation.DEFAULT_APP) - status = automation.runApp(url, browserEnv, appPath, PROFILE_DIRECTORY, {}, - debuggerInfo=debuggerInfo, Deleted: branches/experimental/www/firefox-beta/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-config_autoconf.mk.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,30 +0,0 @@ ---- 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@ Deleted: branches/experimental/www/firefox-beta/files/patch-config_config.mk ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-config_config.mk Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- 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) Deleted: branches/experimental/www/firefox-beta/files/patch-config_mkdepend_Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-config_mkdepend_Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- 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) Deleted: branches/experimental/www/firefox-beta/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-configure.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,119 +0,0 @@ ---- 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 - -@@ -3803,19 +3803,21 @@ - AC_CHECK_FUNCS(localtime_r strtok_r) - - dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt --_SAVE_LDFLAGS=$LDFLAGS --LDFLAGS="$LDFLAGS -lrt" --AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, -+_SAVE_LIBS=$LIBS -+AC_SEARCH_LIBS(clock_gettime, rt) -+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), - ac_cv_have_clock_monotonic, - [AC_TRY_LINK([#include <time.h>], - [ struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); ], - ac_cv_have_clock_monotonic=yes, - ac_cv_have_clock_monotonic=no)]) --LDFLAGS=$_SAVE_LDFLAGS -+LIBS=$_SAVE_LIBS - if test "$ac_cv_have_clock_monotonic" = "yes"; then - HAVE_CLOCK_MONOTONIC=1 -- REALTIME_LIBS=-lrt -+ if test "$ac_cv_search_clock_gettime" != "none required"; then -+ REALTIME_LIBS=$ac_cv_search_clock_gettime -+ fi - AC_DEFINE(HAVE_CLOCK_MONOTONIC) - AC_SUBST(HAVE_CLOCK_MONOTONIC) - AC_SUBST(REALTIME_LIBS) -@@ -4410,6 +4410,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 ======================================================== -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS -@@ -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 Deleted: branches/experimental/www/firefox-beta/files/patch-content__base__public__nsContentUtils.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-content__base__public__nsContentUtils.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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; Deleted: branches/experimental/www/firefox-beta/files/patch-db_sqlite3_src_Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-db_sqlite3_src_Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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 Deleted: branches/experimental/www/firefox-beta/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- dom/plugins/ipc/PluginMessageUtils.cpp~ -+++ dom/plugins/ipc/PluginMessageUtils.cpp -@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const - i += with.length(); - } - -- return munged; -+ return munged.c_str(); - } - #endif - Deleted: branches/experimental/www/firefox-beta/files/patch-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-gfx-qcms-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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) Deleted: branches/experimental/www/firefox-beta/files/patch-gfx-qcms-qcmstypes.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-gfx-qcms-qcmstypes.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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 Deleted: branches/experimental/www/firefox-beta/files/patch-gfx-thebes-gfxPlatform.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-gfx-thebes-gfxPlatform.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,34 +0,0 @@ ---- 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(); Deleted: branches/experimental/www/firefox-beta/files/patch-gfx-ycbcr-Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-gfx-ycbcr-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- 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 Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- ipc/chromium/Makefile.in~ -+++ ipc/chromium/Makefile.in -@@ -23,9 +23,7 @@ vpath %.c \ - $(srcdir)/src/third_party/libevent \ - $(NULL) - else # } else { --# message_pump_libevent.cc includes third_party/libevent/event.h, --# which we put in $(DIST), see export rule below --LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) - endif # } - - vpath %.cc \ Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- 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 { Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- 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) { Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,19 +0,0 @@ ---- ipc/chromium/src/base/file_util_linux.cc~ -+++ ipc/chromium/src/base/file_util_linux.cc -@@ -5,6 +5,7 @@ - #include "base/file_util.h" - - #include <fcntl.h> -+#include <unistd.h> - - #include <string> - #include <vector> -@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) { - #ifdef ANDROID - return GetTempDir(path); - #else -- *path = FilePath("/dev/shm"); -+ *path = FilePath("/tmp"); - return true; - #endif - } Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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) Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,19 +0,0 @@ ---- ipc/chromium/src/base/message_pump_libevent.cc~ -+++ ipc/chromium/src/base/message_pump_libevent.cc -@@ -6,6 +6,7 @@ - - #include <errno.h> - #include <fcntl.h> -+#include <unistd.h> - - #include "eintr_wrapper.h" - #include "base/logging.h" -@@ -15,7 +15,7 @@ - #include "base/scoped_nsautorelease_pool.h" - #include "base/scoped_ptr.h" - #include "base/time.h" --#include "third_party/libevent/event.h" -+#include "event.h" - - // Lifecycle of struct event - // Libevent uses two main data structures: Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- 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" Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- ipc/chromium/src/base/platform_thread_posix.cc~ -+++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -11,6 +11,7 @@ - #include <mach/mach.h> - #elif defined(OS_LINUX) - #include <sys/syscall.h> -+#include <pthread_np.h> - #include <unistd.h> - #endif - -@@ -34,7 +35,13 @@ PlatformThreadId PlatformThread::Current - #if defined(OS_MACOSX) - return mach_thread_self(); - #elif defined(OS_LINUX) -- return syscall(__NR_gettid); -+#if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+#else -+ long tid; -+ syscall(SYS_thr_self, &tid); -+ return tid; -+#endif - #endif - } - Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ -+++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h -@@ -34,7 +34,7 @@ - #include "base/third_party/nspr/prcpucfg_win.h" - #elif defined(__APPLE__) - #include "base/third_party/nspr/prcpucfg_mac.h" --#elif defined(__linux__) || defined(ANDROID) -+#elif defined(__FreeBSD__) || defined(ANDROID) - #include "base/third_party/nspr/prcpucfg_linux.h" - #else - #error Provide a prcpucfg.h appropriate for your platform Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-time_posix.cc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-time_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- 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 Deleted: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-build-build_config.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-build-build_config.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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 Deleted: branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,30 +0,0 @@ ---- 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 -@@ -352,7 +352,7 @@ - # For architectures without YARR JIT, PCRE is faster than the YARR - # interpreter (bug 684559). - --ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) -+ifeq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU))) - - VPATH += $(srcdir)/yarr/pcre \ - $(NULL) -@@ -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 Deleted: branches/experimental/www/firefox-beta/files/patch-js-src-config-mkdepend_Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js-src-config-mkdepend_Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- 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) Deleted: branches/experimental/www/firefox-beta/files/patch-js-src-config_config.mk ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js-src-config_config.mk Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- 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) Deleted: branches/experimental/www/firefox-beta/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js-src-configure.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- 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 - -@@ -2814,6 +2814,16 @@ - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; -+amd64*-*) -+ ENABLE_TRACEJIT=1 -+ NANOJIT_ARCH=X64 -+ ENABLE_METHODJIT=1 -+ ENABLE_MONOIC=1 -+ ENABLE_POLYIC=1 -+ ENABLE_POLYIC_TYPED_ARRAY=1 -+ AC_DEFINE(JS_CPU_X64) -+ AC_DEFINE(JS_PUNBOX64) -+ ;; - x86_64*-*) - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 -@@ -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_ */ - Deleted: branches/experimental/www/firefox-beta/files/patch-js-src-jscpucfg.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js-src-jscpucfg.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ ---- 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> - Deleted: branches/experimental/www/firefox-beta/files/patch-js-src-methodjit-MethodJIT.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js-src-methodjit-MethodJIT.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- js/src/methodjit/MethodJIT.cpp~ -+++ js/src/methodjit/MethodJIT.cpp -@@ -171,7 +171,7 @@ - - JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); - --#if defined(__linux__) && defined(JS_CPU_X64) -+#if defined(__ELF__) && defined(JS_CPU_X64) - # define SYMBOL_STRING_RELOC(name) #name "@plt" - #else - # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) -@@ -149,7 +149,7 @@ - - #if defined(XP_MACOSX) - # define HIDE_SYMBOL(name) ".private_extern _" #name --#elif defined(__linux__) -+#elif defined(__ELF__) - # define HIDE_SYMBOL(name) ".hidden" #name - #else - # define HIDE_SYMBOL(name) Deleted: branches/experimental/www/firefox-beta/files/patch-js_src_jsnum.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js_src_jsnum.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,31 +0,0 @@ ---- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500 -+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500 -@@ -43,6 +43,9 @@ - /* - * JS number type and wrapper class. - */ -+#if defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #ifdef XP_OS2 - #define _PC_53 PC_53 - #define _MCW_EM MCW_EM -@@ -691,8 +694,18 @@ - - #else - -+#if defined(__FreeBSD__) -+#if __BSD_VISIBLE == 0 -+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined -+#endif -+#include <fenv.h> -+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT)) -+#else -+ - #define FIX_FPU() ((void)0) - -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ -+ - #endif - - JSBool Deleted: branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200 -+++ layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200 -@@ -159,9 +159,10 @@ - -I$(srcdir)/../../content/html/content/src \ - -I$(srcdir)/../../dom/base \ - -I$(srcdir)/../../dom/plugins/base \ -- $(MOZ_CAIRO_CFLAGS) \ - $(NULL) - -+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) -+ - ifdef MOZ_ENABLE_GTK2 - CXXFLAGS += $(MOZ_GTK2_CFLAGS) - endif Deleted: branches/experimental/www/firefox-beta/files/patch-media-libvpx-vpx_config.c ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-media-libvpx-vpx_config.c Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- 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" - Deleted: branches/experimental/www/firefox-beta/files/patch-media-libvpx-vpx_config.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-media-libvpx-vpx_config.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- 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" - Deleted: branches/experimental/www/firefox-beta/files/patch-memory-mozalloc-mozalloc.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-memory-mozalloc-mozalloc.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- memory/mozalloc/mozalloc.cpp~ -+++ memory/mozalloc/mozalloc.cpp -@@ -52,6 +52,9 @@ - #if defined(XP_UNIX) - # include <unistd.h> // for valloc on *BSD - #endif //if defined(XP_UNIX) -+#ifdef __FreeBSD__ -+# include <malloc_np.h> // for malloc_usable_size -+#endif - - #if defined(MOZ_MEMORY) - // jemalloc.h doesn't redeclare symbols if they're provided by the OS -@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || defined(XP_LINUX) -+#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__) - // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations - // might use a libc that doesn't have malloc_usable_size. Let's fix this - // if/when it happens. Deleted: branches/experimental/www/firefox-beta/files/patch-nsprpub-pr-include-md_freebsd.cfg ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-nsprpub-pr-include-md_freebsd.cfg Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,100 +0,0 @@ ---- 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" Deleted: branches/experimental/www/firefox-beta/files/patch-nsprpub-pr-include-md_freebsd.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-nsprpub-pr-include-md_freebsd.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,30 +0,0 @@ ---- 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 Deleted: branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- 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 Deleted: branches/experimental/www/firefox-beta/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-security-nss-lib-Makefile Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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 Deleted: branches/experimental/www/firefox-beta/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- 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 - Deleted: branches/experimental/www/firefox-beta/files/patch-security_manager_ssl_src_nsNSSComponent.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-security_manager_ssl_src_nsNSSComponent.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" Deleted: branches/experimental/www/firefox-beta/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-toolkit-xre-nsAppRunner.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- toolkit/xre/nsAppRunner.cpp~ -+++ toolkit/xre/nsAppRunner.cpp -@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n - gQtOnlyArgv[gQtOnlyArgc] = nsnull; - #endif - #if defined(MOZ_WIDGET_GTK2) --#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) - // Disable the slice allocator, since jemalloc already uses similar layout - // algorithms, and using a sub-allocator tends to increase fragmentation. - // This must be done before g_thread_init() is called. Deleted: branches/experimental/www/firefox-beta/files/patch-toolkit_library_Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-toolkit_library_Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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 -@@ -181,7 +181,7 @@ - export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) - $(INSTALL) $^ . - --EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%% - - ifdef MOZ_ENABLE_LIBXUL - include $(srcdir)/libxul-rules.mk Deleted: branches/experimental/www/firefox-beta/files/patch-toolkit_xre_Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-toolkit_xre_Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,8 +0,0 @@ ---- 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) Deleted: branches/experimental/www/firefox-beta/files/patch-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-widget-qt-nsNativeThemeQt.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- widget/qt/nsNativeThemeQt.cpp~ -+++ widget/qt/nsNativeThemeQt.cpp -@@ -25,7 +25,9 @@ - #include "nsThemeConstants.h" - #include "nsIServiceManager.h" - #include "nsIDOMHTMLInputElement.h" -+#ifdef __GLIBC__ - #include <malloc.h> -+#endif - - - #include "gfxASurface.h" Deleted: branches/experimental/www/firefox-beta/files/patch-xpcom-io-nsAppFileLocationProvider.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-xpcom-io-nsAppFileLocationProvider.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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)); Deleted: branches/experimental/www/firefox-beta/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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(); Deleted: branches/experimental/www/firefox-beta/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- 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); Deleted: branches/experimental/www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 -+++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,11 @@ - nsresult - nsThreadManager::Init() - { -+#ifdef NS_TLS && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - Deleted: branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-xpcom_base_nsStackWalk.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,19 +0,0 @@ ---- 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> - Deleted: branches/experimental/www/firefox-beta/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,85 +0,0 @@ ---- 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 -@@ -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 - -@@ -117,7 +120,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -130,6 +133,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) -@@ -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 -@@ -350,7 +365,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_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) Deleted: branches/experimental/www/firefox-beta/pkg-descr ============================================================================== --- branches/experimental/www/firefox-beta/pkg-descr Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ -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 Deleted: branches/experimental/www/firefox-beta/pkg-message ============================================================================== --- branches/experimental/www/firefox-beta/pkg-message Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,48 +0,0 @@ -====================================================================== - -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@) -====================================================================== Deleted: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,194 +0,0 @@ -# New ports collection makefile for: mozilla -# Date created: 31 Mar 1998 -# Whom: eivind/dima/jseger -# -# $FreeBSD: ports/www/seamonkey/Makefile,v 1.323 2012/03/14 15:50:04 beat Exp $ -# - -PORTNAME= seamonkey -DISTVERSION= 2.9b3 -CATEGORIES?= www ipv6 -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source -DISTNAME= seamonkey-${DISTVERSION}.source - -MAINTAINER= gecko@FreeBSD.org -COMMENT= The open source, standards compliant web browser - -BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ - nss>=3.13.2:${PORTSDIR}/security/nss \ - sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ - unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo - -USE_AUTOTOOLS= autoconf213:env -CONFLICTS_BUILD= spidermonkey-1.[0-7]* -USE_BZIP2= yes -USE_GMAKE= yes -USE_GECKO= gecko -WANT_GNOME= yes -USE_QT4= # empty -QT_NONSTANDARD= yes -WANT_PERL= yes -GNU_CONFIGURE= yes -ALL_TARGET= default -USE_GL= gl -MAKE_JOBS_SAFE= yes -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome -MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin - -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} - -MOZ_EXTENSIONS= default -MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-application=suite \ - --disable-updater \ - --disable-necko-wifi - -USE_MOZILLA= # empty -USE_GECKO_OPTIONS=+smb -MOZILLA_PLIST_DIRS= bin lib -MOZ_PKGCONFIG_FILES= - -NOT_FOR_ARCHS= ia64 - -OPTIONS_DEFAULT=DBUS -OPTIONS=MAILNEWS "Enable Mail and News modules" on \ - COMPOSER "Enable the HTML Composer module" on \ - LDAP "Enable LDAP support for Mailnews" on \ - CHATZILLA "Enable the Chatzilla IRC module" on \ - LIGHTNING "Enable calendar extension" off - -.include <bsd.port.pre.mk> - -MOZSRC:= ${WRKDIR}/comm-beta/mozilla -WRKSRC= ${WRKDIR}/comm-beta - -.if ${ARCH} == powerpc64 -.if ${OSVERSION} < 900033 -BROKEN= Needs binutils 2.17.50 to build -.else -CONFIGURE_ENV+= UNAME_m="powerpc64" -CFLAGS+= -mminimal-toc -.endif -.endif - -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - -.if defined(WITHOUT_MAILNEWS) -EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ - ${FILESDIR}/extra-patch-configure.in -MOZ_OPTIONS+= --disable-ldap --disable-mailnews -.else -# mail and news desired, but not LDAP -.if defined(WITHOUT_LDAP) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bridge-bridge.mk -MOZ_OPTIONS+= --disable-ldap --enable-mailnews -.else -MOZ_OPTIONS+= --enable-ldap --enable-mailnews -.endif -.endif -.if !defined(WITHOUT_CHATZILLA) -MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc -.endif - -.if defined(WITHOUT_COMPOSER) -MOZ_OPTIONS+= --disable-composer -.endif - -.if ${ARCH} == amd64 || ${ARCH} == i386 -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm -.endif - -.if !empty(CXX:M*clang++*) -CFLAGS+= -Wno-return-type-c-linkage -.endif - -.if ${CXXFLAGS:M-stdlib=libc++} -CXXABI= -lcxxrt -.else -CXXABI= # implied -.endif - -.if defined(WITH_LIGHTNING) -MOZ_OPTIONS+= --enable-calendar -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar -LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi -XPI_LIBDIR= ${PREFIX}/lib/xpi -XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} -XPI_ID= lightning@seamonkey.mozilla.org -.else -MOZ_OPTIONS+= --disable-calendar -.endif - -post-patch: - @${GREP} -Flr -e MSG_LINEBREAK -e CRLF ${WRKSRC}/mailnews \ - | ${XARGS} ${REINPLACE_CMD} -Ee 's/"(MSG_|CRLF)/" \1/g' \ - -e 's/(BREAK|CRLF)"/\1 "/g' - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ - ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ - -e 's|%%CXXABI%%|${CXXABI}|' \ - ${WRKSRC}/suite/build/Makefile.in \ - ${MOZSRC}/storage/build/Makefile.in \ - ${MOZSRC}/toolkit/library/Makefile.in \ - ${MOZSRC}/db/sqlite3/src/Makefile.in - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ - ${WRKSRC}/mozilla/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \ - ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ - ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp - @${REINPLACE_CMD} -e 's|libgnomeui-2.so.0|libgnomeui-2.so|' \ - ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ - ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp - @${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \ - ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp - @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ - < ${FILESDIR}/seamonkey.desktop.in > \ - ${WRKDIR}/${MOZILLA}.desktop -pre-configure: - (cd ${WRKSRC} && ${AUTOCONF}) - (cd ${MOZSRC} && ${AUTOCONF}) - (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) - -pre-install: - ${ECHO_CMD} share/applications/${MOZILLA}.desktop >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} 'share/pixmaps/${MOZILLA}.png' >> ${PLIST} - -do-install: - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ - ${LN} -sf ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png \ - ${PREFIX}/share/pixmaps/${MOZILLA}.png - -post-install: -.if defined(WITH_LIGHTNING) - @${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/seamonkey - @(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE}) - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID} - @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_LIBDIR}/${XPI_ID}/install.rdf - @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID} - @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/seamonkey/extensions 2>/dev/null || true - @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/seamonkey 2>/dev/null || true - @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \ - ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} 'lib/xpi/symlinks/seamonkey/${XPI_ID}' >> ${TMPPLIST} - @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/seamonkey/extensions 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/seamonkey/extensions/${XPI_ID}' >> ${TMPPLIST} - @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \ - ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/seamonkey 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST} -.endif - -.include <bsd.port.post.mk> Deleted: branches/experimental/www/seamonkey-beta/distinfo ============================================================================== --- branches/experimental/www/seamonkey-beta/distinfo Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,2 +0,0 @@ -SHA256 (seamonkey-2.9b3.source.tar.bz2) = 8532d8deeadd6ac6894a0828fbfdfb456b04c08cd1ce6baeaf6d05137023d900 -SIZE (seamonkey-2.9b3.source.tar.bz2) = 102211948 Deleted: branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk ============================================================================== --- branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- bridge/bridge.mk.orig 2012-03-13 06:23:10.000000000 +0100 -+++ bridge/bridge.mk 2012-03-14 12:28:03.000000000 +0100 -@@ -38,17 +38,19 @@ - - APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete - --#ifdef MOZ_LDAP_XPCOM -+ifdef MOZ_LDAP_XPCOM - APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk - APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom --#endif -+endif - - #ifdef MOZ_MORK - APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork - #endif - -+ifdef disabled - APP_LIBXUL_DIRS += \ - $(DEPTH)$(SUBDIR)/mailnews/base \ - $(DEPTH)$(SUBDIR)/mailnews/mime/public \ - $(DEPTH)$(SUBDIR)/mailnews \ - $(NULL) -+endif Deleted: branches/experimental/www/seamonkey-beta/files/extra-patch-bridge-bridge.mk ============================================================================== --- branches/experimental/www/seamonkey-beta/files/extra-patch-bridge-bridge.mk Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- bridge/bridge.mk.orig 2011-11-24 18:31:11.000000000 +0100 -+++ bridge/bridge.mk 2011-11-24 18:31:23.000000000 +0100 -@@ -38,10 +38,10 @@ - - APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete - --#ifdef MOZ_LDAP_XPCOM -+ifdef MOZ_LDAP_XPCOM - APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk - APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom --#endif -+endif - - #ifdef MOZ_MORK - APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork Deleted: branches/experimental/www/seamonkey-beta/files/extra-patch-configure.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/extra-patch-configure.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- configure.in.orig 2012-03-14 14:18:03.000000000 +0100 -+++ configure.in 2012-03-14 14:18:25.000000000 +0100 -@@ -837,11 +837,6 @@ - AC_PROG_CPP - AC_PROG_CXXCPP - --MAIL_COMPONENT="mail msgsmime import" --export MAIL_COMPONENT --MAIL_MODULE="MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule)" --export MAIL_MODULE -- - if test -n "$_WIN32_MSVC"; then - SKIP_PATH_CHECKS=1 - SKIP_COMPILER_CHECKS=1 Deleted: branches/experimental/www/seamonkey-beta/files/extra-patch-security_manager_Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/extra-patch-security_manager_Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/manager/Makefile.in.orig.patched Thu May 25 10:19:22 2006 -+++ security/manager/Makefile.in Thu May 25 10:19:22 2006 -@@ -159,8 +159,6 @@ - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) - ifeq ($(OS_ARCH),WINNT) - cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --else -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif - # $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) - ifndef SKIP_CHK Deleted: branches/experimental/www/seamonkey-beta/files/moz_pis_S50cleanhome ============================================================================== --- branches/experimental/www/seamonkey-beta/files/moz_pis_S50cleanhome Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,31 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to clean up users' Mozilla home directories to make upgrading -# less painful. - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR} - -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # Debian does this for new builds - # rm -f "${dir}/XUL.mfasl" - # force a rebuild of compreg.dat and xpti.dat for new installations - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi Deleted: branches/experimental/www/seamonkey-beta/files/mozconfig-generic.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/mozconfig-generic.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,8 +0,0 @@ -ac_add_options --prefix=@FAKEDIR@ -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -export PERL="@PERL@" Deleted: branches/experimental/www/seamonkey-beta/files/patch-bug741737 ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-bug741737 Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,93 +0,0 @@ -changeset: 91900:eee73897136b -user: Martin Stransky <stransky@redhat.com> -date: Tue Apr 17 19:57:40 2012 -0400 -summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb - -diff --git a/configure.in b/configure.in ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm, - - dnl system libvpx Support - dnl ======================================================== --MOZ_ARG_WITH_STRING(system-libvpx, --[ --with-system-libvpx=[PFX] -- Use system libvpx [installed at prefix PFX]], -- LIBVPX_DIR=$withval) -- --MOZ_NATIVE_LIBVPX= -+MOZ_ARG_WITH_BOOL(system-libvpx, -+[ --with-system-libvpx Use system libvpx (located with pkgconfig)], -+ MOZ_NATIVE_LIBVPX=1) -+ - MOZ_LIBVPX_INCLUDES= - MOZ_LIBVPX_LIBS= - -@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then - AC_DEFINE(MOZ_VP8_ENCODER) - fi - -- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then -- _SAVE_CFLAGS=$CFLAGS -- _SAVE_LDFLAGS=$LDFLAGS -- _SAVE_LIBS=$LIBS -- if test "${LIBVPX_DIR}" = "yes"; then -- LIBVPX_DIR=/usr -- fi -- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" -- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" -- MOZ_NATIVE_LIBVPX_DEC_TEST= -- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, -- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then -- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) -- fi], -- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) -- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, -- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], -- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) -- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then -- AC_MSG_CHECKING([for libvpx version >= v1.0.0]) -- dnl We need at least v1.0.0 to fix several crash bugs (for which we -- dnl had local patches prior to v1.0.0). -- dnl -- dnl This is a terrible test for the library version, but we don't -- dnl have a good one. There is no version number in a public header, -- dnl and testing the headers still doesn't guarantee we link against -- dnl the right version. While we could call vpx_codec_version() at -- dnl run-time, that would break cross-compiling. There are no -- dnl additional exported decoder symbols between the v1.0.0 release -- dnl and the v0.9.7 one to check for. -- AC_TRY_COMPILE([ -- #include <vpx/vpx_decoder.h> -- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) -- #error "test failed." -- #endif -- ], -- [return 0;], -- [AC_MSG_RESULT([yes]) -- MOZ_NATIVE_LIBVPX=1 -- AC_DEFINE(MOZ_NATIVE_LIBVPX) -- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" -- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], -- [AC_MSG_RESULT([no]) -- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) -- fi -- CFLAGS=$_SAVE_CFLAGS -- LDFLAGS=$_SAVE_LDFLAGS -- LIBS=$_SAVE_LIBS -+ if test -n "$MOZ_NATIVE_LIBVPX"; then -+ dnl ============================ -+ dnl === libvpx Version check === -+ dnl ============================ -+ dnl Check to see if we have a system libvpx package. -+ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0) -+ -+ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], -+ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) -+ -+ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], -+ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) - fi - fi - - Deleted: branches/experimental/www/seamonkey-beta/files/patch-config-rules.mk ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-config-rules.mk Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) Deleted: branches/experimental/www/seamonkey-beta/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-config_autoconf.mk.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- config/autoconf.mk.in.orig 2011-08-17 10:26:35.000000000 +0200 -+++ config/autoconf.mk.in 2011-08-17 10:27:16.000000000 +0200 -@@ -60,14 +60,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%% - - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist Deleted: branches/experimental/www/seamonkey-beta/files/patch-configure.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-configure.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,122 +0,0 @@ ---- configure.in.orig 2011-12-17 18:35:47.000000000 +0100 -+++ configure.in 2011-12-19 15:57:09.000000000 +0100 -@@ -1410,7 +1410,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1430,7 +1430,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -1753,7 +1753,7 @@ - esac - - case "${host_cpu}" in -- x86_64) -+ amd64 | x86_64) - HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" - ;; - esac -@@ -2415,6 +2415,9 @@ - x86_64-*) - AC_DEFINE(_AMD64_) - ;; -+ amd64*) -+ AC_DEFINE(_AMD64_) -+ ;; - *) - AC_DEFINE(_CPU_ARCH_NOT_DEFINED) - ;; -@@ -2486,7 +2489,7 @@ - else - DLL_SUFFIX=".so.1.0" - fi -- MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib' -+ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib' - DSO_CFLAGS='' - DSO_PIC_CFLAGS='-fPIC' - DSO_LDOPTS='-shared -fPIC' -@@ -3304,11 +3307,11 @@ - ;; - *) - MOZ_CHECK_PTHREADS(pthreads, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads", - MOZ_CHECK_PTHREADS(pthread, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", - MOZ_CHECK_PTHREADS(c_r, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", - MOZ_CHECK_PTHREADS(c, - USE_PTHREADS=1 - ) -@@ -3383,18 +3386,18 @@ - *-*-freebsd*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) -- dnl -pthread links in -lc_r, so don't specify it explicitly. -+ dnl -pthread links in -pthread, so don't specify it explicitly. - if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="-pthread" - else -- _PTHREAD_LDFLAGS="-lc_r" -+ _PTHREAD_LDFLAGS="-pthread" - fi - ;; - - *-*-openbsd*|*-*-bsdi*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) -- dnl -pthread links in -lc_r, so don't specify it explicitly. -+ dnl -pthread links in -pthread, so don't specify it explicitly. - if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="-pthread" - fi -@@ -3569,7 +3572,7 @@ - ac_cv_func_iconv, - [AC_TRY_LINK([ - #include <stdlib.h> -- #include <iconv.h> -+ #include "/usr/local/include/iconv.h" - ], - [ - iconv_t h = iconv_open("", ""); -@@ -3590,7 +3593,7 @@ - ac_cv_func_const_iconv, - [AC_TRY_COMPILE([ - #include <stdlib.h> -- #include <iconv.h> -+ #include "/usr/local/include/iconv.h" - ], - [ - const char *input = "testing"; -@@ -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 ======================================================== -@@ -4383,7 +4386,7 @@ - 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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~ -+++ mozilla/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 { Deleted: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,19 +0,0 @@ ---- mozilla/ipc/chromium/src/base/file_util_linux.cc~ -+++ mozilla/ipc/chromium/src/base/file_util_linux.cc -@@ -5,6 +5,7 @@ - #include "base/file_util.h" - - #include <fcntl.h> -+#include <unistd.h> - - #include <string> - #include <vector> -@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) { - #ifdef ANDROID - return GetTempDir(path); - #else -- *path = FilePath("/dev/shm"); -+ *path = FilePath("/tmp"); - return true; - #endif - } Deleted: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/ipc/chromium/src/base/file_util_posix.cc~ -+++ mozilla/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) Deleted: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/ipc/chromium/src/base/platform_file_posix.cc~ -+++ mozilla/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" Deleted: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 -+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 -@@ -34,7 +33,8 @@ - #if defined(OS_MACOSX) - return mach_thread_self(); - #elif defined(OS_LINUX) -- return syscall(__NR_gettid); -+ // TODO(BSD): find a better thread ID -+ return reinterpret_cast<int64>(pthread_self()); - #endif - } - Deleted: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ -+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h -@@ -34,7 +34,7 @@ - #include "base/third_party/nspr/prcpucfg_win.h" - #elif defined(__APPLE__) - #include "base/third_party/nspr/prcpucfg_mac.h" --#elif defined(__linux__) || defined(ANDROID) -+#elif defined(__FreeBSD__) || defined(ANDROID) - #include "base/third_party/nspr/prcpucfg_linux.h" - #else - #error Provide a prcpucfg.h appropriate for your platform Deleted: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-time_posix.cc ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-time_posix.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/ipc/chromium/src/base/time_posix.cc~ -+++ mozilla/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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-build-build_config.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-build-build_config.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/ipc/chromium/src/build/build_config.h~ -+++ mozilla/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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 -+++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 -@@ -254,6 +254,10 @@ - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+endif -+ - ifeq ($(OS_ARCH), NetBSD) - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) - endif Deleted: branches/experimental/www/seamonkey-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 -+++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-01 10:18:43.000000000 +0100 -@@ -147,6 +147,11 @@ - CUSTOM_LIBS=1 - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+CUSTOM_LIBS=1 -+endif -+ - # no extra libs on HP-UX - ifeq ($(OS_ARCH), HP-UX) - CUSTOM_LIBS=1 Deleted: branches/experimental/www/seamonkey-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ ---- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200 -+++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200 -@@ -42,7 +42,7 @@ - NSPR_LIBS = @NSPR_LIBS@ - NSPR_CFLAGS = @NSPR_CFLAGS@ - NSS_LIBS = @NSS_LIBS@ --NSS_CFLAGS = @NSS_CFLAGS@ -+NSS_CFLAGS = @NSS_CFLAGS@ -I/usr/local/include/nss/nss - - include $(MOD_DEPTH)/config/autoconf.mk - include $(topsrcdir)/build.mk -@@ -180,6 +180,10 @@ - CUSTOM_LIBS=1 - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+CUSTOM_LIBS=1 -+endif -+ - ifndef CUSTOM_LIBS - EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME) - EXTRA_LIBS += $(NSSLINK) Deleted: branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- ldap/xpcom/src/Makefile.in.orig 2012-03-12 10:25:35.000000000 +0100 -+++ ldap/xpcom/src/Makefile.in 2012-03-12 10:26:09.000000000 +0100 -@@ -89,6 +89,10 @@ - $(NULL) - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+endif -+ - EXTRA_DSO_LDOPTS += $(LDAP_LIBS) - ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) Deleted: branches/experimental/www/seamonkey-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- mailnews/addrbook/src/nsDirPrefs.cpp~ -+++ mailnews/addrbook/src/nsDirPrefs.cpp -@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid - DIR_Server *s=nsnull; - - switch (position) { -- case DIR_POS_APPEND: -+ case (PRInt32)DIR_POS_APPEND: - /* Do nothing if the request is to append a server that is already - * in the list. - */ -@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid - wholeList->AppendElement(server); - break; - -- case DIR_POS_DELETE: -+ case (PRInt32)DIR_POS_DELETE: - /* Remove the prefs corresponding to the given server. If the prefName - * value is nsnull, the server has never been saved and there are no - * prefs to remove. Deleted: branches/experimental/www/seamonkey-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- mailnews/compose/src/nsSmtpProtocol.cpp~ -+++ mailnews/compose/src/nsSmtpProtocol.cpp -@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr - - switch (code) - { -- case NS_ERROR_SMTP_SERVER_ERROR: -- case NS_ERROR_TCP_READ_ERROR: -- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: -- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: -- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: -- case NS_ERROR_SENDING_FROM_COMMAND: -- case NS_ERROR_SENDING_RCPT_COMMAND: -- case NS_ERROR_SENDING_DATA_COMMAND: -- case NS_ERROR_SENDING_MESSAGE: -- case NS_ERROR_SMTP_GREETING: -+ case (int)NS_ERROR_SMTP_SERVER_ERROR: -+ case (int)NS_ERROR_TCP_READ_ERROR: -+ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: -+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: -+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: -+ case (int)NS_ERROR_SENDING_FROM_COMMAND: -+ case (int)NS_ERROR_SENDING_RCPT_COMMAND: -+ case (int)NS_ERROR_SENDING_DATA_COMMAND: -+ case (int)NS_ERROR_SENDING_MESSAGE: -+ case (int)NS_ERROR_SMTP_GREETING: - bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg)); - msg = nsTextFormatter::vsmprintf(eMsg.get(), args); - break; Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-browser-installer-package-manifest.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- mozilla/browser/installer/package-manifest.in~ -+++ mozilla/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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-build-autoconf-config.sub ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-build-autoconf-config.sub Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 -+++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-build-unix-run-mozilla.sh ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-build-unix-run-mozilla.sh Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- mozilla/build/unix/run-mozilla.sh.orig 2010-10-08 21:51:26.000000000 +0200 -+++ mozilla/build/unix/run-mozilla.sh 2010-10-10 21:45:33.000000000 +0200 -@@ -308,7 +308,7 @@ - } - if moz_should_set_ld_library_path - then -- LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"} -+ LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - fi - - if [ -n "$LD_LIBRARYN32_PATH" ] -@@ -390,6 +390,9 @@ - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH - -+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey -+export MOZ_PLUGIN_PATH -+ - if [ $moz_debug -eq 1 ] - then - moz_debug_program ${1+"$@"} Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-autoconf.mk.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-autoconf.mk.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/config/autoconf.mk.in.orig 2009-09-17 19:09:10.000000000 +0200 -+++ mozilla/config/autoconf.mk.in 2009-09-17 19:09:26.000000000 +0200 -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-gcc-stl-wrapper.template.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-gcc-stl-wrapper.template.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/config/gcc-stl-wrapper.template.h.orig 2010-05-12 13:56:18.000000000 +0000 -+++ mozilla/config/gcc-stl-wrapper.template.h 2010-05-12 13:56:52.000000000 +0000 -@@ -89,7 +89,7 @@ - // -fshort-wchar). We don't want that and so define our own inlined - // __throw_*(). - #ifndef mozilla_throw_gcc_h --# include "mozilla/throw_gcc.h" -+# include "../../memory/mozalloc/throw_gcc.h" - #endif - - #endif // if mozilla_${HEADER}_h Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-mkdepend-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-mkdepend-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/config/mkdepend/Makefile.in.orig 2009-09-11 19:30:23.000000000 +0200 -+++ mozilla/config/mkdepend/Makefile.in 2009-09-11 19:29:53.000000000 +0200 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-mkdepend-imakemdep.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-config-mkdepend-imakemdep.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ mozilla/config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,109 +0,0 @@ ---- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -1549,7 +1549,7 @@ - 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 - -@@ -3803,19 +3803,21 @@ - AC_CHECK_FUNCS(localtime_r strtok_r) - - dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt --_SAVE_LDFLAGS=$LDFLAGS --LDFLAGS="$LDFLAGS -lrt" --AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, -+_SAVE_LIBS=$LIBS -+AC_SEARCH_LIBS(clock_gettime, rt) -+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), - ac_cv_have_clock_monotonic, - [AC_TRY_LINK([#include <time.h>], - [ struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); ], - ac_cv_have_clock_monotonic=yes, - ac_cv_have_clock_monotonic=no)]) --LDFLAGS=$_SAVE_LDFLAGS -+LIBS=$_SAVE_LIBS - if test "$ac_cv_have_clock_monotonic" = "yes"; then - HAVE_CLOCK_MONOTONIC=1 -- REALTIME_LIBS=-lrt -+ if test "$ac_cv_search_clock_gettime" != "none required"; then -+ REALTIME_LIBS=$ac_cv_search_clock_gettime -+ fi - AC_DEFINE(HAVE_CLOCK_MONOTONIC) - AC_SUBST(HAVE_CLOCK_MONOTONIC) - AC_SUBST(REALTIME_LIBS) -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS -@@ -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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/content/svg/content/src/nsSVGElement.cpp.orig 2010-05-12 16:46:09.000000000 +0200 -+++ mozilla/content/svg/content/src/nsSVGElement.cpp 2010-05-12 16:49:33.000000000 +0200 -@@ -102,7 +102,11 @@ - // vararg-list methods in this file: - // nsSVGElement::GetAnimated{Length,Number,Integer}Values - // See bug 547964 for details: --PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); -+// I really try to get the details but I'm not allowed to -+// access this bug in bugzilla: -+// You are not authorized to access bug #547964. -+// So disable this ASSERT as it breaks build. -+//PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); - - - nsSVGEnumMapping nsSVGElement::sSVGUnitTypesMap[] = { Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~ -+++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp -@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const - i += with.length(); - } - -- return munged; -+ return munged.c_str(); - } - #endif - Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100 -+++ mozilla/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) Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-qcmstypes.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-qcmstypes.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100 -+++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100 -@@ -25,7 +25,7 @@ - #ifdef __OS2__ - /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ - #include <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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,34 +0,0 @@ ---- mozilla/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000 -+++ mozilla/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(); Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- mozilla/gfx/ycbcr/Makefile.in~ -+++ mozilla/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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-ycbcr-chromium_types.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-ycbcr-chromium_types.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- mozilla/gfx/ycbcr/chromium_types.h.orig 2010-07-12 11:52:39.000000000 +0200 -+++ mozilla/gfx/ycbcr/chromium_types.h 2010-07-12 11:53:21.000000000 +0200 -@@ -72,6 +72,10 @@ - #define ARCH_CPU_SPARC_FAMILY 1 - #define ARCH_CPU_SPARC 1 - #define ARCH_CPU_64_BITS 1 -+#elif defined(__sparc64__) -+#define ARCH_CPU_SPARC_FAMILY 1 -+#define ARCH_CPU_SPARC 1 -+#define ARCH_CPU_64_BITS 1 - #else - #error Please add support for your architecture in chromium_types.h - #endif Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- mozilla/ipc/chromium/Makefile.in~ -+++ mozilla/ipc/chromium/Makefile.in -@@ -23,9 +23,7 @@ vpath %.c \ - $(srcdir)/src/third_party/libevent \ - $(NULL) - else # } else { --# message_pump_libevent.cc includes third_party/libevent/event.h, --# which we put in $(DIST), see export rule below --LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) - endif # } - - vpath %.cc \ Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- mozilla/ipc/chromium/src/base/dir_reader_linux.h.orig 2011-12-16 21:29:22.000000000 +0100 -+++ mozilla/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) { Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,19 +0,0 @@ ---- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ -+++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc -@@ -6,6 +6,7 @@ - - #include <errno.h> - #include <fcntl.h> -+#include <unistd.h> - - #include "eintr_wrapper.h" - #include "base/logging.h" -@@ -15,7 +15,7 @@ - #include "base/scoped_nsautorelease_pool.h" - #include "base/scoped_ptr.h" - #include "base/time.h" --#include "third_party/libevent/event.h" -+#include "event.h" - - // Lifecycle of struct event - // Libevent uses two main data structures: Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,30 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 -+++ mozilla/js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -352,7 +352,7 @@ - # For architectures without YARR JIT, PCRE is faster than the YARR - # interpreter (bug 684559). - --ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) -+ifeq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU))) - - VPATH += $(srcdir)/yarr/pcre \ - $(NULL) -@@ -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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-build-autoconf-config.sub ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-build-autoconf-config.sub Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08 09:52:25.000000000 +0100 -+++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-config-mkdepend-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/js/src/config/mkdepend/Makefile.in.orig 2009-09-14 13:17:15.000000000 +0200 -+++ mozilla/js/src/config/mkdepend/Makefile.in 2009-09-14 13:17:34.000000000 +0200 -@@ -72,7 +72,7 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- mozilla/js/src/configure.in.orig 2012-03-12 10:27:55.000000000 +0100 -+++ mozilla/js/src/configure.in 2012-03-12 10:28:22.000000000 +0100 -@@ -2831,12 +2831,14 @@ - AC_DEFINE(JS_NUNBOX32) - ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 - ENABLE_POLYIC=1 - ENABLE_METHODJIT_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) - AC_DEFINE(JS_NUNBOX32) -+ fi - ;; - esac - -@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n - * C++ implementations should define these macros only when __STDC_LIMIT_MACROS - * is defined before <stdint.h> is included. */ - #define __STDC_LIMIT_MACROS -+#define __STDC_CONSTANT_MACROS - - #endif /* _JS_CONFDEFS_H_ */ - Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-jscpucfg.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-jscpucfg.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ ---- mozilla/js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100 -+++ mozilla/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> - Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- mozilla/js/src/methodjit/MethodJIT.cpp~ -+++ mozilla/js/src/methodjit/MethodJIT.cpp -@@ -171,7 +171,7 @@ - - JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); - --#if defined(__linux__) && defined(JS_CPU_X64) -+#if defined(__ELF__) && defined(JS_CPU_X64) - # define SYMBOL_STRING_RELOC(name) #name "@plt" - #else - # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) -@@ -149,7 +149,7 @@ - - #if defined(XP_MACOSX) - # define HIDE_SYMBOL(name) ".private_extern _" #name --#elif defined(__linux__) -+#elif defined(__ELF__) - # define HIDE_SYMBOL(name) ".hidden" #name - #else - # define HIDE_SYMBOL(name) Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.c ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.c Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- mozilla/media/libvpx/vpx_config_c.c~ -+++ mozilla/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" - Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- mozilla/media/libvpx/vpx_config.h~ -+++ mozilla/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" - Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- mozilla/memory/mozalloc/mozalloc.cpp~ -+++ mozilla/memory/mozalloc/mozalloc.cpp -@@ -52,6 +52,9 @@ - #if defined(XP_UNIX) - # include <unistd.h> // for valloc on *BSD - #endif //if defined(XP_UNIX) -+#ifdef __FreeBSD__ -+# include <malloc_np.h> // for malloc_usable_size -+#endif - - #if defined(MOZ_MEMORY) - // jemalloc.h doesn't redeclare symbols if they're provided by the OS -@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || defined(XP_LINUX) -+#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__) - // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations - // might use a libc that doesn't have malloc_usable_size. Let's fix this - // if/when it happens. Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 -@@ -49,8 +49,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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-nss-lib-Makefile Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/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 Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 -+++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 -@@ -181,7 +181,7 @@ - export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) - $(INSTALL) $^ . - --EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%% - - ifdef MOZ_ENABLE_LIBXUL - include $(srcdir)/libxul-rules.mk - Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/toolkit/xre/nsAppRunner.cpp~ -+++ mozilla/toolkit/xre/nsAppRunner.cpp -@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n - gQtOnlyArgv[gQtOnlyArgc] = nsnull; - #endif - #if defined(MOZ_WIDGET_GTK2) --#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) - // Disable the slice allocator, since jemalloc already uses similar layout - // algorithms, and using a sub-allocator tends to increase fragmentation. - // This must be done before g_thread_init() is called. Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/widget/qt/nsNativeThemeQt.cpp~ -+++ mozilla/widget/qt/nsNativeThemeQt.cpp -@@ -25,7 +25,9 @@ - #include "nsThemeConstants.h" - #include "nsIServiceManager.h" - #include "nsIDOMHTMLInputElement.h" -+#ifdef __GLIBC__ - #include <malloc.h> -+#endif - - - #include "gfxASurface.h" Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/xpcom/base/nsStackWalk.cpp~ -+++ mozilla/xpcom/base/nsStackWalk.cpp -@@ -1638,6 +1638,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> - Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,18 +0,0 @@ ---- mozilla/xpcom/io/nsNativeCharsetUtils.cpp.orig 2011-06-16 15:45:54.000000000 +0200 -+++ mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2011-06-16 15:46:49.000000000 +0200 -@@ -96,11 +96,11 @@ - // iconv for all platforms where nltypes.h and nllanginfo.h are present - // along with iconv. - // --#if defined(HAVE_ICONV) && defined(HAVE_NL_TYPES_H) && defined(HAVE_LANGINFO_CODESET) --#define USE_ICONV 1 --#else -+//#if defined(HAVE_ICONV) && defined(HAVE_NL_TYPES_H) && defined(HAVE_LANGINFO_CODESET) -+//#define USE_ICONV 1 -+//#else - #define USE_STDCONV 1 --#endif -+//#endif - - static void - isolatin1_to_utf16(const char **input, PRUint32 *inputLeft, PRUnichar **output, PRUint32 *outputLeft) Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,85 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 -@@ -74,6 +74,9 @@ - # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk - MODULE_OPTIMIZE_FLAGS=-O3 - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - endif - -@@ -117,7 +120,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -129,6 +132,12 @@ - ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) - 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) - # -@@ -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 -@@ -350,7 +365,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_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) Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla__content__base__public__nsContentUtils.h ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla__content__base__public__nsContentUtils.h Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200 -+++ mozilla/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; Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 -+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,11 @@ - nsresult - nsThreadManager::Init() - { -+#ifdef NS_TLS && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - Deleted: branches/experimental/www/seamonkey-beta/files/patch-suite-build-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-suite-build-Makefile.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- suite/build/Makefile.in~ -+++ suite/build/Makefile.in -@@ -76,6 +76,7 @@ SHARED_LIBRARY_LIBS += ../shell/src/$(LI - endif - - EXTRA_DSO_LDOPTS += \ -+ %%CXXABI%% \ - $(LIBS_DIR) \ - $(EXTRA_DSO_LIBS) \ - $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \ Deleted: branches/experimental/www/seamonkey-beta/files/patch-xptcall-amd64 ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-xptcall-amd64 Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,386 +0,0 @@ ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 -@@ -0,0 +1,174 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ Deleted: branches/experimental/www/seamonkey-beta/files/patch-xptcall-ia64 ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-xptcall-ia64 Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,38 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig 2009-08-26 18:47:07.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s 2009-08-26 18:49:39.000000000 +0200 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'NS_InvokeByIndex_P' -+ .global XPTC_InvokeByIndex - .proc NS_InvokeByIndex_P - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --NS_InvokeByIndex_P:: -+NS_InvokeByIndex_P: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig 2009-08-26 18:47:07.000000000 +0200 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s 2009-08-26 18:47:34.000000000 +0200 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 10 arguments, first 8 are the input arguments of previous - // function call. The 9th one is methodIndex and the 10th is the - // pointer to the remaining input arguments. The last two arguments Deleted: branches/experimental/www/seamonkey-beta/files/patch-xptcall-sparc64 ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-xptcall-sparc64 Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} Deleted: branches/experimental/www/seamonkey-beta/files/seamonkey.desktop.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/seamonkey.desktop.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,169 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Seamonkey Web Browser -Name[az]=Seamonkey Veb Səyyahı -Name[bg]=Интернет браузър (Seamonkey) -Name[bs]=Seamonkey web preglednik -Name[ca]=Navegador web Seamonkey -Name[cs]=Prohlížeč WWW Seamonkey -Name[cy]=Y Porwr Gwe Seamonkey -Name[da]=Seamonkey - internetbrowser -Name[de]=Seamonkey Webbrowser -Name[el]=Περιηγητής Διαδικτύου Seamonkey -Name[en_CA]=Seamonkey Web Browser -Name[en_GB]=Seamonkey Web Browser -Name[es]=Navegador Web Seamonkey -Name[et]=Seamonkey veebibrauser -Name[eu]=Seamonkey web arakatzailea -Name[fa]=مرورگر وب Seamonkey -Name[fi]=Seamonkey, WWW-selain -Name[fr]=Navigateur Web Seamonkey -Name[ga]=Brabhsálaí Lín Seamonkey -Name[he]=דפדפן Seamonkey -Name[hr]=Seamonkey Web preglednik -Name[hu]=Seamonkey webböngésző -Name[id]=Web Browser Seamonkey -Name[it]=Browser web Seamonkey -Name[ja]=Seamonkey ウェブ・ブラウザ -Name[ko]=Seamonkey 웹 브라우저 -Name[li]=Seamonkey Web Browser -Name[lt]=Seamonkey web naršyklė -Name[mk]=Seamonkey Веб Прелистувач -Name[mn]=Seamonkey веб хөтөч -Name[ms]=Pelungsur Web Seamonkey -Name[nb]=Seamonkey nettleser -Name[nl]=Seamonkey webbrowser -Name[nn]=Seamonkey nettlesar -Name[no]=Seamonkey nettleser -Name[pl]=Przeglądarka WWW Seamonkey -Name[pt]=Navegador Web Seamonkey -Name[pt_BR]=Navegador Web Seamonkey -Name[ro]=Navigatorul Seamonkey -Name[sl]=Spletni brskalnik Seamonkey -Name[sq]=Seamonkey - Shfletuesi Web -Name[sv]=Webbläsaren Seamonkey -Name[tk]=Seamonkey Web Ahtarçisi -Name[tr]=Seamonkey Web Tarayıcı -Name[uk]=Переглядач web Seamonkey -Name[vi]=Trình Duyệt Web Seamonkey -Name[wa]=Betchteu waibe Seamonkey -Name[zh_CN]=Seamonkey Web 浏览器 -Name[zh_TW]=Seamonkey 網頁瀏覽器 -GenericName=Seamonkey Web Browser -GenericName[az]=Seamonkey Veb Səyyahı -GenericName[bg]=Интернет браузър (Seamonkey) -GenericName[bs]=Seamonkey web preglednik -GenericName[ca]=Navegador web Seamonkey -GenericName[cs]=Prohlížeč WWW Seamonkey -GenericName[cy]=Y Porwr Gwe Seamonkey -GenericName[da]=Seamonkey - internetbrowser -GenericName[de]=Seamonkey Webbrowser -GenericName[el]=Περιηγητής Διαδικτύου Seamonkey -GenericName[en_CA]=Seamonkey Web Browser -GenericName[en_GB]=Seamonkey Web Browser -GenericName[es]=Navegador Web Seamonkey -GenericName[et]=Seamonkey veebibrauser -GenericName[eu]=Seamonkey web arakatzailea -GenericName[fa]=مرورگر وب Seamonkey -GenericName[fi]=Seamonkey, WWW-selain -GenericName[fr]=Navigateur Web Seamonkey -GenericName[ga]=Brabhsálaí Lín Seamonkey -GenericName[he]=דפדפן Seamonkey -GenericName[hr]=Seamonkey Web preglednik -GenericName[hu]=Seamonkey webböngésző -GenericName[id]=Web Browser Seamonkey -GenericName[it]=Browser web Seamonkey -GenericName[ja]=Seamonkey ウェブ・ブラウザ -GenericName[ko]=Seamonkey 웹 브라우저 -GenericName[li]=Seamonkey Web Browser -GenericName[lt]=Seamonkey web naršyklė -GenericName[mk]=Seamonkey Веб Прелистувач -GenericName[mn]=Seamonkey веб хөтөч -GenericName[ms]=Pelungsur Web Seamonkey -GenericName[nb]=Seamonkey nettleser -GenericName[nl]=Seamonkey webbrowser -GenericName[nn]=Seamonkey nettlesar -GenericName[no]=Seamonkey nettleser -GenericName[pl]=Przeglądarka WWW Seamonkey -GenericName[pt]=Navegador Web Seamonkey -GenericName[pt_BR]=Navegador Web Seamonkey -GenericName[ro]=Navigatorul Seamonkey -GenericName[sl]=Spletni brskalnik Seamonkey -GenericName[sq]=Seamonkey - Shfletuesi Web -GenericName[sv]=Webbläsaren Seamonkey -GenericName[tk]=Seamonkey Web Ahtarçisi -GenericName[tr]=Seamonkey Web Tarayıcı -GenericName[uk]=Переглядач web Seamonkey -GenericName[vi]=Trình Duyệt Web Seamonkey -GenericName[wa]=Betchteu waibe Seamonkey -GenericName[zh_CN]=Seamonkey Web 浏览器 -GenericName[zh_TW]=Seamonkey 網頁瀏覽器 -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]=Benyt 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[fa]=مرور وب -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]=ใช้งานเว็บบราวเซอร์ Seamonkey -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 -StartupNotify=true -Terminal=false -Type=Application -Icon=%%MOZILLA%%.png -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml; Deleted: branches/experimental/www/seamonkey-beta/pkg-deinstall.in ============================================================================== --- branches/experimental/www/seamonkey-beta/pkg-deinstall.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ -#!/bin/sh -# -# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.25 2008/07/26 19:07:07 ahze Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xDEINSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% - -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components/*.dat -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini -rm -f ${MOZDIR}/chrome/app-chrome.manifest -rm -rf ${MOZDIR}/updates -find %%MOZDIR%%/plugins/ -depth 1 -type l -delete > /dev/null 2>&1 -find %%MOZDIR%%/extensions/ -depth 1 -type l -delete > /dev/null 2>&1 - -exit 0 Deleted: branches/experimental/www/seamonkey-beta/pkg-descr ============================================================================== --- branches/experimental/www/seamonkey-beta/pkg-descr Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,6 +0,0 @@ -This is the current release of the Seamonkey open source web browser. It should -be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, -JavaScript, MathML, SSL encryption, SVG and RDF. Also supports Java with -the use of the FreeBSD native Java plug-in. - -WWW: http://www.mozilla.org/projects/seamonkey/ Deleted: branches/experimental/www/seamonkey-beta/pkg-install.in ============================================================================== --- branches/experimental/www/seamonkey-beta/pkg-install.in Tue Jun 26 06:00:44 2012 (r802) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,38 +0,0 @@ -#!/bin/sh -# -# $MCom: ports/www/mozilla/pkg-install.in,v 1.26 2008/08/04 16:58:03 mezz Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -MOZBIN=${MOZDIR}/%%MOZILLA_BIN%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome - -echo "===> Building Chrome's registry..." -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -mkdir -p ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/component.reg - -cd ${MOZDIR} || exit 1 -if [ -f ${REGXPCOM} ]; then - ./run-mozilla.sh ${REGXPCOM} || true -fi -if [ -f ${REGCHROME} ]; then - ./run-mozilla.sh ${REGCHROME} || true -fi -if [ -f ${MOZBIN} -a "${1%-*}" = "nvu" ]; then - ./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1 -fi -cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1 - -exit 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206260600.q5Q60jZZ069407>