Date: Wed, 10 Oct 2012 21:13:07 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305684 - in head: . Mk mail mail/enigmail mail/enigmail-seamonkey mail/enigmail-thunderbird mail/enigmail-thunderbird-esr mail/linux-thunderbird mail/thunderbird mail/thunderbird-esr m... Message-ID: <201210102113.q9ALD7xC002643@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Wed Oct 10 21:13:06 2012 New Revision: 305684 URL: http://svn.freebsd.org/changeset/ports/305684 Log: - Update firefox-esr, thunderbird-esr, linux-firefox and linux-thunderbird to 10.0.8 - Update firefox and thunderbird to 16.0 - Update seamonkey to 2.13 - Update all -i18n ports respectively - switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better latency during pause and seeking with HTML5 video - remove fedisableexcept() hacks, obsolete since FreeBSD 4.0 - support system hunspell dictionaries [1] - unbreak -esr ports with clang3.2 [2] - unbreak nss build when CC contains full path [3] - remove GNOME option grouping [4] - integrate enigmail into thunderbird/seamonkey as an option [5] - remove mail/enigmail* [6] - enable ENIGMAIL, LIGHTNING and GIO options by default - add more reporters in about:memory: page-faults-hard, page-faults-soft, resident, vsize - use bundled jemalloc 3.0.0 on FreeBSD < 10.0 for gecko 16.0, only heap-allocated reporter works in about:memory (see bug 762445) - use lrintf() instead of slow C cast in bundled libopus - use libjpeg-turbo's faster color conversion if available during build - record startup time for telemetry - use -z origin instead of hardcoding path to gecko runtime - fail early if incompatible libxul version is installed (in USE_GECKO) - *miscellaneous cleanups and fixups* PR: ports/171534 [1] PR: ports/171566 [2] PR: ports/172164 [3] PR: ports/172201 [4] Discussed with: ale, beat, Jan Beich [5] Approved by: ale [6] In collaboration with: Jan Beich <jbeich@tormail.org> Security: 6e5a9afd-12d3-11e2-b47d-c8600054b392 Feature safe: yes Approved by: portmgr (beat) Added: head/mail/thunderbird-esr/files/patch-bug788108 (contents, props changed) head/mail/thunderbird-esr/files/patch-bug789436 (contents, props changed) head/mail/thunderbird-esr/files/patch-bug789693 (contents, props changed) head/mail/thunderbird-esr/files/patch-bug791305 (contents, props changed) head/mail/thunderbird-esr/files/patch-bug791366 (contents, props changed) head/mail/thunderbird-esr/files/patch-clang32-visibility-hack (contents, props changed) head/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp (contents, props changed) head/mail/thunderbird/files/patch-bug788108 (contents, props changed) head/mail/thunderbird/files/patch-bug788955 (contents, props changed) head/mail/thunderbird/files/patch-bug789436 (contents, props changed) head/mail/thunderbird/files/patch-bug789656 (contents, props changed) head/mail/thunderbird/files/patch-bug789693 (contents, props changed) head/mail/thunderbird/files/patch-bug791305 (contents, props changed) head/mail/thunderbird/files/patch-bug791366 (contents, props changed) head/mail/thunderbird/files/patch-config-baseconfig.mk (contents, props changed) head/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp (contents, props changed) head/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp (contents, props changed) head/security/nss/files/patch-..::coreconf::ruleset.mk (contents, props changed) head/www/firefox-esr/files/patch-bug696030 (contents, props changed) head/www/firefox-esr/files/patch-bug713802 (contents, props changed) head/www/firefox-esr/files/patch-bug788108 (contents, props changed) head/www/firefox-esr/files/patch-bug789436 (contents, props changed) head/www/firefox-esr/files/patch-bug789693 (contents, props changed) head/www/firefox-esr/files/patch-bug791305 (contents, props changed) head/www/firefox-esr/files/patch-bug791366 (contents, props changed) head/www/firefox-esr/files/patch-clang32-visibility-hack (contents, props changed) head/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp (contents, props changed) head/www/firefox/files/patch-bug713802 (contents, props changed) head/www/firefox/files/patch-bug788108 (contents, props changed) head/www/firefox/files/patch-bug788955 (contents, props changed) head/www/firefox/files/patch-bug789436 (contents, props changed) head/www/firefox/files/patch-bug789656 (contents, props changed) head/www/firefox/files/patch-bug789693 (contents, props changed) head/www/firefox/files/patch-bug791305 (contents, props changed) head/www/firefox/files/patch-bug791366 (contents, props changed) head/www/firefox/files/patch-config-baseconfig.mk (contents, props changed) head/www/firefox/files/patch-content-media-nsAudioStream.cpp (contents, props changed) head/www/firefox/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp (contents, props changed) head/www/firefox/files/pkg-deinstall.in (contents, props changed) head/www/firefox/files/pkg-install.in (contents, props changed) head/www/libxul/files/patch-bug696030 (contents, props changed) head/www/libxul/files/patch-bug713802 (contents, props changed) head/www/libxul/files/patch-bug789693 (contents, props changed) head/www/libxul/files/patch-bug791305 (contents, props changed) head/www/libxul/files/patch-bug791366 (contents, props changed) head/www/libxul/files/patch-clang32-visibility-hack (contents, props changed) head/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp (contents, props changed) head/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp (contents, props changed) head/www/seamonkey/files/patch-bug713802 (contents, props changed) head/www/seamonkey/files/patch-bug788108 (contents, props changed) head/www/seamonkey/files/patch-bug788955 (contents, props changed) head/www/seamonkey/files/patch-bug789436 (contents, props changed) head/www/seamonkey/files/patch-bug789656 (contents, props changed) head/www/seamonkey/files/patch-bug789693 (contents, props changed) head/www/seamonkey/files/patch-bug791305 (contents, props changed) head/www/seamonkey/files/patch-bug791366 (contents, props changed) head/www/seamonkey/files/patch-config-autoconf.mk.in (contents, props changed) head/www/seamonkey/files/patch-config-baseconfig.mk (contents, props changed) head/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp (contents, props changed) head/www/seamonkey/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp (contents, props changed) Deleted: head/mail/enigmail/ head/mail/enigmail-seamonkey/ head/mail/enigmail-thunderbird/ head/mail/enigmail-thunderbird-esr/ head/mail/thunderbird-esr/files/patch-bug351181 head/mail/thunderbird-esr/files/patch-bug781474 head/mail/thunderbird-esr/files/patch-bug785638 head/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack head/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp head/mail/thunderbird/files/patch-bug351181 head/mail/thunderbird/files/patch-bug723860 head/mail/thunderbird/files/patch-bug759459 head/mail/thunderbird/files/patch-bug760899 head/mail/thunderbird/files/patch-bug761030 head/mail/thunderbird/files/patch-bug761419 head/mail/thunderbird/files/patch-bug781474 head/mail/thunderbird/files/patch-bug785638 head/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in head/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp head/www/firefox-esr/files/patch-bug351181 head/www/firefox-esr/files/patch-bug781474 head/www/firefox-esr/files/patch-bug785638 head/www/firefox-esr/files/patch-clang32-libc++-visibility-hack head/www/firefox/files/patch-bug351181 head/www/firefox/files/patch-bug723860 head/www/firefox/files/patch-bug752895 head/www/firefox/files/patch-bug759459 head/www/firefox/files/patch-bug760899 head/www/firefox/files/patch-bug761030 head/www/firefox/files/patch-bug761419 head/www/firefox/files/patch-bug781474 head/www/firefox/files/patch-bug785638 head/www/firefox/files/patch-config_autoconf.mk.in head/www/libxul/files/patch-bug785638 head/www/libxul/files/patch-clang32-libc++-visibility-hack head/www/seamonkey/files/patch-bug351181 head/www/seamonkey/files/patch-bug723860 head/www/seamonkey/files/patch-bug759459 head/www/seamonkey/files/patch-bug760899 head/www/seamonkey/files/patch-bug761030 head/www/seamonkey/files/patch-bug761419 head/www/seamonkey/files/patch-bug781474 head/www/seamonkey/files/patch-bug785638 head/www/seamonkey/files/patch-config_autoconf.mk.in head/www/seamonkey/pkg-deinstall.in head/www/seamonkey/pkg-install.in Modified: head/MOVED head/Mk/bsd.gecko.mk head/UPDATING head/mail/Makefile (contents, props changed) head/mail/linux-thunderbird/Makefile head/mail/linux-thunderbird/distinfo (contents, props changed) head/mail/thunderbird-esr-i18n/Makefile head/mail/thunderbird-esr-i18n/distinfo (contents, props changed) head/mail/thunderbird-esr/Makefile head/mail/thunderbird-esr/distinfo (contents, props changed) head/mail/thunderbird-esr/files/patch-bug543241 (contents, props changed) head/mail/thunderbird-esr/files/patch-bug753046 (contents, props changed) head/mail/thunderbird-i18n/Makefile head/mail/thunderbird-i18n/distinfo head/mail/thunderbird/Makefile head/mail/thunderbird/distinfo head/mail/thunderbird/files/extra-bug780531 (contents, props changed) head/mail/thunderbird/files/patch-bug543241 (contents, props changed) head/mail/thunderbird/files/patch-bug753046 (contents, props changed) head/mail/thunderbird/files/patch-bug774671 (contents, props changed) head/mail/thunderbird/files/patch-bug778056 (contents, props changed) head/mail/thunderbird/files/patch-bug778078 (contents, props changed) head/mail/thunderbird/files/patch-bug784776 (contents, props changed) head/security/ca_root_nss/Makefile head/security/nss/Makefile head/security/nss/files/nss-config.in (contents, props changed) head/security/vuxml/vuln.xml head/www/firefox-esr-i18n/Makefile head/www/firefox-esr-i18n/distinfo (contents, props changed) head/www/firefox-esr/Makefile head/www/firefox-esr/distinfo (contents, props changed) head/www/firefox-esr/files/patch-bug543241 (contents, props changed) head/www/firefox-esr/files/patch-bug753046 (contents, props changed) head/www/firefox-esr/pkg-message (contents, props changed) head/www/firefox-i18n/Makefile head/www/firefox-i18n/distinfo (contents, props changed) head/www/firefox/Makefile head/www/firefox/Makefile.options (contents, props changed) head/www/firefox/distinfo (contents, props changed) head/www/firefox/files/extra-bug780531 (contents, props changed) head/www/firefox/files/patch-bug543241 (contents, props changed) head/www/firefox/files/patch-bug753046 (contents, props changed) head/www/firefox/files/patch-bug774671 (contents, props changed) head/www/firefox/files/patch-bug778056 (contents, props changed) head/www/firefox/files/patch-bug778078 (contents, props changed) head/www/firefox/files/patch-bug784776 (contents, props changed) head/www/firefox/pkg-message (contents, props changed) head/www/kompozer/Makefile head/www/libxul/Makefile head/www/libxul/distinfo head/www/libxul/files/patch-bug543241 (contents, props changed) head/www/libxul/files/patch-bug753046 (contents, props changed) head/www/libxul19/Makefile head/www/linux-firefox/Makefile head/www/linux-firefox/distinfo (contents, props changed) head/www/linux-seamonkey/Makefile head/www/linux-seamonkey/distinfo (contents, props changed) head/www/seamonkey-i18n/Makefile head/www/seamonkey-i18n/distinfo head/www/seamonkey/Makefile head/www/seamonkey/distinfo head/www/seamonkey/files/extra-bug780531 (contents, props changed) head/www/seamonkey/files/patch-bug543241 (contents, props changed) head/www/seamonkey/files/patch-bug753046 (contents, props changed) head/www/seamonkey/files/patch-bug774671 (contents, props changed) head/www/seamonkey/files/patch-bug778056 (contents, props changed) head/www/seamonkey/files/patch-bug778078 (contents, props changed) head/www/seamonkey/files/patch-bug784776 (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Wed Oct 10 21:02:04 2012 (r305683) +++ head/MOVED Wed Oct 10 21:13:06 2012 (r305684) @@ -3717,3 +3717,7 @@ www/jakarta-jmeter|www/jmeter|2012-09-25 www/smarty|www/smarty2|2012-09-26|Renamed to prepare for addition of Smarty 3.x to the tree devel/p5-Devel-Mallinfo||2012-10-08|Has expired: Does not work on FreeBSD, mallinfo() is a GNU libc function and is not available on FreeBSD multimedia/vdpau-video|multimedia/libva-vdpau-driver|2012-10-09|Project renamed +mail/enigmail||2012-10-10|Enigmail is now an option in the thunderbird/seamonkey port +mail/enigmail-seamonkey||2012-10-10|Enigmail is now an option in the seamonkey port +mail/enigmail-thunderbird||2012-10-10|Enigmail is now an option in the thunderbird port +mail/enigmail-thunderbird-esr||2012-10-10|Enigmail is now an option in the thunderbird-esr port Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Wed Oct 10 21:02:04 2012 (r305683) +++ head/Mk/bsd.gecko.mk Wed Oct 10 21:13:06 2012 (r305684) @@ -79,8 +79,8 @@ Gecko_Pre_Include= bsd.gecko.mk _GECKO_ALL= libxul libxul19 -libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so -libxul19_PLIST= ${LOCALBASE}/lib/libxul/libxul.so +libxul_PLIST= libxul>=10 +libxul19_PLIST= libxul<2 .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www @@ -179,7 +179,7 @@ Gecko_Pre_Include= bsd.gecko.mk # is given by the maintainer via the port or by the # user via defined variable try to find the highest # stable installed version. -# Available values: yes 10+ 15+ 10 15+ +# Available values: yes 10+ 16+ 10 16+ # NOTE: # default value 10 is used in case of USE_FIREFOX=yes # @@ -190,9 +190,9 @@ Gecko_Pre_Include= bsd.gecko.mk # version is given by the maintainer via the port # or by the user via defined variable try to find # the highest stable installed version. -# Available values: yes 12+ 12 +# Available values: yes 13+ 13 # NOTE: -# default value 12 is used in case of USE_SEAMONKEY=yes +# default value 13 is used in case of USE_SEAMONKEY=yes # # USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey. # Available values: see USE_SEAMONKEY @@ -201,7 +201,7 @@ Gecko_Pre_Include= bsd.gecko.mk # version is given by the maintainer via the port # or by the user via defined variable try to find # the highest stable installed version. -# Available values: yes 10+ 15+ 10 15 +# Available values: yes 10+ 16+ 10 16 # NOTE: # default value 10 is used in case of USE_THUNDERBIRD=yes # @@ -221,11 +221,11 @@ _FIREFOX_BUILD_DEPENDS= yes .endif _FIREFOX_DEFAULT_VERSION= 10 -_FIREFOX_VERSIONS= 10 15 -_FIREFOX_RANGE_VERSIONS= 10+ 15+ +_FIREFOX_VERSIONS= 10 16 +_FIREFOX_RANGE_VERSIONS= 10+ 16+ # For specifying [10, ..]+ -_FIREFOX_15P= 15 ${_FIREFOX_10P} +_FIREFOX_16P= 16 ${_FIREFOX_10P} _FIREFOX_10P= 10 # Set the default Firefox version and check if USE_FIREFOX=yes was given @@ -272,7 +272,7 @@ IGNORE= cannot install: unknown Firefo # Dependence lines for different Firefox versions 10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -15_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +16_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox # Add dependencies .if defined(USE_FIREFOX) @@ -294,12 +294,12 @@ USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD _SEAMONKEY_BUILD_DEPENDS= yes .endif -_SEAMONKEY_DEFAULT_VERSION= 12 -_SEAMONKEY_VERSIONS= 12 -_SEAMONKEY_RANGE_VERSIONS= 12+ +_SEAMONKEY_DEFAULT_VERSION= 13 +_SEAMONKEY_VERSIONS= 13 +_SEAMONKEY_RANGE_VERSIONS= 13+ -# For specifying [12, ..]+ -_SEAMONKEY_12P= 12 +# For specifying [13, ..]+ +_SEAMONKEY_13P= 13 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given .if ${USE_SEAMONKEY} == "yes" @@ -341,7 +341,7 @@ IGNORE= cannot install: unknown SeaMon .endif # Dependence lines for different SeaMonkey versions -12_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +13_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey # Add dependencies .if defined(USE_SEAMONKEY) @@ -364,11 +364,11 @@ _THUNDERBIRD_BUILD_DEPENDS= yes .endif _THUNDERBIRD_DEFAULT_VERSION= 10 -_THUNDERBIRD_VERSIONS= 10 15 -_THUNDERBIRD_RANGE_VERSIONS= 10+ 15+ +_THUNDERBIRD_VERSIONS= 10 16 +_THUNDERBIRD_RANGE_VERSIONS= 10+ 16+ # For specifying [10, ..]+ -_THUNDERBIRD_15P= 15 ${_THUNDERBIRD_10P} +_THUNDERBIRD_16P= 16 ${_THUNDERBIRD_10P} _THUNDERBIRD_10P= 10 # Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given @@ -414,7 +414,7 @@ IGNORE= cannot install: unknown Thunde # Dependence lines for different Thunderbird versions 10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird-esr -15_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird +16_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird # Add dependencies .if defined(USE_THUNDERBIRD) @@ -519,7 +519,6 @@ FAKEDIR?= ${WRKDIR}/fake PLIST?= ${WRKDIR}/plist PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files -MASTER_DIR?= ${.CURDIR}/../../www/seamonkey MOZ_PIS_DIR?= lib/${MOZILLA}/init.d @@ -528,9 +527,8 @@ MOZCONFIG?= ${WRKSRC}/.mozconfig MOZILLA_PLIST_DIRS?= bin lib PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall -MASTER_MOZDIR?= ${PORTSDIR}/www/seamonkey -PKGINSTALL_INC?= ${MASTER_MOZDIR}/pkg-install.in -PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in +PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-install.in +PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ @@ -547,6 +545,25 @@ MOZ_OPTIONS+= --prefix="${FAKEDIR}" CPPFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +.if ${OSVERSION} > 800072 +LDFLAGS+= -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN +.else +LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} +.endif + +.if ${MOZILLA_VER:R:R} >= 16 || exists(${.CURDIR}/files/patch-bug788955) +.if ${OSVERSION} > 1000011 +# use jemalloc 3.0.0 API in libc +MOZ_EXPORT+= MOZ_JEMALLOC=1 +.elif ${OSVERSION} > 800004 +MOZ_OPTIONS+= --enable-jemalloc +MOZ_EXPORT+= MOZ_JEMALLOC=1 +.elif ${OSVERSION} > 700101 +# has _pthread_mutex_init_calloc_cb but firefox crashes when jemalloc +# configured without --enable-debug +.endif +.endif + # Standard depends _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip @@ -567,6 +584,8 @@ ffi_EXTRACT_AFTER_ARGS= --exclude mozill hunspell_LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell hunspell_MOZ_OPTIONS= --enable-system-hunspell +# XXX: depends on pkgng package flavor support +#jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/libjpeg-turbo jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libjpeg @@ -578,8 +597,6 @@ nss_LIB_DEPENDS= nss3:${PORTSDIR}/securi nss_MOZ_OPTIONS= --with-system-nss nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/coreconf \ --exclude mozilla*/security/nss -nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss -nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} png_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} @@ -590,7 +607,7 @@ sqlite_MOZ_OPTIONS= --enable-system-sqli vpx_LIB_DEPENDS= vpx:${PORTSDIR}/multimedia/libvpx vpx_MOZ_OPTIONS= --with-system-libvpx -#vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx +vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx zip_BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip zip_RUN_DEPENDS= ${zip_BUILD_DEPENDS} @@ -606,8 +623,6 @@ LIB_DEPENDS+= ${${dep}_LIB_DEPENDS} RUN_DEPENDS+= ${${dep}_RUN_DEPENDS} MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS} EXTRACT_AFTER_ARGS+= ${${dep}_EXTRACT_AFTER_ARGS} -CPPFLAGS+= ${${dep}_CPPFLAGS} -LDFLAGS+= ${${dep}_LDFLAGS} .endif .endfor @@ -617,7 +632,6 @@ MOZ_TOOLKIT?= cairo-gtk2 MOZ_OPTIONS+= --disable-tests \ --enable-chrome-format=${MOZ_CHROME} \ --enable-default-toolkit=${MOZ_TOOLKIT} \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --with-pthreads # Configure options for install .if !defined(MOZ_EXTENSIONS) @@ -690,7 +704,7 @@ MOZ_OPTIONS+= --enable-gconf MOZ_OPTIONS+= --disable-gconf .endif -.if ${PORT_OPTIONS:MGIO} +.if ${PORT_OPTIONS:MGIO} && ! ${PORT_OPTIONS:MQT4} MOZ_OPTIONS+= --enable-gio .else MOZ_OPTIONS+= --disable-gio @@ -818,6 +832,18 @@ gecko-post-patch: s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \ ${MOZSRC}/build/unix/mozilla-config.in .endif +.if ${USE_MOZILLA:M-nspr} + @${ECHO_MSG} "===> Applying NSPR patches" + @for i in ${.CURDIR}/../../devel/nspr/files/patch-*; do \ + ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/nsprpub/build < $$i; \ + done +.endif +.if ${USE_MOZILLA:M-nss} + @${ECHO_MSG} "===> Applying NSS patches" + @for i in ${.CURDIR}/../../security/nss/files/patch-*; do \ + ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/security/nss < $$i; \ + done +.endif .for subdir in "" nsprpub js/src @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \ for f in \ @@ -863,9 +889,19 @@ gecko-post-patch: ${MOZSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ - ${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp + ${MOZSRC}/xpcom/io/SpecialSystemDirectory.cpp + @${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \ + ${MOZSRC}/xpcom/build/nsXPCOMPrivate.h + @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \ + -e 's|mozilla/plugins|browser_plugins|g' \ + ${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \ + ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp @${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -Ee '/PR_LoadLibrary/s/(\.so)\.[0-9]+/\1/' +.if ${MOZILLA} != "kompozer" + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp +.endif # handles mozilla pis scripts. gecko-moz-pis-patch: Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Oct 10 21:02:04 2012 (r305683) +++ head/UPDATING Wed Oct 10 21:13:06 2012 (r305684) @@ -6,6 +6,28 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20121010: + AFFECTS: users of mail/enigmail* + AUTHOR: gecko@FreeBSD.org + + Enigmail has been integrated into the Thunderbird / SeaMonkey build and + is available as option ENIGMAIL (enabled by default) + + Before upgrading Thunderbird or SeaMonkey delete all installed enigmail + ports by running e.g. + + # pkg_delete -f seamonkey-enigmail-1.4.3 thunderbird-esr-enigmail-1.4.3 \ + thunderbird-enigmail-1.4.3 + +20121010: + AFFECTS: users of www/firefox and www/seamonkey + AUTHOR: gecko@FreeBSD.org + + When using Firefox or SeaMonkey compiled with ALSA option ON it may + crash on assert in cubeb_refill_stream as described in ports/170473. + To fix either set media.use_cubeb -> false in about:config or rebuild + audio/alsa-plugins with ARIFF_OSS option disabled (default). + +20121010: AFFECTS: users of CURRENT (OSVERSION >= 1000017) AUTHOR: bapt@FreeBSD.org Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Wed Oct 10 21:02:04 2012 (r305683) +++ head/mail/Makefile Wed Oct 10 21:13:06 2012 (r305684) @@ -114,10 +114,6 @@ SUBDIR += emh SUBDIR += emh-xemacs21-mule SUBDIR += emil - SUBDIR += enigmail - SUBDIR += enigmail-seamonkey - SUBDIR += enigmail-thunderbird - SUBDIR += enigmail-thunderbird-esr SUBDIR += enma SUBDIR += eps SUBDIR += epstools Modified: head/mail/linux-thunderbird/Makefile ============================================================================== --- head/mail/linux-thunderbird/Makefile Wed Oct 10 21:02:04 2012 (r305683) +++ head/mail/linux-thunderbird/Makefile Wed Oct 10 21:13:06 2012 (r305684) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -PORTVERSION= 10.0.7 +PORTVERSION= 10.0.8 CATEGORIES= mail MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US DISTNAME= ${PORTNAME}-${DISTVERSION}esr Modified: head/mail/linux-thunderbird/distinfo ============================================================================== --- head/mail/linux-thunderbird/distinfo Wed Oct 10 21:02:04 2012 (r305683) +++ head/mail/linux-thunderbird/distinfo Wed Oct 10 21:13:06 2012 (r305684) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-10.0.7esr.tar.bz2) = 2b1fd99bcaa6b4288f86eba7bdf80fe467cde0cf2899a7ec106ba1e4fee0625c -SIZE (thunderbird-10.0.7esr.tar.bz2) = 18582085 +SHA256 (thunderbird-10.0.8esr.tar.bz2) = 7cf3daaf391864a265e8a0e17c49aee61fe63b3f92eba701f5a547216968330b +SIZE (thunderbird-10.0.8esr.tar.bz2) = 18579071 Modified: head/mail/thunderbird-esr-i18n/Makefile ============================================================================== --- head/mail/thunderbird-esr-i18n/Makefile Wed Oct 10 21:02:04 2012 (r305683) +++ head/mail/thunderbird-esr-i18n/Makefile Wed Oct 10 21:13:06 2012 (r305684) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird-i18n -PORTVERSION= 10.0.7 +PORTVERSION= 10.0.8 CATEGORIES= mail MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= Modified: head/mail/thunderbird-esr-i18n/distinfo ============================================================================== --- head/mail/thunderbird-esr-i18n/distinfo Wed Oct 10 21:02:04 2012 (r305683) +++ head/mail/thunderbird-esr-i18n/distinfo Wed Oct 10 21:13:06 2012 (r305684) @@ -1,84 +1,16 @@ -SHA256 (xpi/thunderbird-i18n-10.0.7/ar.xpi) = fe218825ba239511ebf490896fcd85416bf93867d12077afa2061087d9718e85 -SIZE (xpi/thunderbird-i18n-10.0.7/ar.xpi) = 441466 -SHA256 (xpi/thunderbird-i18n-10.0.7/br.xpi) = f560a951a8c6eb7ca89126cbb09a78f075379fc1af7ed8ff2f6bbe882030fc0d -SIZE (xpi/thunderbird-i18n-10.0.7/br.xpi) = 415527 -SHA256 (xpi/thunderbird-i18n-10.0.7/ca.xpi) = a8b00ba4f84055b54e03ae82a35836e6cd9c7d07a16b1940286b026aeb3e6be1 -SIZE (xpi/thunderbird-i18n-10.0.7/ca.xpi) = 416069 -SHA256 (xpi/thunderbird-i18n-10.0.7/cs.xpi) = 7cced93d103ae1775b064dc0c256494c3cda1971b4e4391f7f6f596c01df6171 -SIZE (xpi/thunderbird-i18n-10.0.7/cs.xpi) = 419419 -SHA256 (xpi/thunderbird-i18n-10.0.7/da.xpi) = ae3a98db9393ff020c6795b0fe3418258119299485569bd9d18210e8690b9781 -SIZE (xpi/thunderbird-i18n-10.0.7/da.xpi) = 363376 -SHA256 (xpi/thunderbird-i18n-10.0.7/de.xpi) = 8d94b8000182a52e93a3fcc04f4830f858bfbe95f1e08074f2b576b69468e61c -SIZE (xpi/thunderbird-i18n-10.0.7/de.xpi) = 418266 -SHA256 (xpi/thunderbird-i18n-10.0.7/en-GB.xpi) = 00a9e65eb3a1ca5194dbee9acf1fff84fc9ee3b1050dacbc42db04bf25532917 -SIZE (xpi/thunderbird-i18n-10.0.7/en-GB.xpi) = 391743 -SHA256 (xpi/thunderbird-i18n-10.0.7/en-US.xpi) = 410e503c93bc65fd26423f2afc440e42fbbaf2fb30d71a9ddb0bf992a464451d -SIZE (xpi/thunderbird-i18n-10.0.7/en-US.xpi) = 391242 -SHA256 (xpi/thunderbird-i18n-10.0.7/es-AR.xpi) = ca5002269cb602cac293da5e18c0c6d3273146afbd7a496deec2edccf8e87f16 -SIZE (xpi/thunderbird-i18n-10.0.7/es-AR.xpi) = 410726 -SHA256 (xpi/thunderbird-i18n-10.0.7/es-ES.xpi) = f3948a633ab98dc3ce233b5cd97eb84a2a40475336e8b4d31a9dd892832c2dda -SIZE (xpi/thunderbird-i18n-10.0.7/es-ES.xpi) = 355143 -SHA256 (xpi/thunderbird-i18n-10.0.7/et.xpi) = 6ce8c3a922a3ce944d4a125938081d032ce61776680e3d6f205a62f5f9441550 -SIZE (xpi/thunderbird-i18n-10.0.7/et.xpi) = 410724 -SHA256 (xpi/thunderbird-i18n-10.0.7/eu.xpi) = 4258ef8ceef02bcfd6e95f59198b67572e97023ac2558790d18acde5c5f7e2d1 -SIZE (xpi/thunderbird-i18n-10.0.7/eu.xpi) = 406387 -SHA256 (xpi/thunderbird-i18n-10.0.7/fi.xpi) = 2d2212368adac818ca5e2569f0d8c8a83f47ac8285584e7525de4add85fe3bd4 -SIZE (xpi/thunderbird-i18n-10.0.7/fi.xpi) = 411928 -SHA256 (xpi/thunderbird-i18n-10.0.7/fr.xpi) = 664b23ff9eeda1f9c7c073574e31bb33e8cb7ac3beeb888251f007fe87e97163 -SIZE (xpi/thunderbird-i18n-10.0.7/fr.xpi) = 414749 -SHA256 (xpi/thunderbird-i18n-10.0.7/fy-NL.xpi) = 62ae77f3a07becc2fb5444d0a39ff383c06690891b5560e24e9ba5b355bf42d6 -SIZE (xpi/thunderbird-i18n-10.0.7/fy-NL.xpi) = 413985 -SHA256 (xpi/thunderbird-i18n-10.0.7/ga-IE.xpi) = 1e1dc0f5d5603f70c08d0a42bf46f111e6881933f3622471f8311f635eac611c -SIZE (xpi/thunderbird-i18n-10.0.7/ga-IE.xpi) = 423261 -SHA256 (xpi/thunderbird-i18n-10.0.7/gd.xpi) = 85d57a2f5928b46a55b8fb94bddd0af18332a5c0c181f53f82db1bdb8fc8ca20 -SIZE (xpi/thunderbird-i18n-10.0.7/gd.xpi) = 425876 -SHA256 (xpi/thunderbird-i18n-10.0.7/gl.xpi) = 444afe24e82c6957e32d720fe786d2514a083af60401992631fb0cb5887704be -SIZE (xpi/thunderbird-i18n-10.0.7/gl.xpi) = 409229 -SHA256 (xpi/thunderbird-i18n-10.0.7/he.xpi) = 963b51119331019d01f6d3866a0919c900e6c478ba83a68d0b5c030706d38e32 -SIZE (xpi/thunderbird-i18n-10.0.7/he.xpi) = 439206 -SHA256 (xpi/thunderbird-i18n-10.0.7/hu.xpi) = 126ad900c30a335654f769bf59bcb56bfbefff21d865c0bf76bd0b3469036439 -SIZE (xpi/thunderbird-i18n-10.0.7/hu.xpi) = 426356 -SHA256 (xpi/thunderbird-i18n-10.0.7/is.xpi) = f3feeb6a0547f9ad1a9a80a155cdbcdd9c99fb7ada5f87e58e8611533058b031 -SIZE (xpi/thunderbird-i18n-10.0.7/is.xpi) = 412634 -SHA256 (xpi/thunderbird-i18n-10.0.7/it.xpi) = 7c02ef5f947e6fcaf75dd7aa08471bfc74700402d50cec5caaef51bdf72b4222 -SIZE (xpi/thunderbird-i18n-10.0.7/it.xpi) = 347634 -SHA256 (xpi/thunderbird-i18n-10.0.7/ja.xpi) = 90ca263411c5fe34a4ca09a32a26e4fcc59c697d5421f52a9bba1a491b5c72db -SIZE (xpi/thunderbird-i18n-10.0.7/ja.xpi) = 459031 -SHA256 (xpi/thunderbird-i18n-10.0.7/ko.xpi) = 4125d21e5490689a58cfa28d31bd82d3b26b08cbbcc57b70fc1944def3bc29bd -SIZE (xpi/thunderbird-i18n-10.0.7/ko.xpi) = 372016 -SHA256 (xpi/thunderbird-i18n-10.0.7/lt.xpi) = a69679f4fde548307cbc0da41cfe0d76f24d52cdc482fbb9fb35419886c2f135 -SIZE (xpi/thunderbird-i18n-10.0.7/lt.xpi) = 531022 -SHA256 (xpi/thunderbird-i18n-10.0.7/nb-NO.xpi) = d827073f2a1ef8d8789a02e99827dbfda5ed52aa8d10d1acfd3743ebc048d1a8 -SIZE (xpi/thunderbird-i18n-10.0.7/nb-NO.xpi) = 407729 -SHA256 (xpi/thunderbird-i18n-10.0.7/nl.xpi) = 063a650298c7eb33bf1e2317cd1d7cd88c5fa6070393de190eda4826108d0389 -SIZE (xpi/thunderbird-i18n-10.0.7/nl.xpi) = 407985 -SHA256 (xpi/thunderbird-i18n-10.0.7/nn-NO.xpi) = ece5f50981dd386346db2d0f2d75817d09389ae5c18ba43be1b075c823c06276 -SIZE (xpi/thunderbird-i18n-10.0.7/nn-NO.xpi) = 409459 -SHA256 (xpi/thunderbird-i18n-10.0.7/pl.xpi) = a45a9ebcea735a49960c3135a6b96a93f2e0186143c8b69df8b608cbfea52576 -SIZE (xpi/thunderbird-i18n-10.0.7/pl.xpi) = 393578 -SHA256 (xpi/thunderbird-i18n-10.0.7/pt-BR.xpi) = 8f616f2f40011ce1452282bde4527852ffc52f0a97a00e9139db2177a3e32549 -SIZE (xpi/thunderbird-i18n-10.0.7/pt-BR.xpi) = 417229 -SHA256 (xpi/thunderbird-i18n-10.0.7/pt-PT.xpi) = 6e92c09d7c4fecbcd9c5c54a44401ce571fab14216fa7f5a4c3484327cf3104e -SIZE (xpi/thunderbird-i18n-10.0.7/pt-PT.xpi) = 414266 -SHA256 (xpi/thunderbird-i18n-10.0.7/rm.xpi) = 52a6ecf1840e80b6bf4ac8bf0a7188c891f42606049f3fc1472fd107a0c1be77 -SIZE (xpi/thunderbird-i18n-10.0.7/rm.xpi) = 414709 -SHA256 (xpi/thunderbird-i18n-10.0.7/ru.xpi) = 80a78cb74462394387f85b7efbf94a5d1112419ba9ac891c3db8360624fa2f07 -SIZE (xpi/thunderbird-i18n-10.0.7/ru.xpi) = 411634 -SHA256 (xpi/thunderbird-i18n-10.0.7/si.xpi) = 97a8f425d2a37736235543e06338d8bde9b238d49b22b260fedd611fcb4a5fcc -SIZE (xpi/thunderbird-i18n-10.0.7/si.xpi) = 456607 -SHA256 (xpi/thunderbird-i18n-10.0.7/sk.xpi) = fec10c4f96780eb6c14f3d70e730cfb63f9cf285db4ec515c69160cd51e89926 -SIZE (xpi/thunderbird-i18n-10.0.7/sk.xpi) = 425029 -SHA256 (xpi/thunderbird-i18n-10.0.7/sl.xpi) = 58ef94c1badb82b5d7b236900d57290431bd72b7d8e0e63c43c46eca7a1f9e5a -SIZE (xpi/thunderbird-i18n-10.0.7/sl.xpi) = 410432 -SHA256 (xpi/thunderbird-i18n-10.0.7/sq.xpi) = 25e971347e1cc1fea876135eabb904f356396ade11f29a9a3151934d86c23ffc -SIZE (xpi/thunderbird-i18n-10.0.7/sq.xpi) = 360480 -SHA256 (xpi/thunderbird-i18n-10.0.7/sv-SE.xpi) = 66d4b30a2cafdfa9e384f301c0ba7f5999d9c4c3e8f035ed378909b23dbecf06 -SIZE (xpi/thunderbird-i18n-10.0.7/sv-SE.xpi) = 478281 -SHA256 (xpi/thunderbird-i18n-10.0.7/ta-LK.xpi) = f42cb0e4034c217dfdc7e86bd280805657374965037690f101a37bf8c0778575 -SIZE (xpi/thunderbird-i18n-10.0.7/ta-LK.xpi) = 475718 -SHA256 (xpi/thunderbird-i18n-10.0.7/tr.xpi) = 768c15d8bb6609655fecbc720ebde9834962730c82ff32f4d0dd6df1f880c046 -SIZE (xpi/thunderbird-i18n-10.0.7/tr.xpi) = 418210 -SHA256 (xpi/thunderbird-i18n-10.0.7/uk.xpi) = 00e09bd289a3a1bf569e4d13cb3f012052f8f36d4f852e1fe0b6a1d69d1ac1cf -SIZE (xpi/thunderbird-i18n-10.0.7/uk.xpi) = 463925 -SHA256 (xpi/thunderbird-i18n-10.0.7/zh-TW.xpi) = 3597c44d938c300eacab2de3a67f242a83d32b30ba9257f955740de480bad8b6 -SIZE (xpi/thunderbird-i18n-10.0.7/zh-TW.xpi) = 431827 +SHA256 (xpi/thunderbird-i18n-10.0.8/es-ES.xpi) = b2d651cf8e46979637b5e5c5a0ec95fb8d12e9f2f20c660504b0a509e42978cf +SIZE (xpi/thunderbird-i18n-10.0.8/es-ES.xpi) = 355142 +SHA256 (xpi/thunderbird-i18n-10.0.8/pt-BR.xpi) = d5604357b65b20a1e6acd4aa4eb9cb02154156b1836e90c4c18ac36fcbd3889f +SIZE (xpi/thunderbird-i18n-10.0.8/pt-BR.xpi) = 417229 +SHA256 (xpi/thunderbird-i18n-10.0.8/ru.xpi) = 675475afefed4ab8e8ac29bd74bd6b2619d403519db7a3b5159458a71e1138cc +SIZE (xpi/thunderbird-i18n-10.0.8/ru.xpi) = 411633 +SHA256 (xpi/thunderbird-i18n-10.0.8/ja.xpi) = 20c7b247db1b04b9c6299a13b348fdeaf320e683d6f36427cd468c30e4b102df +SIZE (xpi/thunderbird-i18n-10.0.8/ja.xpi) = 459030 +SHA256 (xpi/thunderbird-i18n-10.0.8/de.xpi) = 200c48b132653c1e72e580d73e471399cfd4e22ac3ef3f1df77c48840d0558f7 +SIZE (xpi/thunderbird-i18n-10.0.8/de.xpi) = 418265 +SHA256 (xpi/thunderbird-i18n-10.0.8/fr.xpi) = 4b00df0f3fa1092137b8735e86149183f7bcad9f97b3f36dd1f84aea430d1af6 +SIZE (xpi/thunderbird-i18n-10.0.8/fr.xpi) = 414748 +SHA256 (xpi/thunderbird-i18n-10.0.8/ko.xpi) = 3c60709ef8536f77be75b2659467d3e22ed327254c23e4812a5c756c59949ec0 +SIZE (xpi/thunderbird-i18n-10.0.8/ko.xpi) = 372015 +SHA256 (xpi/thunderbird-i18n-10.0.8/it.xpi) = 0bb9413db267342fbf8cea6abf180ab9aec174e98a1d59f3ed3b371f6ca54ae3 +SIZE (xpi/thunderbird-i18n-10.0.8/it.xpi) = 347632 Modified: head/mail/thunderbird-esr/Makefile ============================================================================== --- head/mail/thunderbird-esr/Makefile Wed Oct 10 21:02:04 2012 (r305683) +++ head/mail/thunderbird-esr/Makefile Wed Oct 10 21:13:06 2012 (r305684) @@ -6,21 +6,24 @@ # PORTNAME= thunderbird -DISTVERSION= 10.0.7 +DISTVERSION= 10.0.8 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source -DISTNAME= ${PORTNAME}-${DISTVERSION}esr.source +DISTFILES= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ - nss>=3.13.1:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip +EM_VERSION= 1.4.5 + USE_AUTOTOOLS= autoconf213:env LATEST_LINK= thunderbird-esr USE_GECKO= gecko @@ -51,7 +54,8 @@ PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZIL SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFINE= LIGHTNING +OPTIONS_DEFINE= ENIGMAIL LIGHTNING +OPTIONS_DEFAULT=ENIGMAIL LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.pre.mk> @@ -59,6 +63,8 @@ OPTIONS_DEFINE= LIGHTNING WRKSRC= ${WRKDIR}/comm-esr10 MOZSRC:= ${WRKSRC}/mozilla +XPI_LIBDIR= ${PREFIX}/lib/xpi + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 @@ -78,12 +84,25 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/y CFLAGS+= -Wno-return-type-c-linkage .endif +.if ${PORT_OPTIONS:MENIGMAIL} +MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail +DISTFILES+= ${EM_DISTFILE}:enigmail +RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg +EM_DISTNAME= enigmail-${EM_VERSION} +EM_DISTFILE= ${EM_DISTNAME}.tar.gz +EM_XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi +EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} +EM_ID= ${PORTNAME}@mozilla-enigmail.org +EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ + ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ + ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm +.endif + .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning XPI_FILE= ${MOZ_OBJDIR}/mozilla/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 @@ -93,16 +112,38 @@ MOZ_OPTIONS+= --disable-calendar post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop +.if ${PORT_OPTIONS:MENIGMAIL} + @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ + -C ${WRKSRC}/mailnews/extensions +.endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp +.if ${PORT_OPTIONS:MENIGMAIL} + @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ + ${WRKSRC}/mailnews/extensions/enigmail/makemake + @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ + -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ + ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in + @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ + -e '/em:maxVersion/s/pre//' \ + ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf +.endif pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) (cd ${MOZSRC} && ${AUTOCONF}) (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) +.if ${PORT_OPTIONS:MENIGMAIL} +post-build: + cd ${WRKSRC}/mailnews/extensions/enigmail && \ + ./makemake -r -o ${MOZ_OBJDIR} + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} all xpi \ + -C ${MOZ_OBJDIR}/mailnews/extensions/enigmail +.endif + port-pre-install: ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults @@ -130,7 +171,25 @@ post-install: @${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} +.endif +.if ${PORT_OPTIONS:MENIGMAIL} + @${MKDIR} ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} + @(cd ${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${EM_ID} + @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES} + @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${EM_ID} + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true + @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -not -type d) | ${SORT} | \ + ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST} + @${ECHO_CMD} 'lib/xpi/symlinks/${PORTNAME}/${EM_ID}' >> ${TMPPLIST} + @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} + @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} + @(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -type d) | ${SORT} -r | \ + ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST} +.endif +.if ${PORT_OPTIONS:MLIGHTNING} || ${PORT_OPTIONS:MENIGMAIL} + @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${PORTNAME} 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 Modified: head/mail/thunderbird-esr/distinfo ============================================================================== --- head/mail/thunderbird-esr/distinfo Wed Oct 10 21:02:04 2012 (r305683) +++ head/mail/thunderbird-esr/distinfo Wed Oct 10 21:13:06 2012 (r305684) @@ -1,2 +1,4 @@ -SHA256 (thunderbird-10.0.7esr.source.tar.bz2) = 994ca16a01e4446747b54b1b5fb2bda11aec2c92359571bffa0f6c8e45f27c35 -SIZE (thunderbird-10.0.7esr.source.tar.bz2) = 97590919 +SHA256 (thunderbird-10.0.8esr.source.tar.bz2) = 9575f9f97fab48d36b3a24040db83fb9b92de913b3689e9910afaf39a486fbbd +SIZE (thunderbird-10.0.8esr.source.tar.bz2) = 97594384 +SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020 +SIZE (enigmail-1.4.5.tar.gz) = 1269207 Modified: head/mail/thunderbird-esr/files/patch-bug543241 ============================================================================== --- head/mail/thunderbird-esr/files/patch-bug543241 Wed Oct 10 21:02:04 2012 (r305683) +++ head/mail/thunderbird-esr/files/patch-bug543241 Wed Oct 10 21:13:06 2012 (r305684) @@ -1,5 +1,16 @@ --- ./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 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -89,6 +89,11 @@ nsresult nsThreadManager::Init() Modified: head/mail/thunderbird-esr/files/patch-bug753046 ============================================================================== --- head/mail/thunderbird-esr/files/patch-bug753046 Wed Oct 10 21:02:04 2012 (r305683) +++ head/mail/thunderbird-esr/files/patch-bug753046 Wed Oct 10 21:13:06 2012 (r305684) @@ -451,7 +451,7 @@ $NetBSD: patch-ipc_chromium_src_base_pla --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread.h -@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE +@@ -22,9 +22,12 @@ typedef void* PlatformThreadHandle; // HANDLE #elif defined(OS_POSIX) #include <pthread.h> typedef pthread_t PlatformThreadHandle; @@ -460,6 +460,7 @@ $NetBSD: patch-ipc_chromium_src_base_pla #include <unistd.h> typedef pid_t PlatformThreadId; +#elif defined(OS_BSD) ++#include <sys/types.h> +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include <mach/mach.h> Added: head/mail/thunderbird-esr/files/patch-bug788108 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird-esr/files/patch-bug788108 Wed Oct 10 21:13:06 2012 (r305684) @@ -0,0 +1,20 @@ +--- mozilla/content/base/public/nsContentUtils.h~ ++++ mozilla/content/base/public/nsContentUtils.h +@@ -18,17 +18,6 @@ + #include <ieeefp.h> + #endif + +-//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. +-#ifdef __FreeBSD__ +-#include <ieeefp.h> +-#ifdef __alpha__ +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; +-#endif +-static fp_except_t oldmask = fpsetmask(~allmask); +-#endif +- + #include "nsAString.h" + #include "nsIStatefulFrame.h" + #include "nsNodeInfoManager.h" Added: head/mail/thunderbird-esr/files/patch-bug789436 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird-esr/files/patch-bug789436 Wed Oct 10 21:13:06 2012 (r305684) @@ -0,0 +1,27 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include <ieeefp.h> +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + Added: head/mail/thunderbird-esr/files/patch-bug789693 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird-esr/files/patch-bug789693 Wed Oct 10 21:13:06 2012 (r305684) @@ -0,0 +1,108 @@ +--- mozilla/toolkit/components/startup/nsAppStartup.cpp ++++ mozilla/toolkit/components/startup/nsAppStartup.cpp +@@ -50,17 +50,40 @@ + #include <sys/syscall.h> + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include <sys/param.h> + #include <sys/sysctl.h> + #endif + +-#ifdef __OpenBSD__ +-#include <sys/param.h> +-#include <sys/sysctl.h> ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <sys/user.h> + #endif + + #include "mozilla/Telemetry.h" + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + using namespace mozilla; +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ sizeof(KINFO_PROC), ++ 1, ++#endif ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[0]); + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- PRTime starttime = static_cast<PRTime>(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; +- starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &buffer_size, NULL, 0)) + return 0; + +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- PRTime starttime = static_cast<PRTime>(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast<PRTime>(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; + return starttime; + } + #else Added: head/mail/thunderbird-esr/files/patch-bug791305 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird-esr/files/patch-bug791305 Wed Oct 10 21:13:06 2012 (r305684) @@ -0,0 +1,107 @@ +commit c269a16 +Author: Jeff Muizelaar <jmuizelaar@mozilla.com> +Date: Fri Sep 14 15:54:55 2012 -0400 + + Bug 791305. Use libjpeg's color conversion code instead of our own. r=joe,r=khuey + + libjpeg-turbo supports converting directly to a format compatible with cairo's + FORMAT_RGB24. Use that instead of our own handcoded function. This also gives + us SSE2 and NEON version of this function. + + --HG-- + extra : rebase_source : 18f48925f023a33ec2a097d4f4e5cc2ab40be1e9 +--- + configure.in | 6 +- + image/decoders/nsJPEGDecoder.cpp | 311 ++------------------------------------- + 2 files changed, 20 insertions(+), 297 deletions(-) + +diff --git mozilla/image/decoders/nsJPEGDecoder.cpp mozilla/image/decoders/nsJPEGDecoder.cpp +index c1fb515..1d2a259 100644 +--- mozilla/image/decoders/nsJPEGDecoder.cpp ++++ mozilla/image/decoders/nsJPEGDecoder.cpp +@@ -22,6 +22,13 @@ + extern "C" { + #include "iccjpeg.h" + ++#ifdef JCS_EXTENSIONS ++#if defined(IS_BIG_ENDIAN) ++#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB ++#else ++#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX ++#endif ++#else + /* Colorspace conversion (copied from jpegint.h) */ + struct jpeg_color_deconverter { + JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); +@@ -34,6 +41,7 @@ METHODDEF(void) + ycc_rgb_convert_argb (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, JDIMENSION input_row, + JSAMPARRAY output_buf, int num_rows); ++#endif + } + + static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); +@@ -329,7 +340,18 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + case JCS_GRAYSCALE: + case JCS_RGB: + case JCS_YCbCr: ++#ifdef JCS_EXTENSIONS ++ // if we're not color managing we can decode directly to ++ // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB ++ if (mCMSMode != eCMSMode_All) { ++ mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB; ++ mInfo.out_color_components = 4; ++ } else { ++ mInfo.out_color_space = JCS_RGB; ++ } ++#else + mInfo.out_color_space = JCS_RGB; ++#endif + break; + case JCS_CMYK: + case JCS_YCCK: +@@ -397,6 +419,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + return; /* I/O suspension */ + } + ++#ifndef JCS_EXTENSIONS + /* Force to use our YCbCr to Packed RGB converter when possible */ + if (!mTransform && (mCMSMode != eCMSMode_All) && + mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { +@@ -404,6 +427,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ + mInfo.cconvert->color_convert = ycc_rgb_convert_argb; + } ++#endif + + /* If this is a progressive JPEG ... */ + mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; +@@ -542,7 +566,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend) + PRUint32 *imageRow = ((PRUint32*)mImageData) + + (mInfo.output_scanline * mInfo.output_width); + ++#ifdef JCS_EXTENSIONS ++ if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) { ++#else + if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { ++#endif + /* Special case: scanline will be directly converted into packed ARGB */ + if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { + *suspend = true; /* suspend */ +@@ -858,6 +887,7 @@ term_source (j_decompress_ptr jd) + } // namespace mozilla + + ++#ifndef JCS_EXTENSIONS + /**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ + + /* +@@ -1130,7 +1160,8 @@ ycc_rgb_convert_argb (j_decompress_ptr cinfo, + } + } + } ++#endif + + + /**************** Inverted CMYK -> RGB conversion **************/ + /* Added: head/mail/thunderbird-esr/files/patch-bug791366 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird-esr/files/patch-bug791366 Wed Oct 10 21:13:06 2012 (r305684) @@ -0,0 +1,124 @@ +diff --git mozilla/xpcom/base/nsMemoryReporterManager.cpp mozilla/xpcom/base/nsMemoryReporterManager.cpp +index a9aff58..674e757 100644 +--- mozilla/xpcom/base/nsMemoryReporterManager.cpp ++++ mozilla/xpcom/base/nsMemoryReporterManager.cpp +@@ -64,7 +64,7 @@ extern void jemalloc_stats(jemalloc_stat + # endif // XP_LINUX + #endif // MOZ_MEMORY + +-#if defined(XP_LINUX) || defined(XP_MACOSX) ++#ifdef XP_UNIX + + #include <sys/time.h> + #include <sys/resource.h> +@@ -122,6 +122,78 @@ static PRInt64 GetResident() + return GetProcSelfStatmField(1); + } + ++#elif defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++ ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <sys/user.h> ++#endif ++ ++#include <unistd.h> ++ ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(__DragonFly__) ++#define KP_SIZE(kp) (kp.kp_vm_map_size) ++#define KP_RSS(kp) (kp.kp_vm_rssize * getpagesize()) ++#elif defined(__FreeBSD__) ++#define KP_SIZE(kp) (kp.ki_size) ++#define KP_RSS(kp) (kp.ki_rssize * getpagesize()) ++#elif defined(__NetBSD__) ++#define KP_SIZE(kp) (kp.p_vm_msize * getpagesize()) ++#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize()) ++#elif defined(__OpenBSD__) ++#define KP_SIZE(kp) ((kp.p_vm_dsize + kp.p_vm_ssize \ ++ + kp.p_vm_tsize) * getpagesize()) ++#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize()) ++#endif ++ ++static nsresult GetKinfoProcSelf(KINFO_PROC *proc) ++{ ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ sizeof(KINFO_PROC), ++ 1, ++#endif ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[0]); ++ size_t size = sizeof(KINFO_PROC); ++ if (sysctl(mib, miblen, proc, &size, NULL, 0)) ++ return NS_ERROR_FAILURE; ++ ++ return NS_OK; ++} ++ ++static PRInt64 GetVsize() ++{ ++ KINFO_PROC proc; ++ if (NS_SUCCEEDED(GetKinfoProcSelf(&proc))) ++ return KP_SIZE(proc); ++ ++ return -1; ++} ++ ++static PRInt64 GetResident() ++{ ++ KINFO_PROC proc; ++ if (NS_SUCCEEDED(GetKinfoProcSelf(&proc))) ++ return KP_RSS(proc); ++ ++ return -1; ++} ++ + #elif defined(XP_MACOSX) + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210102113.q9ALD7xC002643>