Site Navigation

Date:      Sun, 28 Aug 2011 15:08:28 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r615 - branches/experimental/Mk branches/experimental/mail/thunderbird branches/experimental/mail/thunderbird-i18n branches/experimental/mail/thunderbird/files branches/experimental/mail/thunderbird3 branches/experimental/mail/thunderbird3-i18n branches/experimental/mail/thunderbird3/files branches/experimental/www/firefox branches/experimental/www/firefox-i18n branches/experimental/www/firefox/files branches/experimental/www/firefox36 branches/experimental/www/firefox36-i18n branches/experimental/www/seamonkey branches/experimental/www/seamonkey-i18n branches/experimental/www/seamonkey/files branches/experimental/www/seamonkey2 branches/experimental/www/seamonkey2-i18n branches/experimental/www/seamonkey2/files trunk/Mk trunk/deskutils/lightning trunk/deskutils/lightning-thunderbird trunk/mail/thunderbird trunk/mail/thunderbird-i18n trunk/mail/thunderbird/files trunk/mail/thunderbird3 trunk/mail/thunderbird3-i18n trunk/mail/thunderbird3/files trunk/www! /firefox trunk/www/firefox-i18n trunk/www/firefox/files trunk/www/firefox36 trunk/www/firefox36-i18n trunk/www/kompozer trunk/www/libxul trunk/www/seamonkey trunk/www/seamonkey-i18n trunk/www/seamonkey/files trunk/www/seamonkey2 trunk/www/seamonkey2-i18n trunk/www/seamonkey2/files
Message-ID:  <201108281508.p7SF8SDb092669@trillian.chruetertee.ch>

---

next in thread | raw e-mail | index | archive | help

---

Author: flo
Date: Sun Aug 28 15:08:27 2011
New Revision: 615

Log:
sync with ports cvs

Added:
   branches/experimental/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp
   branches/experimental/mail/thunderbird/files/patch-calendar-lightning-install.rdf
   branches/experimental/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp
   branches/experimental/mail/thunderbird3/files/patch-mailnews-extensions-smime-build-Makefile.in
   branches/experimental/www/firefox/files/patch-bugzilla-659932
   branches/experimental/www/seamonkey/files/patch-mozilla_toolkit_xre_glxtest.cpp
   trunk/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp
   trunk/mail/thunderbird/files/patch-calendar-lightning-install.rdf
   trunk/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp
   trunk/mail/thunderbird3/files/patch-mailnews-extensions-smime-build-Makefile.in
   trunk/www/firefox/files/patch-bugzilla-659932
   trunk/www/seamonkey/files/patch-calendar-base-src-calDateTime.cpp
   trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in
   trunk/www/seamonkey/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c
   trunk/www/seamonkey/files/patch-mozilla_toolkit_xre_glxtest.cpp
Deleted:
   branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp
   branches/experimental/www/firefox/files/patch-js-src-jsnativestack.cpp
   branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure
   trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp
   trunk/www/firefox/files/patch-js-src-jsnativestack.cpp
   trunk/www/seamonkey/files/patch-mozilla-js-src-configure
Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/mail/thunderbird-i18n/Makefile
   branches/experimental/mail/thunderbird-i18n/distinfo
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/mail/thunderbird/distinfo
   branches/experimental/mail/thunderbird/files/patch-configure.in
   branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
   branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in
   branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
   branches/experimental/mail/thunderbird/files/thunderbird.desktop.in
   branches/experimental/mail/thunderbird3-i18n/Makefile
   branches/experimental/mail/thunderbird3-i18n/distinfo
   branches/experimental/mail/thunderbird3/Makefile
   branches/experimental/mail/thunderbird3/distinfo
   branches/experimental/mail/thunderbird3/files/thunderbird.desktop.in
   branches/experimental/www/firefox-i18n/Makefile
   branches/experimental/www/firefox-i18n/distinfo
   branches/experimental/www/firefox-i18n/pkg-descr
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox/distinfo
   branches/experimental/www/firefox/files/patch-js-src-Makefile.in
   branches/experimental/www/firefox/files/patch-js-src-configure.in
   branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp
   branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in
   branches/experimental/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h
   branches/experimental/www/firefox36-i18n/Makefile
   branches/experimental/www/firefox36-i18n/distinfo
   branches/experimental/www/firefox36/Makefile
   branches/experimental/www/firefox36/distinfo
   branches/experimental/www/seamonkey-i18n/Makefile
   branches/experimental/www/seamonkey-i18n/Makefile.lang
   branches/experimental/www/seamonkey-i18n/Makefile.option
   branches/experimental/www/seamonkey-i18n/distinfo
   branches/experimental/www/seamonkey-i18n/pkg-descr
   branches/experimental/www/seamonkey/Makefile
   branches/experimental/www/seamonkey/distinfo
   branches/experimental/www/seamonkey/files/patch-config_autoconf.mk.in
   branches/experimental/www/seamonkey/files/patch-configure.in
   branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in
   branches/experimental/www/seamonkey/files/seamonkey.desktop.in
   branches/experimental/www/seamonkey2-i18n/Makefile
   branches/experimental/www/seamonkey2/Makefile
   branches/experimental/www/seamonkey2/files/patch-config_autoconf.mk.in
   branches/experimental/www/seamonkey2/files/seamonkey.desktop.in
   trunk/Mk/bsd.gecko.mk
   trunk/deskutils/lightning-thunderbird/Makefile
   trunk/deskutils/lightning/Makefile
   trunk/mail/thunderbird-i18n/Makefile
   trunk/mail/thunderbird-i18n/distinfo
   trunk/mail/thunderbird/Makefile
   trunk/mail/thunderbird/distinfo
   trunk/mail/thunderbird/files/patch-configure.in
   trunk/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
   trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in
   trunk/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
   trunk/mail/thunderbird/files/thunderbird.desktop.in
   trunk/mail/thunderbird3-i18n/Makefile
   trunk/mail/thunderbird3-i18n/distinfo
   trunk/mail/thunderbird3/Makefile
   trunk/mail/thunderbird3/distinfo
   trunk/mail/thunderbird3/files/thunderbird.desktop.in
   trunk/www/firefox-i18n/Makefile
   trunk/www/firefox-i18n/distinfo
   trunk/www/firefox-i18n/pkg-descr
   trunk/www/firefox/Makefile
   trunk/www/firefox/distinfo
   trunk/www/firefox/files/patch-js-src-Makefile.in
   trunk/www/firefox/files/patch-js-src-configure.in
   trunk/www/firefox/files/patch-js_src_jsnum.cpp
   trunk/www/firefox/files/patch-layout_generic_Makefile.in
   trunk/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h
   trunk/www/firefox36-i18n/Makefile
   trunk/www/firefox36-i18n/distinfo
   trunk/www/firefox36/Makefile
   trunk/www/firefox36/distinfo
   trunk/www/kompozer/Makefile
   trunk/www/libxul/Makefile
   trunk/www/seamonkey-i18n/Makefile
   trunk/www/seamonkey-i18n/distinfo
   trunk/www/seamonkey-i18n/pkg-descr
   trunk/www/seamonkey/Makefile
   trunk/www/seamonkey/distinfo
   trunk/www/seamonkey/files/patch-config_autoconf.mk.in
   trunk/www/seamonkey/files/patch-configure.in
   trunk/www/seamonkey/files/patch-mozilla-js-src-Makefile.in
   trunk/www/seamonkey/files/seamonkey.desktop.in
   trunk/www/seamonkey2-i18n/Makefile
   trunk/www/seamonkey2/Makefile
   trunk/www/seamonkey2/files/patch-config_autoconf.mk.in
   trunk/www/seamonkey2/files/seamonkey.desktop.in

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/Mk/bsd.gecko.mk	Sun Aug 28 15:08:27 2011	(r615)
@@ -4,7 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.33 2011/08/03 22:33:41 flo Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.38 2011/08/20 00:09:08 flo Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -181,9 +181,9 @@
 #                         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 50+ 36+ 50 36
+#                         Available values: yes 60+ 36+ 60 36
 #                         NOTE:
-#                         default value 50 is used in case of USE_FIREFOX=yes
+#                         default value 60 is used in case of USE_FIREFOX=yes
 #
 # USE_FIREFOX_BUILD       Add buildtime dependency on Firefox.
 #                         Available values: see USE_FIREFOX
@@ -192,9 +192,9 @@
 #                         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 22+ 20+ 22 20
+#                         Available values: yes 23+ 20+ 23 20
 #                         NOTE:
-#                         default value 22 is used in case of USE_SEAMONKEY=yes
+#                         default value 23 is used in case of USE_SEAMONKEY=yes
 #
 # USE_SEAMONKEY_BUILD     Add buildtime dependency on SeaMonkey.
 #                         Available values: see USE_SEAMONKEY
@@ -203,9 +203,9 @@
 #                         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 50+ 31+ 50 31
+#                         Available values: yes 60+ 31+ 60 31
 #                         NOTE:
-#                         default value 50 is used in case of USE_THUNDERBIRD=yes
+#                         default value 60 is used in case of USE_THUNDERBIRD=yes
 #
 # USE_THUNDERBIRD_BUILD   Add buildtime dependency on Thunderbird.
 #                         Available values: see USE_THUNDERBIRD
@@ -222,13 +222,13 @@
 _FIREFOX_BUILD_DEPENDS=		yes
 .endif
 
-_FIREFOX_DEFAULT_VERSION=	50
-_FIREFOX_VERSIONS=			50 36
-_FIREFOX_RANGE_VERSIONS=	50+ 36+
+_FIREFOX_DEFAULT_VERSION=	60
+_FIREFOX_VERSIONS=			60 36
+_FIREFOX_RANGE_VERSIONS=	60+ 36+
 
 # For specifying [36, ..]+
-_FIREFOX_36P=	36 ${_FIREFOX_50P}
-_FIREFOX_50P=	50
+_FIREFOX_36P=	36 ${_FIREFOX_60P}
+_FIREFOX_60P=	60
 
 # Set the default Firefox version and check if USE_FIREFOX=yes was given
 .if ${USE_FIREFOX} == "yes"
@@ -236,10 +236,10 @@
 .endif
 
 # Setting/finding Firefox version we want.
-.if exists(${LOCALBASE}/bin/firefox3)
-_FIREFOX_VER!=	${LOCALBASE}/bin/firefox3 --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
-.elif exists(${LOCALBASE}/bin/firefox)
+.if exists(${LOCALBASE}/bin/firefox)
 _FIREFOX_VER!=	${LOCALBASE}/bin/firefox --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.elif exists(${LOCALBASE}/bin/firefox3)
+_FIREFOX_VER!=	${LOCALBASE}/bin/firefox3 --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
 .endif
 
 # Check if installed Firefox version matches the wanted one
@@ -272,7 +272,7 @@
 .endif
 
 # Dependence lines for different Firefox versions
-50_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+60_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
 36_DEPENDS=		${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36
 
 # Add dependencies
@@ -295,12 +295,12 @@
 _SEAMONKEY_BUILD_DEPENDS=	yes
 .endif
 
-_SEAMONKEY_DEFAULT_VERSION=	22
-_SEAMONKEY_VERSIONS=		22 20
-_SEAMONKEY_RANGE_VERSIONS=	22+ 20+
+_SEAMONKEY_DEFAULT_VERSION=	23
+_SEAMONKEY_VERSIONS=		23 20
+_SEAMONKEY_RANGE_VERSIONS=	23+ 20+
 
-# For specifying [22, 20, ..]+
-_SEAMONKEY_22P=	22 ${_SEAMONKEY_20P}
+# For specifying [23, 20, ..]+
+_SEAMONKEY_23P=	23 ${_SEAMONKEY_20P}
 _SEAMONKEY_20P=	20
 
 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given
@@ -311,6 +311,8 @@
 # Setting/finding SeaMonkey version we want.
 .if exists(${LOCALBASE}/bin/seamonkey)
 _SEAMONKEY_VER!=	${LOCALBASE}/bin/seamonkey --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.elif exists(${LOCALBASE}/bin/seamonkey2)
+_SEAMONKEY_VER!=	${LOCALBASE}/bin/seamonkey2 --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/'
 .endif
 
 # Check if installed SeaMonkey version matches the wanted one
@@ -343,8 +345,8 @@
 .endif
 
 # Dependence lines for different SeaMonkey versions
-11_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey
-20_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey2
+23_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+20_DEPENDS=		${LOCALBASE}/lib/seamonkey2/seamonkey:${PORTSDIR}/www/seamonkey2
 
 # Add dependencies
 .if defined(USE_SEAMONKEY)
@@ -366,13 +368,13 @@
 _THUNDERBIRD_BUILD_DEPENDS=		yes
 .endif
 
-_THUNDERBIRD_DEFAULT_VERSION=	50
-_THUNDERBIRD_VERSIONS=			50 31
-_THUNDERBIRD_RANGE_VERSIONS=	50+ 31+
+_THUNDERBIRD_DEFAULT_VERSION=	60
+_THUNDERBIRD_VERSIONS=			60 31
+_THUNDERBIRD_RANGE_VERSIONS=	60+ 31+
 
 # For specifying [31, 30, ..]+
 _THUNDERBIRD_31P=	31 ${_THUNDERBIRD_31P}
-_THUNDERBIRD_50P=	50
+_THUNDERBIRD_60P=	60
 
 # Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
 .if ${USE_THUNDERBIRD} == "yes"
@@ -382,6 +384,8 @@
 # Setting/finding Thunderbird version we want.
 .if exists(${LOCALBASE}/bin/thunderbird)
 _THUNDERBIRD_VER!=	${LOCALBASE}/bin/thunderbird --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.elif exists(${LOCALBASE}/bin/thunderbird3)
+_THUNDERBIRD_VER!=	${LOCALBASE}/bin/thunderbird3 --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/'
 .endif
 
 # Check if installed Thunderbird version matches the wanted one
@@ -414,8 +418,8 @@
 .endif
 
 # Dependence lines for different Thunderbird versions
-50_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
-31_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird3
+60_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+31_DEPENDS=		${LOCALBASE}/lib/thunderbird3/thunderbird:${PORTSDIR}/mail/thunderbird3
 
 # Add dependencies
 .if defined(USE_THUNDERBIRD)
@@ -894,6 +898,13 @@
 	${TAR} cf - -C${FAKEDIR}/${dir} -s'|${FAKEDIR}|${PREFIX}|s' . | \
 		${TAR} xof - -C${PREFIX}/${dir}
 .endfor
+.if (${OSVERSION} < 800081 )
+	# XXX: make sure bsdtar(1) corrected symlinks
+	${FIND} ${FAKEDIR} -type l -exec \
+		${ECHO_CMD} stat -f \'${LN} -hfs \"%Y\" \"%N\"\' {} + | \
+		${SED} s'|${FAKEDIR}|${PREFIX}|g' | ${SH} | \
+		${SED} -n s'|${FAKEDIR}|${PREFIX}|p' | ${SH} -x
+.endif
 .for pcfile in ${MOZ_PKGCONFIG_FILES}
 	${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \
 		${PREFIX}/libdata/pkgconfig/${pcfile}.pc

Modified: branches/experimental/mail/thunderbird-i18n/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		29 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.43 2011/06/30 18:19:48 flo Exp $
+# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.47 2011/08/23 08:00:17 ale Exp $
 #
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	5.0
+PORTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -23,18 +24,17 @@
 .endif
 
 NO_BUILD=	yes
-USE_THUNDERBIRD=	yes
-USE_XPI=	*thunderbird
+USE_THUNDERBIRD=	60
+USE_XPI=	thunderbird
 
-THUNDERBIRD_I18N_ALL=	ar bg br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
+THUNDERBIRD_I18N_ALL=	ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
 			fy-NL ga-IE gd gl he hu is it ja ko lt nb-NO nl nn-NO \
-			pa-IN pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk \
-			zh-TW
+			pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk zh-TW
 
 .ifdef PACKAGE_BUILDING
 THUNDERBIRD_I18N?=	all
 .else
-THUNDERBIRD_I18N?=	es-ES pt-BR ru ja de fr pa-IN ko it
+THUNDERBIRD_I18N?=	es-ES pt-BR ru ja de fr ko it
 .endif
 
 .if ${THUNDERBIRD_I18N} == all
@@ -59,8 +59,10 @@
 		then \
 			exit 1; \
 		fi; \
-		cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/chrome; \
-		${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \
+		cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/chrome/$$lang; \
+		${LOCALBASE}/bin/zip -r ../$$lang.jar locale; \
+		cd ..; ${RM} -rf $$lang; cd ..; \
+		${REINPLACE_CMD} -i "" "s,chrome/$$lang,jar:chrome/$$lang.jar!," chrome.manifest; \
 	done
 
 do-install:

Modified: branches/experimental/mail/thunderbird-i18n/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,88 +1,84 @@
-SHA256 (xpi/thunderbird-i18n-5.0/ar.xpi) = bb3f5afa529bb9ad91004d57c2e4ae77266c4fceaac3af13e69b25756c926eec
-SIZE (xpi/thunderbird-i18n-5.0/ar.xpi) = 426291
-SHA256 (xpi/thunderbird-i18n-5.0/bg.xpi) = c19da2505f426dc8d2190db5b6dc3723e92b7f44a48ff03a3b7942b5668a27a7
-SIZE (xpi/thunderbird-i18n-5.0/bg.xpi) = 444151
-SHA256 (xpi/thunderbird-i18n-5.0/br.xpi) = 19c3387c0f66a2787bb1fe7cc89b72d401db476726480e2e7a0e052f4f9e98ac
-SIZE (xpi/thunderbird-i18n-5.0/br.xpi) = 356430
-SHA256 (xpi/thunderbird-i18n-5.0/ca.xpi) = 0e1aedbe17a62ae8b6588ef76aeee7468743835857b13b6fa11dc96ca23ca4aa
-SIZE (xpi/thunderbird-i18n-5.0/ca.xpi) = 407700
-SHA256 (xpi/thunderbird-i18n-5.0/cs.xpi) = af1c3be0944244dff7f35c7d335b2e28385d83e0ea572c4a43e4dfb3cc4d692c
-SIZE (xpi/thunderbird-i18n-5.0/cs.xpi) = 407837
-SHA256 (xpi/thunderbird-i18n-5.0/da.xpi) = 92514d7df29168123279a0b486264d25fdac8ea984d9ea53c1158e0f850fc304
-SIZE (xpi/thunderbird-i18n-5.0/da.xpi) = 350465
-SHA256 (xpi/thunderbird-i18n-5.0/de.xpi) = fcd373a837dcb615b64635d1d2583d55ca5fe36e5dd32f11cdf1c6e50dc656c0
-SIZE (xpi/thunderbird-i18n-5.0/de.xpi) = 406252
-SHA256 (xpi/thunderbird-i18n-5.0/en-GB.xpi) = f7dbb262115a52d4cb6fe2e7119861241b285d08fbdc2a481bc2648bf9bca591
-SIZE (xpi/thunderbird-i18n-5.0/en-GB.xpi) = 381468
-SHA256 (xpi/thunderbird-i18n-5.0/en-US.xpi) = 7f89a05fd921e3fcfe5d83060bac92d4ac54be9dd7b90e9ee2f7b4ae3e7dd99c
-SIZE (xpi/thunderbird-i18n-5.0/en-US.xpi) = 381080
-SHA256 (xpi/thunderbird-i18n-5.0/es-AR.xpi) = 4249e4dd9e39bcfb1d08ce2ebd042fd4ee332b949dadc5b706026130c178523b
-SIZE (xpi/thunderbird-i18n-5.0/es-AR.xpi) = 399330
-SHA256 (xpi/thunderbird-i18n-5.0/es-ES.xpi) = a952b2c5f098a9685b22b72176575c8d8ba70c8415a24fab2b0a7414242690be
-SIZE (xpi/thunderbird-i18n-5.0/es-ES.xpi) = 343865
-SHA256 (xpi/thunderbird-i18n-5.0/et.xpi) = 2dcb8d5086963964889b07d268baa681abc7744fef01219bc8f35db5184822e9
-SIZE (xpi/thunderbird-i18n-5.0/et.xpi) = 399580
-SHA256 (xpi/thunderbird-i18n-5.0/eu.xpi) = 7c940255e7e5dae14fdd725a9a722f13d5aa38eee98ab0f0ff2cca96db98b7cd
-SIZE (xpi/thunderbird-i18n-5.0/eu.xpi) = 395631
-SHA256 (xpi/thunderbird-i18n-5.0/fi.xpi) = ff2a8aae8c48be298d3fdd7b0dc5621eff9af2c43a4a9e42c961fb8ecd9c3db7
-SIZE (xpi/thunderbird-i18n-5.0/fi.xpi) = 400828
-SHA256 (xpi/thunderbird-i18n-5.0/fr.xpi) = 49f54a41e64d53cf78b6576e89341672f16e629e25b3ffe689a71431fc796768
-SIZE (xpi/thunderbird-i18n-5.0/fr.xpi) = 403253
-SHA256 (xpi/thunderbird-i18n-5.0/fy-NL.xpi) = 8f0e32f4bcd7b097d746f7ed376e3ff01a28d2f2e8e02be1a3015853888f7fb0
-SIZE (xpi/thunderbird-i18n-5.0/fy-NL.xpi) = 403075
-SHA256 (xpi/thunderbird-i18n-5.0/ga-IE.xpi) = a69b3a0818b5ab7a6c27298884cb415dec7dc3f96ad4a8b78ef8d6a3d851d2d7
-SIZE (xpi/thunderbird-i18n-5.0/ga-IE.xpi) = 411750
-SHA256 (xpi/thunderbird-i18n-5.0/gd.xpi) = 0c84eec07f1a1f8a122c73b56f079445abdd9f029231f5471aba231cfce92ac4
-SIZE (xpi/thunderbird-i18n-5.0/gd.xpi) = 414203
-SHA256 (xpi/thunderbird-i18n-5.0/gl.xpi) = 794eb2977a964108ef031bc952babee6a0dc0e93d40263ee12297c28187f39b8
-SIZE (xpi/thunderbird-i18n-5.0/gl.xpi) = 398333
-SHA256 (xpi/thunderbird-i18n-5.0/he.xpi) = 3f49799adfe9e65d39639402a7a9ce6f8bcf036fbe25aa4aadd483007172f864
-SIZE (xpi/thunderbird-i18n-5.0/he.xpi) = 415116
-SHA256 (xpi/thunderbird-i18n-5.0/hu.xpi) = 8ea419595e4ef5034296485290cf89dc6091361b8f785be8e137ac37e934ed7e
-SIZE (xpi/thunderbird-i18n-5.0/hu.xpi) = 415270
-SHA256 (xpi/thunderbird-i18n-5.0/is.xpi) = 8cdf6ddaa75c09ed31e57031f242eb56f0bb87dfc3965f019642a0b035664a44
-SIZE (xpi/thunderbird-i18n-5.0/is.xpi) = 401557
-SHA256 (xpi/thunderbird-i18n-5.0/it.xpi) = d995d24b281c79f36026d302ceb73638d156c619c8a29f7eeaa09c05a6edf89d
-SIZE (xpi/thunderbird-i18n-5.0/it.xpi) = 337738
-SHA256 (xpi/thunderbird-i18n-5.0/ja.xpi) = a582214664357c360e2c8aaae8dab7fdd735e9827c8e3f9190542ca85fd89a04
-SIZE (xpi/thunderbird-i18n-5.0/ja.xpi) = 446749
-SHA256 (xpi/thunderbird-i18n-5.0/ko.xpi) = cc629295d61ea7c9f7103a0ddd096af438bd0ef049a6d6d3aef28c1c4104f0b6
-SIZE (xpi/thunderbird-i18n-5.0/ko.xpi) = 358753
-SHA256 (xpi/thunderbird-i18n-5.0/lt.xpi) = bb3e3dde6f71b303cc6a26fc92db9f724c186ab16932cf1532d740decd62a168
-SIZE (xpi/thunderbird-i18n-5.0/lt.xpi) = 523993
-SHA256 (xpi/thunderbird-i18n-5.0/nb-NO.xpi) = 222f84d8e0b791e2b66e76ada384efca190a0cf4c1262d9cb203b506969ae769
-SIZE (xpi/thunderbird-i18n-5.0/nb-NO.xpi) = 396958
-SHA256 (xpi/thunderbird-i18n-5.0/nl.xpi) = b4fd06c5ea15d7ad769f380ce25cd8e2b867f88d49761bc23e1f8e9150a9afa9
-SIZE (xpi/thunderbird-i18n-5.0/nl.xpi) = 397102
-SHA256 (xpi/thunderbird-i18n-5.0/nn-NO.xpi) = 2a8c106becb4d730cd9dc10588ec87fbbb85f55b15575b98a592ae1c63e9eb95
-SIZE (xpi/thunderbird-i18n-5.0/nn-NO.xpi) = 398579
-SHA256 (xpi/thunderbird-i18n-5.0/pa-IN.xpi) = 9f8214b81a7e850cfb1dc977072638578f8fd1cf65b1f6b9235258b86d353c2f
-SIZE (xpi/thunderbird-i18n-5.0/pa-IN.xpi) = 434024
-SHA256 (xpi/thunderbird-i18n-5.0/pl.xpi) = 54586577f86b4d2c39c909c90e80075e9ff521227bd5c4dc5b947ed84d0152da
-SIZE (xpi/thunderbird-i18n-5.0/pl.xpi) = 383672
-SHA256 (xpi/thunderbird-i18n-5.0/pt-BR.xpi) = c3a827b736e999b24098b6bfa37e4442ae835d66d567bba9b50634aff40ec3f7
-SIZE (xpi/thunderbird-i18n-5.0/pt-BR.xpi) = 406009
-SHA256 (xpi/thunderbird-i18n-5.0/pt-PT.xpi) = 76ee0e9bccf2a225b7ead1259ad82ece574d4db64d383bbf540733c202865f0e
-SIZE (xpi/thunderbird-i18n-5.0/pt-PT.xpi) = 402739
-SHA256 (xpi/thunderbird-i18n-5.0/rm.xpi) = aa91f09081aa264b07996f5c5b5f1058ddb5cf12b2bb47c2c4e3cfac1780a8d1
-SIZE (xpi/thunderbird-i18n-5.0/rm.xpi) = 403569
-SHA256 (xpi/thunderbird-i18n-5.0/ru.xpi) = 561e74bae50a7c8a7e436bf70a3188d0e35f8890387d0091178de6c362a3054b
-SIZE (xpi/thunderbird-i18n-5.0/ru.xpi) = 398261
-SHA256 (xpi/thunderbird-i18n-5.0/si.xpi) = 36b97239a8b87c0bb5f3ef50ea51ea485f0a9976fb9cd1dbc0cf09c8382375ef
-SIZE (xpi/thunderbird-i18n-5.0/si.xpi) = 443551
-SHA256 (xpi/thunderbird-i18n-5.0/sk.xpi) = f8d0f45a365df808d2dc9e7d14037440a9883cef4eadb98bfc5048eb089090ed
-SIZE (xpi/thunderbird-i18n-5.0/sk.xpi) = 413255
-SHA256 (xpi/thunderbird-i18n-5.0/sl.xpi) = bed8303d78a69d19f403e881e85756945b06e542a53e2371c7667cd2f5784576
-SIZE (xpi/thunderbird-i18n-5.0/sl.xpi) = 399391
-SHA256 (xpi/thunderbird-i18n-5.0/sq.xpi) = de288e144e65f46d7b6954e828b434cf2fef10444cdc3bdfd09ff015d68a350b
-SIZE (xpi/thunderbird-i18n-5.0/sq.xpi) = 347151
-SHA256 (xpi/thunderbird-i18n-5.0/sv-SE.xpi) = 0e388da663b96521c0f5b1b7942bbbe65073a82cbf4e3e9852baa081decc3f37
-SIZE (xpi/thunderbird-i18n-5.0/sv-SE.xpi) = 467630
-SHA256 (xpi/thunderbird-i18n-5.0/ta-LK.xpi) = 42799b855d5b3563d29e68662c13a06c971449a8c68a543f02155951566f946a
-SIZE (xpi/thunderbird-i18n-5.0/ta-LK.xpi) = 457259
-SHA256 (xpi/thunderbird-i18n-5.0/tr.xpi) = 0f202abbd2758dc8b995f69be7f3c355ffb8fbf42b54382759930274a9917d36
-SIZE (xpi/thunderbird-i18n-5.0/tr.xpi) = 402358
-SHA256 (xpi/thunderbird-i18n-5.0/uk.xpi) = 63af2eed2f83137928019105f737f3512a1cd0d150f4ff47f903644d08455d3a
-SIZE (xpi/thunderbird-i18n-5.0/uk.xpi) = 451686
-SHA256 (xpi/thunderbird-i18n-5.0/zh-TW.xpi) = 48d0ec4797b8ee021e947828d872e682ec56234fba8de6cba5d16ff8cdd7bbc2
-SIZE (xpi/thunderbird-i18n-5.0/zh-TW.xpi) = 419985
+SHA256 (xpi/thunderbird-i18n-6.0/ar.xpi) = 3a451c2f0d127a9d27b8a350b08e4e081ad355465f11340d20cc0e451e8b8a89
+SIZE (xpi/thunderbird-i18n-6.0/ar.xpi) = 427494
+SHA256 (xpi/thunderbird-i18n-6.0/br.xpi) = d38de60d65bea16a779642a2232425d4d17bb4020c8ff2b42c210ce4a4127bd6
+SIZE (xpi/thunderbird-i18n-6.0/br.xpi) = 357402
+SHA256 (xpi/thunderbird-i18n-6.0/ca.xpi) = 9fc006759723c597b6263ba57b84cf295008ebb84bf77c11c16bb585bd2f1b2e
+SIZE (xpi/thunderbird-i18n-6.0/ca.xpi) = 408682
+SHA256 (xpi/thunderbird-i18n-6.0/cs.xpi) = 8251b8f6968ff6c4a085fbc49ad771ec560f6c380477da70d7a05e9076149d1f
+SIZE (xpi/thunderbird-i18n-6.0/cs.xpi) = 409069
+SHA256 (xpi/thunderbird-i18n-6.0/da.xpi) = c5146a29b714fb9ce0f6b1ee026c17875219b2e65aec3142764f0ee0c36e2bc6
+SIZE (xpi/thunderbird-i18n-6.0/da.xpi) = 351543
+SHA256 (xpi/thunderbird-i18n-6.0/de.xpi) = 4e37fdc9e08acdd8c89e896db7d1bcfb0adcd50d95e96723beda486c26c6f6ca
+SIZE (xpi/thunderbird-i18n-6.0/de.xpi) = 407453
+SHA256 (xpi/thunderbird-i18n-6.0/en-GB.xpi) = 0caf4a881992c2d96a37398bc0be126133a2f0a297b9955293bc362885c23889
+SIZE (xpi/thunderbird-i18n-6.0/en-GB.xpi) = 382371
+SHA256 (xpi/thunderbird-i18n-6.0/en-US.xpi) = 030eeb82f4e226f47aacf6d5b51f96f10d6b5cc2569f031c46a0dee0b9c68593
+SIZE (xpi/thunderbird-i18n-6.0/en-US.xpi) = 381945
+SHA256 (xpi/thunderbird-i18n-6.0/es-AR.xpi) = 9042e7533f8d3e86f586907581c2d22710848fe46c26cccfa667a4f2963d35e6
+SIZE (xpi/thunderbird-i18n-6.0/es-AR.xpi) = 400278
+SHA256 (xpi/thunderbird-i18n-6.0/es-ES.xpi) = 97fa112a00644fd8b0ae94fc4638501855876e8270aa14ee739191935d3fa801
+SIZE (xpi/thunderbird-i18n-6.0/es-ES.xpi) = 344500
+SHA256 (xpi/thunderbird-i18n-6.0/et.xpi) = cb2aa30dbd8e3df24ab43bedc7689d12cf529fd44448b93e2080bb13d7b68edd
+SIZE (xpi/thunderbird-i18n-6.0/et.xpi) = 400758
+SHA256 (xpi/thunderbird-i18n-6.0/eu.xpi) = 648eb6a6e6260be9de9ab0a4cbd23d40f3c7ff965039c5d332acf1b0a7924ac8
+SIZE (xpi/thunderbird-i18n-6.0/eu.xpi) = 396653
+SHA256 (xpi/thunderbird-i18n-6.0/fi.xpi) = 86a4fde30c122031b7806107069d9fef605a2f590fc66efb7b456de11af7e42e
+SIZE (xpi/thunderbird-i18n-6.0/fi.xpi) = 401789
+SHA256 (xpi/thunderbird-i18n-6.0/fr.xpi) = d357085563e0edd71241a09ad3d7c63c0737ae3e70cf07692884ae176a648378
+SIZE (xpi/thunderbird-i18n-6.0/fr.xpi) = 404210
+SHA256 (xpi/thunderbird-i18n-6.0/fy-NL.xpi) = d9cab2a49a76da9d421b6969c6f3abf565bd37340c0a69a396a8f6e515db1837
+SIZE (xpi/thunderbird-i18n-6.0/fy-NL.xpi) = 404129
+SHA256 (xpi/thunderbird-i18n-6.0/ga-IE.xpi) = 9e2d5dd92cf1dec950f791e2dfb396da860ca5e666d31b972e6e02613f2c279b
+SIZE (xpi/thunderbird-i18n-6.0/ga-IE.xpi) = 412669
+SHA256 (xpi/thunderbird-i18n-6.0/gd.xpi) = d86e05f537b4746ab655e4161ad1a18d5558645b9b95dc891db713cd21aa8dc2
+SIZE (xpi/thunderbird-i18n-6.0/gd.xpi) = 415265
+SHA256 (xpi/thunderbird-i18n-6.0/gl.xpi) = c3faac2259d7396f34b71f05627dd6e8d62abd617200aae892a26b1d9c4d7742
+SIZE (xpi/thunderbird-i18n-6.0/gl.xpi) = 399351
+SHA256 (xpi/thunderbird-i18n-6.0/he.xpi) = f330351e4f2810da09d08a8332529337484b04512c87e69b70ea815636e423ed
+SIZE (xpi/thunderbird-i18n-6.0/he.xpi) = 415986
+SHA256 (xpi/thunderbird-i18n-6.0/hu.xpi) = 6e5aec41df3d9fcbb7671d5ed0264be96d8a3f3c5d3a18f2cc4db0059fc1d742
+SIZE (xpi/thunderbird-i18n-6.0/hu.xpi) = 416271
+SHA256 (xpi/thunderbird-i18n-6.0/is.xpi) = 05afdf13888edef7fa6e95ac5b088e6828b1ca7d196cced5f13f79090dbd49f5
+SIZE (xpi/thunderbird-i18n-6.0/is.xpi) = 402535
+SHA256 (xpi/thunderbird-i18n-6.0/it.xpi) = e301f259468f0d2f42813fade0942be0d8968db71aaecf89de59be8ec06d6431
+SIZE (xpi/thunderbird-i18n-6.0/it.xpi) = 336843
+SHA256 (xpi/thunderbird-i18n-6.0/ja.xpi) = 1c44d010f91bc71584f4b1551cc6f042f2f54eb23627b733747f346594017330
+SIZE (xpi/thunderbird-i18n-6.0/ja.xpi) = 448030
+SHA256 (xpi/thunderbird-i18n-6.0/ko.xpi) = 1cfecb7fa95016d4063df2fb79c4ba6e25b500074a4535b9fd258804101bf8d7
+SIZE (xpi/thunderbird-i18n-6.0/ko.xpi) = 359873
+SHA256 (xpi/thunderbird-i18n-6.0/lt.xpi) = be7c7e1b88a30b7108c1d3852f22442060d5a358279fe3fa74051f94cb5850e6
+SIZE (xpi/thunderbird-i18n-6.0/lt.xpi) = 525096
+SHA256 (xpi/thunderbird-i18n-6.0/nb-NO.xpi) = 9d0330d71dcab318d34caa04757ee53baadaf33ab84a2485028e2d7df276d31e
+SIZE (xpi/thunderbird-i18n-6.0/nb-NO.xpi) = 397892
+SHA256 (xpi/thunderbird-i18n-6.0/nl.xpi) = f8de141b8eac6c098265c5835cb3477ebb82ce8c98f45bd0df2a13f16d9294c5
+SIZE (xpi/thunderbird-i18n-6.0/nl.xpi) = 398169
+SHA256 (xpi/thunderbird-i18n-6.0/nn-NO.xpi) = 45644c01a20167fea279a9a44f94a37d6e69208ff4adf9fda7ed3007a1aae314
+SIZE (xpi/thunderbird-i18n-6.0/nn-NO.xpi) = 399482
+SHA256 (xpi/thunderbird-i18n-6.0/pl.xpi) = abffe09ca4f72c19d17e6dcbd1d9c2b64bf77170e1c54153a45b2dadb7159250
+SIZE (xpi/thunderbird-i18n-6.0/pl.xpi) = 384740
+SHA256 (xpi/thunderbird-i18n-6.0/pt-BR.xpi) = 3fa4331317435d3cb4376f79dcef4c0af4c820221ac03a456111ce92db17b9c8
+SIZE (xpi/thunderbird-i18n-6.0/pt-BR.xpi) = 406991
+SHA256 (xpi/thunderbird-i18n-6.0/pt-PT.xpi) = 60d724aed7550840d7dfcc7de405117b704f7fdfbec8a34f2ff7999b8569a039
+SIZE (xpi/thunderbird-i18n-6.0/pt-PT.xpi) = 403984
+SHA256 (xpi/thunderbird-i18n-6.0/rm.xpi) = 754aba44bfe48932f30a192d3f7296b8dc8901adda66df5813e0c73dea4f8b54
+SIZE (xpi/thunderbird-i18n-6.0/rm.xpi) = 404561
+SHA256 (xpi/thunderbird-i18n-6.0/ru.xpi) = b0fc8d5d7ff89f1ccc9d662da7e9a3120900e50003a2281f056abfce3708903e
+SIZE (xpi/thunderbird-i18n-6.0/ru.xpi) = 398962
+SHA256 (xpi/thunderbird-i18n-6.0/si.xpi) = f9618dcd779b0a6d3f33d77777e400acf547237ae14269150764df259fb9045a
+SIZE (xpi/thunderbird-i18n-6.0/si.xpi) = 446393
+SHA256 (xpi/thunderbird-i18n-6.0/sk.xpi) = 1f18758211c456335ee335b135c4ad06a20ed734d2abe6541caac589395337ad
+SIZE (xpi/thunderbird-i18n-6.0/sk.xpi) = 414265
+SHA256 (xpi/thunderbird-i18n-6.0/sl.xpi) = 4fc68f3a7f5b15c4e3314c81ad2945be0881d32da94aa9b118c4911031353ed1
+SIZE (xpi/thunderbird-i18n-6.0/sl.xpi) = 400275
+SHA256 (xpi/thunderbird-i18n-6.0/sq.xpi) = e7ef33b2802aa983e3985f6162490f7be6a0ca32d82d2540ea71cbc80102d0b0
+SIZE (xpi/thunderbird-i18n-6.0/sq.xpi) = 348955
+SHA256 (xpi/thunderbird-i18n-6.0/sv-SE.xpi) = 6d5b5c1a48c6a2d5918f534800777ddf5e61b5b81374ccc3bb2cc09fc75a2c52
+SIZE (xpi/thunderbird-i18n-6.0/sv-SE.xpi) = 468587
+SHA256 (xpi/thunderbird-i18n-6.0/ta-LK.xpi) = 6614445d8c29a4287469dc781d62630f580e240b0156931d8f32f886effa1963
+SIZE (xpi/thunderbird-i18n-6.0/ta-LK.xpi) = 463618
+SHA256 (xpi/thunderbird-i18n-6.0/tr.xpi) = 595b22151201dc4b9d08a0321530c1f1f2494d5b6edb5527cd56648b245f1493
+SIZE (xpi/thunderbird-i18n-6.0/tr.xpi) = 403273
+SHA256 (xpi/thunderbird-i18n-6.0/uk.xpi) = a7030f7f6aa9d52b4a39c344ef1d5aeae9114dca9590e2eabf24b3c2849601ec
+SIZE (xpi/thunderbird-i18n-6.0/uk.xpi) = 452775
+SHA256 (xpi/thunderbird-i18n-6.0/zh-TW.xpi) = 5c07cc4f35a827e9b533888cdfb482b44f8cebd2a079b5b370ce656e8ecc8de0
+SIZE (xpi/thunderbird-i18n-6.0/zh-TW.xpi) = 420983

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:			4 September 2003
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.129 2011/07/15 22:20:11 flo Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.133 2011/08/25 08:35:58 ale Exp $
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	5.0
+DISTVERSION=	6.0
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -22,7 +23,6 @@
 
 USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
-CONFLICTS_INSTALL=	thunderbird-3.1*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 
@@ -36,20 +36,19 @@
 USE_GMAKE=	yes
 USE_GL=		gl
 
-MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg
+MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg,websocket
 MOZ_GRAPHICS=	default,-xbm
-MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+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 \
 	--with-system-libevent=${LOCALBASE}
 MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZ_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
-			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 MOZ_PKGCONFIG_FILES=
 
-PORTNAME_ICON=	${PORTNAME}.png
+PORTNAME_ICON=	${MOZILLA}.png
 PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
@@ -59,7 +58,7 @@
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-miramar
+WRKSRC=		${WRKDIR}/comm-release
 MOZSRC:=	${WRKSRC}/mozilla
 
 .if ${ARCH} == powerpc64
@@ -82,7 +81,7 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
@@ -99,15 +98,15 @@
 MOZ_OPTIONS+=	--disable-calendar
 .endif
 
-post-extract::
-	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
+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 \"/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}|' \
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/toolkit/library/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in

Modified: branches/experimental/mail/thunderbird/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-5.0.source.tar.bz2) = bb1858dc44e1e9f92b44a1eaf9456190d55b485cf65435266848300ac2b7c5de
-SIZE (thunderbird-5.0.source.tar.bz2) = 86637589
+SHA256 (thunderbird-6.0.source.tar.bz2) = 3c56af448ebd4805c7997d8e0e41f4333d110ad2c4ad4873204bd4d68bbd8189
+SIZE (thunderbird-6.0.source.tar.bz2) = 86286245

Added: branches/experimental/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,8 @@
+--- calendar/base/src/calDateTime.cpp.orig	2011-08-03 20:08:23.361859978 +0200
++++ calendar/base/src/calDateTime.cpp	2011-08-03 20:08:32.351860948 +0200
+@@ -1,4 +1,4 @@
+-/* ***** BEGIN LICENSE BLOCK *****
++/* ***** BEGIN LICENSE BLOCK *****
+  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+  *
+  * The contents of this file are subject to the Mozilla Public License Version

Added: branches/experimental/mail/thunderbird/files/patch-calendar-lightning-install.rdf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-calendar-lightning-install.rdf	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,11 @@
+--- calendar/lightning/install.rdf.orig	2011-08-18 14:35:19.000000000 +0200
++++ calendar/lightning/install.rdf	2011-08-18 14:35:46.000000000 +0200
+@@ -12,7 +12,7 @@
+         <!-- thunderbird -->
+         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+         <em:minVersion>5.0b1</em:minVersion>
+-        <em:maxVersion>5.*</em:maxVersion>
++        <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+ 

Modified: branches/experimental/mail/thunderbird/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-configure.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird/files/patch-configure.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,6 @@
---- configure.in.orig	2011-03-14 14:50:16.000000000 +0100
-+++ configure.in	2011-04-22 12:52:35.061444423 +0200
-@@ -1420,7 +1420,7 @@
+--- configure.in.orig	2011-07-15 07:42:33.000000000 +0200
++++ configure.in	2011-07-22 13:43:44.000000000 +0200
+@@ -1438,7 +1438,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,7 +9,7 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -1440,7 +1440,7 @@
+@@ -1458,7 +1458,7 @@
  dnl ===============================================================
  INTEL_ARCHITECTURE=
  case "$OS_TEST" in
@@ -18,7 +18,90 @@
        INTEL_ARCHITECTURE=1
  esac
  
-@@ -4388,7 +4388,7 @@
+@@ -1781,7 +1781,7 @@
+     esac
+ 
+     case "${host_cpu}" in
+-    x86_64)
++    amd64 | x86_64)
+         HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
+         ;;
+     esac
+@@ -2437,6 +2437,9 @@
+     x86_64-*)
+     	AC_DEFINE(_AMD64_)
+ 	;;
++    amd64*)
++    	AC_DEFINE(_AMD64_)
++	;;
+     *)
+     	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
+ 	;;
+@@ -2508,7 +2511,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'
+@@ -3326,11 +3329,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
+                 )
+@@ -3405,18 +3408,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
+@@ -3591,7 +3594,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("", "");
+@@ -3612,7 +3615,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";
+@@ -4409,7 +4412,7 @@
  LDFLAGS=$_SAVE_LDFLAGS
  LIBS=$_SAVE_LIBS
  
@@ -27,3 +110,12 @@
      ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
      ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
  fi
+@@ -5966,7 +5969,7 @@
+     i*86)
+       MOZ_CRT_CPU_ARCH=intel
+       ;;
+-    x86_64)
++    amd64 | x86_64)
+       MOZ_CRT_CPU_ARCH=amd64
+       ;;
+     *)

Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,25 @@
---- mozilla/js/src/Makefile.in.orig	2011-03-17 18:51:39.000000000 +0100
-+++ mozilla/js/src/Makefile.in	2011-03-18 19:41:09.000000000 +0100
-@@ -612,7 +612,7 @@
+--- mozilla/js/src/Makefile.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/Makefile.in	2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+@@ -469,6 +469,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
+@@ -739,7 +742,7 @@
  # to reliably get limit macros defined, we'd always have to define the
  # one below before including any header, but that's obscure and
  # fragile, so we do it here.
@@ -9,7 +28,7 @@
  
  INCLUDES	+= -I$(srcdir)
  
-@@ -666,7 +666,8 @@
+@@ -793,7 +796,8 @@
  endif # WINNT
  
  ifeq ($(OS_ARCH),FreeBSD)

Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,33 +1,72 @@
---- mozilla/js/src/configure.in.orig	2010-11-04 21:05:48.000000000 +0100
-+++ mozilla/js/src/configure.in	2010-11-22 21:30:24.000000000 +0100
-@@ -2621,7 +2621,7 @@
+--- mozilla/js/src/configure.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/configure.in	2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+@@ -1495,7 +1495,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
+ esac
+ 
+@@ -2713,7 +2713,7 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
 -x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
      ENABLE_TRACEJIT=1
      NANOJIT_ARCH=X64
      ENABLE_METHODJIT=1
-@@ -2638,11 +2638,6 @@
-     AC_DEFINE(JS_CPU_ARM)
-     AC_DEFINE(JS_NUNBOX32)
+@@ -2723,23 +2723,23 @@
+     AC_DEFINE(JS_CPU_X64)
+     AC_DEFINE(JS_PUNBOX64)
+     ;;
+-arm*-*)
++x86_64*-*)
+     ENABLE_TRACEJIT=1
+-    NANOJIT_ARCH=ARM
++    NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    AC_DEFINE(JS_CPU_ARM)
+-    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_POLYIC_TYPED_ARRAY=1
++    AC_DEFINE(JS_CPU_X64)
++    AC_DEFINE(JS_PUNBOX64)
      ;;
 -sparc*-*)
--    ENABLE_TRACEJIT=1
++arm*-*)
+     ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
++    NANOJIT_ARCH=ARM
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    ENABLE_POLYIC_TYPED_ARRAY=1
 -    AC_DEFINE(JS_CPU_SPARC)
--    ;;
++    AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
  esac
- 
- MOZ_ARG_DISABLE_BOOL(methodjit,
-@@ -2693,7 +2688,7 @@
+@@ -2796,6 +2796,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
++    AC_DEFINE(AVMPLUS_AMD64)
++    AC_DEFINE(AVMPLUS_64BIT)
++    ;;
+ x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
-     ;;
-

Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp	Sun Aug 28 15:08:27 2011	(r614)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/js/src/jsnativestack.cpp~
-+++ mozilla/js/src/jsnativestack.cpp
-@@ -50,7 +50,8 @@
- #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
- # include <pthread.h>
- 
--# if defined(__FreeBSD__)
-+# if defined(FREEBSD)
-+#  include <cstddef>
- #  include <pthread_np.h>
- # endif

Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,14 +1,15 @@
---- mozilla/layout/generic/Makefile.in.orig	2011-05-28 15:25:03.000000000 +0200
-+++ mozilla/layout/generic/Makefile.in	2011-06-03 08:21:03.853676671 +0200
-@@ -160,9 +160,10 @@
+--- 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)/../../modules/plugin/base/src \
+ 		-I$(srcdir)/../../dom/plugins/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++ CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
 +
  ifdef MOZ_ENABLE_GTK2
  CXXFLAGS += $(MOZ_GTK2_CFLAGS)
  endif
+

Added: branches/experimental/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,25 @@
+--- 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);
+ }

Modified: branches/experimental/mail/thunderbird/files/thunderbird.desktop.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/thunderbird.desktop.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird/files/thunderbird.desktop.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -3,7 +3,7 @@
 Name=Thunderbird
 GenericName=Mail Client
 Comment=Mail client and News Reader
-Exec=thunderbird %U
+Exec=@MOZILLA@ %U
 Icon=@PORTNAME_ICON@
 StartupNotify=false
 Terminal=false

Modified: branches/experimental/mail/thunderbird3-i18n/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird3-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		29 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.47 2011/07/01 14:45:45 flo Exp $
+# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.50 2011/08/18 10:29:59 ale Exp $
 #
 
-PORTNAME=	thunderbird-i18n
-PORTVERSION=	3.1.11
+PORTNAME=	thunderbird3-i18n
+PORTVERSION=	3.1.12
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -20,11 +21,9 @@
 RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
 .endif
 
-LATEST_LINK=	thunderbird3-i18n
-
 NO_BUILD=	yes
 USE_THUNDERBIRD=	31
-USE_XPI=	*thunderbird*
+USE_XPI=	thunderbird3 linux-thunderbird
 
 THUNDERBIRD_I18N_ALL=	af ar be bg bn-BD ca cs da de el en-GB en-US es-AR es-ES \
 			et eu fi fr fy-NL ga-IE he hu id is it ja ko lt nb-NO nl \
@@ -42,11 +41,11 @@
 .endif
 THUNDERBIRD_I18N_?=	${THUNDERBIRD_I18N}
 
-WDIR=	langpack-*@thunderbird.mozilla.org
+WDIR=	langpack3-*@thunderbird.mozilla.org
 
 XPI_DISTNAMES=	${THUNDERBIRD_I18N_}
 .for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}=		langpack-${dist}@thunderbird.mozilla.org
+XPI_ID_${dist}=		langpack3-${dist}@thunderbird.mozilla.org
 XPI_FILES_${dist}=	chrome.manifest install.rdf chrome/${dist}.jar defaults/pref/all-l10n.js
 XPI_DIRS_${dist}=	chrome defaults/pref defaults
 .endfor
@@ -55,7 +54,7 @@
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR} ${WRKSRC}
 	@for lang in ${THUNDERBIRD_I18N_}; do \
-		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\
+		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack3-$$lang@thunderbird.mozilla.org);\
 		then \
 			exit 1; \
 		fi \
@@ -75,7 +74,8 @@
 
 post-patch:
 	${FIND} ${WRKSRC} -name install.rdf -print0 | \
-		${XARGS} -0L1 ${REINPLACE_CMD} -i '' '/<?xml/,$$!d'
+		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d' \
+			-e 's/\(langpack\)/\13/'
 
 list-langs:
 	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/${MASTER_SITE_SUBDIR}"|\

Modified: branches/experimental/mail/thunderbird3-i18n/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird3-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird3-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,92 +1,92 @@
-SHA256 (xpi/thunderbird-i18n-3.1.11/af.xpi) = d2676300f8fea683c381b07c046316cc9259b2ec762642cbd9bcb66214d0dc2f
-SIZE (xpi/thunderbird-i18n-3.1.11/af.xpi) = 210615
-SHA256 (xpi/thunderbird-i18n-3.1.11/ar.xpi) = 30649cdcc5cce17c0322932698133efb3ecae0da3bed18b5622a2029be4c812a
-SIZE (xpi/thunderbird-i18n-3.1.11/ar.xpi) = 230384
-SHA256 (xpi/thunderbird-i18n-3.1.11/be.xpi) = b5d2d70496baf0cd5475ed416dbcc87110eab7163eabe71c4291cf7332ad1d0a
-SIZE (xpi/thunderbird-i18n-3.1.11/be.xpi) = 194430
-SHA256 (xpi/thunderbird-i18n-3.1.11/bg.xpi) = 2b4b023866113eccb07e5090852d410d6d85d2f071178ed4fc4d30934a451eb3
-SIZE (xpi/thunderbird-i18n-3.1.11/bg.xpi) = 235125
-SHA256 (xpi/thunderbird-i18n-3.1.11/bn-BD.xpi) = 18e0cf60c411be7a7ad29f0e8f20dddd598703979df2c7a65549738aad47671e
-SIZE (xpi/thunderbird-i18n-3.1.11/bn-BD.xpi) = 244827
-SHA256 (xpi/thunderbird-i18n-3.1.11/ca.xpi) = 5e1b3002068406612f13b68514a6f44b9ffc30c70dab159172ddd48884c929db
-SIZE (xpi/thunderbird-i18n-3.1.11/ca.xpi) = 219359
-SHA256 (xpi/thunderbird-i18n-3.1.11/cs.xpi) = de60a3b46922507659a804f8d4c22481b1c3de8e1d08d6f85baa9e7a51b9cd37
-SIZE (xpi/thunderbird-i18n-3.1.11/cs.xpi) = 218194
-SHA256 (xpi/thunderbird-i18n-3.1.11/da.xpi) = a609ed3e1fcf4ae4ba36fffcf0b3b6a1ec421b3651a26c96a2db4f625e8954a9
-SIZE (xpi/thunderbird-i18n-3.1.11/da.xpi) = 203226
-SHA256 (xpi/thunderbird-i18n-3.1.11/de.xpi) = 8c66b7b527e025e148f11fbe19fd0b8acc45bf8b2baac6400cbb30b248c9c355
-SIZE (xpi/thunderbird-i18n-3.1.11/de.xpi) = 222817
-SHA256 (xpi/thunderbird-i18n-3.1.11/el.xpi) = 0bfe08f807b4b529bf12053526c803fa104b6c38d132f8f262a498f846ca9762
-SIZE (xpi/thunderbird-i18n-3.1.11/el.xpi) = 210073
-SHA256 (xpi/thunderbird-i18n-3.1.11/en-GB.xpi) = 0e8bfde8e4e442f03afb8f9d85deb1b7b99324194ad9306dd771305ce60d1a11
-SIZE (xpi/thunderbird-i18n-3.1.11/en-GB.xpi) = 203675
-SHA256 (xpi/thunderbird-i18n-3.1.11/en-US.xpi) = e9d8815a034151824700b22daadeaf196e8c3fef3620542d0345a7c43fc0a9ab
-SIZE (xpi/thunderbird-i18n-3.1.11/en-US.xpi) = 202586
-SHA256 (xpi/thunderbird-i18n-3.1.11/es-AR.xpi) = ee7e5ffb47d60e47dcd1c40f747541a358eca46b2cc3d950921d144b2dd7e1c7
-SIZE (xpi/thunderbird-i18n-3.1.11/es-AR.xpi) = 218588
-SHA256 (xpi/thunderbird-i18n-3.1.11/es-ES.xpi) = 691410443b2ea2db2b7ced24de3c0628985991ce55e35200ddf474bb93110dc1
-SIZE (xpi/thunderbird-i18n-3.1.11/es-ES.xpi) = 172879
-SHA256 (xpi/thunderbird-i18n-3.1.11/et.xpi) = e4fe7777c73d32cf64bc8d4689d18e7e4f670d8f965bfdd3edcad81bceee3091
-SIZE (xpi/thunderbird-i18n-3.1.11/et.xpi) = 221753
-SHA256 (xpi/thunderbird-i18n-3.1.11/eu.xpi) = 84793c78d3d9120adc189df98c94c4d73511d7f805449fc67a43d4a6482990a3
-SIZE (xpi/thunderbird-i18n-3.1.11/eu.xpi) = 211283
-SHA256 (xpi/thunderbird-i18n-3.1.11/fi.xpi) = 786054a681a8a7077f1810930c9210fbd0e9ec708e58b344840cfdb2241f3afa
-SIZE (xpi/thunderbird-i18n-3.1.11/fi.xpi) = 219474
-SHA256 (xpi/thunderbird-i18n-3.1.11/fr.xpi) = 184cfde6453301b5fdfa0549a5793134917f9d3729a953e280161ec9a2cbc9de
-SIZE (xpi/thunderbird-i18n-3.1.11/fr.xpi) = 221771
-SHA256 (xpi/thunderbird-i18n-3.1.11/fy-NL.xpi) = c71c158840e3f7c9a2b48db7c4eb887783983e0d221ffacc08ca6a34226509ff
-SIZE (xpi/thunderbird-i18n-3.1.11/fy-NL.xpi) = 220800
-SHA256 (xpi/thunderbird-i18n-3.1.11/ga-IE.xpi) = a809fabd7328ecb5e60b9bb6626abd5e44fa8078ac5d597ecd4dfdf5f8d597cf
-SIZE (xpi/thunderbird-i18n-3.1.11/ga-IE.xpi) = 219429
-SHA256 (xpi/thunderbird-i18n-3.1.11/he.xpi) = 05d3daad9c69694611513fcbb7dd63ec99468412d6e076d3a8c774fb4f4092a8
-SIZE (xpi/thunderbird-i18n-3.1.11/he.xpi) = 204908
-SHA256 (xpi/thunderbird-i18n-3.1.11/hu.xpi) = 6210fc89e67c1f08c4260b23b5a114114df852498d271ec839bc7b5a0a929257
-SIZE (xpi/thunderbird-i18n-3.1.11/hu.xpi) = 226159
-SHA256 (xpi/thunderbird-i18n-3.1.11/id.xpi) = b1de7097b7be766685aedbe814b1c8a2b2e9c08b393fcd5cb9ae987d20ce9120
-SIZE (xpi/thunderbird-i18n-3.1.11/id.xpi) = 185845
-SHA256 (xpi/thunderbird-i18n-3.1.11/is.xpi) = b4446bcc95fa68bda9f8f1880f1b60f9aecffa28db1d4493130572b5d66b6c02
-SIZE (xpi/thunderbird-i18n-3.1.11/is.xpi) = 214017
-SHA256 (xpi/thunderbird-i18n-3.1.11/it.xpi) = c450d0f68c2f0982fc9cc9f3279439715d7b8fa7559bb75bb59b31955ef671b7
-SIZE (xpi/thunderbird-i18n-3.1.11/it.xpi) = 171393
-SHA256 (xpi/thunderbird-i18n-3.1.11/ja.xpi) = c2191f03aca9b32ac07a7d195f64424a3f1d5ed82d8a75c4a0b7c0dffc5d4b55
-SIZE (xpi/thunderbird-i18n-3.1.11/ja.xpi) = 236626
-SHA256 (xpi/thunderbird-i18n-3.1.11/ko.xpi) = f53b79ffa380f54b226a3a61e2d2277742cf70527e4c186f019d651e1d26f3b3
-SIZE (xpi/thunderbird-i18n-3.1.11/ko.xpi) = 194783
-SHA256 (xpi/thunderbird-i18n-3.1.11/lt.xpi) = 1648ea194666162de0c8ad742df2fcc673916b2b342511cb6f2944f48f27654c
-SIZE (xpi/thunderbird-i18n-3.1.11/lt.xpi) = 235296
-SHA256 (xpi/thunderbird-i18n-3.1.11/nb-NO.xpi) = 6dd25c3ba6b5c482a4ea124111b61d6d43e0d791d4c9944a1cfa736a111efbc5
-SIZE (xpi/thunderbird-i18n-3.1.11/nb-NO.xpi) = 213869
-SHA256 (xpi/thunderbird-i18n-3.1.11/nl.xpi) = 6d98d6181ed04ca66798a3e8511b650ab4cb301400685cc065da69e950d1dc7f
-SIZE (xpi/thunderbird-i18n-3.1.11/nl.xpi) = 216584
-SHA256 (xpi/thunderbird-i18n-3.1.11/nn-NO.xpi) = 3a9ab5f556968292866f5a492406d4c09f10dde4fb0f6165486f6602115cad72
-SIZE (xpi/thunderbird-i18n-3.1.11/nn-NO.xpi) = 215631
-SHA256 (xpi/thunderbird-i18n-3.1.11/pa-IN.xpi) = 654ee53022ee53a75b9716775ab0e5421b04923178c0ba3d307b46b3897a48f8
-SIZE (xpi/thunderbird-i18n-3.1.11/pa-IN.xpi) = 241100
-SHA256 (xpi/thunderbird-i18n-3.1.11/pl.xpi) = d4ba0ba503d213a4a821ab99678743bd156540ae1a7459b80fa4e078c46ed3b3
-SIZE (xpi/thunderbird-i18n-3.1.11/pl.xpi) = 203878
-SHA256 (xpi/thunderbird-i18n-3.1.11/pt-BR.xpi) = c0529bf7af12a245b7c55f5e0c3c9d9ee4e8f168462a123cc8d91983ad21d44c
-SIZE (xpi/thunderbird-i18n-3.1.11/pt-BR.xpi) = 215018
-SHA256 (xpi/thunderbird-i18n-3.1.11/pt-PT.xpi) = ed8f735f7433dbe78c2a767d7dfb65e165d7946a256a0bdc600f05fd6f222b67
-SIZE (xpi/thunderbird-i18n-3.1.11/pt-PT.xpi) = 214252
-SHA256 (xpi/thunderbird-i18n-3.1.11/ro.xpi) = 53b54449117ee582197c97b527a5a2f3213e6be575ba5c1853bd7d5e062b1fce
-SIZE (xpi/thunderbird-i18n-3.1.11/ro.xpi) = 221215
-SHA256 (xpi/thunderbird-i18n-3.1.11/ru.xpi) = e1d500dd8c51cbe585e4c0702bfdf6ba5e6aef61064703718dd33ee6a3f4170a
-SIZE (xpi/thunderbird-i18n-3.1.11/ru.xpi) = 198272
-SHA256 (xpi/thunderbird-i18n-3.1.11/si.xpi) = 23fee1ef7b12266892d0c8311a6bb0c54299dd477c5bcc1bfc9502b9c2f415a4
-SIZE (xpi/thunderbird-i18n-3.1.11/si.xpi) = 246153
-SHA256 (xpi/thunderbird-i18n-3.1.11/sk.xpi) = 2ae452e53ce3ace687d5ca6d413cd50f68c947568fe96a598bf78be3bb1f7811
-SIZE (xpi/thunderbird-i18n-3.1.11/sk.xpi) = 224600
-SHA256 (xpi/thunderbird-i18n-3.1.11/sl.xpi) = cd04565d38131759fc2ab455cd94e228f3d1f4ae351ed75544eb75b26b224b64
-SIZE (xpi/thunderbird-i18n-3.1.11/sl.xpi) = 218485
-SHA256 (xpi/thunderbird-i18n-3.1.11/sq.xpi) = 8a9443f06d1bd34f282639fc9ea127a851ab46387213e32aca4960f730ab99aa
-SIZE (xpi/thunderbird-i18n-3.1.11/sq.xpi) = 211283
-SHA256 (xpi/thunderbird-i18n-3.1.11/sv-SE.xpi) = 42b9e49a41d0684937cbcb3576dfb962cd721cd09415d96373c36e216611769d
-SIZE (xpi/thunderbird-i18n-3.1.11/sv-SE.xpi) = 221171
-SHA256 (xpi/thunderbird-i18n-3.1.11/tr.xpi) = 8d458a6eded9e4eb0985b9601918f7424922db549e4fd6eece7889b670b79202
-SIZE (xpi/thunderbird-i18n-3.1.11/tr.xpi) = 215821
-SHA256 (xpi/thunderbird-i18n-3.1.11/uk.xpi) = 0df41a6bf414778e9274dad896b3d8e116a3994564bf6e74fdda87e4edc83b7c
-SIZE (xpi/thunderbird-i18n-3.1.11/uk.xpi) = 244808
-SHA256 (xpi/thunderbird-i18n-3.1.11/zh-CN.xpi) = c8c3b092a4a999bb30d47797f9c0850634282ad561a233132f28ced48a0be01f
-SIZE (xpi/thunderbird-i18n-3.1.11/zh-CN.xpi) = 219649
-SHA256 (xpi/thunderbird-i18n-3.1.11/zh-TW.xpi) = 5719a75ab55111a2adfff2c982aa7fba6dae91e0977479060f2bf259c2de9024
-SIZE (xpi/thunderbird-i18n-3.1.11/zh-TW.xpi) = 220607
+SHA256 (xpi/thunderbird3-i18n-3.1.12/af.xpi) = 00d47a4b1443689a328d4903ccea06a058d2d847789442d4a044212bb6813b56
+SIZE (xpi/thunderbird3-i18n-3.1.12/af.xpi) = 210617
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ar.xpi) = 706f67296c7058d694c712964239b44dcfc4a93ab1148b70fee22ed1056c6832
+SIZE (xpi/thunderbird3-i18n-3.1.12/ar.xpi) = 230333
+SHA256 (xpi/thunderbird3-i18n-3.1.12/be.xpi) = 20fb419f9da957b5130a01fe590b134bb5c4f0da7b43a5c1d6a8c6912fb4bd7a
+SIZE (xpi/thunderbird3-i18n-3.1.12/be.xpi) = 194476
+SHA256 (xpi/thunderbird3-i18n-3.1.12/bg.xpi) = 411b87b6af8874d10c7a0dfd8844ec353b4ca0ad029f8a6c91dfefb4defd9289
+SIZE (xpi/thunderbird3-i18n-3.1.12/bg.xpi) = 235184
+SHA256 (xpi/thunderbird3-i18n-3.1.12/bn-BD.xpi) = d54b48d3a23a1f7a2a54b07f14e2cecc0459e5b5ab46e020d8236ce8677dcc7c
+SIZE (xpi/thunderbird3-i18n-3.1.12/bn-BD.xpi) = 244805
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ca.xpi) = 2c95d2ad962eee598dc9f191e28174abb7c480a75e14dc8197747080e0d1a5f2
+SIZE (xpi/thunderbird3-i18n-3.1.12/ca.xpi) = 219314
+SHA256 (xpi/thunderbird3-i18n-3.1.12/cs.xpi) = a5f093964b19436d49e4bcf7f02ca3934cf798fcf7faae9ecc2bbb1dc9737fc4
+SIZE (xpi/thunderbird3-i18n-3.1.12/cs.xpi) = 218130
+SHA256 (xpi/thunderbird3-i18n-3.1.12/da.xpi) = 85e0e1a4c13d47674968bcde41e44ed381d7dc8bcc05a12a81fb339de6781231
+SIZE (xpi/thunderbird3-i18n-3.1.12/da.xpi) = 203150
+SHA256 (xpi/thunderbird3-i18n-3.1.12/de.xpi) = 6b2b729105a56c257f1f208ed8e226c339484d4b6ea0f90fa03bcf6a00bc7afa
+SIZE (xpi/thunderbird3-i18n-3.1.12/de.xpi) = 222818
+SHA256 (xpi/thunderbird3-i18n-3.1.12/el.xpi) = 2186af3dfe77557537754183c5192591b3f96ea2e059f2a23763c541878b7b49
+SIZE (xpi/thunderbird3-i18n-3.1.12/el.xpi) = 210070
+SHA256 (xpi/thunderbird3-i18n-3.1.12/en-GB.xpi) = 726b213dedb8e38b2d95369383d366e85867afcc3f5ebc4b1b96b702299cd8b9
+SIZE (xpi/thunderbird3-i18n-3.1.12/en-GB.xpi) = 203673
+SHA256 (xpi/thunderbird3-i18n-3.1.12/en-US.xpi) = 88745ab8c67fdeb350eab42f048832a882200d6dfce176efadcc6d0d1bfe2718
+SIZE (xpi/thunderbird3-i18n-3.1.12/en-US.xpi) = 202539
+SHA256 (xpi/thunderbird3-i18n-3.1.12/es-AR.xpi) = f9ea5829b19328acd7932a7cdad7b38450a369806acf38788890dd5f59c3682e
+SIZE (xpi/thunderbird3-i18n-3.1.12/es-AR.xpi) = 218585
+SHA256 (xpi/thunderbird3-i18n-3.1.12/es-ES.xpi) = 83e3620f77f374ec881418babb8d23e4850bffd25f7cff332a052f0242b6eb22
+SIZE (xpi/thunderbird3-i18n-3.1.12/es-ES.xpi) = 172931
+SHA256 (xpi/thunderbird3-i18n-3.1.12/et.xpi) = 98dae9caad40aa545e1746436a03471a3a40771232479af4b6eabd17c26f7264
+SIZE (xpi/thunderbird3-i18n-3.1.12/et.xpi) = 221757
+SHA256 (xpi/thunderbird3-i18n-3.1.12/eu.xpi) = e44d496e1044e8731e5614e0aeed0726f218ec37945efd3cbcd7f0b643a03b97
+SIZE (xpi/thunderbird3-i18n-3.1.12/eu.xpi) = 211336
+SHA256 (xpi/thunderbird3-i18n-3.1.12/fi.xpi) = 11eb1836e1bfd91cd4ff20cf5f4e6f2e37e3d5ae1ca00eafe9dfcef52893aa51
+SIZE (xpi/thunderbird3-i18n-3.1.12/fi.xpi) = 219509
+SHA256 (xpi/thunderbird3-i18n-3.1.12/fr.xpi) = d1d0a71e0a2dd573de890af44471d8c939b4e49d03da6dde14b782a08a8b16fa
+SIZE (xpi/thunderbird3-i18n-3.1.12/fr.xpi) = 221711
+SHA256 (xpi/thunderbird3-i18n-3.1.12/fy-NL.xpi) = e995d2bf4734b4c3f9e640ccf68a3838d5ce8847d13673d6157a1c3b0006078e
+SIZE (xpi/thunderbird3-i18n-3.1.12/fy-NL.xpi) = 220856
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ga-IE.xpi) = f926f0c86e6be92ffb1887c8f9a345ad1cedfecb16f513f5ed7224b98df56d60
+SIZE (xpi/thunderbird3-i18n-3.1.12/ga-IE.xpi) = 219479
+SHA256 (xpi/thunderbird3-i18n-3.1.12/he.xpi) = afe05e430e17eb4a8bdca70419c64d374d64b21a53fa7b5474dd7d81816f5873
+SIZE (xpi/thunderbird3-i18n-3.1.12/he.xpi) = 204926
+SHA256 (xpi/thunderbird3-i18n-3.1.12/hu.xpi) = 0b4489ffde1978c1eef53553142e76e92d047d6e861120b70fde7a56462c4c12
+SIZE (xpi/thunderbird3-i18n-3.1.12/hu.xpi) = 226142
+SHA256 (xpi/thunderbird3-i18n-3.1.12/id.xpi) = 3ead769425abb01fbfbdcdb6a7c31c093634d86d6a5ed26b9a1024fa09bf0d70
+SIZE (xpi/thunderbird3-i18n-3.1.12/id.xpi) = 185890
+SHA256 (xpi/thunderbird3-i18n-3.1.12/is.xpi) = 98d3332b4f99cf093226fce7d7c5ce815299f47e13077e7759584413ac412005
+SIZE (xpi/thunderbird3-i18n-3.1.12/is.xpi) = 214065
+SHA256 (xpi/thunderbird3-i18n-3.1.12/it.xpi) = 0a6b16afd2c2fb6093fe7ae2ef97ccb3982693c23b1ac736ab861d2243598a0a
+SIZE (xpi/thunderbird3-i18n-3.1.12/it.xpi) = 171387
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ja.xpi) = 30c9fec8e2bff232b784b597d61d0fff279ee99ae6a26696df59c53dec3db437
+SIZE (xpi/thunderbird3-i18n-3.1.12/ja.xpi) = 236588
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ko.xpi) = a69cb2617626c1a1971a88247e3a0426c7864304e02f3605c01bc6705695ce9b
+SIZE (xpi/thunderbird3-i18n-3.1.12/ko.xpi) = 194778
+SHA256 (xpi/thunderbird3-i18n-3.1.12/lt.xpi) = ce31c1996711fcd8a456d2498190cb06761e7ba31f8b77821975da7bfa679955
+SIZE (xpi/thunderbird3-i18n-3.1.12/lt.xpi) = 235350
+SHA256 (xpi/thunderbird3-i18n-3.1.12/nb-NO.xpi) = 60bccb04cbf09e20d4c52b18e7d885935c2e2d8901409c5340692dcd1f455471
+SIZE (xpi/thunderbird3-i18n-3.1.12/nb-NO.xpi) = 213922
+SHA256 (xpi/thunderbird3-i18n-3.1.12/nl.xpi) = b80baa65a3cab1f8bfbed5f174323b5e09516158c8ca88509080e13b6c52d888
+SIZE (xpi/thunderbird3-i18n-3.1.12/nl.xpi) = 216576
+SHA256 (xpi/thunderbird3-i18n-3.1.12/nn-NO.xpi) = 84545f62247649930cf0fda31f39f5d3da9d16f77bf185b75dce3d4ab05bc117
+SIZE (xpi/thunderbird3-i18n-3.1.12/nn-NO.xpi) = 215657
+SHA256 (xpi/thunderbird3-i18n-3.1.12/pa-IN.xpi) = 86aedc7febd97af086ba492535fce9e48be99b2313c685761f591afd30471cde
+SIZE (xpi/thunderbird3-i18n-3.1.12/pa-IN.xpi) = 241063
+SHA256 (xpi/thunderbird3-i18n-3.1.12/pl.xpi) = 80356ac8db5f20c82ce254a9b65ae45bc2d7a24fd732f258c31cdf08c33115cc
+SIZE (xpi/thunderbird3-i18n-3.1.12/pl.xpi) = 203883
+SHA256 (xpi/thunderbird3-i18n-3.1.12/pt-BR.xpi) = 2f2ff15fd8db8d2d16c54d10ed9fd9af54bcf519c9dd2cf8bab1cfab20b9e408
+SIZE (xpi/thunderbird3-i18n-3.1.12/pt-BR.xpi) = 215068
+SHA256 (xpi/thunderbird3-i18n-3.1.12/pt-PT.xpi) = 6f37b1bb4d57b73802c4bd8e4e0a2a00c8aae2b4b449dab6a6fae53c9032009a
+SIZE (xpi/thunderbird3-i18n-3.1.12/pt-PT.xpi) = 214280
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ro.xpi) = bce7dadf0281f835b4ddc1b80743d6f9cb78c5e45417fc714d2fb51af99d5ae2
+SIZE (xpi/thunderbird3-i18n-3.1.12/ro.xpi) = 221247
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ru.xpi) = 70df1b09b26c586c436e414ee2cbe4323798489aea577ed5a51aa4c702d608ad
+SIZE (xpi/thunderbird3-i18n-3.1.12/ru.xpi) = 198238
+SHA256 (xpi/thunderbird3-i18n-3.1.12/si.xpi) = 2a44ed4567fcbed007a1792f1ffe48d00c45b1fae4e46f9d48ae271077f72c25
+SIZE (xpi/thunderbird3-i18n-3.1.12/si.xpi) = 246104
+SHA256 (xpi/thunderbird3-i18n-3.1.12/sk.xpi) = d1bb13d247cadad693928c41a3f3d849ea82e665701f727b734ed673853f73fd
+SIZE (xpi/thunderbird3-i18n-3.1.12/sk.xpi) = 224601
+SHA256 (xpi/thunderbird3-i18n-3.1.12/sl.xpi) = 582c529e15f4fdfdc3d5789c96e67e6540c26b9eacab4da00ffdbc94e488dfdc
+SIZE (xpi/thunderbird3-i18n-3.1.12/sl.xpi) = 218473
+SHA256 (xpi/thunderbird3-i18n-3.1.12/sq.xpi) = 0415fbf1d8500ca9e6067554d28b6377af9f9722adbdcfa871773e009a6fd78f
+SIZE (xpi/thunderbird3-i18n-3.1.12/sq.xpi) = 211273
+SHA256 (xpi/thunderbird3-i18n-3.1.12/sv-SE.xpi) = 022d7a5837e453f4a08ab72296a79f00d105740fac88562fa00e691d3344e870
+SIZE (xpi/thunderbird3-i18n-3.1.12/sv-SE.xpi) = 221163
+SHA256 (xpi/thunderbird3-i18n-3.1.12/tr.xpi) = f4b71cfdd3573e3d9b7618bfafce7ba8f2fbd3fa894f323460d36da1e46af9b7
+SIZE (xpi/thunderbird3-i18n-3.1.12/tr.xpi) = 215749
+SHA256 (xpi/thunderbird3-i18n-3.1.12/uk.xpi) = 87f313a5d64ea3c2482da377e53031676da084e5e9a1e3f69409a7b6458172f0
+SIZE (xpi/thunderbird3-i18n-3.1.12/uk.xpi) = 244865
+SHA256 (xpi/thunderbird3-i18n-3.1.12/zh-CN.xpi) = 6293366577bf2893e09768c81167fa5cdd42a8fff15c44b1f6c16e652f2a5591
+SIZE (xpi/thunderbird3-i18n-3.1.12/zh-CN.xpi) = 219647
+SHA256 (xpi/thunderbird3-i18n-3.1.12/zh-TW.xpi) = b63fb7b26cf7f91d53b6acaa0d9c47b7739afce1cdba82ddee2cfee6b0b70657
+SIZE (xpi/thunderbird3-i18n-3.1.12/zh-TW.xpi) = 220634

Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird3/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:			4 September 2003
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.131 2011/06/30 18:13:18 flo Exp $
+# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.134 2011/08/23 18:39:07 kwm Exp $
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	3.1.11
+DISTVERSION=	3.1.12
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -20,7 +21,6 @@
 USE_AUTOTOOLS=	autoconf213
 LATEST_LINK=	thunderbird3
 USE_GECKO=	gecko
-CONFLICTS_INSTALL=	thunderbird-5.0*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 
@@ -35,7 +35,10 @@
 
 MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data
 MOZ_GRAPHICS=	default,-xbm
-MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+MOZILLA_SUFX=	3
+MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
+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
@@ -44,7 +47,7 @@
 MOZILLA_PLIST_DIRS=	bin lib
 MOZ_PKGCONFIG_FILES=
 
-PORTNAME_ICON=	${PORTNAME}.png
+PORTNAME_ICON=	${MOZILLA}.png
 PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
@@ -77,11 +80,11 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
-post-extract::
-	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
+post-extract:
+	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
@@ -104,10 +107,10 @@
 	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
 
 port-pre-install:
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
+	${MKDIR} ${FAKEDIR}/lib/${MOZILLA}/defaults
 
 pre-install:
-	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
+	@${ECHO_CMD} 'share/applications/${MOZILLA_EXEC_NAME}.desktop' >> ${PLIST}
 	@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
 	@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
 

Modified: branches/experimental/mail/thunderbird3/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird3/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird3/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-3.1.11.source.tar.bz2) = 3e78284661b1be1d35753550b7a183d583d7ee68c8bac683283d3931f90fdd1a
-SIZE (thunderbird-3.1.11.source.tar.bz2) = 68716700
+SHA256 (thunderbird-3.1.12.source.tar.bz2) = ae020f6cebf81541e08642f371484c2ae6edbd7db1b70fe51f1e2cb462d48089
+SIZE (thunderbird-3.1.12.source.tar.bz2) = 69096988

Added: branches/experimental/mail/thunderbird3/files/patch-mailnews-extensions-smime-build-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird3/files/patch-mailnews-extensions-smime-build-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,16 @@
+$FreeBSD: ports/mail/thunderbird3/files/patch-mailnews-extensions-smime-build-Makefile.in,v 1.1 2011/07/05 21:14:20 crees Exp $
+
+This is from ports/156912; it fixes the build failure due to the gmake-3.81-ism
+in mailnews/extensions/smime/build/Makefile.in
+
+--- mailnews/extensions/smime/build/Makefile.in.orig	2011-05-09 18:49:18.458634807 +0100
++++ mailnews/extensions/smime/build/Makefile.in	2011-05-09 18:50:07.015309434 +0100
+@@ -81,7 +81,7 @@
+ 		$(NULL)
+ 
+ ifndef MOZ_STATIC_MAIL_BUILD
+-SHARED_LIBRARY_LIBS + = ../../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
++SHARED_LIBRARY_LIBS += ../../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
+ endif
+ 
+ ifdef MOZILLA_INTERNAL_API

Modified: branches/experimental/mail/thunderbird3/files/thunderbird.desktop.in
==============================================================================
--- branches/experimental/mail/thunderbird3/files/thunderbird.desktop.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/mail/thunderbird3/files/thunderbird.desktop.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -3,7 +3,7 @@
 Name=Thunderbird
 GenericName=Mail Client
 Comment=Mail client and News Reader
-Exec=thunderbird %U
+Exec=@MOZILLA@ %U
 Icon=@PORTNAME_ICON@
 StartupNotify=false
 Terminal=false

Modified: branches/experimental/www/firefox-i18n/Makefile
==============================================================================
--- branches/experimental/www/firefox-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.51 2011/06/21 21:12:31 flo Exp $
+# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.55 2011/08/24 22:52:07 flo Exp $
 #
 
 PORTNAME=	firefox-i18n
-PORTVERSION=	5.0
+PORTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	firefox/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -14,12 +15,12 @@
 DIST_SUBDIR=	xpi/${DISTNAME}
 
 MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Localized interface for Firefox 5.0
+COMMENT=	Localized interface for Firefox 6.0
 
 EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
-USE_FIREFOX=	yes
-USE_XPI=	*firefox
+USE_FIREFOX=	60
+USE_XPI=	firefox
 
 USE_SUBMAKE=	yes
 
@@ -56,8 +57,10 @@
 		then \
 			exit 1; \
 		fi; \
-		cd ${WRKSRC}/langpack-$$lang@firefox.mozilla.org/chrome; \
-		${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \
+		cd ${WRKSRC}/langpack-$$lang@firefox.mozilla.org/chrome/$$lang; \
+		${LOCALBASE}/bin/zip -r ../$$lang.jar locale; \
+		cd ..; ${RM} -rf $$lang; cd ..; \
+		${REINPLACE_CMD} -i "" "s,chrome/$$lang,jar:chrome/$$lang.jar!," chrome.manifest; \
 	done
 
 .if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)

Modified: branches/experimental/www/firefox-i18n/distinfo
==============================================================================
--- branches/experimental/www/firefox-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,164 +1,164 @@
-SHA256 (xpi/firefox-i18n-5.0/af.xpi) = a2e8b93b72193ec4eeca255a1cc735f548e77cb90a459b8c55eb4908a8f9f6b0
-SIZE (xpi/firefox-i18n-5.0/af.xpi) = 221342
-SHA256 (xpi/firefox-i18n-5.0/ak.xpi) = dffb31551d27180204aa74509f36a0b31faf67a7bd46a38ce5783ecf38890652
-SIZE (xpi/firefox-i18n-5.0/ak.xpi) = 222856
-SHA256 (xpi/firefox-i18n-5.0/ar.xpi) = f40d36aa041dd5e6fb378ab7385a6c593513b07b6d18dcb1a347ddb0ae80d31c
-SIZE (xpi/firefox-i18n-5.0/ar.xpi) = 242499
-SHA256 (xpi/firefox-i18n-5.0/ast.xpi) = c5cdb9fccd6889cc81e935c3657fabf32ade2c0e633dfb117d439b662144b298
-SIZE (xpi/firefox-i18n-5.0/ast.xpi) = 218875
-SHA256 (xpi/firefox-i18n-5.0/be.xpi) = 39c2a84ec5b87b87d43bdd5fb853419496bac5a3468065b248d070bb72a6b346
-SIZE (xpi/firefox-i18n-5.0/be.xpi) = 232148
-SHA256 (xpi/firefox-i18n-5.0/bg.xpi) = 1359fc832811e1bd58e99a441aef1e97573b44ef1a8f4f644ef611f9684b8708
-SIZE (xpi/firefox-i18n-5.0/bg.xpi) = 255712
-SHA256 (xpi/firefox-i18n-5.0/bn-BD.xpi) = 5c3da96b4f16783b1dcfea19d1359924ec315c4478f38f226675a11b598ac637
-SIZE (xpi/firefox-i18n-5.0/bn-BD.xpi) = 264307
-SHA256 (xpi/firefox-i18n-5.0/bn-IN.xpi) = 25f88327fb65b9854425b19d0d36aabfddf08e367aeebf40930f969d02a286cd
-SIZE (xpi/firefox-i18n-5.0/bn-IN.xpi) = 294137
-SHA256 (xpi/firefox-i18n-5.0/br.xpi) = 7c7f8097edbefc427c21c97030bf9d8f4434f6530b95d75bf2b07450e3c154d0
-SIZE (xpi/firefox-i18n-5.0/br.xpi) = 229699
-SHA256 (xpi/firefox-i18n-5.0/bs.xpi) = 2a3b36f5795d8cf596a522b0da4eaadf6f9f5fe08e08d96e084e0bd56f76dc5a
-SIZE (xpi/firefox-i18n-5.0/bs.xpi) = 227566
-SHA256 (xpi/firefox-i18n-5.0/ca.xpi) = cf6968da5dcf725427d167f4ec66341c29f787be9f39bccce7829fafa5ae74c5
-SIZE (xpi/firefox-i18n-5.0/ca.xpi) = 228977
-SHA256 (xpi/firefox-i18n-5.0/cs.xpi) = 637a57375c30da3b97ae672de94ef0805c41e630884405fde8b04d05b3c94d6a
-SIZE (xpi/firefox-i18n-5.0/cs.xpi) = 230068
-SHA256 (xpi/firefox-i18n-5.0/cy.xpi) = 929378c8ec2859ecf5dd539e678f520459489cdc1c770847ed0ab5822582bca4
-SIZE (xpi/firefox-i18n-5.0/cy.xpi) = 222565
-SHA256 (xpi/firefox-i18n-5.0/da.xpi) = f7e4f0c488ba5a0a1da3895372b5087bcad8db5d0e7b48b53a856cce0f60adf5
-SIZE (xpi/firefox-i18n-5.0/da.xpi) = 222498
-SHA256 (xpi/firefox-i18n-5.0/de.xpi) = e112cee3947ffa02c9709a701404979a0098632b6813bd9278490d80351d0cba
-SIZE (xpi/firefox-i18n-5.0/de.xpi) = 230248
-SHA256 (xpi/firefox-i18n-5.0/el.xpi) = 3eb3d6a8f869242aa449afc040035bcaf1f3db901b5030ed6280fb091e78c25d
-SIZE (xpi/firefox-i18n-5.0/el.xpi) = 244653
-SHA256 (xpi/firefox-i18n-5.0/en-GB.xpi) = cf96c48cfbf09f7ca7d57f8a88735b320fcbe78cb41413dddf2f14e11e0f38b9
-SIZE (xpi/firefox-i18n-5.0/en-GB.xpi) = 214199
-SHA256 (xpi/firefox-i18n-5.0/en-US.xpi) = 64b89b850e9c522c848a43893d6a1d8daf6f6c23e10ef0c5f464059e7a2d7b80
-SIZE (xpi/firefox-i18n-5.0/en-US.xpi) = 213834
-SHA256 (xpi/firefox-i18n-5.0/en-ZA.xpi) = 8deb294e6a9f7ddddf880353fc2f70b47e7aa4f9dc66c3bba97c7da9b7c7010a
-SIZE (xpi/firefox-i18n-5.0/en-ZA.xpi) = 213782
-SHA256 (xpi/firefox-i18n-5.0/eo.xpi) = ea1d78e00db6eac107fe2352dedee06c59a704157493c92dcb0435cde5193c8b
-SIZE (xpi/firefox-i18n-5.0/eo.xpi) = 223122
-SHA256 (xpi/firefox-i18n-5.0/es-AR.xpi) = 406d1ec67efb2090c82c9140422d50cc4bcf47183b7aa593579840030539fa1d
-SIZE (xpi/firefox-i18n-5.0/es-AR.xpi) = 227033
-SHA256 (xpi/firefox-i18n-5.0/es-CL.xpi) = 15f44f3e16724d590fffd7eb6b0c36084a195f72ba74e312ea103ecf381e126e
-SIZE (xpi/firefox-i18n-5.0/es-CL.xpi) = 229573
-SHA256 (xpi/firefox-i18n-5.0/es-ES.xpi) = f28a77f348ac0697f772b12a57eed3ac1d453f068d4b1908db85b14034f989a2
-SIZE (xpi/firefox-i18n-5.0/es-ES.xpi) = 202968
-SHA256 (xpi/firefox-i18n-5.0/es-MX.xpi) = 051e78ae837da4d8cb5d77d58e15efc769d4fe169722a62dd1f2dfc0ca17f4b3
-SIZE (xpi/firefox-i18n-5.0/es-MX.xpi) = 203603
-SHA256 (xpi/firefox-i18n-5.0/et.xpi) = b026307d175afa1aaa554a3c922f038af1807f850b732db08e4977e990ef7c91
-SIZE (xpi/firefox-i18n-5.0/et.xpi) = 224313
-SHA256 (xpi/firefox-i18n-5.0/eu.xpi) = 92d585c82509b1dfb6f9f37d6507a74e2c70246db28542452ebf53cd790aac2e
-SIZE (xpi/firefox-i18n-5.0/eu.xpi) = 222260
-SHA256 (xpi/firefox-i18n-5.0/fa.xpi) = 4e323228d73084bfe9640e259b87461837783679cafb9345c07d824d707e1b69
-SIZE (xpi/firefox-i18n-5.0/fa.xpi) = 249669
-SHA256 (xpi/firefox-i18n-5.0/fi.xpi) = ea3ab6729e77ac12e1c0f63c29cd58d985aebf8a211953fe66121c76a76d3444
-SIZE (xpi/firefox-i18n-5.0/fi.xpi) = 225413
-SHA256 (xpi/firefox-i18n-5.0/fr.xpi) = 7174a6cd2bda7ac1ca2fb990fefdc056204c16b2a72d212a6273709a2ed6a90f
-SIZE (xpi/firefox-i18n-5.0/fr.xpi) = 231107
-SHA256 (xpi/firefox-i18n-5.0/fy-NL.xpi) = 664ffc517c326307a24ae5e81b599fa527bca1b4704473b19fc406f256ab4cce
-SIZE (xpi/firefox-i18n-5.0/fy-NL.xpi) = 228490
-SHA256 (xpi/firefox-i18n-5.0/ga-IE.xpi) = 11591862978c1475a83102500270596f0c4b1a18e234a6ac8ed5e2fc1ead1c95
-SIZE (xpi/firefox-i18n-5.0/ga-IE.xpi) = 233448
-SHA256 (xpi/firefox-i18n-5.0/gl.xpi) = e645891f96c31e832bb12bc23e7b8d1819ddd642c26720cb151541d342d8aede
-SIZE (xpi/firefox-i18n-5.0/gl.xpi) = 225236
-SHA256 (xpi/firefox-i18n-5.0/gu-IN.xpi) = f426ca547c83be254ae3e110c6fb0c919c74a2bc99fc46942705286e36197849
-SIZE (xpi/firefox-i18n-5.0/gu-IN.xpi) = 253576
-SHA256 (xpi/firefox-i18n-5.0/he.xpi) = 75338fc5821e688d6dd113089cebe5321cf961b25d465abd623f09273200c470
-SIZE (xpi/firefox-i18n-5.0/he.xpi) = 235116
-SHA256 (xpi/firefox-i18n-5.0/hi-IN.xpi) = 1a54f1a8693ac489e6422d2d99db5d8bf5804b7d131d594a3dda0f4a0cada9d6
-SIZE (xpi/firefox-i18n-5.0/hi-IN.xpi) = 258506
-SHA256 (xpi/firefox-i18n-5.0/hr.xpi) = 0b5f555cf3218a8dea482862ef9c0fe21f48fb15c42b7b00822267d6dbed315f
-SIZE (xpi/firefox-i18n-5.0/hr.xpi) = 235177
-SHA256 (xpi/firefox-i18n-5.0/hu.xpi) = c7d0a9cb17fec754758241ec977d4fcfc8cd50fc61a19f36f749de045b87f02a
-SIZE (xpi/firefox-i18n-5.0/hu.xpi) = 235650
-SHA256 (xpi/firefox-i18n-5.0/hy-AM.xpi) = 5f89db48c14c1c88ae3d34e28416804f9b758185711fe0755349b1d00ae73ff4
-SIZE (xpi/firefox-i18n-5.0/hy-AM.xpi) = 420343
-SHA256 (xpi/firefox-i18n-5.0/id.xpi) = 6d2f2918a5628ae0f06fd64007448e7884704718921ad2e9cd3b1fb602d7934e
-SIZE (xpi/firefox-i18n-5.0/id.xpi) = 219287
-SHA256 (xpi/firefox-i18n-5.0/is.xpi) = d606131a39efcae6cbc082cda5a95366f8c443993027f2d84d3c1c77a0258c8b
-SIZE (xpi/firefox-i18n-5.0/is.xpi) = 225064
-SHA256 (xpi/firefox-i18n-5.0/it.xpi) = 788fbc67421c1e2e3a681cfb7a9c6ca333f39631803109e63c1537ce4997f763
-SIZE (xpi/firefox-i18n-5.0/it.xpi) = 200504
-SHA256 (xpi/firefox-i18n-5.0/ja.xpi) = fd2940c200de8271c055b4eed20798a18408b7473109bfb4a672376f2c95b212
-SIZE (xpi/firefox-i18n-5.0/ja.xpi) = 253532
-SHA256 (xpi/firefox-i18n-5.0/kk.xpi) = db1cea7c63226275a7e8ded104222f6cff37d8d94cedff7a3095db0d73a93bb3
-SIZE (xpi/firefox-i18n-5.0/kk.xpi) = 257652
-SHA256 (xpi/firefox-i18n-5.0/kn.xpi) = dd658af2b106ed1ae292afc7d3009def4f9d9c7745ccd6e6429b56df0872204d
-SIZE (xpi/firefox-i18n-5.0/kn.xpi) = 275000
-SHA256 (xpi/firefox-i18n-5.0/ko.xpi) = 18637412840d5bc0caf55f08034ca908c5efb84e32e38a3d5e3662fdbd775040
-SIZE (xpi/firefox-i18n-5.0/ko.xpi) = 207948
-SHA256 (xpi/firefox-i18n-5.0/ku.xpi) = 8f9fbd41b099ae99aa4c2f88957636f0fcf2ba84f0d622d4f95ae0184ea0fd57
-SIZE (xpi/firefox-i18n-5.0/ku.xpi) = 232519
-SHA256 (xpi/firefox-i18n-5.0/lg.xpi) = 8f4823299cd377231e528f56e04d1e7fa653604fd36a33bd6001959983a89215
-SIZE (xpi/firefox-i18n-5.0/lg.xpi) = 229749
-SHA256 (xpi/firefox-i18n-5.0/lt.xpi) = f46ea7371becead269e7dc7441601f2bca5920d1ee8a4f6b1ebfd67b2034903e
-SIZE (xpi/firefox-i18n-5.0/lt.xpi) = 314962
-SHA256 (xpi/firefox-i18n-5.0/lv.xpi) = 5fde2474f968b20b5876f7f49c228ba0948e00f2fcefcd25f1ac343d4c2b5b1a
-SIZE (xpi/firefox-i18n-5.0/lv.xpi) = 226467
-SHA256 (xpi/firefox-i18n-5.0/mai.xpi) = 61f64a1634c74a8618e75b42e50f730775db1e9bfbcab33b8187f89282fb8f3a
-SIZE (xpi/firefox-i18n-5.0/mai.xpi) = 258290
-SHA256 (xpi/firefox-i18n-5.0/mk.xpi) = 0bfab372a3a79503a3d06dba43acd462caf1971f90b72d21d82e068c8da82029
-SIZE (xpi/firefox-i18n-5.0/mk.xpi) = 251524
-SHA256 (xpi/firefox-i18n-5.0/ml.xpi) = b8efc38640f4b1e7b3046800c9d0b23ac8ca4bc08572450c9450cba55d832d41
-SIZE (xpi/firefox-i18n-5.0/ml.xpi) = 283533
-SHA256 (xpi/firefox-i18n-5.0/mr.xpi) = e177b3506d5255e4127fd76dec257262a5ab9cebc70d853f46d437bbfb783432
-SIZE (xpi/firefox-i18n-5.0/mr.xpi) = 258813
-SHA256 (xpi/firefox-i18n-5.0/nb-NO.xpi) = 129eb4174605c4ccfd4bebb3cd583ff812d26008bae76f714f8150dd8678fd9b
-SIZE (xpi/firefox-i18n-5.0/nb-NO.xpi) = 223346
-SHA256 (xpi/firefox-i18n-5.0/nl.xpi) = aaf5e3cdbd604ab2bc8fc399825bcad48d48bc08067e5a340ed18a53a63737ff
-SIZE (xpi/firefox-i18n-5.0/nl.xpi) = 224641
-SHA256 (xpi/firefox-i18n-5.0/nn-NO.xpi) = 1a7c2d87d3179acd3d694261f301e86379b58d8669a8ef89b16b2608948d10e4
-SIZE (xpi/firefox-i18n-5.0/nn-NO.xpi) = 224672
-SHA256 (xpi/firefox-i18n-5.0/nso.xpi) = 3aff12e9447a2f4db5bc79c99b55e9db43a2c4308dd37a281c0e729868138ec5
-SIZE (xpi/firefox-i18n-5.0/nso.xpi) = 227969
-SHA256 (xpi/firefox-i18n-5.0/or.xpi) = a4c9d21982037242531587823aa1eaecac139c653f88b3d8029048d805e12182
-SIZE (xpi/firefox-i18n-5.0/or.xpi) = 262339
-SHA256 (xpi/firefox-i18n-5.0/pa-IN.xpi) = 759f7d9642a28cbb1798407725988e459eaeca569a94ed94f0b023bfa9d30d6a
-SIZE (xpi/firefox-i18n-5.0/pa-IN.xpi) = 260036
-SHA256 (xpi/firefox-i18n-5.0/pl.xpi) = 363fcc2c6e9f04bf683ce9fe06564f30a0d4e02416f6903e382f40555833a236
-SIZE (xpi/firefox-i18n-5.0/pl.xpi) = 233164
-SHA256 (xpi/firefox-i18n-5.0/pt-BR.xpi) = d5223a1f479394d0c3e1e3b84b0ce94fa52efadeedeb88af20eae43ac6afc6f8
-SIZE (xpi/firefox-i18n-5.0/pt-BR.xpi) = 228668
-SHA256 (xpi/firefox-i18n-5.0/pt-PT.xpi) = ec9bba62e2646d01d33c5d18396980d0c7e45ae35e1b035acf993c4b43db9916
-SIZE (xpi/firefox-i18n-5.0/pt-PT.xpi) = 228030
-SHA256 (xpi/firefox-i18n-5.0/rm.xpi) = 76108978d4b9d816f1fcbb76c36159f8c75f5314cd3cd6329b2e247e5e6b10cf
-SIZE (xpi/firefox-i18n-5.0/rm.xpi) = 227680
-SHA256 (xpi/firefox-i18n-5.0/ro.xpi) = 97a2644d9a5103d9694209a7fde031ec54087a9ab89ee1e375a29f71a42abf43
-SIZE (xpi/firefox-i18n-5.0/ro.xpi) = 230861
-SHA256 (xpi/firefox-i18n-5.0/ru.xpi) = 31f7d8a72337a0dcbff611d13825f39e0845354d4b413e6296aeaa5bc6b54bd3
-SIZE (xpi/firefox-i18n-5.0/ru.xpi) = 240318
-SHA256 (xpi/firefox-i18n-5.0/si.xpi) = 85ad3f3bb028fe27696ef340a47760a8e261e7a2b0a2e5a1d22f14a0284d3b4c
-SIZE (xpi/firefox-i18n-5.0/si.xpi) = 252297
-SHA256 (xpi/firefox-i18n-5.0/sk.xpi) = 249427c900e5be9d6a485be9dc9811255f8434651e0e0446fcd42069d8b28bf0
-SIZE (xpi/firefox-i18n-5.0/sk.xpi) = 235237
-SHA256 (xpi/firefox-i18n-5.0/sl.xpi) = 9f10154128b19ee00e07990e98429a0c701f755f65d60c0537fee9a5903f14ee
-SIZE (xpi/firefox-i18n-5.0/sl.xpi) = 223110
-SHA256 (xpi/firefox-i18n-5.0/son.xpi) = e412bac4ae30ca6c5a10577ff0b92adda666cd681a3ae7dd6c4b2b315037e00c
-SIZE (xpi/firefox-i18n-5.0/son.xpi) = 221301
-SHA256 (xpi/firefox-i18n-5.0/sq.xpi) = 4c473f7c4f7ff2d02475eb263e029d0bb36807140d658643e7e2af35a173639d
-SIZE (xpi/firefox-i18n-5.0/sq.xpi) = 208379
-SHA256 (xpi/firefox-i18n-5.0/sr.xpi) = 448f085fa3448dc7a04214097a5e495a20047e08c23b5e7fb5a0b97d6222aad7
-SIZE (xpi/firefox-i18n-5.0/sr.xpi) = 204265
-SHA256 (xpi/firefox-i18n-5.0/sv-SE.xpi) = 1f5060773f8ca6ee30adae54dccc8b9b9b8bd79170f2716c5e1ff1f681a757c0
-SIZE (xpi/firefox-i18n-5.0/sv-SE.xpi) = 261675
-SHA256 (xpi/firefox-i18n-5.0/ta-LK.xpi) = 91be63dfdda892d304cace8c6b1e365f38161cff0f0effb996125b8a916936bf
-SIZE (xpi/firefox-i18n-5.0/ta-LK.xpi) = 268411
-SHA256 (xpi/firefox-i18n-5.0/ta.xpi) = 97bf49b15d9dfffbdac6106ceeefe15776fba9eeb5d024dba6fa46053d10eb89
-SIZE (xpi/firefox-i18n-5.0/ta.xpi) = 253294
-SHA256 (xpi/firefox-i18n-5.0/te.xpi) = ee3dad3dd509519e5e433aa5313aadb2e1a795b0be504696b5595c2d69392d21
-SIZE (xpi/firefox-i18n-5.0/te.xpi) = 267869
-SHA256 (xpi/firefox-i18n-5.0/th.xpi) = cb4c0100e22c82a50a7bc05d8a9888235c4a67a9b4e66b10b6eeaae34063fac5
-SIZE (xpi/firefox-i18n-5.0/th.xpi) = 254357
-SHA256 (xpi/firefox-i18n-5.0/tr.xpi) = 43e2ee2ca92d6992656b6b297b63b897a9a08fc20297a636e7793f1af4c6557a
-SIZE (xpi/firefox-i18n-5.0/tr.xpi) = 227980
-SHA256 (xpi/firefox-i18n-5.0/uk.xpi) = 5bf6b7f1fca042015e75669e1baa1741b29db0e95d9f9e12da1c8066f482ea42
-SIZE (xpi/firefox-i18n-5.0/uk.xpi) = 261247
-SHA256 (xpi/firefox-i18n-5.0/vi.xpi) = 7b17b6bdd0d68a45a1fe6b6080fc266f33e501278895eb0735beec90e2e6f41e
-SIZE (xpi/firefox-i18n-5.0/vi.xpi) = 240934
-SHA256 (xpi/firefox-i18n-5.0/zh-CN.xpi) = e94fb218286c20ef5d273d2e895da482d73f430b5f704f1d49f0603ca3aeda80
-SIZE (xpi/firefox-i18n-5.0/zh-CN.xpi) = 237222
-SHA256 (xpi/firefox-i18n-5.0/zh-TW.xpi) = 238422319c1c764f0eca0b96a5f6d23a27e1024cc15dc40b17b09b8dc09a545e
-SIZE (xpi/firefox-i18n-5.0/zh-TW.xpi) = 238052
-SHA256 (xpi/firefox-i18n-5.0/zu.xpi) = d5ba9b23b342502d2012b78405c1ba07307fe48f21f23542e38c2fd59a32c15b
-SIZE (xpi/firefox-i18n-5.0/zu.xpi) = 228727
+SHA256 (xpi/firefox-i18n-6.0/af.xpi) = a6e372754cfa913dd04b1d75f202a548a9d4de3939e122db88dc34f6ea43d7b8
+SIZE (xpi/firefox-i18n-6.0/af.xpi) = 225575
+SHA256 (xpi/firefox-i18n-6.0/ak.xpi) = dc82d5c1a5ed8ca5029e162783900090a8221616d415bfee950d5c6ee048fc25
+SIZE (xpi/firefox-i18n-6.0/ak.xpi) = 227074
+SHA256 (xpi/firefox-i18n-6.0/ar.xpi) = 97201c6c93b03cf5a6decfaa0ccc17c2f8c04806fcc9bc1799bf64e4b1350acf
+SIZE (xpi/firefox-i18n-6.0/ar.xpi) = 246750
+SHA256 (xpi/firefox-i18n-6.0/ast.xpi) = 3e831245801884d344b380169bdc018b56117e828ee369d64afdd171c560bf20
+SIZE (xpi/firefox-i18n-6.0/ast.xpi) = 221231
+SHA256 (xpi/firefox-i18n-6.0/be.xpi) = 646b52a83632b50f38a1c0a12db620195e7c9fd112cf9277851d312da88c5959
+SIZE (xpi/firefox-i18n-6.0/be.xpi) = 234765
+SHA256 (xpi/firefox-i18n-6.0/bg.xpi) = fb0d195c388eaa84e35545a6498774cd6d25bab19bb8a021ce33dc0fb1071184
+SIZE (xpi/firefox-i18n-6.0/bg.xpi) = 260541
+SHA256 (xpi/firefox-i18n-6.0/bn-BD.xpi) = fdb44cf1a29248ac0212c965d25415a4dd80d5c4cab1bc07a1949bd416dc71dc
+SIZE (xpi/firefox-i18n-6.0/bn-BD.xpi) = 270802
+SHA256 (xpi/firefox-i18n-6.0/bn-IN.xpi) = bc8145a430806b2723855a34369c746e1c6fce28eaaee83543dd8eee2b95bc29
+SIZE (xpi/firefox-i18n-6.0/bn-IN.xpi) = 300026
+SHA256 (xpi/firefox-i18n-6.0/br.xpi) = 04540a7adbcbff81e34cf486ed9e751b2ea50ff051727aca52492f96491662d4
+SIZE (xpi/firefox-i18n-6.0/br.xpi) = 234142
+SHA256 (xpi/firefox-i18n-6.0/bs.xpi) = 03be7c41389039d0784b475b24131da9ef092df416b23644eca62e224479fa4c
+SIZE (xpi/firefox-i18n-6.0/bs.xpi) = 231947
+SHA256 (xpi/firefox-i18n-6.0/ca.xpi) = 1ec16d06e29aa7f583bae928fd96095878d34076bba1f8fdd72c934af2cf09e0
+SIZE (xpi/firefox-i18n-6.0/ca.xpi) = 233434
+SHA256 (xpi/firefox-i18n-6.0/cs.xpi) = da556af47d9660eeb5ca195b6f1e4642ec42428fad0286c29c07a1bf8166b879
+SIZE (xpi/firefox-i18n-6.0/cs.xpi) = 234785
+SHA256 (xpi/firefox-i18n-6.0/cy.xpi) = c2ecd8b64a45f6cdfc4a0668e26c05ee9bf510391714513d92e69b7fcf651800
+SIZE (xpi/firefox-i18n-6.0/cy.xpi) = 227478
+SHA256 (xpi/firefox-i18n-6.0/da.xpi) = c0440750c18b5ff6dd3c227ee9561a2d7494beaf42fe8c151101275e9401457d
+SIZE (xpi/firefox-i18n-6.0/da.xpi) = 226958
+SHA256 (xpi/firefox-i18n-6.0/de.xpi) = aaf7a6faa1f13fc92dd19b8cd9c18cdc8cbecfc170bfcc9f8f032ad2f905590f
+SIZE (xpi/firefox-i18n-6.0/de.xpi) = 234956
+SHA256 (xpi/firefox-i18n-6.0/el.xpi) = 4a7a2ca8f8842d1235ed71121dc0a96b1825167b277835f9ad7131a97d99310f
+SIZE (xpi/firefox-i18n-6.0/el.xpi) = 249677
+SHA256 (xpi/firefox-i18n-6.0/en-GB.xpi) = 0b24f6af5483b0217d9d5a66740a786f2adff208a841a0be9417de1eeb303d5c
+SIZE (xpi/firefox-i18n-6.0/en-GB.xpi) = 218288
+SHA256 (xpi/firefox-i18n-6.0/en-US.xpi) = 283702493ca185300068df07314737efa6c445dab34e9ebc78b592e0d4febf3c
+SIZE (xpi/firefox-i18n-6.0/en-US.xpi) = 217901
+SHA256 (xpi/firefox-i18n-6.0/en-ZA.xpi) = ddce1431f14524edb8ac138f4dc4fbbbc1e0a582f2035020ff9b3541c705e80c
+SIZE (xpi/firefox-i18n-6.0/en-ZA.xpi) = 218608
+SHA256 (xpi/firefox-i18n-6.0/eo.xpi) = af77ccfad8e918eb0fc7dbab3966b2ce2c3e0a85f895ac944ce2aba82a2c1e14
+SIZE (xpi/firefox-i18n-6.0/eo.xpi) = 227527
+SHA256 (xpi/firefox-i18n-6.0/es-AR.xpi) = 14e1ae6618b44ef724cc154732fd69cd5ebde8775e22d6ef2f11b6ddb865f375
+SIZE (xpi/firefox-i18n-6.0/es-AR.xpi) = 231473
+SHA256 (xpi/firefox-i18n-6.0/es-CL.xpi) = cd8e563ac6c6e2888efdf70dcbd0a854eb9dcd3b42ace20d87dd5c24896f377c
+SIZE (xpi/firefox-i18n-6.0/es-CL.xpi) = 233763
+SHA256 (xpi/firefox-i18n-6.0/es-ES.xpi) = 3fa104b9d031c36084572bc773edf5a731f11166385f0f618d0ff4c18aade5d1
+SIZE (xpi/firefox-i18n-6.0/es-ES.xpi) = 205206
+SHA256 (xpi/firefox-i18n-6.0/es-MX.xpi) = b40f3b08e22f9bd44196cc9f51bf3da5666d587287bd3252f3ac9f3792fd80e7
+SIZE (xpi/firefox-i18n-6.0/es-MX.xpi) = 205887
+SHA256 (xpi/firefox-i18n-6.0/et.xpi) = d92e543c080e29979aab9d47f65a9e6623eebd437844ff0a1f1450f1a0d36335
+SIZE (xpi/firefox-i18n-6.0/et.xpi) = 228894
+SHA256 (xpi/firefox-i18n-6.0/eu.xpi) = 14e0ddb5c426bff2081e3befe23aaf4e15bcbce9bc13d668eaa625f495fddf75
+SIZE (xpi/firefox-i18n-6.0/eu.xpi) = 226724
+SHA256 (xpi/firefox-i18n-6.0/fa.xpi) = 9c9747638a65c54ff0362be78c011f5b52ec48dc8b85c534a88922c3cf86a5ed
+SIZE (xpi/firefox-i18n-6.0/fa.xpi) = 254646
+SHA256 (xpi/firefox-i18n-6.0/fi.xpi) = 19b4e3a34df89bd30308fd8e306eca1a4c7e0a2f552c6dcbf0a448f0237f522d
+SIZE (xpi/firefox-i18n-6.0/fi.xpi) = 229827
+SHA256 (xpi/firefox-i18n-6.0/fr.xpi) = cb6f55ff11c445d433b8c1347c82c53aab39b90d8c7a54b94baf8054e0ca05fd
+SIZE (xpi/firefox-i18n-6.0/fr.xpi) = 235512
+SHA256 (xpi/firefox-i18n-6.0/fy-NL.xpi) = f3e020540b27666694901ccb9921ff2856f5d0a1b4c15e9b893857116a5b2d46
+SIZE (xpi/firefox-i18n-6.0/fy-NL.xpi) = 232894
+SHA256 (xpi/firefox-i18n-6.0/ga-IE.xpi) = 7a65aa3ebf2fb7830cad88dd8b234ac4826a6cc126a7cc0005c957cd0072def7
+SIZE (xpi/firefox-i18n-6.0/ga-IE.xpi) = 237689
+SHA256 (xpi/firefox-i18n-6.0/gl.xpi) = c3504e161a9bc80f2acbe4ff4ecd0310938b08bb333d1ce8e507e25af38c3ecf
+SIZE (xpi/firefox-i18n-6.0/gl.xpi) = 229665
+SHA256 (xpi/firefox-i18n-6.0/gu-IN.xpi) = 703a224eb1651de895cc1efc9225c8f4cda1c0016becfb3d72c40bfa8fc97bb7
+SIZE (xpi/firefox-i18n-6.0/gu-IN.xpi) = 257764
+SHA256 (xpi/firefox-i18n-6.0/he.xpi) = c94ca5e8178fe6f4ed1c6cd9e1410f21bc54c182571ce364f940ae0864db6bf4
+SIZE (xpi/firefox-i18n-6.0/he.xpi) = 239581
+SHA256 (xpi/firefox-i18n-6.0/hi-IN.xpi) = 4f617a857918494f470e8c848daa690d083ed744bb623a6ad90d20cd0e7a4721
+SIZE (xpi/firefox-i18n-6.0/hi-IN.xpi) = 263278
+SHA256 (xpi/firefox-i18n-6.0/hr.xpi) = 953e27c8dad0bcf5e1ede9e1e77572577476d9a3b690c86fa0a76534e20e0b43
+SIZE (xpi/firefox-i18n-6.0/hr.xpi) = 240046
+SHA256 (xpi/firefox-i18n-6.0/hu.xpi) = f01be08eaf477777f35138fa2b1d0f202c289cf2ae02df9ae97a9fe241f0ed8a
+SIZE (xpi/firefox-i18n-6.0/hu.xpi) = 240258
+SHA256 (xpi/firefox-i18n-6.0/hy-AM.xpi) = 280f8b4e132ab00e4ce213ef4404a63ec1ed0e29fc62e6cdc65afbfff74cb7cd
+SIZE (xpi/firefox-i18n-6.0/hy-AM.xpi) = 424394
+SHA256 (xpi/firefox-i18n-6.0/id.xpi) = 50138424e8adb1a5c135d1c4fccb054f5d3b491bb8dcd24e1a30e9f5fb89e1d6
+SIZE (xpi/firefox-i18n-6.0/id.xpi) = 223599
+SHA256 (xpi/firefox-i18n-6.0/is.xpi) = b68b294e888432ad446fe5f3b8a37f03a28c234296d2a7e0d27478204a767fde
+SIZE (xpi/firefox-i18n-6.0/is.xpi) = 229422
+SHA256 (xpi/firefox-i18n-6.0/it.xpi) = 10691c720286febef91b221ecc66ee89279c41abf32fef86bc59a17da43f415b
+SIZE (xpi/firefox-i18n-6.0/it.xpi) = 202637
+SHA256 (xpi/firefox-i18n-6.0/ja.xpi) = fe301ba3ab532194d71c1f60f6a576c1d8da20e0ae27a3ebfb2857548417df54
+SIZE (xpi/firefox-i18n-6.0/ja.xpi) = 258440
+SHA256 (xpi/firefox-i18n-6.0/kk.xpi) = 6ef01f609ea580fa8c8d8b12a7ea2be787dc00efc29642e5f8af886773b2c0cd
+SIZE (xpi/firefox-i18n-6.0/kk.xpi) = 262254
+SHA256 (xpi/firefox-i18n-6.0/kn.xpi) = 5b06985f5f10ddf153814370562f756242c458375e9d98e7ed3dd8c6c2c4ae72
+SIZE (xpi/firefox-i18n-6.0/kn.xpi) = 281002
+SHA256 (xpi/firefox-i18n-6.0/ko.xpi) = 0dcbad96b428623d434749d47da9786ee451afa0d857db56f7055c8ae1a4e87d
+SIZE (xpi/firefox-i18n-6.0/ko.xpi) = 212862
+SHA256 (xpi/firefox-i18n-6.0/ku.xpi) = 544393cb438abe3636b36c6e689dd5d24ee51267c17a47826c4e58c5893e7603
+SIZE (xpi/firefox-i18n-6.0/ku.xpi) = 236375
+SHA256 (xpi/firefox-i18n-6.0/lg.xpi) = 213ea7ac604538328e8c3160c35b5000ce12451ccf1e78f96536bdb7092d6646
+SIZE (xpi/firefox-i18n-6.0/lg.xpi) = 234042
+SHA256 (xpi/firefox-i18n-6.0/lt.xpi) = 2de613ce3f9571e2c87b0f783b82fe7950a1548833ff0b5634ea41064ebb2a66
+SIZE (xpi/firefox-i18n-6.0/lt.xpi) = 319722
+SHA256 (xpi/firefox-i18n-6.0/lv.xpi) = 416b2631e2c8dc1f72b7a6fff25468e32838a796e9fd54744a6d0aad031f268b
+SIZE (xpi/firefox-i18n-6.0/lv.xpi) = 230398
+SHA256 (xpi/firefox-i18n-6.0/mai.xpi) = 3053fb2cd83b0bdb036796d000f03919da2526fff1d828fedf6f1c6521de4a81
+SIZE (xpi/firefox-i18n-6.0/mai.xpi) = 262934
+SHA256 (xpi/firefox-i18n-6.0/mk.xpi) = c35676cb390d255f51f228ff3ec22cf4aab2502c5ff79e678614c7773b552629
+SIZE (xpi/firefox-i18n-6.0/mk.xpi) = 256537
+SHA256 (xpi/firefox-i18n-6.0/ml.xpi) = e4363f186a7bfb34754b3f4f4b5fca5e538475b144a685f313fb8fb23ce7687f
+SIZE (xpi/firefox-i18n-6.0/ml.xpi) = 287988
+SHA256 (xpi/firefox-i18n-6.0/mr.xpi) = 7c645f2c36c48b2fd34fcdd5e6b282c6a5a4f6704c73817da84b3b8ac0f961b9
+SIZE (xpi/firefox-i18n-6.0/mr.xpi) = 263497
+SHA256 (xpi/firefox-i18n-6.0/nb-NO.xpi) = aa2e552b9136c1b149795021884a4e04f3c345e1cdfa81dbd74684a7d63ec3d0
+SIZE (xpi/firefox-i18n-6.0/nb-NO.xpi) = 227700
+SHA256 (xpi/firefox-i18n-6.0/nl.xpi) = 9d3cc96d4f9f72991ac7099dd4df1b06f49fb2be885a3cb4f4736be75d784136
+SIZE (xpi/firefox-i18n-6.0/nl.xpi) = 229019
+SHA256 (xpi/firefox-i18n-6.0/nn-NO.xpi) = 190b4c5f2638d010a09860c35c75a27256b15697b1ae7a3c05d14848a286dc3c
+SIZE (xpi/firefox-i18n-6.0/nn-NO.xpi) = 228845
+SHA256 (xpi/firefox-i18n-6.0/nso.xpi) = 8fec475ad68c5807b0cd544b254a006c3c72e3b7b26c4d70a30a0109a2ffe545
+SIZE (xpi/firefox-i18n-6.0/nso.xpi) = 232420
+SHA256 (xpi/firefox-i18n-6.0/or.xpi) = d1a15c171f59882821325f58942bd48b15d0cc8d52a8a7be3bbc7e11ea51c11a
+SIZE (xpi/firefox-i18n-6.0/or.xpi) = 266744
+SHA256 (xpi/firefox-i18n-6.0/pa-IN.xpi) = d6577e72ea8f4aabd086f2fda7bb76ee5a51d5ee91013ac6ced399e44480f07f
+SIZE (xpi/firefox-i18n-6.0/pa-IN.xpi) = 264584
+SHA256 (xpi/firefox-i18n-6.0/pl.xpi) = 524b668eb02715fd23f0f0368b65165c81648cba266a804dbcc5dd4bc72303c4
+SIZE (xpi/firefox-i18n-6.0/pl.xpi) = 237909
+SHA256 (xpi/firefox-i18n-6.0/pt-BR.xpi) = e1b0ea66df64e88e02cf05105aab887cd75acc1e8506f8abe80c2422c3ab4ca8
+SIZE (xpi/firefox-i18n-6.0/pt-BR.xpi) = 233073
+SHA256 (xpi/firefox-i18n-6.0/pt-PT.xpi) = 8d467fdd9bc9a1c9a8801543e4f2577ed7ae7d6d6862580dd9ba61c795f216f2
+SIZE (xpi/firefox-i18n-6.0/pt-PT.xpi) = 232662
+SHA256 (xpi/firefox-i18n-6.0/rm.xpi) = 0b7b73c657e15af3fdf00016525ef8934446add2669715789cff340934a4b9b3
+SIZE (xpi/firefox-i18n-6.0/rm.xpi) = 232094
+SHA256 (xpi/firefox-i18n-6.0/ro.xpi) = 0d48c600f1ce7d38989eff627a1a2a478a989efe73a6ec38e37ffc322f8bd382
+SIZE (xpi/firefox-i18n-6.0/ro.xpi) = 235303
+SHA256 (xpi/firefox-i18n-6.0/ru.xpi) = a5a2c25c83605ccfc8e372fbca074bbfc186a31f4a96bea59bb684000400adfe
+SIZE (xpi/firefox-i18n-6.0/ru.xpi) = 243043
+SHA256 (xpi/firefox-i18n-6.0/si.xpi) = 01080fb0721b32b845512e2f43875977550e8bee9e709939413f45d7849d10ca
+SIZE (xpi/firefox-i18n-6.0/si.xpi) = 258004
+SHA256 (xpi/firefox-i18n-6.0/sk.xpi) = 681d10e1514be5c34e690f2df4ffdb400f27cb3b24274df6613730cd7604c9de
+SIZE (xpi/firefox-i18n-6.0/sk.xpi) = 239857
+SHA256 (xpi/firefox-i18n-6.0/sl.xpi) = c796ff7ffb64d175bf99bc16e77775ab6683c6f882674181f8115a0d030e7ad8
+SIZE (xpi/firefox-i18n-6.0/sl.xpi) = 227446
+SHA256 (xpi/firefox-i18n-6.0/son.xpi) = 0658aac50b3d0344f6679ddc597db1ae652954aa5022b135de02ba80124f7f8b
+SIZE (xpi/firefox-i18n-6.0/son.xpi) = 225686
+SHA256 (xpi/firefox-i18n-6.0/sq.xpi) = b4f13473c80a5a06f4e240fa3ff197b0bdfc610b559f58c32b1c1b6b118442b9
+SIZE (xpi/firefox-i18n-6.0/sq.xpi) = 212918
+SHA256 (xpi/firefox-i18n-6.0/sr.xpi) = b4a4cd84cd8df382f4fdebb50f482eac6e34b736d5ae729f29a1ef2857fa6496
+SIZE (xpi/firefox-i18n-6.0/sr.xpi) = 261928
+SHA256 (xpi/firefox-i18n-6.0/sv-SE.xpi) = 0b54939f5f3c58cc09573274288186b330d18b93a56a17a03d2a4dbdb49b61e1
+SIZE (xpi/firefox-i18n-6.0/sv-SE.xpi) = 265341
+SHA256 (xpi/firefox-i18n-6.0/ta-LK.xpi) = 67b4292aa6b7c15902cea10d5bbc5866fbccc9faf7b69e9c45f6acfc63dd7ae3
+SIZE (xpi/firefox-i18n-6.0/ta-LK.xpi) = 273382
+SHA256 (xpi/firefox-i18n-6.0/ta.xpi) = 718efb5dd19391bcccb640ad7644b0b1a13dba8362e34da66928b2a66071c8ef
+SIZE (xpi/firefox-i18n-6.0/ta.xpi) = 258053
+SHA256 (xpi/firefox-i18n-6.0/te.xpi) = 1d2d80d89223778cb8093c0244328aee3fcc0638fb48de855a7903a7aae4bd2d
+SIZE (xpi/firefox-i18n-6.0/te.xpi) = 272285
+SHA256 (xpi/firefox-i18n-6.0/th.xpi) = 637e45b381cdfffeaeddb57bf2837e37aa04c29a87ac8bc8217a405621194619
+SIZE (xpi/firefox-i18n-6.0/th.xpi) = 259124
+SHA256 (xpi/firefox-i18n-6.0/tr.xpi) = 486bd8fac72d0de5479dc0ae0c544167f5a776c03e9b794c20eaffe840fef9c0
+SIZE (xpi/firefox-i18n-6.0/tr.xpi) = 232347
+SHA256 (xpi/firefox-i18n-6.0/uk.xpi) = dfedb8b15b42f58fb10b7ac5e51b7a87340aa2b8c223b5f47e46123e2a734851
+SIZE (xpi/firefox-i18n-6.0/uk.xpi) = 266235
+SHA256 (xpi/firefox-i18n-6.0/vi.xpi) = cc83a4f55ffc537a4fd9ff99fb2898bbfb7f687c5a030352883be413054c6f16
+SIZE (xpi/firefox-i18n-6.0/vi.xpi) = 245639
+SHA256 (xpi/firefox-i18n-6.0/zh-CN.xpi) = 72ae15d06f826de529312a81b1345fd5e057adc38d2c2c9db15e5eb29b650ead
+SIZE (xpi/firefox-i18n-6.0/zh-CN.xpi) = 241868
+SHA256 (xpi/firefox-i18n-6.0/zh-TW.xpi) = 5b5d3cd6ee368007415b82e338204d3fe658291f4f4d454fcc1efc7e93d0563c
+SIZE (xpi/firefox-i18n-6.0/zh-TW.xpi) = 242787
+SHA256 (xpi/firefox-i18n-6.0/zu.xpi) = 7e6aa854e7e606f00c8e238c11c634b5fd5d068156840736b5997ecb6f6ad6d9
+SIZE (xpi/firefox-i18n-6.0/zu.xpi) = 233159

Modified: branches/experimental/www/firefox-i18n/pkg-descr
==============================================================================
--- branches/experimental/www/firefox-i18n/pkg-descr	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox-i18n/pkg-descr	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,3 +1,3 @@
-Language packs for Firefox 4.0
+Language packs for Firefox
 
 WWW: http://www.mozilla.org/projects/l10n/

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.242 2011/07/04 17:28:33 flo Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.246 2011/08/24 23:34:00 flo Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	5.0
+DISTVERSION=	6.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -16,19 +17,19 @@
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.8.8:${PORTSDIR}/devel/nspr \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		event-1.4:${PORTSDIR}/devel/libevent
 
+CONFLICTS_BUILD=	spidermonkey-*
+
 USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZILLA_NAME=	Firefox
 MOZ_TOOLKIT=	cairo-gtk2
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
-			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 
 MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
@@ -39,7 +40,6 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
-MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
 
 FIREFOX_ICON=		${MOZILLA}.png
@@ -53,8 +53,7 @@
 		--with-system-libevent=${LOCALBASE}
 
 OPTIONS=	DBUS "Enable D-BUS support" on \
-		PGO "Enable Profile-Guided Optimization" off \
-		SMB "Enable smb:// URI support using gnomevfs" off
+		PGO "Enable Profile-Guided Optimization" off
 
 .include <bsd.port.pre.mk>
 
@@ -71,7 +70,7 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
 .if defined(WITH_PGO)
@@ -102,7 +101,7 @@
 	@sleep 10
 .endif
 
-post-extract::
+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

Modified: branches/experimental/www/firefox/distinfo
==============================================================================
--- branches/experimental/www/firefox/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (firefox-5.0.source.tar.bz2) = 6bf97d80c8296f6ac576a07a87460e68066066de8bf23afe5f271cb7e1eedf44
-SIZE (firefox-5.0.source.tar.bz2) = 68782151
+SHA256 (firefox-6.0.source.tar.bz2) = cc3fb554ca02358e000502a1023d5ba01e6d18ae30c719f5a3b1ce1ad8334973
+SIZE (firefox-6.0.source.tar.bz2) = 67919174

Added: branches/experimental/www/firefox/files/patch-bugzilla-659932
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bugzilla-659932	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,35 @@
+--- toolkit/xre/glxtest.cpp.orig	2011-08-11 17:41:31.000000000 -0400
++++ toolkit/xre/glxtest.cpp	2011-08-23 15:09:48.000000000 -0400
+@@ -114,6 +114,9 @@
+   typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *);
+   PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension"));
+ 
++  typedef GLXFBConfig* (* PFNGLXQUERYVERSION) (Display *, int *, int *);
++  PFNGLXQUERYVERSION glXQueryVersion = cast<PFNGLXQUERYVERSION>(dlsym(libgl, "glXQueryVersion"));
++
+   typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *);
+   PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig"));
+ 
+@@ -139,6 +142,7 @@
+   PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString"));
+ 
+   if (!glXQueryExtension ||
++      !glXQueryVersion ||
+       !glXChooseFBConfig ||
+       !glXGetVisualFromFBConfig ||
+       !glXCreatePixmap ||
+@@ -158,6 +162,14 @@
+   ///// Check that the GLX extension is present /////
+   if (!glXQueryExtension(dpy, NULL, NULL))
+     fatal_error("GLX extension missing");
++  
++  ///// Check that the GLX version is >= 1.3, needed for glXCreatePixmap, bug 659932 /////
++  int majorVersion, minorVersion;
++  if (!glXQueryVersion(dpy, &majorVersion, &minorVersion))
++    fatal_error("Unable to query GLX version");
++
++  if (majorVersion < 1 || (majorVersion == 1 && minorVersion < 3))
++    fatal_error("GLX version older than the required 1.3");
+ 
+   XSetErrorHandler(x_error_handler);
+ 

Modified: branches/experimental/www/firefox/files/patch-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-js-src-Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox/files/patch-js-src-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,25 @@
---- js/src/Makefile.in.orig	2011-03-17 18:51:39.000000000 +0100
-+++ js/src/Makefile.in	2011-03-18 19:41:09.000000000 +0100
-@@ -612,7 +612,7 @@
+--- js/src/Makefile.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ js/src/Makefile.in	2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+@@ -469,6 +469,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
+@@ -739,7 +742,7 @@
  # to reliably get limit macros defined, we'd always have to define the
  # one below before including any header, but that's obscure and
  # fragile, so we do it here.
@@ -9,13 +28,14 @@
  
  INCLUDES	+= -I$(srcdir)
  
-@@ -666,7 +666,8 @@
- endif # WINNT
- 
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS	+= -pthread
-+DEFINES		+= -DFREEBSD
-+EXTRA_LIBS	+= -pthread -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
+
+-@@ -793,7 +796,8 @@
++@@ -793,7 +796,7 @@
+  endif # WINNT
+  
+  ifeq ($(OS_ARCH),FreeBSD)
+ -EXTRA_LIBS += -pthread
+-+DEFINES           += -DFREEBSD
+ +EXTRA_LIBS       += -pthread -lc
+  endif
+  ifeq ($(OS_ARCH),IRIX)

Modified: branches/experimental/www/firefox/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-js-src-configure.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox/files/patch-js-src-configure.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,32 +1,72 @@
---- js/src/configure.in.orig	2010-11-04 21:05:48.000000000 +0100
-+++ js/src/configure.in	2010-11-22 21:30:24.000000000 +0100
-@@ -2621,7 +2621,7 @@
+--- js/src/configure.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ js/src/configure.in	2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+@@ -1495,7 +1495,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
+ esac
+ 
+@@ -2713,7 +2713,7 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
 -x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
      ENABLE_TRACEJIT=1
      NANOJIT_ARCH=X64
      ENABLE_METHODJIT=1
-@@ -2638,11 +2638,6 @@
-     AC_DEFINE(JS_CPU_ARM)
-     AC_DEFINE(JS_NUNBOX32)
+@@ -2723,23 +2723,23 @@
+     AC_DEFINE(JS_CPU_X64)
+     AC_DEFINE(JS_PUNBOX64)
+     ;;
+-arm*-*)
++x86_64*-*)
+     ENABLE_TRACEJIT=1
+-    NANOJIT_ARCH=ARM
++    NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    AC_DEFINE(JS_CPU_ARM)
+-    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_POLYIC_TYPED_ARRAY=1
++    AC_DEFINE(JS_CPU_X64)
++    AC_DEFINE(JS_PUNBOX64)
      ;;
 -sparc*-*)
--    ENABLE_TRACEJIT=1
++arm*-*)
+     ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
++    NANOJIT_ARCH=ARM
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    ENABLE_POLYIC_TYPED_ARRAY=1
 -    AC_DEFINE(JS_CPU_SPARC)
--    ;;
++    AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
  esac
- 
- MOZ_ARG_DISABLE_BOOL(methodjit,
-@@ -2693,7 +2688,7 @@
+@@ -2796,6 +2796,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
++    AC_DEFINE(AVMPLUS_AMD64)
++    AC_DEFINE(AVMPLUS_64BIT)
++    ;;
+ x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
-     ;;

Deleted: branches/experimental/www/firefox/files/patch-js-src-jsnativestack.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-js-src-jsnativestack.cpp	Sun Aug 28 15:08:27 2011	(r614)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,12 +0,0 @@
---- js/src/jsnativestack.cpp~
-+++ js/src/jsnativestack.cpp
-@@ -50,7 +50,8 @@
- #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
- # include <pthread.h>
- 
--# if defined(__FreeBSD__)
-+# if defined(FREEBSD)
-+#  include <cstddef>
- #  include <pthread_np.h>
- # endif
- 

Modified: branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp	Sun Aug 28 15:08:27 2011	(r615)
@@ -14,7 +14,7 @@
  
  #else
  
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#if defined(__FreeBSD__)
 +#if __BSD_VISIBLE == 0
 +#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
 +#endif

Modified: branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,9 +1,9 @@
---- layout/generic/Makefile.in.orig	2011-04-26 23:21:46.000000000 +0200
-+++ layout/generic/Makefile.in	2011-04-26 23:44:09.096445086 +0200
-@@ -147,9 +147,10 @@
+--- 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)/../../modules/plugin/base/src \
+ 		-I$(srcdir)/../../dom/plugins/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  

Modified: branches/experimental/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h
==============================================================================
--- branches/experimental/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h	Sun Aug 28 15:08:27 2011	(r615)
@@ -15,7 +15,7 @@
  #define _PR_IPV6_V6ONLY_PROBE
  #endif
  
-+#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)
++#if (__FreeBSD_version >= 700016)
 +#if defined(_PR_PTHREADS)
 +#define _PR_HAVE_GETPROTO_R
 +#define _PR_HAVE_5_ARG_GETPROTO_R

Modified: branches/experimental/www/firefox36-i18n/Makefile
==============================================================================
--- branches/experimental/www/firefox36-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox36-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.54 2011/06/21 20:35:48 flo Exp $
+# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.56 2011/08/18 10:01:12 ale Exp $
 #
 
 PORTNAME=	firefox36-i18n
-PORTVERSION=	3.6.18
+PORTVERSION=	3.6.20
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	firefox/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -17,7 +18,7 @@
 COMMENT=	Localized interface for Firefox 3.6
 
 USE_FIREFOX=	36
-USE_XPI=	*firefox3
+USE_XPI=	firefox3 linux-firefox
 
 USE_SUBMAKE=	yes
 

Modified: branches/experimental/www/firefox36-i18n/distinfo
==============================================================================
--- branches/experimental/www/firefox36-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox36-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,146 +1,146 @@
-SHA256 (xpi/firefox36-i18n-3.6.18/af.xpi) = a1b0fa31710b8ba3df8a7fda96c853c7c45188810322e9b21141bce4b26a62f0
-SIZE (xpi/firefox36-i18n-3.6.18/af.xpi) = 121613
-SHA256 (xpi/firefox36-i18n-3.6.18/ar.xpi) = 3a5df27a72432451f704fa02696de8a1c347540b2c311f3b418138e087a1bc2a
-SIZE (xpi/firefox36-i18n-3.6.18/ar.xpi) = 132124
-SHA256 (xpi/firefox36-i18n-3.6.18/as.xpi) = ef08c529c7b52567423c729154581b1bd04f134854d0fcb0e3c5f9060154bc44
-SIZE (xpi/firefox36-i18n-3.6.18/as.xpi) = 134267
-SHA256 (xpi/firefox36-i18n-3.6.18/be.xpi) = ad36a4c6b5fbbdd0138006a912b89d19a92031c8429aa254a879661efbe4841d
-SIZE (xpi/firefox36-i18n-3.6.18/be.xpi) = 122232
-SHA256 (xpi/firefox36-i18n-3.6.18/bg.xpi) = a0e4d4f183cc1e6a5dc5894ddfaf9585093fbf90a3f9083de2cb5348b09970a3
-SIZE (xpi/firefox36-i18n-3.6.18/bg.xpi) = 134079
-SHA256 (xpi/firefox36-i18n-3.6.18/bn-BD.xpi) = 09def7ad8f8da291fcf3d112e14e4f0431dddde4c6f82f96e86f739d4cca4c0f
-SIZE (xpi/firefox36-i18n-3.6.18/bn-BD.xpi) = 141151
-SHA256 (xpi/firefox36-i18n-3.6.18/bn-IN.xpi) = 24753735a38e55436b762cd38752daa5bc1f7515390d76b7e1539de0e1dc214f
-SIZE (xpi/firefox36-i18n-3.6.18/bn-IN.xpi) = 160115
-SHA256 (xpi/firefox36-i18n-3.6.18/ca.xpi) = d5949320a48ec9e43ce86e4b5f459df571d8f541719403ce68a6b9b3f7dc682d
-SIZE (xpi/firefox36-i18n-3.6.18/ca.xpi) = 127932
-SHA256 (xpi/firefox36-i18n-3.6.18/cs.xpi) = ccc9a1ce0ea15d60dcffc48abfd795e32bf93a04c0e299fd3b183842d77e9b93
-SIZE (xpi/firefox36-i18n-3.6.18/cs.xpi) = 126731
-SHA256 (xpi/firefox36-i18n-3.6.18/cy.xpi) = 2526f732d3a4daf0cc39c04f64340884607fd6f31166c5c34b2c9aa29bf627e1
-SIZE (xpi/firefox36-i18n-3.6.18/cy.xpi) = 121945
-SHA256 (xpi/firefox36-i18n-3.6.18/da.xpi) = 055d8400f3907aa076ef6f7d857308436755b28b2c1b71e31546cebe10de0a89
-SIZE (xpi/firefox36-i18n-3.6.18/da.xpi) = 125595
-SHA256 (xpi/firefox36-i18n-3.6.18/de.xpi) = dee89a61db082a968f33fda58a1d135f5b64d3fcefd68bfd1a5c34c989234906
-SIZE (xpi/firefox36-i18n-3.6.18/de.xpi) = 128970
-SHA256 (xpi/firefox36-i18n-3.6.18/el.xpi) = 6f52dcfda307377ee857aa4060796b00e2700060ab6bc1595f8802c08ef846da
-SIZE (xpi/firefox36-i18n-3.6.18/el.xpi) = 135214
-SHA256 (xpi/firefox36-i18n-3.6.18/en-GB.xpi) = 0abb01e8ca676f20b536a36c2e21b558d8300cf44a345bb790180e19b8c5d277
-SIZE (xpi/firefox36-i18n-3.6.18/en-GB.xpi) = 119211
-SHA256 (xpi/firefox36-i18n-3.6.18/eo.xpi) = 172061e9960daf7c49159f0920becc4aeb72c0180ba3d64b2c4e1b993425573a
-SIZE (xpi/firefox36-i18n-3.6.18/eo.xpi) = 121874
-SHA256 (xpi/firefox36-i18n-3.6.18/es-AR.xpi) = df17796983994946c7987e93b7f23abe90ff98ea4d973c9d5bad11ce6f8e7168
-SIZE (xpi/firefox36-i18n-3.6.18/es-AR.xpi) = 127774
-SHA256 (xpi/firefox36-i18n-3.6.18/es-CL.xpi) = 0be1099a2c5208f60f51e48ba926a52b5f3757a0e5d103d033dd0db28fe86614
-SIZE (xpi/firefox36-i18n-3.6.18/es-CL.xpi) = 129439
-SHA256 (xpi/firefox36-i18n-3.6.18/es-ES.xpi) = 986330e0f66ec1237ce2024071817f8ffe36259f5453b7ac65dbc5b2b9f92f0e
-SIZE (xpi/firefox36-i18n-3.6.18/es-ES.xpi) = 108673
-SHA256 (xpi/firefox36-i18n-3.6.18/es-MX.xpi) = dbaa7291b59d54566963b43c42297bd5df56fec476aa82c5f4ec1120a19309ae
-SIZE (xpi/firefox36-i18n-3.6.18/es-MX.xpi) = 127401
-SHA256 (xpi/firefox36-i18n-3.6.18/et.xpi) = 6b5f14c2b0c4ea27841a7a052e1d954b972870dc5909f1be423aa553adfc416f
-SIZE (xpi/firefox36-i18n-3.6.18/et.xpi) = 127406
-SHA256 (xpi/firefox36-i18n-3.6.18/eu.xpi) = d7af33f55efa957f8e6cd628bc70f4bdbbb941c4d3cf2019a7c3e937edd7eca1
-SIZE (xpi/firefox36-i18n-3.6.18/eu.xpi) = 121855
-SHA256 (xpi/firefox36-i18n-3.6.18/fa.xpi) = cbc01d12756d2b4509c0185065506d17faa35837c909b8eaf990785ae822c829
-SIZE (xpi/firefox36-i18n-3.6.18/fa.xpi) = 138416
-SHA256 (xpi/firefox36-i18n-3.6.18/fi.xpi) = dce7f169e54e1f111f0e10880b0ff7284e9645793c13a779645b4c6783e67980
-SIZE (xpi/firefox36-i18n-3.6.18/fi.xpi) = 126795
-SHA256 (xpi/firefox36-i18n-3.6.18/fr.xpi) = 9110f090694a94884a181d184c60d922cebb8c8990f758f62df88f87d49481a8
-SIZE (xpi/firefox36-i18n-3.6.18/fr.xpi) = 128984
-SHA256 (xpi/firefox36-i18n-3.6.18/fy-NL.xpi) = 162f6940217a4197aa4b9e5c43ea62cab285f5dcbb4cca05d04132ce9595169a
-SIZE (xpi/firefox36-i18n-3.6.18/fy-NL.xpi) = 129187
-SHA256 (xpi/firefox36-i18n-3.6.18/ga-IE.xpi) = d6ee30e5b49e474a9b8d03d276411af0eac8a6088f84b20e63f5439a2c0f5e21
-SIZE (xpi/firefox36-i18n-3.6.18/ga-IE.xpi) = 127755
-SHA256 (xpi/firefox36-i18n-3.6.18/gl.xpi) = a819931b970ad05bebe91966346a89a99982f6da5bebb2659f87300147bfd672
-SIZE (xpi/firefox36-i18n-3.6.18/gl.xpi) = 124818
-SHA256 (xpi/firefox36-i18n-3.6.18/gu-IN.xpi) = 4df2b639899d0b8ebdd0bc28b20edffedf915c24c56271edd0485640f5cbdbae
-SIZE (xpi/firefox36-i18n-3.6.18/gu-IN.xpi) = 146303
-SHA256 (xpi/firefox36-i18n-3.6.18/he.xpi) = af62604fc0a0fe51446321de5317934466a32ce34040d65a90d11abae8f77914
-SIZE (xpi/firefox36-i18n-3.6.18/he.xpi) = 123135
-SHA256 (xpi/firefox36-i18n-3.6.18/hi-IN.xpi) = ecd84ecce3c63e60f808435535ee34cfa15bea20fb998a0b67568fe8a7f0994c
-SIZE (xpi/firefox36-i18n-3.6.18/hi-IN.xpi) = 141884
-SHA256 (xpi/firefox36-i18n-3.6.18/hr.xpi) = 0a86fb86f9c3765871bdd330bcc597ae44026a4ceb22ba483493e95e6eb894f1
-SIZE (xpi/firefox36-i18n-3.6.18/hr.xpi) = 127008
-SHA256 (xpi/firefox36-i18n-3.6.18/hu.xpi) = 9baa83ee4a8219b6ca61455c34ba2a03bd4ac7019c4b5d32356d150355c71213
-SIZE (xpi/firefox36-i18n-3.6.18/hu.xpi) = 131098
-SHA256 (xpi/firefox36-i18n-3.6.18/id.xpi) = 36fc15eabce3eb24ee46e126a665eda0d6edb71834b404791ac67c752b749850
-SIZE (xpi/firefox36-i18n-3.6.18/id.xpi) = 103931
-SHA256 (xpi/firefox36-i18n-3.6.18/is.xpi) = c4a279774167ec8d636fbc1b01437198b6777a614ccd7ab177908ec32ca2e4de
-SIZE (xpi/firefox36-i18n-3.6.18/is.xpi) = 123393
-SHA256 (xpi/firefox36-i18n-3.6.18/it.xpi) = e874190f33de28eaca3f2e3f0ebe77a1e75429a6183be7f26dcf1e25fb5d8b51
-SIZE (xpi/firefox36-i18n-3.6.18/it.xpi) = 107942
-SHA256 (xpi/firefox36-i18n-3.6.18/ja.xpi) = c0012b22c405c7380d6f3d53b92be979d190fb4cba8eb362392f18403fdbe429
-SIZE (xpi/firefox36-i18n-3.6.18/ja.xpi) = 136986
-SHA256 (xpi/firefox36-i18n-3.6.18/ka.xpi) = 5e99fd2dd3c22361be842d2877ad21046b2ad964a67e3723dff4e92d7bccadf8
-SIZE (xpi/firefox36-i18n-3.6.18/ka.xpi) = 154120
-SHA256 (xpi/firefox36-i18n-3.6.18/kk.xpi) = e74de19fee473090a2b405898342bcd588d8f4159312ba29ed5055b65f8bb31c
-SIZE (xpi/firefox36-i18n-3.6.18/kk.xpi) = 137723
-SHA256 (xpi/firefox36-i18n-3.6.18/kn.xpi) = 719551c71cfaff6b9bb07aa96a7e6787c2c726ee5b0e35cddd580fb368918fce
-SIZE (xpi/firefox36-i18n-3.6.18/kn.xpi) = 148714
-SHA256 (xpi/firefox36-i18n-3.6.18/ko.xpi) = e0d4a66b781c9771e5f6535f392193062799edb06b1fc400b90c262e77e2cf1a
-SIZE (xpi/firefox36-i18n-3.6.18/ko.xpi) = 115633
-SHA256 (xpi/firefox36-i18n-3.6.18/ku.xpi) = c548eb9793b465f00908e214009d79374046cfaf5f6adf59cf96144a631dc562
-SIZE (xpi/firefox36-i18n-3.6.18/ku.xpi) = 130831
-SHA256 (xpi/firefox36-i18n-3.6.18/lt.xpi) = f0dddc79169c5fceb8e56030c4275bea71e8ff957c73beca9af71c39a0e77f22
-SIZE (xpi/firefox36-i18n-3.6.18/lt.xpi) = 139690
-SHA256 (xpi/firefox36-i18n-3.6.18/lv.xpi) = dfcf1ab0223b280e491076271b8b17bba1c9d8f65603c2cca09ba48a12ff0854
-SIZE (xpi/firefox36-i18n-3.6.18/lv.xpi) = 124806
-SHA256 (xpi/firefox36-i18n-3.6.18/mk.xpi) = f0f9f9e0b54c3f3a78232b49a6c69c3b73856b6602492840d8dc44aa1c64e12d
-SIZE (xpi/firefox36-i18n-3.6.18/mk.xpi) = 128238
-SHA256 (xpi/firefox36-i18n-3.6.18/ml.xpi) = 94b6c84fd152c96cf727d82f1672310ac895d3af12c71526bd04018c9264164d
-SIZE (xpi/firefox36-i18n-3.6.18/ml.xpi) = 152168
-SHA256 (xpi/firefox36-i18n-3.6.18/mr.xpi) = c00de19360ddb043e79e456652f278e1b6e8dc8bc80e941c26e303b1bb06d9be
-SIZE (xpi/firefox36-i18n-3.6.18/mr.xpi) = 141125
-SHA256 (xpi/firefox36-i18n-3.6.18/nb-NO.xpi) = 7743cc5245067d9e30b2c42e11200fbe267133d5d4ecc64d7f4d461995c689e5
-SIZE (xpi/firefox36-i18n-3.6.18/nb-NO.xpi) = 124100
-SHA256 (xpi/firefox36-i18n-3.6.18/nl.xpi) = 7b9df9856d705d5cda89df08104d548cff989304bf25c3630a6de67467edc0f8
-SIZE (xpi/firefox36-i18n-3.6.18/nl.xpi) = 126409
-SHA256 (xpi/firefox36-i18n-3.6.18/nn-NO.xpi) = 46a9df1d094ff4a8152b80892b43d784621534d2ad7bf5fe9deebce9dd876e40
-SIZE (xpi/firefox36-i18n-3.6.18/nn-NO.xpi) = 125131
-SHA256 (xpi/firefox36-i18n-3.6.18/oc.xpi) = 2129db9be63bc3e1237555c38384e756523a7ca2f28ec4006c8f0c67c739fdb2
-SIZE (xpi/firefox36-i18n-3.6.18/oc.xpi) = 108301
-SHA256 (xpi/firefox36-i18n-3.6.18/or.xpi) = 2cc812d8465aee3645c004a104b86b89dc1b945fe430b69e0bb80f671326bba6
-SIZE (xpi/firefox36-i18n-3.6.18/or.xpi) = 142445
-SHA256 (xpi/firefox36-i18n-3.6.18/pa-IN.xpi) = 00d6ec8adda6ec9c49417844c9b4165d0ba3ce98d677467dbf0672c5ea5d41ab
-SIZE (xpi/firefox36-i18n-3.6.18/pa-IN.xpi) = 142084
-SHA256 (xpi/firefox36-i18n-3.6.18/pl.xpi) = 9141a13fec4533112ff2953fd8f21f85982c42f3e79d8a99f4a94ceaad5a49f1
-SIZE (xpi/firefox36-i18n-3.6.18/pl.xpi) = 131038
-SHA256 (xpi/firefox36-i18n-3.6.18/pt-BR.xpi) = ea0dfda721f85b74b1b1a6621b8a180f618a1583d088f01546c2c385eb460173
-SIZE (xpi/firefox36-i18n-3.6.18/pt-BR.xpi) = 125364
-SHA256 (xpi/firefox36-i18n-3.6.18/pt-PT.xpi) = e26e496b4e02b1833a38258877de428e4d98294de5b09eca8b3668418601fa86
-SIZE (xpi/firefox36-i18n-3.6.18/pt-PT.xpi) = 125422
-SHA256 (xpi/firefox36-i18n-3.6.18/rm.xpi) = 565be68d618f55dabbab755538854edc0760318a202f40411627919a0ca8f4ac
-SIZE (xpi/firefox36-i18n-3.6.18/rm.xpi) = 127397
-SHA256 (xpi/firefox36-i18n-3.6.18/ro.xpi) = 7aa806b49d31849bd82ed5a711757a99b78fe1bae55deca2ff4b09523be5db15
-SIZE (xpi/firefox36-i18n-3.6.18/ro.xpi) = 129116
-SHA256 (xpi/firefox36-i18n-3.6.18/ru.xpi) = 2763a4bb49e7fc220424434ea249e8b4102033895f03e205a40a48e715cbd55d
-SIZE (xpi/firefox36-i18n-3.6.18/ru.xpi) = 124942
-SHA256 (xpi/firefox36-i18n-3.6.18/si.xpi) = 5c864c6703d7b51eb5dd4990f8d78dd487b4658c378c30dfc2afdde99ca58227
-SIZE (xpi/firefox36-i18n-3.6.18/si.xpi) = 142189
-SHA256 (xpi/firefox36-i18n-3.6.18/sk.xpi) = 4e8dcb87bbc74670c974dfa5101e09db5804aac2ecb6ad5aa11288570342ad0d
-SIZE (xpi/firefox36-i18n-3.6.18/sk.xpi) = 131107
-SHA256 (xpi/firefox36-i18n-3.6.18/sl.xpi) = ea3fe79b466408496d36a2ff1d22641b6d6c4a8db493271e50ecf9915b0c3cbc
-SIZE (xpi/firefox36-i18n-3.6.18/sl.xpi) = 124289
-SHA256 (xpi/firefox36-i18n-3.6.18/sq.xpi) = 96a6bbcb711d8cb3a2b07df4baf7652a6d8108368684f98e2ffd4bb366929331
-SIZE (xpi/firefox36-i18n-3.6.18/sq.xpi) = 121259
-SHA256 (xpi/firefox36-i18n-3.6.18/sr.xpi) = d0a54c5479d271365d8a58f60aa9bb08aea1354549eed803009841c06635418d
-SIZE (xpi/firefox36-i18n-3.6.18/sr.xpi) = 135921
-SHA256 (xpi/firefox36-i18n-3.6.18/sv-SE.xpi) = 06498200807e9a4a937c95a9b30a7bbd4a1160c3807bf431538b34c10edb8776
-SIZE (xpi/firefox36-i18n-3.6.18/sv-SE.xpi) = 128436
-SHA256 (xpi/firefox36-i18n-3.6.18/ta-LK.xpi) = 93b0fc2c6bba0feb0e8d086d52efc615a885cce9713b12f1c246da90553187ae
-SIZE (xpi/firefox36-i18n-3.6.18/ta-LK.xpi) = 149287
-SHA256 (xpi/firefox36-i18n-3.6.18/ta.xpi) = 85fc93015b2d28841a218c415c915f538be4bd094d4eefb5c9d9ba07f489ad09
-SIZE (xpi/firefox36-i18n-3.6.18/ta.xpi) = 137230
-SHA256 (xpi/firefox36-i18n-3.6.18/te.xpi) = 7fb2e988697396d35acb6b60dc4a00b2acd7e71e9613bb936cce78c28344615b
-SIZE (xpi/firefox36-i18n-3.6.18/te.xpi) = 147869
-SHA256 (xpi/firefox36-i18n-3.6.18/th.xpi) = cb30bc1cf6fa8867764325b81f3574ebf04fa50726d174c59fc046614301b50f
-SIZE (xpi/firefox36-i18n-3.6.18/th.xpi) = 134398
-SHA256 (xpi/firefox36-i18n-3.6.18/tr.xpi) = 23b49730637422c34ac58cd043081627eb06f6f08567509f286e827443040321
-SIZE (xpi/firefox36-i18n-3.6.18/tr.xpi) = 125362
-SHA256 (xpi/firefox36-i18n-3.6.18/uk.xpi) = e95f83a5fb6cfe6adb546485ab9c249248c6a67621e404ce645f8f3ce3db3740
-SIZE (xpi/firefox36-i18n-3.6.18/uk.xpi) = 143185
-SHA256 (xpi/firefox36-i18n-3.6.18/vi.xpi) = 22ce8a29d3ab0d15ccb2b38e454abe4383a6029221881960b192787a378c4718
-SIZE (xpi/firefox36-i18n-3.6.18/vi.xpi) = 129032
-SHA256 (xpi/firefox36-i18n-3.6.18/zh-CN.xpi) = 0af247e771a6dbd4c17dc07e818dfe4cf32838ea6d61429e0294730ab665e494
-SIZE (xpi/firefox36-i18n-3.6.18/zh-CN.xpi) = 127099
-SHA256 (xpi/firefox36-i18n-3.6.18/zh-TW.xpi) = bf44a6af56589808f77a760f8c36ee0515bfda957817aa21ebe063d993c99124
-SIZE (xpi/firefox36-i18n-3.6.18/zh-TW.xpi) = 128516
+SHA256 (xpi/firefox36-i18n-3.6.20/af.xpi) = 2b07c056a1790905dd9a0b81b87d16181b7209c1d57eea5389538b8b95f386ff
+SIZE (xpi/firefox36-i18n-3.6.20/af.xpi) = 121642
+SHA256 (xpi/firefox36-i18n-3.6.20/ar.xpi) = d32b4beae719721b28b499f1d89f93af33f043f7a534914d406269d225d477c3
+SIZE (xpi/firefox36-i18n-3.6.20/ar.xpi) = 132121
+SHA256 (xpi/firefox36-i18n-3.6.20/as.xpi) = 8b1399e2d9d17b8273044259eaee3aa2f94885e8260e7132e75bac7ee60cc2a0
+SIZE (xpi/firefox36-i18n-3.6.20/as.xpi) = 134264
+SHA256 (xpi/firefox36-i18n-3.6.20/be.xpi) = 1b9e8f07394e60e601cd3bfe438d4e5d746b348aed30c522c6cc38d8ce669817
+SIZE (xpi/firefox36-i18n-3.6.20/be.xpi) = 122270
+SHA256 (xpi/firefox36-i18n-3.6.20/bg.xpi) = 34c76fc3ef15c193a7cc85d6bd971f81ba73b40973c6dbca1d91ead31f68c38d
+SIZE (xpi/firefox36-i18n-3.6.20/bg.xpi) = 134075
+SHA256 (xpi/firefox36-i18n-3.6.20/bn-BD.xpi) = 6008cb24195cbde7bc95fb0d3259df4b41e0e69ce120c46427156c76092aee4e
+SIZE (xpi/firefox36-i18n-3.6.20/bn-BD.xpi) = 141179
+SHA256 (xpi/firefox36-i18n-3.6.20/bn-IN.xpi) = c984fb202812d8e5b73435ce20678d06d221dfe865c55d90824e183d6ea15754
+SIZE (xpi/firefox36-i18n-3.6.20/bn-IN.xpi) = 160075
+SHA256 (xpi/firefox36-i18n-3.6.20/ca.xpi) = 85a18150a46d294a4710db46f075c3bf16d481bc6cc60243e510a5691c82c1c7
+SIZE (xpi/firefox36-i18n-3.6.20/ca.xpi) = 127934
+SHA256 (xpi/firefox36-i18n-3.6.20/cs.xpi) = 46fd7d8433bfd2a873ab5953d3979eb5c130666912d0a90d7e985ce8b438f0b3
+SIZE (xpi/firefox36-i18n-3.6.20/cs.xpi) = 126764
+SHA256 (xpi/firefox36-i18n-3.6.20/cy.xpi) = 1cabe8ab106b6b9fea64b46fe9e8cc530f4c06a1fe76322be080d520c04dab7b
+SIZE (xpi/firefox36-i18n-3.6.20/cy.xpi) = 121947
+SHA256 (xpi/firefox36-i18n-3.6.20/da.xpi) = cdb8ca7e001a0d561a8852590836bcb0d458b2b75605b4f32b25a1bc6729fe31
+SIZE (xpi/firefox36-i18n-3.6.20/da.xpi) = 125571
+SHA256 (xpi/firefox36-i18n-3.6.20/de.xpi) = 52c80f3ed136750a939ab32a542e707f75c2f32c997add2df53f92dbc60e059d
+SIZE (xpi/firefox36-i18n-3.6.20/de.xpi) = 128968
+SHA256 (xpi/firefox36-i18n-3.6.20/el.xpi) = 2fe939a5aa9f0324b18da9955e061e25ac692615b4e3413d02b7aae55acca5d8
+SIZE (xpi/firefox36-i18n-3.6.20/el.xpi) = 135212
+SHA256 (xpi/firefox36-i18n-3.6.20/en-GB.xpi) = d7a602a83925b317567cd2623f08cd9066ffcc47b3111076c80c6b0f3c6acd47
+SIZE (xpi/firefox36-i18n-3.6.20/en-GB.xpi) = 119245
+SHA256 (xpi/firefox36-i18n-3.6.20/eo.xpi) = f17b526ef77f3c4fa18410d28b39dea853b913bbab2bd18542e5d93429cef4b5
+SIZE (xpi/firefox36-i18n-3.6.20/eo.xpi) = 121845
+SHA256 (xpi/firefox36-i18n-3.6.20/es-AR.xpi) = cc2e1446fec321c6d2ac9a8ce52402c66cc4a3616f850666a6eec40461a94641
+SIZE (xpi/firefox36-i18n-3.6.20/es-AR.xpi) = 127758
+SHA256 (xpi/firefox36-i18n-3.6.20/es-CL.xpi) = 4c7e3e066b25b114ecb004ee0bb2c54e71e536d0fb4264777e56f2673af10379
+SIZE (xpi/firefox36-i18n-3.6.20/es-CL.xpi) = 129467
+SHA256 (xpi/firefox36-i18n-3.6.20/es-ES.xpi) = 1d2f99a59e8ac5af5c9bfb17ac02447f5e7162c2d34ba85b7ba3296381f7f509
+SIZE (xpi/firefox36-i18n-3.6.20/es-ES.xpi) = 108666
+SHA256 (xpi/firefox36-i18n-3.6.20/es-MX.xpi) = a86af87dca5dd93efe0fa4a3dc5f8f0539b778f29d2463fbac7e9c291bef10c3
+SIZE (xpi/firefox36-i18n-3.6.20/es-MX.xpi) = 127396
+SHA256 (xpi/firefox36-i18n-3.6.20/et.xpi) = c16e20cc1fa28889a76fc3c6fff6dad7c2c03014336a1480a03ca4f132953174
+SIZE (xpi/firefox36-i18n-3.6.20/et.xpi) = 127368
+SHA256 (xpi/firefox36-i18n-3.6.20/eu.xpi) = ba8f2a0b8c623f462a68db9d3d81116834e53d8611090166efe767c76312c4f4
+SIZE (xpi/firefox36-i18n-3.6.20/eu.xpi) = 121825
+SHA256 (xpi/firefox36-i18n-3.6.20/fa.xpi) = 4786bc73dfea8dec915c3513b64a3725b6741932baa83659343d73231f3c036e
+SIZE (xpi/firefox36-i18n-3.6.20/fa.xpi) = 138375
+SHA256 (xpi/firefox36-i18n-3.6.20/fi.xpi) = 18312d777fdb954e074199d884caa6da9f980b066a334c9dc0ac3aaa22609611
+SIZE (xpi/firefox36-i18n-3.6.20/fi.xpi) = 126821
+SHA256 (xpi/firefox36-i18n-3.6.20/fr.xpi) = 894ac3b62de2f019bb3ffd9f13560cb91d41d22efac6be590db6eeb7c6f5dc02
+SIZE (xpi/firefox36-i18n-3.6.20/fr.xpi) = 129000
+SHA256 (xpi/firefox36-i18n-3.6.20/fy-NL.xpi) = 54394cc2221a0e9cc9d318121f919edc9f404a837fef2e0c385bd82a808fecd2
+SIZE (xpi/firefox36-i18n-3.6.20/fy-NL.xpi) = 129185
+SHA256 (xpi/firefox36-i18n-3.6.20/ga-IE.xpi) = 1ce534d9fd48ece4bf63c8d97c10678655e42310afbe8f89e6457a203686a83d
+SIZE (xpi/firefox36-i18n-3.6.20/ga-IE.xpi) = 127774
+SHA256 (xpi/firefox36-i18n-3.6.20/gl.xpi) = 9b73cf10001d39c46d574171fcf99491e50ffae882bce5c5e0dc946f81f4418c
+SIZE (xpi/firefox36-i18n-3.6.20/gl.xpi) = 124796
+SHA256 (xpi/firefox36-i18n-3.6.20/gu-IN.xpi) = a6926155a9c9e4bc39112372b3b2d4797131fa04b262af9b13132da66baa4c00
+SIZE (xpi/firefox36-i18n-3.6.20/gu-IN.xpi) = 146300
+SHA256 (xpi/firefox36-i18n-3.6.20/he.xpi) = a7f336c12a0e9295194f8dca63acb9acdccd77a64211851c74864ba683c130cc
+SIZE (xpi/firefox36-i18n-3.6.20/he.xpi) = 123103
+SHA256 (xpi/firefox36-i18n-3.6.20/hi-IN.xpi) = 914205b7eb19ed5b5ddfb1484ed4481070d237a25389a7ffe3ba32a33c569184
+SIZE (xpi/firefox36-i18n-3.6.20/hi-IN.xpi) = 141886
+SHA256 (xpi/firefox36-i18n-3.6.20/hr.xpi) = 4ae7fb5ec4f76b53d007e9f9c9ba9554f55e9c5e2e1ca3fbca3525810126d430
+SIZE (xpi/firefox36-i18n-3.6.20/hr.xpi) = 126982
+SHA256 (xpi/firefox36-i18n-3.6.20/hu.xpi) = cd7b4080404a1df1bd01f024af2a834b9e1d3236d947be8cab96c9707cf502bb
+SIZE (xpi/firefox36-i18n-3.6.20/hu.xpi) = 131099
+SHA256 (xpi/firefox36-i18n-3.6.20/id.xpi) = d057296c9d9601b34c2c4bb58e4d6aa1af30be540e9ae8a1b74038e0bb37a65a
+SIZE (xpi/firefox36-i18n-3.6.20/id.xpi) = 103928
+SHA256 (xpi/firefox36-i18n-3.6.20/is.xpi) = f96d27c4c18b28fc2d86adad2118eb9ec1f9702bd32e1a64c2a87b0e4d0e52a0
+SIZE (xpi/firefox36-i18n-3.6.20/is.xpi) = 123424
+SHA256 (xpi/firefox36-i18n-3.6.20/it.xpi) = 1a4a84b0f0f32927a6660748cb4e348683cd969d759882f78a2c8a59fa5b7628
+SIZE (xpi/firefox36-i18n-3.6.20/it.xpi) = 107972
+SHA256 (xpi/firefox36-i18n-3.6.20/ja.xpi) = a60eb63ad0128072c1b282476f4cdf9d0898489f0f3778bf961f87313ed9e183
+SIZE (xpi/firefox36-i18n-3.6.20/ja.xpi) = 137012
+SHA256 (xpi/firefox36-i18n-3.6.20/ka.xpi) = 3e483772663f978ca1e263262156d682ec1762d1d2f600d8495d2f5a1678c5e1
+SIZE (xpi/firefox36-i18n-3.6.20/ka.xpi) = 154149
+SHA256 (xpi/firefox36-i18n-3.6.20/kk.xpi) = ed2edcc7ac43e1361ef3d511ec5e2e3a1c2e04aacab033880ed6b8d4d1f6b48d
+SIZE (xpi/firefox36-i18n-3.6.20/kk.xpi) = 137753
+SHA256 (xpi/firefox36-i18n-3.6.20/kn.xpi) = 705ffc4da7aa0a7c77f26f46fbfe6db782ea9b6a7d530264adad50a4430dd59a
+SIZE (xpi/firefox36-i18n-3.6.20/kn.xpi) = 148708
+SHA256 (xpi/firefox36-i18n-3.6.20/ko.xpi) = dfa3c5b0127f8fdf1d44198f01f66d1553996961dcf7e9cdf4eb716ac60981f0
+SIZE (xpi/firefox36-i18n-3.6.20/ko.xpi) = 115633
+SHA256 (xpi/firefox36-i18n-3.6.20/ku.xpi) = 980993c883f6ee82539c927fba6221977396e30b4399e2f614e4e426ee78ee6c
+SIZE (xpi/firefox36-i18n-3.6.20/ku.xpi) = 130807
+SHA256 (xpi/firefox36-i18n-3.6.20/lt.xpi) = 6d75f49612aef91500705b997cf6e9341943d77b834907cdae7bef4ef5272db2
+SIZE (xpi/firefox36-i18n-3.6.20/lt.xpi) = 139686
+SHA256 (xpi/firefox36-i18n-3.6.20/lv.xpi) = c2a422308855a895ff63a4581f2df04b3d2fc43b4be49a56364ad4bc1733b0dd
+SIZE (xpi/firefox36-i18n-3.6.20/lv.xpi) = 124814
+SHA256 (xpi/firefox36-i18n-3.6.20/mk.xpi) = 52bbeb4103ca76a41f988db139ffdfccc278325e2ca8c47594cb3bcc9c52e0e0
+SIZE (xpi/firefox36-i18n-3.6.20/mk.xpi) = 128266
+SHA256 (xpi/firefox36-i18n-3.6.20/ml.xpi) = 6d34b1d5a93a174d7a176d6f718925feec8987cede4d9b3afe6ea573526ebf0f
+SIZE (xpi/firefox36-i18n-3.6.20/ml.xpi) = 152168
+SHA256 (xpi/firefox36-i18n-3.6.20/mr.xpi) = bfdd5f6efad9d792fc465d974fce2874a4ca640f18a55a606e400ff286ccb9f5
+SIZE (xpi/firefox36-i18n-3.6.20/mr.xpi) = 141117
+SHA256 (xpi/firefox36-i18n-3.6.20/nb-NO.xpi) = 5fe9abe93b0b0b635c517350bf6367c3f1c2c5a6c831ecbc284bcdc257edca96
+SIZE (xpi/firefox36-i18n-3.6.20/nb-NO.xpi) = 124101
+SHA256 (xpi/firefox36-i18n-3.6.20/nl.xpi) = 460ead617e9535dfff93bff7e1948ce23695eb65280cd2178317d4bf2f82c457
+SIZE (xpi/firefox36-i18n-3.6.20/nl.xpi) = 126413
+SHA256 (xpi/firefox36-i18n-3.6.20/nn-NO.xpi) = 93934069fabcf268c1e52ea97410727570848c90e5c9da3c96c0e332ee8a2c13
+SIZE (xpi/firefox36-i18n-3.6.20/nn-NO.xpi) = 125104
+SHA256 (xpi/firefox36-i18n-3.6.20/oc.xpi) = 0799a3b93b09d694fff714072d0e44daf9fc4ef7290458585f096ee8f20b3b73
+SIZE (xpi/firefox36-i18n-3.6.20/oc.xpi) = 108305
+SHA256 (xpi/firefox36-i18n-3.6.20/or.xpi) = 1290c4488730c06e42883181dfbd316e0bbdfda9ffd58b0cd68aa69e81b206c6
+SIZE (xpi/firefox36-i18n-3.6.20/or.xpi) = 142446
+SHA256 (xpi/firefox36-i18n-3.6.20/pa-IN.xpi) = 568be3631fad035b4e1d57b10fe4fcdddd3305a77ae4819b23e4bc17431661be
+SIZE (xpi/firefox36-i18n-3.6.20/pa-IN.xpi) = 142118
+SHA256 (xpi/firefox36-i18n-3.6.20/pl.xpi) = 4687703863826186c186819fbdff9fc6769019ba398ea88e4fb4306d9952b6f8
+SIZE (xpi/firefox36-i18n-3.6.20/pl.xpi) = 131010
+SHA256 (xpi/firefox36-i18n-3.6.20/pt-BR.xpi) = 7dcf3798c55c314b25b625b000ea0bce1613d57392151f0909ae4d1c74c86dae
+SIZE (xpi/firefox36-i18n-3.6.20/pt-BR.xpi) = 125361
+SHA256 (xpi/firefox36-i18n-3.6.20/pt-PT.xpi) = cab49b8ba2433ae7cda92b48d6814d37fb4c14418c6e1a13a2973e86a93832ba
+SIZE (xpi/firefox36-i18n-3.6.20/pt-PT.xpi) = 125384
+SHA256 (xpi/firefox36-i18n-3.6.20/rm.xpi) = bb75ac2dc6c37caa2b6bf9b506fe2a19ca5b2d1c19c8f4aedea9afc05e07f02e
+SIZE (xpi/firefox36-i18n-3.6.20/rm.xpi) = 127396
+SHA256 (xpi/firefox36-i18n-3.6.20/ro.xpi) = 61cf46aa559f6863d2838cc73a8c5496fe9b7e81f424d35390d9b15b449ce455
+SIZE (xpi/firefox36-i18n-3.6.20/ro.xpi) = 129135
+SHA256 (xpi/firefox36-i18n-3.6.20/ru.xpi) = 0779469667d0c6520844de7f960b6977640527152a89ce9911ed584949150901
+SIZE (xpi/firefox36-i18n-3.6.20/ru.xpi) = 124911
+SHA256 (xpi/firefox36-i18n-3.6.20/si.xpi) = 767f681e3c023313651b1679f83953977cebcf41690686e23931851c9803c0bd
+SIZE (xpi/firefox36-i18n-3.6.20/si.xpi) = 142227
+SHA256 (xpi/firefox36-i18n-3.6.20/sk.xpi) = 9bd3bac36b73e7b66c529f03dc267784843d81e3ba21e37d445102645dc523a9
+SIZE (xpi/firefox36-i18n-3.6.20/sk.xpi) = 131112
+SHA256 (xpi/firefox36-i18n-3.6.20/sl.xpi) = eaa75ea0ac57fda525773a0fe4f9add4767c84c7800fb5774b5648d0093ad11d
+SIZE (xpi/firefox36-i18n-3.6.20/sl.xpi) = 124259
+SHA256 (xpi/firefox36-i18n-3.6.20/sq.xpi) = 04307e85a43313c9e3108a435aaabd84713dc9dd24c09026216579b587ea4714
+SIZE (xpi/firefox36-i18n-3.6.20/sq.xpi) = 121273
+SHA256 (xpi/firefox36-i18n-3.6.20/sr.xpi) = 2a290c335cff6622030ebcf3e4104812e00f40c8d2723e60ea79de81b66ea446
+SIZE (xpi/firefox36-i18n-3.6.20/sr.xpi) = 135921
+SHA256 (xpi/firefox36-i18n-3.6.20/sv-SE.xpi) = 12aa332d6e01209231ec2da2dd8ceaed8eb219cac85383d3c8f5cd09495c2bb2
+SIZE (xpi/firefox36-i18n-3.6.20/sv-SE.xpi) = 128408
+SHA256 (xpi/firefox36-i18n-3.6.20/ta-LK.xpi) = b06f123cf08690aa5ce0a76d6cf85d42d87548fad1099e89b071330b1cbb7361
+SIZE (xpi/firefox36-i18n-3.6.20/ta-LK.xpi) = 149288
+SHA256 (xpi/firefox36-i18n-3.6.20/ta.xpi) = 5239c863c5f470a3e52dfc97ff0057d770e4ccff97d58aaefc580bad83f09739
+SIZE (xpi/firefox36-i18n-3.6.20/ta.xpi) = 137231
+SHA256 (xpi/firefox36-i18n-3.6.20/te.xpi) = 706ac758aeeaf52b0ba3fe97fe2e5e314a8b3ffb222e78a6be77e5b9d81e7ac6
+SIZE (xpi/firefox36-i18n-3.6.20/te.xpi) = 147868
+SHA256 (xpi/firefox36-i18n-3.6.20/th.xpi) = 0bc1cce51220a03b3697d9d304d9f0c422a7abc2783671e97c59d122dd31b8b6
+SIZE (xpi/firefox36-i18n-3.6.20/th.xpi) = 134397
+SHA256 (xpi/firefox36-i18n-3.6.20/tr.xpi) = 3cae56d25286de466e4133f7ed1c3c9a8f4da76634703b28b090239f972bb1a5
+SIZE (xpi/firefox36-i18n-3.6.20/tr.xpi) = 125330
+SHA256 (xpi/firefox36-i18n-3.6.20/uk.xpi) = 5954d62a55694a26f9b5a8355e78b95b4322e55191baa37266de1067f2a4d545
+SIZE (xpi/firefox36-i18n-3.6.20/uk.xpi) = 143217
+SHA256 (xpi/firefox36-i18n-3.6.20/vi.xpi) = 8986d199d6251ea1325698edcf351c559bf5ebba1083773eb07b72f6b0872453
+SIZE (xpi/firefox36-i18n-3.6.20/vi.xpi) = 129024
+SHA256 (xpi/firefox36-i18n-3.6.20/zh-CN.xpi) = c8b90c078dbfa497040662566b00c6fe54a80c3781b1c840c71adc11f8e335bc
+SIZE (xpi/firefox36-i18n-3.6.20/zh-CN.xpi) = 127092
+SHA256 (xpi/firefox36-i18n-3.6.20/zh-TW.xpi) = 521b0964814ce374e758e046dffc9980c5d7ab1eae3253942705fb3ce5fcd1a2
+SIZE (xpi/firefox36-i18n-3.6.20/zh-TW.xpi) = 128541

Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox36/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox36/Makefile,v 1.242 2011/06/21 20:35:48 flo Exp $
+# $FreeBSD: ports/www/firefox36/Makefile,v 1.245 2011/08/23 18:39:15 kwm Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.6.18
+DISTVERSION=	3.6.20
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -27,8 +28,6 @@
 MOZILLA_SUFX=	3
 MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
 MOZ_TOOLKIT=	cairo-gtk2
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
-			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 
 MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
@@ -38,9 +37,7 @@
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
-CONFLICTS_INSTALL=	firefox-3.5.*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
@@ -86,10 +83,10 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
-post-extract::
+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

Modified: branches/experimental/www/firefox36/distinfo
==============================================================================
--- branches/experimental/www/firefox36/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/firefox36/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (firefox-3.6.18.source.tar.bz2) = 6780185e0ea8e112e337c36bb7b3900ec7b72dd4445e0bd2983b748b84049e04
-SIZE (firefox-3.6.18.source.tar.bz2) = 51553263
+SHA256 (firefox-3.6.20.source.tar.bz2) = 0e8e3110c8cd1f4ad913c3c7424952b1aeebf6b375e8f6b5ccfe3e0b6d8abb18
+SIZE (firefox-3.6.20.source.tar.bz2) = 51564376

Modified: branches/experimental/www/seamonkey-i18n/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.2 2011/08/10 21:32:08 flo Exp $
+# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.5 2011/08/23 08:00:17 ale Exp $
 #
 
 PORTNAME=	seamonkey-i18n
-PORTVERSION=	2.2
+PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	seamonkey/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
@@ -14,12 +15,12 @@
 DIST_SUBDIR=	xpi/${DISTNAME}
 
 MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Localized interface for SeaMonkey 2.2
+COMMENT=	Localized interface for SeaMonkey 2.3
 
 EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
-USE_SEAMONKEY=	yes
-USE_XPI=	*seamonkey
+USE_SEAMONKEY=	23
+USE_XPI=	seamonkey
 
 USE_SUBMAKE=	yes
 
@@ -55,8 +56,10 @@
 		then \
 			exit 1; \
 		fi; \
-		cd ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org/chrome; \
-		${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \
+		cd ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org/chrome/$$lang; \
+		${LOCALBASE}/bin/zip -r ../$$lang.jar locale; \
+		cd ..; ${RM} -rf $$lang; cd ..; \
+		${REINPLACE_CMD} -i "" "s,chrome/$$lang,jar:chrome/$$lang.jar!," chrome.manifest; \
 	done
 
 do-install:

Modified: branches/experimental/www/seamonkey-i18n/Makefile.lang
==============================================================================
--- branches/experimental/www/seamonkey-i18n/Makefile.lang	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey-i18n/Makefile.lang	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,7 +2,7 @@
 # Date created:         30 Nov 2008
 # Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
 #
-# $FreeBSD$
+# $FreeBSD: ports/www/seamonkey-i18n/Makefile.lang,v 1.1 2011/08/01 23:43:20 flo Exp $
 #
 # Currently, the following 22 languages are supported.
 #

Modified: branches/experimental/www/seamonkey-i18n/Makefile.option
==============================================================================
--- branches/experimental/www/seamonkey-i18n/Makefile.option	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey-i18n/Makefile.option	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,7 +2,7 @@
 # Date created:         30 Nov 2008
 # Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
 #
-# $FreeBSD$
+# $FreeBSD: ports/www/seamonkey-i18n/Makefile.option,v 1.1 2011/08/01 23:43:20 flo Exp $
 #
 
 OPTIONS=		LANG_CA "Catalan"               off \

Modified: branches/experimental/www/seamonkey-i18n/distinfo
==============================================================================
--- branches/experimental/www/seamonkey-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,44 +1,44 @@
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ca.langpack.xpi) = 433a6e1dea81a1dbe9fc5f0e360845affb71dec9e3c5a669cc355281f17d70d9
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ca.langpack.xpi) = 811514
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.cs.langpack.xpi) = 666d504cf2d216a7a8de8a13898719da89a42166e4ee1d4c2d2bfcb4c9e39b6e
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.cs.langpack.xpi) = 814944
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.de.langpack.xpi) = 13c3f08bcda947e5c20111a73bee995d5ac8bd97defd8ad235530b61d75de72a
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.de.langpack.xpi) = 857283
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-GB.langpack.xpi) = 8133dc83554f01712330682c2b269ccb2917ee3064ef7394ef9f82db26845932
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-GB.langpack.xpi) = 787529
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-US.langpack.xpi) = 8ac1ce65dc5044deabd9e1b49234f448cff3435b0660e42e091ddb611d219cda
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-US.langpack.xpi) = 786992
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-AR.langpack.xpi) = 4db1673c306b821dca7de124415b4b92c339a076bc7cd38892ae06927659c982
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-AR.langpack.xpi) = 813118
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-ES.langpack.xpi) = 08158721a1122ad6a74f688792e5f7e6e33ce078e1118dd8f13386da6eda6bd9
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-ES.langpack.xpi) = 785711
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fi.langpack.xpi) = a1350aa978c30a71f5ea2a7983bf2bb3f27ad46ad2572d355b565664ebe66804
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fi.langpack.xpi) = 807217
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fr.langpack.xpi) = fcac0a2c51cf193fa2c712670a6c73e94ed58588ddd8dc0ad3e708b777f81842
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fr.langpack.xpi) = 896104
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.hu.langpack.xpi) = 95a1e3f685b74a8d655bdeec7bdb7a8ce88699dff9432483b5cadab3bbe10982
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.hu.langpack.xpi) = 827308
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.it.langpack.xpi) = 28e7b90ff8d7596d7fca6c253d8fd2b1fc9464217cb7fe1a86a4ae9b832a1f8c
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.it.langpack.xpi) = 739672
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja-JP-mac.langpack.xpi) = a83857fdebb8df144e725ccbc399e68447dc887d3539c27be4c2e5dd8ed43796
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja-JP-mac.langpack.xpi) = 885812
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja.langpack.xpi) = ad3d03f42747427c3c862a6a30cb4b513a66fb21a8fee778cc56f3f3a013761e
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja.langpack.xpi) = 861377
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.lt.langpack.xpi) = d129bc0278ca8637df4fe377c29ffcc687d2d20b4de35b7144d83508bfeb6713
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.lt.langpack.xpi) = 959540
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nb-NO.langpack.xpi) = 15818961fa34bc4610fcce26f8bd8885495f030d2ddf5d3f05fa0ee69aafbf96
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nb-NO.langpack.xpi) = 805675
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nl.langpack.xpi) = 34385a5ae09d976b7124366cea2304ce6b4489119c337b175fb9340529324a76
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nl.langpack.xpi) = 804311
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pl.langpack.xpi) = 44e0e2883601f7a71c64e8fad1e5653904dab5f25834cc96b479f7d3efa73f01
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pl.langpack.xpi) = 825438
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pt-PT.langpack.xpi) = d733234dc5b11ea32b611d54efefea31eea331d21555db91712f9810d1f2493c
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pt-PT.langpack.xpi) = 842511
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ru.langpack.xpi) = 15700e56b4ead24fb08c8a65b615343a56f364dee311dc5e808f1055c9277c5a
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ru.langpack.xpi) = 889516
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sk.langpack.xpi) = a25e78e2c9e682910bd6fcdc7639ac7902d07f99ac9ccb85e567bb28606dcfcd
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sk.langpack.xpi) = 840212
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sv-SE.langpack.xpi) = 83b5e7572ed550e299b2813a0826d3760e18fd49b56a3e852f3be32cd133a1fc
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sv-SE.langpack.xpi) = 869508
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.tr.langpack.xpi) = 0bb342f7845493c35f743b3f8589e9fa0d7ed1c283f400eeb929617c13f26f56
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.tr.langpack.xpi) = 805151
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ca.langpack.xpi) = f939aeab00dd7261ed20292b398cb076b279612814289e30665cdba8c44cb50a
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ca.langpack.xpi) = 812149
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.cs.langpack.xpi) = f47e9a26e8124980dd5fce7cb01e56e1196934896a0d753778864fb3d1d94fca
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.cs.langpack.xpi) = 815818
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.de.langpack.xpi) = 275132b2a76da4597510fc5d72fce1840ec580c7a564932a5b94e05511a08e8c
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.de.langpack.xpi) = 858157
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.en-GB.langpack.xpi) = c6cb14d30fd87b2e0d0b250999cfd93bd4475fd3fb2246eb29052a0c351566e2
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.en-GB.langpack.xpi) = 788274
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.en-US.langpack.xpi) = 9cdae61ae3ad0eca8d1f6434cb74b7d838fa8e2c4ab36e84adcf0b7fede34960
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.en-US.langpack.xpi) = 787693
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.es-AR.langpack.xpi) = 883332c947fc4cfd3d81fd1fb9e04df4ba27effd825f702b8a68086995431f3a
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.es-AR.langpack.xpi) = 813751
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.es-ES.langpack.xpi) = ef98e845c899b4ce3649ec657ec879d82fc2a757243d79824871549051f17512
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.es-ES.langpack.xpi) = 786103
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.fi.langpack.xpi) = 860c3283f5358f3bc6fa932c303e2a26f5da14a0200be586641b787b4dc8111d
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.fi.langpack.xpi) = 807886
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.fr.langpack.xpi) = 869c575724c45bc1706b31bdc27b4f7d447fe2b21ec3fb47dd1c25c71e7421f2
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.fr.langpack.xpi) = 896690
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.hu.langpack.xpi) = e61a5870ea87ae690b3f6590ea76ccc43a3074ae30d7f6f58731afc7d8eb98a1
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.hu.langpack.xpi) = 829753
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.it.langpack.xpi) = 889460f7a20d64af6ee6dda56fd7151d301b4c4cdfdb29c7e0184ed84eed4215
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.it.langpack.xpi) = 737251
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ja-JP-mac.langpack.xpi) = 5cddac55b523d88ef02d8a9a2c22bd05d53a6ef2d5aa3101c3249ccbfad26bce
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ja-JP-mac.langpack.xpi) = 886678
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ja.langpack.xpi) = 65b8364f105b62acad9022aadefc79615fc52172d3c84ef9bd51df50b018201d
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ja.langpack.xpi) = 862244
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.lt.langpack.xpi) = bb038f4aea2728f50a3af52e2325a8e798230585f912f0f4eec486699f60f242
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.lt.langpack.xpi) = 960314
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.nb-NO.langpack.xpi) = c2280f1940b79ba1eff704d7cd41a9153c6e065cd742c17edd32a3def70ebbbb
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.nb-NO.langpack.xpi) = 806302
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.nl.langpack.xpi) = 7504a0fb10a25b2af1922ad50914fdb1a0c33f7e8119c34c5ef5638ba06f0a1c
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.nl.langpack.xpi) = 804973
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.pl.langpack.xpi) = 2dca139d0c1f8a002338466cc10e53e34c6cfdb3b43624d36bc9db3e6f95ccc0
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.pl.langpack.xpi) = 826227
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.pt-PT.langpack.xpi) = 04f9e49df4216f4b61df08bdc4e33afe50f908119c0a71705413b850b211055e
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.pt-PT.langpack.xpi) = 843400
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ru.langpack.xpi) = 571f7b6a4e1ebbdb7d0cb0b77dbe379010954fb1570d9fc34054407ff69d12ee
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ru.langpack.xpi) = 889852
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.sk.langpack.xpi) = b8e49d47578eb090f1f10314b687fd815ea2e36a482533d9c1ff00f9854974a0
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.sk.langpack.xpi) = 840864
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.sv-SE.langpack.xpi) = 7f99bb693372633a7f1eec491abcd782b2595aac4783f870bb15d603796fb627
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.sv-SE.langpack.xpi) = 870149
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.tr.langpack.xpi) = 4cfd13af28f092337b5224b1821fa6258f94eddc7763777292c30b8a58742f94
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.tr.langpack.xpi) = 805726

Modified: branches/experimental/www/seamonkey-i18n/pkg-descr
==============================================================================
--- branches/experimental/www/seamonkey-i18n/pkg-descr	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey-i18n/pkg-descr	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,3 +1,3 @@
-Language packs for SeaMonkey 2.1
+Language packs for SeaMonkey
 
 WWW: http://www.seamonkey-project.org/releases/#langpacks

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,12 +2,12 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.301 2011/08/10 21:25:33 flo Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.305 2011/08/25 08:35:59 ale Exp $
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.2
-PORTREVISION=	1
+DISTVERSION=	2.3
+PORTREVISION=	3
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -22,7 +22,6 @@
 
 USE_AUTOTOOLS=	autoconf213
 CONFLICTS_BUILD=	spidermonkey-1.[0-7]*
-CONFLICTS_INSTALL=	seamonkey-2.0*
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GECKO=	gecko
@@ -39,10 +38,9 @@
 
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 
-MOZILLA=	${PORTNAME}-${PORTVERSION}
-MOZILLA_EXEC_NAME=	${PORTNAME}
 MOZ_EXTENSIONS=	default
-MOZ_OPTIONS+=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+MOZ_OPTIONS+=	--program-transform-name='s/seamonkey/${MOZILLA}/' \
+		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 		--enable-svg \
 		--enable-application=suite	\
 		--enable-svg-renderer=cairo	\
@@ -72,8 +70,6 @@
 MOZSRC:=	${WRKDIR}/comm-release/mozilla
 WRKSRC=		${WRKDIR}/comm-release
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -110,7 +106,7 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
@@ -131,7 +127,7 @@
 	@${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:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/toolkit/library/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in
@@ -156,17 +152,18 @@
 		${WRKSRC}/mozilla/js/src/configure.in \
 		${WRKSRC}/mozilla/configure.in \
 		${WRKSRC}/configure.in
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
-		${WRKDIR}/seamonkey.desktop
+		${WRKDIR}/${MOZILLA}.desktop
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})
 	(cd ${MOZSRC} && ${AUTOCONF})
 	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
 
 pre-install:
-	${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST}
+	${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}
 .if defined(WITH_LIGHTNING)
 	@${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \
 		${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST}
@@ -174,7 +171,9 @@
 
 do-install:
 	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${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)

Modified: branches/experimental/www/seamonkey/distinfo
==============================================================================
--- branches/experimental/www/seamonkey/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.2.source.tar.bz2) = 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a
-SIZE (seamonkey-2.2.source.tar.bz2) = 87478968
+SHA256 (seamonkey-2.3.source.tar.bz2) = a709ac32c166448da4c9558ca17809ddbfa87f7e0e2a0638387ae080fb6758a4
+SIZE (seamonkey-2.3.source.tar.bz2) = 87002565

Modified: branches/experimental/www/seamonkey/files/patch-config_autoconf.mk.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-config_autoconf.mk.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey/files/patch-config_autoconf.mk.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig	2009-07-17 15:18:04.000000000 +0200
-+++ config/autoconf.mk.in	2009-08-25 01:15:47.000000000 +0200
-@@ -61,7 +61,7 @@
+--- 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@
@@ -9,3 +9,13 @@
  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

Modified: branches/experimental/www/seamonkey/files/patch-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-configure.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey/files/patch-configure.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,5 +1,5 @@
---- configure.in.orig	2011-07-28 00:58:59.534861026 +0200
-+++ configure.in	2011-07-28 01:00:05.591863508 +0200
+--- configure.in.orig	2011-07-15 07:42:33.000000000 +0200
++++ configure.in	2011-07-22 13:43:44.000000000 +0200
 @@ -1438,7 +1438,7 @@
      CPU_ARCH=sparc
      ;;
@@ -18,3 +18,104 @@
        INTEL_ARCHITECTURE=1
  esac
  
+@@ -1781,7 +1781,7 @@
+     esac
+ 
+     case "${host_cpu}" in
+-    x86_64)
++    amd64 | x86_64)
+         HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
+         ;;
+     esac
+@@ -2437,6 +2437,9 @@
+     x86_64-*)
+     	AC_DEFINE(_AMD64_)
+ 	;;
++    amd64*)
++    	AC_DEFINE(_AMD64_)
++	;;
+     *)
+     	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
+ 	;;
+@@ -2508,7 +2511,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'
+@@ -3326,11 +3329,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
+                 )
+@@ -3405,18 +3408,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
+@@ -3591,7 +3594,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("", "");
+@@ -3612,7 +3615,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";
+@@ -4409,7 +4412,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
+@@ -5966,7 +5969,7 @@
+     i*86)
+       MOZ_CRT_CPU_ARCH=intel
+       ;;
+-    x86_64)
++    amd64 | x86_64)
+       MOZ_CRT_CPU_ARCH=amd64
+       ;;
+     *)

Modified: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,10 +1,41 @@
---- mozilla/js/src/Makefile.in.orig	2009-08-25 18:58:30.000000000 +0200
-+++ mozilla/js/src/Makefile.in	2009-08-25 18:58:47.000000000 +0200
-@@ -428,6 +428,7 @@
+--- mozilla/js/src/Makefile.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/Makefile.in	2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+@@ -469,6 +469,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
+@@ -739,7 +742,7 @@
+ # to reliably get limit macros defined, we'd always have to define the
+ # one below before including any header, but that's obscure and
+ # fragile, so we do it here.
+-DEFINES		+= -D__STDC_LIMIT_MACROS
++DEFINES		+= -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
+ 
+ INCLUDES	+= -I$(srcdir)
+ 
+@@ -793,7 +796,8 @@
+ endif # WINNT
  
  ifeq ($(OS_ARCH),FreeBSD)
- EXTRA_LIBS	+= -pthread
-+LDFLAGS		+= -lc
+-EXTRA_LIBS	+= -pthread
++DEFINES		+= -DFREEBSD
++EXTRA_LIBS	+= -pthread -lc
  endif
  ifeq ($(OS_ARCH),IRIX)
  ifdef USE_N32
+

Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure	Sun Aug 28 15:08:27 2011	(r614)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,26 +0,0 @@
---- mozilla/js/src/configure.orig	2010-10-08 21:56:36.000000000 +0200
-+++ mozilla/js/src/configure	2010-10-10 21:48:36.000000000 +0200
-@@ -5373,7 +5373,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- 
-@@ -7346,14 +7346,6 @@
- EOF
- 
-     ;;
--sparc*-*)
--    ENABLE_TRACEJIT=1
--    NANOJIT_ARCH=Sparc
--    cat >> confdefs.h <<\EOF
--#define JS_CPU_SPARC 1
--EOF
--
--    ;;
- esac
- 
- # Check whether --enable-methodjit or --disable-methodjit was given.

Added: branches/experimental/www/seamonkey/files/patch-mozilla_toolkit_xre_glxtest.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla_toolkit_xre_glxtest.cpp	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,25 @@
+--- 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);
+ }

Modified: branches/experimental/www/seamonkey/files/seamonkey.desktop.in
==============================================================================
--- branches/experimental/www/seamonkey/files/seamonkey.desktop.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey/files/seamonkey.desktop.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -160,10 +160,10 @@
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=seamonkey %U
+Exec=%%MOZILLA%% %U
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=%%PREFIX%%/lib/seamonkey-2.2/chrome/icons/default/default48.png
+Icon=%%MOZILLA%%.png
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;

Modified: branches/experimental/www/seamonkey2-i18n/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey2-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.17 2011/03/03 04:39:49 beat Exp $
+# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.22 2011/08/23 08:01:58 ale Exp $
 #
 
 PORTNAME=	seamonkey2-i18n
 PORTVERSION=	2.0.14
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	seamonkey/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
@@ -16,12 +17,12 @@
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Localized interface for SeaMonkey 2
 
-USE_SEAMONKEY=	yes
-USE_XPI=	*seamonkey
+USE_SEAMONKEY=	20
+USE_XPI=	seamonkey2 linux-seamonkey
 
 USE_SUBMAKE=	yes
 
-WDIR=	langpack-*@seamonkey.mozilla.org
+WDIR=	langpack2-*@seamonkey.mozilla.org
 
 XPI_DISTNAMES=	${SEAMONKEY_I18N_}
 
@@ -36,7 +37,7 @@
 SEAMONKEY_I18N_?=	${SEAMONKEY_I18N}
 
 .for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}=		langpack-${dist}@seamonkey.mozilla.org
+XPI_ID_${dist}=		langpack2-${dist}@seamonkey.mozilla.org
 XPI_FILES_${dist}=	chrome.manifest install.rdf chrome/${dist}.jar
 XPI_DIRS_${dist}=	chrome
 .endfor
@@ -49,7 +50,7 @@
 
 do-extract:
 	@for lang in ${SEAMONKEY_I18N_}; do \
-		if ! (${EXTRACT_CMD} ${_DISTDIR}/seamonkey-${PORTVERSION}.$$lang.langpack.xpi -d ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org);\
+		if ! (${EXTRACT_CMD} ${_DISTDIR}/seamonkey-${PORTVERSION}.$$lang.langpack.xpi -d ${WRKSRC}/langpack2-$$lang@seamonkey.mozilla.org);\
 		then \
 			exit 1; \
 		fi \
@@ -70,7 +71,8 @@
 
 post-patch:
 	${FIND} ${WRKSRC} -name install.rdf -print0 | \
-		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d'
+		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d' \
+			-e 's/\(langpack\)/\12/'
 
 List-Langs:
 	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/${PORTVERSION}/langpack"|\

Modified: branches/experimental/www/seamonkey2/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey2/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.318 2011/03/06 19:46:51 beat Exp $
+# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.322 2011/08/18 09:57:39 ale Exp $
 #
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.0.14
+PORTREVISION=	1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -16,7 +17,6 @@
 COMMENT=	The open source, standards compliant web browser
 
 CONFLICTS_BUILD=	spidermonkey-1.[0-7]*
-CONFLICTS_INSTALL=	seamonkey-1*
 LATEST_LINK=	seamonkey2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -33,7 +33,10 @@
 USE_GCC=	4.2+
 
 MOZ_EXTENSIONS=	default
-MOZ_OPTIONS+=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+MOZILLA_SUFX=	2
+MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
+MOZ_OPTIONS+=	--program-transform-name='s/seamonkey/${MOZILLA}/' \
+		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 		--enable-svg \
 		--enable-application=suite	\
 		--enable-svg-renderer=cairo	\
@@ -141,22 +144,19 @@
 		${WRKSRC}/mozilla/js/src/configure \
 		${WRKSRC}/mozilla/configure \
 		${WRKSRC}/configure
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
-		${WRKDIR}/seamonkey.desktop
-
-port-pre-install:
-	@${REINPLACE_CMD} -e 's|seamonkey-${PORTVERSION}|seamonkey|' \
-		${FAKEDIR}/bin/seamonkey
-	@${RM} -f ${FAKEDIR}/bin/seamonkey.bak
-	${MV} ${FAKEDIR}/lib/seamonkey-${PORTVERSION} ${FAKEDIR}/lib/seamonkey
+		${WRKDIR}/${MOZILLA}.desktop
 
 pre-install:
-	${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST}
+	${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}/seamonkey.desktop ${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
 
 .include <bsd.port.post.mk>

Modified: branches/experimental/www/seamonkey2/files/patch-config_autoconf.mk.in
==============================================================================
--- branches/experimental/www/seamonkey2/files/patch-config_autoconf.mk.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey2/files/patch-config_autoconf.mk.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig	2009-07-17 15:18:04.000000000 +0200
-+++ config/autoconf.mk.in	2009-08-25 01:15:47.000000000 +0200
-@@ -61,7 +61,7 @@
+--- config/autoconf.mk.in.orig	2011-08-17 10:28:51.000000000 +0200
++++ config/autoconf.mk.in	2011-08-17 10:29:26.000000000 +0200
+@@ -62,14 +62,14 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
@@ -9,3 +9,13 @@
  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

Modified: branches/experimental/www/seamonkey2/files/seamonkey.desktop.in
==============================================================================
--- branches/experimental/www/seamonkey2/files/seamonkey.desktop.in	Sun Aug 28 15:01:08 2011	(r614)
+++ branches/experimental/www/seamonkey2/files/seamonkey.desktop.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -160,10 +160,10 @@
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=seamonkey %U
+Exec=%%MOZILLA%% %U
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default48.png
+Icon=%%MOZILLA%%.png
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/Mk/bsd.gecko.mk	Sun Aug 28 15:08:27 2011	(r615)
@@ -4,7 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.33 2011/08/03 22:33:41 flo Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.38 2011/08/20 00:09:08 flo Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -181,9 +181,9 @@
 #                         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 50+ 36+ 50 36
+#                         Available values: yes 60+ 36+ 60 36
 #                         NOTE:
-#                         default value 50 is used in case of USE_FIREFOX=yes
+#                         default value 60 is used in case of USE_FIREFOX=yes
 #
 # USE_FIREFOX_BUILD       Add buildtime dependency on Firefox.
 #                         Available values: see USE_FIREFOX
@@ -192,9 +192,9 @@
 #                         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 22+ 20+ 22 20
+#                         Available values: yes 23+ 20+ 23 20
 #                         NOTE:
-#                         default value 22 is used in case of USE_SEAMONKEY=yes
+#                         default value 23 is used in case of USE_SEAMONKEY=yes
 #
 # USE_SEAMONKEY_BUILD     Add buildtime dependency on SeaMonkey.
 #                         Available values: see USE_SEAMONKEY
@@ -203,9 +203,9 @@
 #                         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 50+ 31+ 50 31
+#                         Available values: yes 60+ 31+ 60 31
 #                         NOTE:
-#                         default value 50 is used in case of USE_THUNDERBIRD=yes
+#                         default value 60 is used in case of USE_THUNDERBIRD=yes
 #
 # USE_THUNDERBIRD_BUILD   Add buildtime dependency on Thunderbird.
 #                         Available values: see USE_THUNDERBIRD
@@ -222,13 +222,13 @@
 _FIREFOX_BUILD_DEPENDS=		yes
 .endif
 
-_FIREFOX_DEFAULT_VERSION=	50
-_FIREFOX_VERSIONS=			50 36
-_FIREFOX_RANGE_VERSIONS=	50+ 36+
+_FIREFOX_DEFAULT_VERSION=	60
+_FIREFOX_VERSIONS=			60 36
+_FIREFOX_RANGE_VERSIONS=	60+ 36+
 
 # For specifying [36, ..]+
-_FIREFOX_36P=	36 ${_FIREFOX_50P}
-_FIREFOX_50P=	50
+_FIREFOX_36P=	36 ${_FIREFOX_60P}
+_FIREFOX_60P=	60
 
 # Set the default Firefox version and check if USE_FIREFOX=yes was given
 .if ${USE_FIREFOX} == "yes"
@@ -236,10 +236,10 @@
 .endif
 
 # Setting/finding Firefox version we want.
-.if exists(${LOCALBASE}/bin/firefox3)
-_FIREFOX_VER!=	${LOCALBASE}/bin/firefox3 --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
-.elif exists(${LOCALBASE}/bin/firefox)
+.if exists(${LOCALBASE}/bin/firefox)
 _FIREFOX_VER!=	${LOCALBASE}/bin/firefox --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.elif exists(${LOCALBASE}/bin/firefox3)
+_FIREFOX_VER!=	${LOCALBASE}/bin/firefox3 --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
 .endif
 
 # Check if installed Firefox version matches the wanted one
@@ -272,7 +272,7 @@
 .endif
 
 # Dependence lines for different Firefox versions
-50_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+60_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
 36_DEPENDS=		${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36
 
 # Add dependencies
@@ -295,12 +295,12 @@
 _SEAMONKEY_BUILD_DEPENDS=	yes
 .endif
 
-_SEAMONKEY_DEFAULT_VERSION=	22
-_SEAMONKEY_VERSIONS=		22 20
-_SEAMONKEY_RANGE_VERSIONS=	22+ 20+
+_SEAMONKEY_DEFAULT_VERSION=	23
+_SEAMONKEY_VERSIONS=		23 20
+_SEAMONKEY_RANGE_VERSIONS=	23+ 20+
 
-# For specifying [22, 20, ..]+
-_SEAMONKEY_22P=	22 ${_SEAMONKEY_20P}
+# For specifying [23, 20, ..]+
+_SEAMONKEY_23P=	23 ${_SEAMONKEY_20P}
 _SEAMONKEY_20P=	20
 
 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given
@@ -311,6 +311,8 @@
 # Setting/finding SeaMonkey version we want.
 .if exists(${LOCALBASE}/bin/seamonkey)
 _SEAMONKEY_VER!=	${LOCALBASE}/bin/seamonkey --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.elif exists(${LOCALBASE}/bin/seamonkey2)
+_SEAMONKEY_VER!=	${LOCALBASE}/bin/seamonkey2 --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/'
 .endif
 
 # Check if installed SeaMonkey version matches the wanted one
@@ -343,8 +345,8 @@
 .endif
 
 # Dependence lines for different SeaMonkey versions
-11_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey
-20_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey2
+23_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+20_DEPENDS=		${LOCALBASE}/lib/seamonkey2/seamonkey:${PORTSDIR}/www/seamonkey2
 
 # Add dependencies
 .if defined(USE_SEAMONKEY)
@@ -366,13 +368,13 @@
 _THUNDERBIRD_BUILD_DEPENDS=		yes
 .endif
 
-_THUNDERBIRD_DEFAULT_VERSION=	50
-_THUNDERBIRD_VERSIONS=			50 31
-_THUNDERBIRD_RANGE_VERSIONS=	50+ 31+
+_THUNDERBIRD_DEFAULT_VERSION=	60
+_THUNDERBIRD_VERSIONS=			60 31
+_THUNDERBIRD_RANGE_VERSIONS=	60+ 31+
 
 # For specifying [31, 30, ..]+
 _THUNDERBIRD_31P=	31 ${_THUNDERBIRD_31P}
-_THUNDERBIRD_50P=	50
+_THUNDERBIRD_60P=	60
 
 # Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
 .if ${USE_THUNDERBIRD} == "yes"
@@ -382,6 +384,8 @@
 # Setting/finding Thunderbird version we want.
 .if exists(${LOCALBASE}/bin/thunderbird)
 _THUNDERBIRD_VER!=	${LOCALBASE}/bin/thunderbird --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.elif exists(${LOCALBASE}/bin/thunderbird3)
+_THUNDERBIRD_VER!=	${LOCALBASE}/bin/thunderbird3 --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/'
 .endif
 
 # Check if installed Thunderbird version matches the wanted one
@@ -414,8 +418,8 @@
 .endif
 
 # Dependence lines for different Thunderbird versions
-50_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
-31_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird3
+60_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+31_DEPENDS=		${LOCALBASE}/lib/thunderbird3/thunderbird:${PORTSDIR}/mail/thunderbird3
 
 # Add dependencies
 .if defined(USE_THUNDERBIRD)
@@ -530,7 +534,6 @@
 PORT_MOZCONFIG?=	${FILESDIR}/mozconfig.in
 MOZCONFIG?=		${WRKSRC}/.mozconfig
 MOZILLA_PLIST_DIRS?=	bin include lib share/idl
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 PKGINSTALL?=	${WRKDIR}/pkg-install
 PKGDEINSTALL?=	${WRKDIR}/pkg-deinstall
 MASTER_MOZDIR?=	${PORTSDIR}/www/seamonkey
@@ -847,11 +850,10 @@
 .endfor
 	@${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \
 		s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \
-		${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*
+		-i '' $$(${REALPATH} ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*)
 .endif
 	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*
-	${RM} -f ${FAKEDIR}/bin/*.bak
+		-i '' $$(${REALPATH} ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*)
 .endif
 
 gecko-create-plist:
@@ -867,7 +869,7 @@
 	${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/ || ${TRUE}
 	${RM} -f ${FAKEDIR}/lib/pkgconfig
 .for dir in ${MOZILLA_PLIST_DIRS}
-	@cd ${FAKEDIR}/${dir} && ${FIND} -H -s * -type f | \
+	@cd ${FAKEDIR}/${dir} && ${FIND} -H -s * ! -type d | \
 		${SED} -e 's|^|${dir}/|' >> ${PLISTF} && \
 		${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLISTD}
@@ -892,11 +894,17 @@
 .for dir in ${MOZILLA_PLIST_DIRS}
 .if !exists(${PREFIX}/${dir})
 	${MKDIR} ${PREFIX}/${dir}
-	${CHMOD} 755 ${PREFIX}/${dir}
 .endif
-	cd ${FAKEDIR}/${dir} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir}
+	${TAR} cf - -C${FAKEDIR}/${dir} -s'|${FAKEDIR}|${PREFIX}|s' . | \
+		${TAR} xof - -C${PREFIX}/${dir}
 .endfor
+.if (${OSVERSION} < 800081 )
+	# XXX: make sure bsdtar(1) corrected symlinks
+	${FIND} ${FAKEDIR} -type l -exec \
+		${ECHO_CMD} stat -f \'${LN} -hfs \"%Y\" \"%N\"\' {} + | \
+		${SED} s'|${FAKEDIR}|${PREFIX}|g' | ${SH} | \
+		${SED} -n s'|${FAKEDIR}|${PREFIX}|p' | ${SH} -x
+.endif
 .for pcfile in ${MOZ_PKGCONFIG_FILES}
 	${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \
 		${PREFIX}/libdata/pkgconfig/${pcfile}.pc

Modified: trunk/deskutils/lightning-thunderbird/Makefile
==============================================================================
--- trunk/deskutils/lightning-thunderbird/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/deskutils/lightning-thunderbird/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,12 +2,12 @@
 # Date created:		2005-02-26
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.39 2011/07/04 20:47:14 flo Exp $
+# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.41 2011/08/23 18:39:01 kwm Exp $
 #
 
 PORTNAME=	lightning
 DISTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	calendar/${PORTNAME}/releases/${DISTVERSION}b2/source
@@ -61,17 +61,15 @@
 EXTRA_PATCHES=	${FILESDIR}/liboggplay_oss
 .endif
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if defined(WITHOUT_DBUS)
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \

Modified: trunk/deskutils/lightning/Makefile
==============================================================================
--- trunk/deskutils/lightning/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/deskutils/lightning/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,7 +2,7 @@
 # Date created:		2005-02-26
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.37 2011/07/04 20:46:09 flo Exp $
+# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.38 2011/08/16 18:36:10 flo Exp $
 #
 
 PORTNAME=	lightning
@@ -61,8 +61,6 @@
 EXTRA_PATCHES=	${FILESDIR}/liboggplay_oss
 .endif
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if defined(WITHOUT_DBUS)
 MOZ_OPTIONS+=	--disable-dbus
 .else
@@ -70,7 +68,7 @@
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \

Modified: trunk/mail/thunderbird-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		29 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.43 2011/06/30 18:19:48 flo Exp $
+# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.47 2011/08/23 08:00:17 ale Exp $
 #
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	5.0
+PORTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -23,18 +24,17 @@
 .endif
 
 NO_BUILD=	yes
-USE_THUNDERBIRD=	yes
-USE_XPI=	*thunderbird
+USE_THUNDERBIRD=	60
+USE_XPI=	thunderbird
 
-THUNDERBIRD_I18N_ALL=	ar bg br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
+THUNDERBIRD_I18N_ALL=	ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
 			fy-NL ga-IE gd gl he hu is it ja ko lt nb-NO nl nn-NO \
-			pa-IN pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk \
-			zh-TW
+			pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk zh-TW
 
 .ifdef PACKAGE_BUILDING
 THUNDERBIRD_I18N?=	all
 .else
-THUNDERBIRD_I18N?=	es-ES pt-BR ru ja de fr pa-IN ko it
+THUNDERBIRD_I18N?=	es-ES pt-BR ru ja de fr ko it
 .endif
 
 .if ${THUNDERBIRD_I18N} == all
@@ -59,8 +59,10 @@
 		then \
 			exit 1; \
 		fi; \
-		cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/chrome; \
-		${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \
+		cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/chrome/$$lang; \
+		${LOCALBASE}/bin/zip -r ../$$lang.jar locale; \
+		cd ..; ${RM} -rf $$lang; cd ..; \
+		${REINPLACE_CMD} -i "" "s,chrome/$$lang,jar:chrome/$$lang.jar!," chrome.manifest; \
 	done
 
 do-install:

Modified: trunk/mail/thunderbird-i18n/distinfo
==============================================================================
--- trunk/mail/thunderbird-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,88 +1,84 @@
-SHA256 (xpi/thunderbird-i18n-5.0/ar.xpi) = bb3f5afa529bb9ad91004d57c2e4ae77266c4fceaac3af13e69b25756c926eec
-SIZE (xpi/thunderbird-i18n-5.0/ar.xpi) = 426291
-SHA256 (xpi/thunderbird-i18n-5.0/bg.xpi) = c19da2505f426dc8d2190db5b6dc3723e92b7f44a48ff03a3b7942b5668a27a7
-SIZE (xpi/thunderbird-i18n-5.0/bg.xpi) = 444151
-SHA256 (xpi/thunderbird-i18n-5.0/br.xpi) = 19c3387c0f66a2787bb1fe7cc89b72d401db476726480e2e7a0e052f4f9e98ac
-SIZE (xpi/thunderbird-i18n-5.0/br.xpi) = 356430
-SHA256 (xpi/thunderbird-i18n-5.0/ca.xpi) = 0e1aedbe17a62ae8b6588ef76aeee7468743835857b13b6fa11dc96ca23ca4aa
-SIZE (xpi/thunderbird-i18n-5.0/ca.xpi) = 407700
-SHA256 (xpi/thunderbird-i18n-5.0/cs.xpi) = af1c3be0944244dff7f35c7d335b2e28385d83e0ea572c4a43e4dfb3cc4d692c
-SIZE (xpi/thunderbird-i18n-5.0/cs.xpi) = 407837
-SHA256 (xpi/thunderbird-i18n-5.0/da.xpi) = 92514d7df29168123279a0b486264d25fdac8ea984d9ea53c1158e0f850fc304
-SIZE (xpi/thunderbird-i18n-5.0/da.xpi) = 350465
-SHA256 (xpi/thunderbird-i18n-5.0/de.xpi) = fcd373a837dcb615b64635d1d2583d55ca5fe36e5dd32f11cdf1c6e50dc656c0
-SIZE (xpi/thunderbird-i18n-5.0/de.xpi) = 406252
-SHA256 (xpi/thunderbird-i18n-5.0/en-GB.xpi) = f7dbb262115a52d4cb6fe2e7119861241b285d08fbdc2a481bc2648bf9bca591
-SIZE (xpi/thunderbird-i18n-5.0/en-GB.xpi) = 381468
-SHA256 (xpi/thunderbird-i18n-5.0/en-US.xpi) = 7f89a05fd921e3fcfe5d83060bac92d4ac54be9dd7b90e9ee2f7b4ae3e7dd99c
-SIZE (xpi/thunderbird-i18n-5.0/en-US.xpi) = 381080
-SHA256 (xpi/thunderbird-i18n-5.0/es-AR.xpi) = 4249e4dd9e39bcfb1d08ce2ebd042fd4ee332b949dadc5b706026130c178523b
-SIZE (xpi/thunderbird-i18n-5.0/es-AR.xpi) = 399330
-SHA256 (xpi/thunderbird-i18n-5.0/es-ES.xpi) = a952b2c5f098a9685b22b72176575c8d8ba70c8415a24fab2b0a7414242690be
-SIZE (xpi/thunderbird-i18n-5.0/es-ES.xpi) = 343865
-SHA256 (xpi/thunderbird-i18n-5.0/et.xpi) = 2dcb8d5086963964889b07d268baa681abc7744fef01219bc8f35db5184822e9
-SIZE (xpi/thunderbird-i18n-5.0/et.xpi) = 399580
-SHA256 (xpi/thunderbird-i18n-5.0/eu.xpi) = 7c940255e7e5dae14fdd725a9a722f13d5aa38eee98ab0f0ff2cca96db98b7cd
-SIZE (xpi/thunderbird-i18n-5.0/eu.xpi) = 395631
-SHA256 (xpi/thunderbird-i18n-5.0/fi.xpi) = ff2a8aae8c48be298d3fdd7b0dc5621eff9af2c43a4a9e42c961fb8ecd9c3db7
-SIZE (xpi/thunderbird-i18n-5.0/fi.xpi) = 400828
-SHA256 (xpi/thunderbird-i18n-5.0/fr.xpi) = 49f54a41e64d53cf78b6576e89341672f16e629e25b3ffe689a71431fc796768
-SIZE (xpi/thunderbird-i18n-5.0/fr.xpi) = 403253
-SHA256 (xpi/thunderbird-i18n-5.0/fy-NL.xpi) = 8f0e32f4bcd7b097d746f7ed376e3ff01a28d2f2e8e02be1a3015853888f7fb0
-SIZE (xpi/thunderbird-i18n-5.0/fy-NL.xpi) = 403075
-SHA256 (xpi/thunderbird-i18n-5.0/ga-IE.xpi) = a69b3a0818b5ab7a6c27298884cb415dec7dc3f96ad4a8b78ef8d6a3d851d2d7
-SIZE (xpi/thunderbird-i18n-5.0/ga-IE.xpi) = 411750
-SHA256 (xpi/thunderbird-i18n-5.0/gd.xpi) = 0c84eec07f1a1f8a122c73b56f079445abdd9f029231f5471aba231cfce92ac4
-SIZE (xpi/thunderbird-i18n-5.0/gd.xpi) = 414203
-SHA256 (xpi/thunderbird-i18n-5.0/gl.xpi) = 794eb2977a964108ef031bc952babee6a0dc0e93d40263ee12297c28187f39b8
-SIZE (xpi/thunderbird-i18n-5.0/gl.xpi) = 398333
-SHA256 (xpi/thunderbird-i18n-5.0/he.xpi) = 3f49799adfe9e65d39639402a7a9ce6f8bcf036fbe25aa4aadd483007172f864
-SIZE (xpi/thunderbird-i18n-5.0/he.xpi) = 415116
-SHA256 (xpi/thunderbird-i18n-5.0/hu.xpi) = 8ea419595e4ef5034296485290cf89dc6091361b8f785be8e137ac37e934ed7e
-SIZE (xpi/thunderbird-i18n-5.0/hu.xpi) = 415270
-SHA256 (xpi/thunderbird-i18n-5.0/is.xpi) = 8cdf6ddaa75c09ed31e57031f242eb56f0bb87dfc3965f019642a0b035664a44
-SIZE (xpi/thunderbird-i18n-5.0/is.xpi) = 401557
-SHA256 (xpi/thunderbird-i18n-5.0/it.xpi) = d995d24b281c79f36026d302ceb73638d156c619c8a29f7eeaa09c05a6edf89d
-SIZE (xpi/thunderbird-i18n-5.0/it.xpi) = 337738
-SHA256 (xpi/thunderbird-i18n-5.0/ja.xpi) = a582214664357c360e2c8aaae8dab7fdd735e9827c8e3f9190542ca85fd89a04
-SIZE (xpi/thunderbird-i18n-5.0/ja.xpi) = 446749
-SHA256 (xpi/thunderbird-i18n-5.0/ko.xpi) = cc629295d61ea7c9f7103a0ddd096af438bd0ef049a6d6d3aef28c1c4104f0b6
-SIZE (xpi/thunderbird-i18n-5.0/ko.xpi) = 358753
-SHA256 (xpi/thunderbird-i18n-5.0/lt.xpi) = bb3e3dde6f71b303cc6a26fc92db9f724c186ab16932cf1532d740decd62a168
-SIZE (xpi/thunderbird-i18n-5.0/lt.xpi) = 523993
-SHA256 (xpi/thunderbird-i18n-5.0/nb-NO.xpi) = 222f84d8e0b791e2b66e76ada384efca190a0cf4c1262d9cb203b506969ae769
-SIZE (xpi/thunderbird-i18n-5.0/nb-NO.xpi) = 396958
-SHA256 (xpi/thunderbird-i18n-5.0/nl.xpi) = b4fd06c5ea15d7ad769f380ce25cd8e2b867f88d49761bc23e1f8e9150a9afa9
-SIZE (xpi/thunderbird-i18n-5.0/nl.xpi) = 397102
-SHA256 (xpi/thunderbird-i18n-5.0/nn-NO.xpi) = 2a8c106becb4d730cd9dc10588ec87fbbb85f55b15575b98a592ae1c63e9eb95
-SIZE (xpi/thunderbird-i18n-5.0/nn-NO.xpi) = 398579
-SHA256 (xpi/thunderbird-i18n-5.0/pa-IN.xpi) = 9f8214b81a7e850cfb1dc977072638578f8fd1cf65b1f6b9235258b86d353c2f
-SIZE (xpi/thunderbird-i18n-5.0/pa-IN.xpi) = 434024
-SHA256 (xpi/thunderbird-i18n-5.0/pl.xpi) = 54586577f86b4d2c39c909c90e80075e9ff521227bd5c4dc5b947ed84d0152da
-SIZE (xpi/thunderbird-i18n-5.0/pl.xpi) = 383672
-SHA256 (xpi/thunderbird-i18n-5.0/pt-BR.xpi) = c3a827b736e999b24098b6bfa37e4442ae835d66d567bba9b50634aff40ec3f7
-SIZE (xpi/thunderbird-i18n-5.0/pt-BR.xpi) = 406009
-SHA256 (xpi/thunderbird-i18n-5.0/pt-PT.xpi) = 76ee0e9bccf2a225b7ead1259ad82ece574d4db64d383bbf540733c202865f0e
-SIZE (xpi/thunderbird-i18n-5.0/pt-PT.xpi) = 402739
-SHA256 (xpi/thunderbird-i18n-5.0/rm.xpi) = aa91f09081aa264b07996f5c5b5f1058ddb5cf12b2bb47c2c4e3cfac1780a8d1
-SIZE (xpi/thunderbird-i18n-5.0/rm.xpi) = 403569
-SHA256 (xpi/thunderbird-i18n-5.0/ru.xpi) = 561e74bae50a7c8a7e436bf70a3188d0e35f8890387d0091178de6c362a3054b
-SIZE (xpi/thunderbird-i18n-5.0/ru.xpi) = 398261
-SHA256 (xpi/thunderbird-i18n-5.0/si.xpi) = 36b97239a8b87c0bb5f3ef50ea51ea485f0a9976fb9cd1dbc0cf09c8382375ef
-SIZE (xpi/thunderbird-i18n-5.0/si.xpi) = 443551
-SHA256 (xpi/thunderbird-i18n-5.0/sk.xpi) = f8d0f45a365df808d2dc9e7d14037440a9883cef4eadb98bfc5048eb089090ed
-SIZE (xpi/thunderbird-i18n-5.0/sk.xpi) = 413255
-SHA256 (xpi/thunderbird-i18n-5.0/sl.xpi) = bed8303d78a69d19f403e881e85756945b06e542a53e2371c7667cd2f5784576
-SIZE (xpi/thunderbird-i18n-5.0/sl.xpi) = 399391
-SHA256 (xpi/thunderbird-i18n-5.0/sq.xpi) = de288e144e65f46d7b6954e828b434cf2fef10444cdc3bdfd09ff015d68a350b
-SIZE (xpi/thunderbird-i18n-5.0/sq.xpi) = 347151
-SHA256 (xpi/thunderbird-i18n-5.0/sv-SE.xpi) = 0e388da663b96521c0f5b1b7942bbbe65073a82cbf4e3e9852baa081decc3f37
-SIZE (xpi/thunderbird-i18n-5.0/sv-SE.xpi) = 467630
-SHA256 (xpi/thunderbird-i18n-5.0/ta-LK.xpi) = 42799b855d5b3563d29e68662c13a06c971449a8c68a543f02155951566f946a
-SIZE (xpi/thunderbird-i18n-5.0/ta-LK.xpi) = 457259
-SHA256 (xpi/thunderbird-i18n-5.0/tr.xpi) = 0f202abbd2758dc8b995f69be7f3c355ffb8fbf42b54382759930274a9917d36
-SIZE (xpi/thunderbird-i18n-5.0/tr.xpi) = 402358
-SHA256 (xpi/thunderbird-i18n-5.0/uk.xpi) = 63af2eed2f83137928019105f737f3512a1cd0d150f4ff47f903644d08455d3a
-SIZE (xpi/thunderbird-i18n-5.0/uk.xpi) = 451686
-SHA256 (xpi/thunderbird-i18n-5.0/zh-TW.xpi) = 48d0ec4797b8ee021e947828d872e682ec56234fba8de6cba5d16ff8cdd7bbc2
-SIZE (xpi/thunderbird-i18n-5.0/zh-TW.xpi) = 419985
+SHA256 (xpi/thunderbird-i18n-6.0/ar.xpi) = 3a451c2f0d127a9d27b8a350b08e4e081ad355465f11340d20cc0e451e8b8a89
+SIZE (xpi/thunderbird-i18n-6.0/ar.xpi) = 427494
+SHA256 (xpi/thunderbird-i18n-6.0/br.xpi) = d38de60d65bea16a779642a2232425d4d17bb4020c8ff2b42c210ce4a4127bd6
+SIZE (xpi/thunderbird-i18n-6.0/br.xpi) = 357402
+SHA256 (xpi/thunderbird-i18n-6.0/ca.xpi) = 9fc006759723c597b6263ba57b84cf295008ebb84bf77c11c16bb585bd2f1b2e
+SIZE (xpi/thunderbird-i18n-6.0/ca.xpi) = 408682
+SHA256 (xpi/thunderbird-i18n-6.0/cs.xpi) = 8251b8f6968ff6c4a085fbc49ad771ec560f6c380477da70d7a05e9076149d1f
+SIZE (xpi/thunderbird-i18n-6.0/cs.xpi) = 409069
+SHA256 (xpi/thunderbird-i18n-6.0/da.xpi) = c5146a29b714fb9ce0f6b1ee026c17875219b2e65aec3142764f0ee0c36e2bc6
+SIZE (xpi/thunderbird-i18n-6.0/da.xpi) = 351543
+SHA256 (xpi/thunderbird-i18n-6.0/de.xpi) = 4e37fdc9e08acdd8c89e896db7d1bcfb0adcd50d95e96723beda486c26c6f6ca
+SIZE (xpi/thunderbird-i18n-6.0/de.xpi) = 407453
+SHA256 (xpi/thunderbird-i18n-6.0/en-GB.xpi) = 0caf4a881992c2d96a37398bc0be126133a2f0a297b9955293bc362885c23889
+SIZE (xpi/thunderbird-i18n-6.0/en-GB.xpi) = 382371
+SHA256 (xpi/thunderbird-i18n-6.0/en-US.xpi) = 030eeb82f4e226f47aacf6d5b51f96f10d6b5cc2569f031c46a0dee0b9c68593
+SIZE (xpi/thunderbird-i18n-6.0/en-US.xpi) = 381945
+SHA256 (xpi/thunderbird-i18n-6.0/es-AR.xpi) = 9042e7533f8d3e86f586907581c2d22710848fe46c26cccfa667a4f2963d35e6
+SIZE (xpi/thunderbird-i18n-6.0/es-AR.xpi) = 400278
+SHA256 (xpi/thunderbird-i18n-6.0/es-ES.xpi) = 97fa112a00644fd8b0ae94fc4638501855876e8270aa14ee739191935d3fa801
+SIZE (xpi/thunderbird-i18n-6.0/es-ES.xpi) = 344500
+SHA256 (xpi/thunderbird-i18n-6.0/et.xpi) = cb2aa30dbd8e3df24ab43bedc7689d12cf529fd44448b93e2080bb13d7b68edd
+SIZE (xpi/thunderbird-i18n-6.0/et.xpi) = 400758
+SHA256 (xpi/thunderbird-i18n-6.0/eu.xpi) = 648eb6a6e6260be9de9ab0a4cbd23d40f3c7ff965039c5d332acf1b0a7924ac8
+SIZE (xpi/thunderbird-i18n-6.0/eu.xpi) = 396653
+SHA256 (xpi/thunderbird-i18n-6.0/fi.xpi) = 86a4fde30c122031b7806107069d9fef605a2f590fc66efb7b456de11af7e42e
+SIZE (xpi/thunderbird-i18n-6.0/fi.xpi) = 401789
+SHA256 (xpi/thunderbird-i18n-6.0/fr.xpi) = d357085563e0edd71241a09ad3d7c63c0737ae3e70cf07692884ae176a648378
+SIZE (xpi/thunderbird-i18n-6.0/fr.xpi) = 404210
+SHA256 (xpi/thunderbird-i18n-6.0/fy-NL.xpi) = d9cab2a49a76da9d421b6969c6f3abf565bd37340c0a69a396a8f6e515db1837
+SIZE (xpi/thunderbird-i18n-6.0/fy-NL.xpi) = 404129
+SHA256 (xpi/thunderbird-i18n-6.0/ga-IE.xpi) = 9e2d5dd92cf1dec950f791e2dfb396da860ca5e666d31b972e6e02613f2c279b
+SIZE (xpi/thunderbird-i18n-6.0/ga-IE.xpi) = 412669
+SHA256 (xpi/thunderbird-i18n-6.0/gd.xpi) = d86e05f537b4746ab655e4161ad1a18d5558645b9b95dc891db713cd21aa8dc2
+SIZE (xpi/thunderbird-i18n-6.0/gd.xpi) = 415265
+SHA256 (xpi/thunderbird-i18n-6.0/gl.xpi) = c3faac2259d7396f34b71f05627dd6e8d62abd617200aae892a26b1d9c4d7742
+SIZE (xpi/thunderbird-i18n-6.0/gl.xpi) = 399351
+SHA256 (xpi/thunderbird-i18n-6.0/he.xpi) = f330351e4f2810da09d08a8332529337484b04512c87e69b70ea815636e423ed
+SIZE (xpi/thunderbird-i18n-6.0/he.xpi) = 415986
+SHA256 (xpi/thunderbird-i18n-6.0/hu.xpi) = 6e5aec41df3d9fcbb7671d5ed0264be96d8a3f3c5d3a18f2cc4db0059fc1d742
+SIZE (xpi/thunderbird-i18n-6.0/hu.xpi) = 416271
+SHA256 (xpi/thunderbird-i18n-6.0/is.xpi) = 05afdf13888edef7fa6e95ac5b088e6828b1ca7d196cced5f13f79090dbd49f5
+SIZE (xpi/thunderbird-i18n-6.0/is.xpi) = 402535
+SHA256 (xpi/thunderbird-i18n-6.0/it.xpi) = e301f259468f0d2f42813fade0942be0d8968db71aaecf89de59be8ec06d6431
+SIZE (xpi/thunderbird-i18n-6.0/it.xpi) = 336843
+SHA256 (xpi/thunderbird-i18n-6.0/ja.xpi) = 1c44d010f91bc71584f4b1551cc6f042f2f54eb23627b733747f346594017330
+SIZE (xpi/thunderbird-i18n-6.0/ja.xpi) = 448030
+SHA256 (xpi/thunderbird-i18n-6.0/ko.xpi) = 1cfecb7fa95016d4063df2fb79c4ba6e25b500074a4535b9fd258804101bf8d7
+SIZE (xpi/thunderbird-i18n-6.0/ko.xpi) = 359873
+SHA256 (xpi/thunderbird-i18n-6.0/lt.xpi) = be7c7e1b88a30b7108c1d3852f22442060d5a358279fe3fa74051f94cb5850e6
+SIZE (xpi/thunderbird-i18n-6.0/lt.xpi) = 525096
+SHA256 (xpi/thunderbird-i18n-6.0/nb-NO.xpi) = 9d0330d71dcab318d34caa04757ee53baadaf33ab84a2485028e2d7df276d31e
+SIZE (xpi/thunderbird-i18n-6.0/nb-NO.xpi) = 397892
+SHA256 (xpi/thunderbird-i18n-6.0/nl.xpi) = f8de141b8eac6c098265c5835cb3477ebb82ce8c98f45bd0df2a13f16d9294c5
+SIZE (xpi/thunderbird-i18n-6.0/nl.xpi) = 398169
+SHA256 (xpi/thunderbird-i18n-6.0/nn-NO.xpi) = 45644c01a20167fea279a9a44f94a37d6e69208ff4adf9fda7ed3007a1aae314
+SIZE (xpi/thunderbird-i18n-6.0/nn-NO.xpi) = 399482
+SHA256 (xpi/thunderbird-i18n-6.0/pl.xpi) = abffe09ca4f72c19d17e6dcbd1d9c2b64bf77170e1c54153a45b2dadb7159250
+SIZE (xpi/thunderbird-i18n-6.0/pl.xpi) = 384740
+SHA256 (xpi/thunderbird-i18n-6.0/pt-BR.xpi) = 3fa4331317435d3cb4376f79dcef4c0af4c820221ac03a456111ce92db17b9c8
+SIZE (xpi/thunderbird-i18n-6.0/pt-BR.xpi) = 406991
+SHA256 (xpi/thunderbird-i18n-6.0/pt-PT.xpi) = 60d724aed7550840d7dfcc7de405117b704f7fdfbec8a34f2ff7999b8569a039
+SIZE (xpi/thunderbird-i18n-6.0/pt-PT.xpi) = 403984
+SHA256 (xpi/thunderbird-i18n-6.0/rm.xpi) = 754aba44bfe48932f30a192d3f7296b8dc8901adda66df5813e0c73dea4f8b54
+SIZE (xpi/thunderbird-i18n-6.0/rm.xpi) = 404561
+SHA256 (xpi/thunderbird-i18n-6.0/ru.xpi) = b0fc8d5d7ff89f1ccc9d662da7e9a3120900e50003a2281f056abfce3708903e
+SIZE (xpi/thunderbird-i18n-6.0/ru.xpi) = 398962
+SHA256 (xpi/thunderbird-i18n-6.0/si.xpi) = f9618dcd779b0a6d3f33d77777e400acf547237ae14269150764df259fb9045a
+SIZE (xpi/thunderbird-i18n-6.0/si.xpi) = 446393
+SHA256 (xpi/thunderbird-i18n-6.0/sk.xpi) = 1f18758211c456335ee335b135c4ad06a20ed734d2abe6541caac589395337ad
+SIZE (xpi/thunderbird-i18n-6.0/sk.xpi) = 414265
+SHA256 (xpi/thunderbird-i18n-6.0/sl.xpi) = 4fc68f3a7f5b15c4e3314c81ad2945be0881d32da94aa9b118c4911031353ed1
+SIZE (xpi/thunderbird-i18n-6.0/sl.xpi) = 400275
+SHA256 (xpi/thunderbird-i18n-6.0/sq.xpi) = e7ef33b2802aa983e3985f6162490f7be6a0ca32d82d2540ea71cbc80102d0b0
+SIZE (xpi/thunderbird-i18n-6.0/sq.xpi) = 348955
+SHA256 (xpi/thunderbird-i18n-6.0/sv-SE.xpi) = 6d5b5c1a48c6a2d5918f534800777ddf5e61b5b81374ccc3bb2cc09fc75a2c52
+SIZE (xpi/thunderbird-i18n-6.0/sv-SE.xpi) = 468587
+SHA256 (xpi/thunderbird-i18n-6.0/ta-LK.xpi) = 6614445d8c29a4287469dc781d62630f580e240b0156931d8f32f886effa1963
+SIZE (xpi/thunderbird-i18n-6.0/ta-LK.xpi) = 463618
+SHA256 (xpi/thunderbird-i18n-6.0/tr.xpi) = 595b22151201dc4b9d08a0321530c1f1f2494d5b6edb5527cd56648b245f1493
+SIZE (xpi/thunderbird-i18n-6.0/tr.xpi) = 403273
+SHA256 (xpi/thunderbird-i18n-6.0/uk.xpi) = a7030f7f6aa9d52b4a39c344ef1d5aeae9114dca9590e2eabf24b3c2849601ec
+SIZE (xpi/thunderbird-i18n-6.0/uk.xpi) = 452775
+SHA256 (xpi/thunderbird-i18n-6.0/zh-TW.xpi) = 5c07cc4f35a827e9b533888cdfb482b44f8cebd2a079b5b370ce656e8ecc8de0
+SIZE (xpi/thunderbird-i18n-6.0/zh-TW.xpi) = 420983

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:			4 September 2003
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.129 2011/07/15 22:20:11 flo Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.133 2011/08/25 08:35:58 ale Exp $
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	5.0
+DISTVERSION=	6.0
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -22,7 +23,6 @@
 
 USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
-CONFLICTS_INSTALL=	thunderbird-3.1*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 
@@ -36,20 +36,19 @@
 USE_GMAKE=	yes
 USE_GL=		gl
 
-MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg
+MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg,websocket
 MOZ_GRAPHICS=	default,-xbm
-MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+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 \
 	--with-system-libevent=${LOCALBASE}
 MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZ_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
-			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 MOZ_PKGCONFIG_FILES=
 
-PORTNAME_ICON=	${PORTNAME}.png
+PORTNAME_ICON=	${MOZILLA}.png
 PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
@@ -59,7 +58,7 @@
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-miramar
+WRKSRC=		${WRKDIR}/comm-release
 MOZSRC:=	${WRKSRC}/mozilla
 
 .if ${ARCH} == powerpc64
@@ -71,8 +70,6 @@
 .endif
 .endif
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -84,7 +81,7 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
@@ -101,15 +98,15 @@
 MOZ_OPTIONS+=	--disable-calendar
 .endif
 
-post-extract::
-	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
+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 \"/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:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/toolkit/library/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in

Modified: trunk/mail/thunderbird/distinfo
==============================================================================
--- trunk/mail/thunderbird/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-5.0.source.tar.bz2) = bb1858dc44e1e9f92b44a1eaf9456190d55b485cf65435266848300ac2b7c5de
-SIZE (thunderbird-5.0.source.tar.bz2) = 86637589
+SHA256 (thunderbird-6.0.source.tar.bz2) = 3c56af448ebd4805c7997d8e0e41f4333d110ad2c4ad4873204bd4d68bbd8189
+SIZE (thunderbird-6.0.source.tar.bz2) = 86286245

Added: trunk/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,8 @@
+--- calendar/base/src/calDateTime.cpp.orig	2011-08-03 20:08:23.361859978 +0200
++++ calendar/base/src/calDateTime.cpp	2011-08-03 20:08:32.351860948 +0200
+@@ -1,4 +1,4 @@
+-/* ***** BEGIN LICENSE BLOCK *****
++/* ***** BEGIN LICENSE BLOCK *****
+  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+  *
+  * The contents of this file are subject to the Mozilla Public License Version

Added: trunk/mail/thunderbird/files/patch-calendar-lightning-install.rdf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-calendar-lightning-install.rdf	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,11 @@
+--- calendar/lightning/install.rdf.orig	2011-08-18 14:35:19.000000000 +0200
++++ calendar/lightning/install.rdf	2011-08-18 14:35:46.000000000 +0200
+@@ -12,7 +12,7 @@
+         <!-- thunderbird -->
+         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+         <em:minVersion>5.0b1</em:minVersion>
+-        <em:maxVersion>5.*</em:maxVersion>
++        <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+ 

Modified: trunk/mail/thunderbird/files/patch-configure.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-configure.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird/files/patch-configure.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,6 @@
---- configure.in.orig	2011-03-14 14:50:16.000000000 +0100
-+++ configure.in	2011-04-22 12:52:35.061444423 +0200
-@@ -1420,7 +1420,7 @@
+--- configure.in.orig	2011-07-15 07:42:33.000000000 +0200
++++ configure.in	2011-07-22 13:43:44.000000000 +0200
+@@ -1438,7 +1438,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,7 +9,7 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -1440,7 +1440,7 @@
+@@ -1458,7 +1458,7 @@
  dnl ===============================================================
  INTEL_ARCHITECTURE=
  case "$OS_TEST" in
@@ -18,7 +18,90 @@
        INTEL_ARCHITECTURE=1
  esac
  
-@@ -4388,7 +4388,7 @@
+@@ -1781,7 +1781,7 @@
+     esac
+ 
+     case "${host_cpu}" in
+-    x86_64)
++    amd64 | x86_64)
+         HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
+         ;;
+     esac
+@@ -2437,6 +2437,9 @@
+     x86_64-*)
+     	AC_DEFINE(_AMD64_)
+ 	;;
++    amd64*)
++    	AC_DEFINE(_AMD64_)
++	;;
+     *)
+     	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
+ 	;;
+@@ -2508,7 +2511,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'
+@@ -3326,11 +3329,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
+                 )
+@@ -3405,18 +3408,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
+@@ -3591,7 +3594,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("", "");
+@@ -3612,7 +3615,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";
+@@ -4409,7 +4412,7 @@
  LDFLAGS=$_SAVE_LDFLAGS
  LIBS=$_SAVE_LIBS
  
@@ -27,3 +110,12 @@
      ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
      ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
  fi
+@@ -5966,7 +5969,7 @@
+     i*86)
+       MOZ_CRT_CPU_ARCH=intel
+       ;;
+-    x86_64)
++    amd64 | x86_64)
+       MOZ_CRT_CPU_ARCH=amd64
+       ;;
+     *)

Modified: trunk/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,25 @@
---- mozilla/js/src/Makefile.in.orig	2011-03-17 18:51:39.000000000 +0100
-+++ mozilla/js/src/Makefile.in	2011-03-18 19:41:09.000000000 +0100
-@@ -612,7 +612,7 @@
+--- mozilla/js/src/Makefile.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/Makefile.in	2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+@@ -469,6 +469,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
+@@ -739,7 +742,7 @@
  # to reliably get limit macros defined, we'd always have to define the
  # one below before including any header, but that's obscure and
  # fragile, so we do it here.
@@ -9,7 +28,7 @@
  
  INCLUDES	+= -I$(srcdir)
  
-@@ -666,7 +666,8 @@
+@@ -793,7 +796,8 @@
  endif # WINNT
  
  ifeq ($(OS_ARCH),FreeBSD)

Modified: trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,33 +1,72 @@
---- mozilla/js/src/configure.in.orig	2010-11-04 21:05:48.000000000 +0100
-+++ mozilla/js/src/configure.in	2010-11-22 21:30:24.000000000 +0100
-@@ -2621,7 +2621,7 @@
+--- mozilla/js/src/configure.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/configure.in	2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+@@ -1495,7 +1495,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
+ esac
+ 
+@@ -2713,7 +2713,7 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
 -x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
      ENABLE_TRACEJIT=1
      NANOJIT_ARCH=X64
      ENABLE_METHODJIT=1
-@@ -2638,11 +2638,6 @@
-     AC_DEFINE(JS_CPU_ARM)
-     AC_DEFINE(JS_NUNBOX32)
+@@ -2723,23 +2723,23 @@
+     AC_DEFINE(JS_CPU_X64)
+     AC_DEFINE(JS_PUNBOX64)
+     ;;
+-arm*-*)
++x86_64*-*)
+     ENABLE_TRACEJIT=1
+-    NANOJIT_ARCH=ARM
++    NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    AC_DEFINE(JS_CPU_ARM)
+-    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_POLYIC_TYPED_ARRAY=1
++    AC_DEFINE(JS_CPU_X64)
++    AC_DEFINE(JS_PUNBOX64)
      ;;
 -sparc*-*)
--    ENABLE_TRACEJIT=1
++arm*-*)
+     ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
++    NANOJIT_ARCH=ARM
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    ENABLE_POLYIC_TYPED_ARRAY=1
 -    AC_DEFINE(JS_CPU_SPARC)
--    ;;
++    AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
  esac
- 
- MOZ_ARG_DISABLE_BOOL(methodjit,
-@@ -2693,7 +2688,7 @@
+@@ -2796,6 +2796,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
++    AC_DEFINE(AVMPLUS_AMD64)
++    AC_DEFINE(AVMPLUS_64BIT)
++    ;;
+ x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
-     ;;
-

Deleted: trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp	Sun Aug 28 15:08:27 2011	(r614)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/js/src/jsnativestack.cpp~
-+++ mozilla/js/src/jsnativestack.cpp
-@@ -50,7 +50,8 @@
- #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
- # include <pthread.h>
- 
--# if defined(__FreeBSD__)
-+# if defined(FREEBSD)
-+#  include <cstddef>
- #  include <pthread_np.h>
- # endif

Modified: trunk/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,14 +1,15 @@
---- mozilla/layout/generic/Makefile.in.orig	2011-05-28 15:25:03.000000000 +0200
-+++ mozilla/layout/generic/Makefile.in	2011-06-03 08:21:03.853676671 +0200
-@@ -160,9 +160,10 @@
+--- 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)/../../modules/plugin/base/src \
+ 		-I$(srcdir)/../../dom/plugins/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++ CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
 +
  ifdef MOZ_ENABLE_GTK2
  CXXFLAGS += $(MOZ_GTK2_CFLAGS)
  endif
+

Added: trunk/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-mozilla_toolkit_xre_glxtest.cpp	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,25 @@
+--- 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);
+ }

Modified: trunk/mail/thunderbird/files/thunderbird.desktop.in
==============================================================================
--- trunk/mail/thunderbird/files/thunderbird.desktop.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird/files/thunderbird.desktop.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -3,7 +3,7 @@
 Name=Thunderbird
 GenericName=Mail Client
 Comment=Mail client and News Reader
-Exec=thunderbird %U
+Exec=@MOZILLA@ %U
 Icon=@PORTNAME_ICON@
 StartupNotify=false
 Terminal=false

Modified: trunk/mail/thunderbird3-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird3-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird3-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		29 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.47 2011/07/01 14:45:45 flo Exp $
+# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.50 2011/08/18 10:29:59 ale Exp $
 #
 
-PORTNAME=	thunderbird-i18n
-PORTVERSION=	3.1.11
+PORTNAME=	thunderbird3-i18n
+PORTVERSION=	3.1.12
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -20,11 +21,9 @@
 RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
 .endif
 
-LATEST_LINK=	thunderbird3-i18n
-
 NO_BUILD=	yes
 USE_THUNDERBIRD=	31
-USE_XPI=	*thunderbird*
+USE_XPI=	thunderbird3 linux-thunderbird
 
 THUNDERBIRD_I18N_ALL=	af ar be bg bn-BD ca cs da de el en-GB en-US es-AR es-ES \
 			et eu fi fr fy-NL ga-IE he hu id is it ja ko lt nb-NO nl \
@@ -42,11 +41,11 @@
 .endif
 THUNDERBIRD_I18N_?=	${THUNDERBIRD_I18N}
 
-WDIR=	langpack-*@thunderbird.mozilla.org
+WDIR=	langpack3-*@thunderbird.mozilla.org
 
 XPI_DISTNAMES=	${THUNDERBIRD_I18N_}
 .for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}=		langpack-${dist}@thunderbird.mozilla.org
+XPI_ID_${dist}=		langpack3-${dist}@thunderbird.mozilla.org
 XPI_FILES_${dist}=	chrome.manifest install.rdf chrome/${dist}.jar defaults/pref/all-l10n.js
 XPI_DIRS_${dist}=	chrome defaults/pref defaults
 .endfor
@@ -55,7 +54,7 @@
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR} ${WRKSRC}
 	@for lang in ${THUNDERBIRD_I18N_}; do \
-		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\
+		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack3-$$lang@thunderbird.mozilla.org);\
 		then \
 			exit 1; \
 		fi \
@@ -75,7 +74,8 @@
 
 post-patch:
 	${FIND} ${WRKSRC} -name install.rdf -print0 | \
-		${XARGS} -0L1 ${REINPLACE_CMD} -i '' '/<?xml/,$$!d'
+		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d' \
+			-e 's/\(langpack\)/\13/'
 
 list-langs:
 	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/${MASTER_SITE_SUBDIR}"|\

Modified: trunk/mail/thunderbird3-i18n/distinfo
==============================================================================
--- trunk/mail/thunderbird3-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird3-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,92 +1,92 @@
-SHA256 (xpi/thunderbird-i18n-3.1.11/af.xpi) = d2676300f8fea683c381b07c046316cc9259b2ec762642cbd9bcb66214d0dc2f
-SIZE (xpi/thunderbird-i18n-3.1.11/af.xpi) = 210615
-SHA256 (xpi/thunderbird-i18n-3.1.11/ar.xpi) = 30649cdcc5cce17c0322932698133efb3ecae0da3bed18b5622a2029be4c812a
-SIZE (xpi/thunderbird-i18n-3.1.11/ar.xpi) = 230384
-SHA256 (xpi/thunderbird-i18n-3.1.11/be.xpi) = b5d2d70496baf0cd5475ed416dbcc87110eab7163eabe71c4291cf7332ad1d0a
-SIZE (xpi/thunderbird-i18n-3.1.11/be.xpi) = 194430
-SHA256 (xpi/thunderbird-i18n-3.1.11/bg.xpi) = 2b4b023866113eccb07e5090852d410d6d85d2f071178ed4fc4d30934a451eb3
-SIZE (xpi/thunderbird-i18n-3.1.11/bg.xpi) = 235125
-SHA256 (xpi/thunderbird-i18n-3.1.11/bn-BD.xpi) = 18e0cf60c411be7a7ad29f0e8f20dddd598703979df2c7a65549738aad47671e
-SIZE (xpi/thunderbird-i18n-3.1.11/bn-BD.xpi) = 244827
-SHA256 (xpi/thunderbird-i18n-3.1.11/ca.xpi) = 5e1b3002068406612f13b68514a6f44b9ffc30c70dab159172ddd48884c929db
-SIZE (xpi/thunderbird-i18n-3.1.11/ca.xpi) = 219359
-SHA256 (xpi/thunderbird-i18n-3.1.11/cs.xpi) = de60a3b46922507659a804f8d4c22481b1c3de8e1d08d6f85baa9e7a51b9cd37
-SIZE (xpi/thunderbird-i18n-3.1.11/cs.xpi) = 218194
-SHA256 (xpi/thunderbird-i18n-3.1.11/da.xpi) = a609ed3e1fcf4ae4ba36fffcf0b3b6a1ec421b3651a26c96a2db4f625e8954a9
-SIZE (xpi/thunderbird-i18n-3.1.11/da.xpi) = 203226
-SHA256 (xpi/thunderbird-i18n-3.1.11/de.xpi) = 8c66b7b527e025e148f11fbe19fd0b8acc45bf8b2baac6400cbb30b248c9c355
-SIZE (xpi/thunderbird-i18n-3.1.11/de.xpi) = 222817
-SHA256 (xpi/thunderbird-i18n-3.1.11/el.xpi) = 0bfe08f807b4b529bf12053526c803fa104b6c38d132f8f262a498f846ca9762
-SIZE (xpi/thunderbird-i18n-3.1.11/el.xpi) = 210073
-SHA256 (xpi/thunderbird-i18n-3.1.11/en-GB.xpi) = 0e8bfde8e4e442f03afb8f9d85deb1b7b99324194ad9306dd771305ce60d1a11
-SIZE (xpi/thunderbird-i18n-3.1.11/en-GB.xpi) = 203675
-SHA256 (xpi/thunderbird-i18n-3.1.11/en-US.xpi) = e9d8815a034151824700b22daadeaf196e8c3fef3620542d0345a7c43fc0a9ab
-SIZE (xpi/thunderbird-i18n-3.1.11/en-US.xpi) = 202586
-SHA256 (xpi/thunderbird-i18n-3.1.11/es-AR.xpi) = ee7e5ffb47d60e47dcd1c40f747541a358eca46b2cc3d950921d144b2dd7e1c7
-SIZE (xpi/thunderbird-i18n-3.1.11/es-AR.xpi) = 218588
-SHA256 (xpi/thunderbird-i18n-3.1.11/es-ES.xpi) = 691410443b2ea2db2b7ced24de3c0628985991ce55e35200ddf474bb93110dc1
-SIZE (xpi/thunderbird-i18n-3.1.11/es-ES.xpi) = 172879
-SHA256 (xpi/thunderbird-i18n-3.1.11/et.xpi) = e4fe7777c73d32cf64bc8d4689d18e7e4f670d8f965bfdd3edcad81bceee3091
-SIZE (xpi/thunderbird-i18n-3.1.11/et.xpi) = 221753
-SHA256 (xpi/thunderbird-i18n-3.1.11/eu.xpi) = 84793c78d3d9120adc189df98c94c4d73511d7f805449fc67a43d4a6482990a3
-SIZE (xpi/thunderbird-i18n-3.1.11/eu.xpi) = 211283
-SHA256 (xpi/thunderbird-i18n-3.1.11/fi.xpi) = 786054a681a8a7077f1810930c9210fbd0e9ec708e58b344840cfdb2241f3afa
-SIZE (xpi/thunderbird-i18n-3.1.11/fi.xpi) = 219474
-SHA256 (xpi/thunderbird-i18n-3.1.11/fr.xpi) = 184cfde6453301b5fdfa0549a5793134917f9d3729a953e280161ec9a2cbc9de
-SIZE (xpi/thunderbird-i18n-3.1.11/fr.xpi) = 221771
-SHA256 (xpi/thunderbird-i18n-3.1.11/fy-NL.xpi) = c71c158840e3f7c9a2b48db7c4eb887783983e0d221ffacc08ca6a34226509ff
-SIZE (xpi/thunderbird-i18n-3.1.11/fy-NL.xpi) = 220800
-SHA256 (xpi/thunderbird-i18n-3.1.11/ga-IE.xpi) = a809fabd7328ecb5e60b9bb6626abd5e44fa8078ac5d597ecd4dfdf5f8d597cf
-SIZE (xpi/thunderbird-i18n-3.1.11/ga-IE.xpi) = 219429
-SHA256 (xpi/thunderbird-i18n-3.1.11/he.xpi) = 05d3daad9c69694611513fcbb7dd63ec99468412d6e076d3a8c774fb4f4092a8
-SIZE (xpi/thunderbird-i18n-3.1.11/he.xpi) = 204908
-SHA256 (xpi/thunderbird-i18n-3.1.11/hu.xpi) = 6210fc89e67c1f08c4260b23b5a114114df852498d271ec839bc7b5a0a929257
-SIZE (xpi/thunderbird-i18n-3.1.11/hu.xpi) = 226159
-SHA256 (xpi/thunderbird-i18n-3.1.11/id.xpi) = b1de7097b7be766685aedbe814b1c8a2b2e9c08b393fcd5cb9ae987d20ce9120
-SIZE (xpi/thunderbird-i18n-3.1.11/id.xpi) = 185845
-SHA256 (xpi/thunderbird-i18n-3.1.11/is.xpi) = b4446bcc95fa68bda9f8f1880f1b60f9aecffa28db1d4493130572b5d66b6c02
-SIZE (xpi/thunderbird-i18n-3.1.11/is.xpi) = 214017
-SHA256 (xpi/thunderbird-i18n-3.1.11/it.xpi) = c450d0f68c2f0982fc9cc9f3279439715d7b8fa7559bb75bb59b31955ef671b7
-SIZE (xpi/thunderbird-i18n-3.1.11/it.xpi) = 171393
-SHA256 (xpi/thunderbird-i18n-3.1.11/ja.xpi) = c2191f03aca9b32ac07a7d195f64424a3f1d5ed82d8a75c4a0b7c0dffc5d4b55
-SIZE (xpi/thunderbird-i18n-3.1.11/ja.xpi) = 236626
-SHA256 (xpi/thunderbird-i18n-3.1.11/ko.xpi) = f53b79ffa380f54b226a3a61e2d2277742cf70527e4c186f019d651e1d26f3b3
-SIZE (xpi/thunderbird-i18n-3.1.11/ko.xpi) = 194783
-SHA256 (xpi/thunderbird-i18n-3.1.11/lt.xpi) = 1648ea194666162de0c8ad742df2fcc673916b2b342511cb6f2944f48f27654c
-SIZE (xpi/thunderbird-i18n-3.1.11/lt.xpi) = 235296
-SHA256 (xpi/thunderbird-i18n-3.1.11/nb-NO.xpi) = 6dd25c3ba6b5c482a4ea124111b61d6d43e0d791d4c9944a1cfa736a111efbc5
-SIZE (xpi/thunderbird-i18n-3.1.11/nb-NO.xpi) = 213869
-SHA256 (xpi/thunderbird-i18n-3.1.11/nl.xpi) = 6d98d6181ed04ca66798a3e8511b650ab4cb301400685cc065da69e950d1dc7f
-SIZE (xpi/thunderbird-i18n-3.1.11/nl.xpi) = 216584
-SHA256 (xpi/thunderbird-i18n-3.1.11/nn-NO.xpi) = 3a9ab5f556968292866f5a492406d4c09f10dde4fb0f6165486f6602115cad72
-SIZE (xpi/thunderbird-i18n-3.1.11/nn-NO.xpi) = 215631
-SHA256 (xpi/thunderbird-i18n-3.1.11/pa-IN.xpi) = 654ee53022ee53a75b9716775ab0e5421b04923178c0ba3d307b46b3897a48f8
-SIZE (xpi/thunderbird-i18n-3.1.11/pa-IN.xpi) = 241100
-SHA256 (xpi/thunderbird-i18n-3.1.11/pl.xpi) = d4ba0ba503d213a4a821ab99678743bd156540ae1a7459b80fa4e078c46ed3b3
-SIZE (xpi/thunderbird-i18n-3.1.11/pl.xpi) = 203878
-SHA256 (xpi/thunderbird-i18n-3.1.11/pt-BR.xpi) = c0529bf7af12a245b7c55f5e0c3c9d9ee4e8f168462a123cc8d91983ad21d44c
-SIZE (xpi/thunderbird-i18n-3.1.11/pt-BR.xpi) = 215018
-SHA256 (xpi/thunderbird-i18n-3.1.11/pt-PT.xpi) = ed8f735f7433dbe78c2a767d7dfb65e165d7946a256a0bdc600f05fd6f222b67
-SIZE (xpi/thunderbird-i18n-3.1.11/pt-PT.xpi) = 214252
-SHA256 (xpi/thunderbird-i18n-3.1.11/ro.xpi) = 53b54449117ee582197c97b527a5a2f3213e6be575ba5c1853bd7d5e062b1fce
-SIZE (xpi/thunderbird-i18n-3.1.11/ro.xpi) = 221215
-SHA256 (xpi/thunderbird-i18n-3.1.11/ru.xpi) = e1d500dd8c51cbe585e4c0702bfdf6ba5e6aef61064703718dd33ee6a3f4170a
-SIZE (xpi/thunderbird-i18n-3.1.11/ru.xpi) = 198272
-SHA256 (xpi/thunderbird-i18n-3.1.11/si.xpi) = 23fee1ef7b12266892d0c8311a6bb0c54299dd477c5bcc1bfc9502b9c2f415a4
-SIZE (xpi/thunderbird-i18n-3.1.11/si.xpi) = 246153
-SHA256 (xpi/thunderbird-i18n-3.1.11/sk.xpi) = 2ae452e53ce3ace687d5ca6d413cd50f68c947568fe96a598bf78be3bb1f7811
-SIZE (xpi/thunderbird-i18n-3.1.11/sk.xpi) = 224600
-SHA256 (xpi/thunderbird-i18n-3.1.11/sl.xpi) = cd04565d38131759fc2ab455cd94e228f3d1f4ae351ed75544eb75b26b224b64
-SIZE (xpi/thunderbird-i18n-3.1.11/sl.xpi) = 218485
-SHA256 (xpi/thunderbird-i18n-3.1.11/sq.xpi) = 8a9443f06d1bd34f282639fc9ea127a851ab46387213e32aca4960f730ab99aa
-SIZE (xpi/thunderbird-i18n-3.1.11/sq.xpi) = 211283
-SHA256 (xpi/thunderbird-i18n-3.1.11/sv-SE.xpi) = 42b9e49a41d0684937cbcb3576dfb962cd721cd09415d96373c36e216611769d
-SIZE (xpi/thunderbird-i18n-3.1.11/sv-SE.xpi) = 221171
-SHA256 (xpi/thunderbird-i18n-3.1.11/tr.xpi) = 8d458a6eded9e4eb0985b9601918f7424922db549e4fd6eece7889b670b79202
-SIZE (xpi/thunderbird-i18n-3.1.11/tr.xpi) = 215821
-SHA256 (xpi/thunderbird-i18n-3.1.11/uk.xpi) = 0df41a6bf414778e9274dad896b3d8e116a3994564bf6e74fdda87e4edc83b7c
-SIZE (xpi/thunderbird-i18n-3.1.11/uk.xpi) = 244808
-SHA256 (xpi/thunderbird-i18n-3.1.11/zh-CN.xpi) = c8c3b092a4a999bb30d47797f9c0850634282ad561a233132f28ced48a0be01f
-SIZE (xpi/thunderbird-i18n-3.1.11/zh-CN.xpi) = 219649
-SHA256 (xpi/thunderbird-i18n-3.1.11/zh-TW.xpi) = 5719a75ab55111a2adfff2c982aa7fba6dae91e0977479060f2bf259c2de9024
-SIZE (xpi/thunderbird-i18n-3.1.11/zh-TW.xpi) = 220607
+SHA256 (xpi/thunderbird3-i18n-3.1.12/af.xpi) = 00d47a4b1443689a328d4903ccea06a058d2d847789442d4a044212bb6813b56
+SIZE (xpi/thunderbird3-i18n-3.1.12/af.xpi) = 210617
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ar.xpi) = 706f67296c7058d694c712964239b44dcfc4a93ab1148b70fee22ed1056c6832
+SIZE (xpi/thunderbird3-i18n-3.1.12/ar.xpi) = 230333
+SHA256 (xpi/thunderbird3-i18n-3.1.12/be.xpi) = 20fb419f9da957b5130a01fe590b134bb5c4f0da7b43a5c1d6a8c6912fb4bd7a
+SIZE (xpi/thunderbird3-i18n-3.1.12/be.xpi) = 194476
+SHA256 (xpi/thunderbird3-i18n-3.1.12/bg.xpi) = 411b87b6af8874d10c7a0dfd8844ec353b4ca0ad029f8a6c91dfefb4defd9289
+SIZE (xpi/thunderbird3-i18n-3.1.12/bg.xpi) = 235184
+SHA256 (xpi/thunderbird3-i18n-3.1.12/bn-BD.xpi) = d54b48d3a23a1f7a2a54b07f14e2cecc0459e5b5ab46e020d8236ce8677dcc7c
+SIZE (xpi/thunderbird3-i18n-3.1.12/bn-BD.xpi) = 244805
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ca.xpi) = 2c95d2ad962eee598dc9f191e28174abb7c480a75e14dc8197747080e0d1a5f2
+SIZE (xpi/thunderbird3-i18n-3.1.12/ca.xpi) = 219314
+SHA256 (xpi/thunderbird3-i18n-3.1.12/cs.xpi) = a5f093964b19436d49e4bcf7f02ca3934cf798fcf7faae9ecc2bbb1dc9737fc4
+SIZE (xpi/thunderbird3-i18n-3.1.12/cs.xpi) = 218130
+SHA256 (xpi/thunderbird3-i18n-3.1.12/da.xpi) = 85e0e1a4c13d47674968bcde41e44ed381d7dc8bcc05a12a81fb339de6781231
+SIZE (xpi/thunderbird3-i18n-3.1.12/da.xpi) = 203150
+SHA256 (xpi/thunderbird3-i18n-3.1.12/de.xpi) = 6b2b729105a56c257f1f208ed8e226c339484d4b6ea0f90fa03bcf6a00bc7afa
+SIZE (xpi/thunderbird3-i18n-3.1.12/de.xpi) = 222818
+SHA256 (xpi/thunderbird3-i18n-3.1.12/el.xpi) = 2186af3dfe77557537754183c5192591b3f96ea2e059f2a23763c541878b7b49
+SIZE (xpi/thunderbird3-i18n-3.1.12/el.xpi) = 210070
+SHA256 (xpi/thunderbird3-i18n-3.1.12/en-GB.xpi) = 726b213dedb8e38b2d95369383d366e85867afcc3f5ebc4b1b96b702299cd8b9
+SIZE (xpi/thunderbird3-i18n-3.1.12/en-GB.xpi) = 203673
+SHA256 (xpi/thunderbird3-i18n-3.1.12/en-US.xpi) = 88745ab8c67fdeb350eab42f048832a882200d6dfce176efadcc6d0d1bfe2718
+SIZE (xpi/thunderbird3-i18n-3.1.12/en-US.xpi) = 202539
+SHA256 (xpi/thunderbird3-i18n-3.1.12/es-AR.xpi) = f9ea5829b19328acd7932a7cdad7b38450a369806acf38788890dd5f59c3682e
+SIZE (xpi/thunderbird3-i18n-3.1.12/es-AR.xpi) = 218585
+SHA256 (xpi/thunderbird3-i18n-3.1.12/es-ES.xpi) = 83e3620f77f374ec881418babb8d23e4850bffd25f7cff332a052f0242b6eb22
+SIZE (xpi/thunderbird3-i18n-3.1.12/es-ES.xpi) = 172931
+SHA256 (xpi/thunderbird3-i18n-3.1.12/et.xpi) = 98dae9caad40aa545e1746436a03471a3a40771232479af4b6eabd17c26f7264
+SIZE (xpi/thunderbird3-i18n-3.1.12/et.xpi) = 221757
+SHA256 (xpi/thunderbird3-i18n-3.1.12/eu.xpi) = e44d496e1044e8731e5614e0aeed0726f218ec37945efd3cbcd7f0b643a03b97
+SIZE (xpi/thunderbird3-i18n-3.1.12/eu.xpi) = 211336
+SHA256 (xpi/thunderbird3-i18n-3.1.12/fi.xpi) = 11eb1836e1bfd91cd4ff20cf5f4e6f2e37e3d5ae1ca00eafe9dfcef52893aa51
+SIZE (xpi/thunderbird3-i18n-3.1.12/fi.xpi) = 219509
+SHA256 (xpi/thunderbird3-i18n-3.1.12/fr.xpi) = d1d0a71e0a2dd573de890af44471d8c939b4e49d03da6dde14b782a08a8b16fa
+SIZE (xpi/thunderbird3-i18n-3.1.12/fr.xpi) = 221711
+SHA256 (xpi/thunderbird3-i18n-3.1.12/fy-NL.xpi) = e995d2bf4734b4c3f9e640ccf68a3838d5ce8847d13673d6157a1c3b0006078e
+SIZE (xpi/thunderbird3-i18n-3.1.12/fy-NL.xpi) = 220856
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ga-IE.xpi) = f926f0c86e6be92ffb1887c8f9a345ad1cedfecb16f513f5ed7224b98df56d60
+SIZE (xpi/thunderbird3-i18n-3.1.12/ga-IE.xpi) = 219479
+SHA256 (xpi/thunderbird3-i18n-3.1.12/he.xpi) = afe05e430e17eb4a8bdca70419c64d374d64b21a53fa7b5474dd7d81816f5873
+SIZE (xpi/thunderbird3-i18n-3.1.12/he.xpi) = 204926
+SHA256 (xpi/thunderbird3-i18n-3.1.12/hu.xpi) = 0b4489ffde1978c1eef53553142e76e92d047d6e861120b70fde7a56462c4c12
+SIZE (xpi/thunderbird3-i18n-3.1.12/hu.xpi) = 226142
+SHA256 (xpi/thunderbird3-i18n-3.1.12/id.xpi) = 3ead769425abb01fbfbdcdb6a7c31c093634d86d6a5ed26b9a1024fa09bf0d70
+SIZE (xpi/thunderbird3-i18n-3.1.12/id.xpi) = 185890
+SHA256 (xpi/thunderbird3-i18n-3.1.12/is.xpi) = 98d3332b4f99cf093226fce7d7c5ce815299f47e13077e7759584413ac412005
+SIZE (xpi/thunderbird3-i18n-3.1.12/is.xpi) = 214065
+SHA256 (xpi/thunderbird3-i18n-3.1.12/it.xpi) = 0a6b16afd2c2fb6093fe7ae2ef97ccb3982693c23b1ac736ab861d2243598a0a
+SIZE (xpi/thunderbird3-i18n-3.1.12/it.xpi) = 171387
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ja.xpi) = 30c9fec8e2bff232b784b597d61d0fff279ee99ae6a26696df59c53dec3db437
+SIZE (xpi/thunderbird3-i18n-3.1.12/ja.xpi) = 236588
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ko.xpi) = a69cb2617626c1a1971a88247e3a0426c7864304e02f3605c01bc6705695ce9b
+SIZE (xpi/thunderbird3-i18n-3.1.12/ko.xpi) = 194778
+SHA256 (xpi/thunderbird3-i18n-3.1.12/lt.xpi) = ce31c1996711fcd8a456d2498190cb06761e7ba31f8b77821975da7bfa679955
+SIZE (xpi/thunderbird3-i18n-3.1.12/lt.xpi) = 235350
+SHA256 (xpi/thunderbird3-i18n-3.1.12/nb-NO.xpi) = 60bccb04cbf09e20d4c52b18e7d885935c2e2d8901409c5340692dcd1f455471
+SIZE (xpi/thunderbird3-i18n-3.1.12/nb-NO.xpi) = 213922
+SHA256 (xpi/thunderbird3-i18n-3.1.12/nl.xpi) = b80baa65a3cab1f8bfbed5f174323b5e09516158c8ca88509080e13b6c52d888
+SIZE (xpi/thunderbird3-i18n-3.1.12/nl.xpi) = 216576
+SHA256 (xpi/thunderbird3-i18n-3.1.12/nn-NO.xpi) = 84545f62247649930cf0fda31f39f5d3da9d16f77bf185b75dce3d4ab05bc117
+SIZE (xpi/thunderbird3-i18n-3.1.12/nn-NO.xpi) = 215657
+SHA256 (xpi/thunderbird3-i18n-3.1.12/pa-IN.xpi) = 86aedc7febd97af086ba492535fce9e48be99b2313c685761f591afd30471cde
+SIZE (xpi/thunderbird3-i18n-3.1.12/pa-IN.xpi) = 241063
+SHA256 (xpi/thunderbird3-i18n-3.1.12/pl.xpi) = 80356ac8db5f20c82ce254a9b65ae45bc2d7a24fd732f258c31cdf08c33115cc
+SIZE (xpi/thunderbird3-i18n-3.1.12/pl.xpi) = 203883
+SHA256 (xpi/thunderbird3-i18n-3.1.12/pt-BR.xpi) = 2f2ff15fd8db8d2d16c54d10ed9fd9af54bcf519c9dd2cf8bab1cfab20b9e408
+SIZE (xpi/thunderbird3-i18n-3.1.12/pt-BR.xpi) = 215068
+SHA256 (xpi/thunderbird3-i18n-3.1.12/pt-PT.xpi) = 6f37b1bb4d57b73802c4bd8e4e0a2a00c8aae2b4b449dab6a6fae53c9032009a
+SIZE (xpi/thunderbird3-i18n-3.1.12/pt-PT.xpi) = 214280
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ro.xpi) = bce7dadf0281f835b4ddc1b80743d6f9cb78c5e45417fc714d2fb51af99d5ae2
+SIZE (xpi/thunderbird3-i18n-3.1.12/ro.xpi) = 221247
+SHA256 (xpi/thunderbird3-i18n-3.1.12/ru.xpi) = 70df1b09b26c586c436e414ee2cbe4323798489aea577ed5a51aa4c702d608ad
+SIZE (xpi/thunderbird3-i18n-3.1.12/ru.xpi) = 198238
+SHA256 (xpi/thunderbird3-i18n-3.1.12/si.xpi) = 2a44ed4567fcbed007a1792f1ffe48d00c45b1fae4e46f9d48ae271077f72c25
+SIZE (xpi/thunderbird3-i18n-3.1.12/si.xpi) = 246104
+SHA256 (xpi/thunderbird3-i18n-3.1.12/sk.xpi) = d1bb13d247cadad693928c41a3f3d849ea82e665701f727b734ed673853f73fd
+SIZE (xpi/thunderbird3-i18n-3.1.12/sk.xpi) = 224601
+SHA256 (xpi/thunderbird3-i18n-3.1.12/sl.xpi) = 582c529e15f4fdfdc3d5789c96e67e6540c26b9eacab4da00ffdbc94e488dfdc
+SIZE (xpi/thunderbird3-i18n-3.1.12/sl.xpi) = 218473
+SHA256 (xpi/thunderbird3-i18n-3.1.12/sq.xpi) = 0415fbf1d8500ca9e6067554d28b6377af9f9722adbdcfa871773e009a6fd78f
+SIZE (xpi/thunderbird3-i18n-3.1.12/sq.xpi) = 211273
+SHA256 (xpi/thunderbird3-i18n-3.1.12/sv-SE.xpi) = 022d7a5837e453f4a08ab72296a79f00d105740fac88562fa00e691d3344e870
+SIZE (xpi/thunderbird3-i18n-3.1.12/sv-SE.xpi) = 221163
+SHA256 (xpi/thunderbird3-i18n-3.1.12/tr.xpi) = f4b71cfdd3573e3d9b7618bfafce7ba8f2fbd3fa894f323460d36da1e46af9b7
+SIZE (xpi/thunderbird3-i18n-3.1.12/tr.xpi) = 215749
+SHA256 (xpi/thunderbird3-i18n-3.1.12/uk.xpi) = 87f313a5d64ea3c2482da377e53031676da084e5e9a1e3f69409a7b6458172f0
+SIZE (xpi/thunderbird3-i18n-3.1.12/uk.xpi) = 244865
+SHA256 (xpi/thunderbird3-i18n-3.1.12/zh-CN.xpi) = 6293366577bf2893e09768c81167fa5cdd42a8fff15c44b1f6c16e652f2a5591
+SIZE (xpi/thunderbird3-i18n-3.1.12/zh-CN.xpi) = 219647
+SHA256 (xpi/thunderbird3-i18n-3.1.12/zh-TW.xpi) = b63fb7b26cf7f91d53b6acaa0d9c47b7739afce1cdba82ddee2cfee6b0b70657
+SIZE (xpi/thunderbird3-i18n-3.1.12/zh-TW.xpi) = 220634

Modified: trunk/mail/thunderbird3/Makefile
==============================================================================
--- trunk/mail/thunderbird3/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird3/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:			4 September 2003
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.131 2011/06/30 18:13:18 flo Exp $
+# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.134 2011/08/23 18:39:07 kwm Exp $
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	3.1.11
+DISTVERSION=	3.1.12
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -20,7 +21,6 @@
 USE_AUTOTOOLS=	autoconf213
 LATEST_LINK=	thunderbird3
 USE_GECKO=	gecko
-CONFLICTS_INSTALL=	thunderbird-5.0*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 
@@ -35,7 +35,10 @@
 
 MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data
 MOZ_GRAPHICS=	default,-xbm
-MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+MOZILLA_SUFX=	3
+MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
+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
@@ -44,7 +47,7 @@
 MOZILLA_PLIST_DIRS=	bin lib
 MOZ_PKGCONFIG_FILES=
 
-PORTNAME_ICON=	${PORTNAME}.png
+PORTNAME_ICON=	${MOZILLA}.png
 PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
@@ -66,8 +69,6 @@
 .endif
 .endif
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -79,15 +80,15 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
-post-extract::
-	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
+post-extract:
+	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
@@ -106,10 +107,10 @@
 	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
 
 port-pre-install:
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
+	${MKDIR} ${FAKEDIR}/lib/${MOZILLA}/defaults
 
 pre-install:
-	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
+	@${ECHO_CMD} 'share/applications/${MOZILLA_EXEC_NAME}.desktop' >> ${PLIST}
 	@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
 	@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
 

Modified: trunk/mail/thunderbird3/distinfo
==============================================================================
--- trunk/mail/thunderbird3/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird3/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-3.1.11.source.tar.bz2) = 3e78284661b1be1d35753550b7a183d583d7ee68c8bac683283d3931f90fdd1a
-SIZE (thunderbird-3.1.11.source.tar.bz2) = 68716700
+SHA256 (thunderbird-3.1.12.source.tar.bz2) = ae020f6cebf81541e08642f371484c2ae6edbd7db1b70fe51f1e2cb462d48089
+SIZE (thunderbird-3.1.12.source.tar.bz2) = 69096988

Added: trunk/mail/thunderbird3/files/patch-mailnews-extensions-smime-build-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/thunderbird3/files/patch-mailnews-extensions-smime-build-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,16 @@
+$FreeBSD: ports/mail/thunderbird3/files/patch-mailnews-extensions-smime-build-Makefile.in,v 1.1 2011/07/05 21:14:20 crees Exp $
+
+This is from ports/156912; it fixes the build failure due to the gmake-3.81-ism
+in mailnews/extensions/smime/build/Makefile.in
+
+--- mailnews/extensions/smime/build/Makefile.in.orig	2011-05-09 18:49:18.458634807 +0100
++++ mailnews/extensions/smime/build/Makefile.in	2011-05-09 18:50:07.015309434 +0100
+@@ -81,7 +81,7 @@
+ 		$(NULL)
+ 
+ ifndef MOZ_STATIC_MAIL_BUILD
+-SHARED_LIBRARY_LIBS + = ../../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
++SHARED_LIBRARY_LIBS += ../../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
+ endif
+ 
+ ifdef MOZILLA_INTERNAL_API

Modified: trunk/mail/thunderbird3/files/thunderbird.desktop.in
==============================================================================
--- trunk/mail/thunderbird3/files/thunderbird.desktop.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/mail/thunderbird3/files/thunderbird.desktop.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -3,7 +3,7 @@
 Name=Thunderbird
 GenericName=Mail Client
 Comment=Mail client and News Reader
-Exec=thunderbird %U
+Exec=@MOZILLA@ %U
 Icon=@PORTNAME_ICON@
 StartupNotify=false
 Terminal=false

Modified: trunk/www/firefox-i18n/Makefile
==============================================================================
--- trunk/www/firefox-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.51 2011/06/21 21:12:31 flo Exp $
+# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.55 2011/08/24 22:52:07 flo Exp $
 #
 
 PORTNAME=	firefox-i18n
-PORTVERSION=	5.0
+PORTVERSION=	6.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	firefox/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -14,12 +15,12 @@
 DIST_SUBDIR=	xpi/${DISTNAME}
 
 MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Localized interface for Firefox 5.0
+COMMENT=	Localized interface for Firefox 6.0
 
 EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
-USE_FIREFOX=	yes
-USE_XPI=	*firefox
+USE_FIREFOX=	60
+USE_XPI=	firefox
 
 USE_SUBMAKE=	yes
 
@@ -56,8 +57,10 @@
 		then \
 			exit 1; \
 		fi; \
-		cd ${WRKSRC}/langpack-$$lang@firefox.mozilla.org/chrome; \
-		${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \
+		cd ${WRKSRC}/langpack-$$lang@firefox.mozilla.org/chrome/$$lang; \
+		${LOCALBASE}/bin/zip -r ../$$lang.jar locale; \
+		cd ..; ${RM} -rf $$lang; cd ..; \
+		${REINPLACE_CMD} -i "" "s,chrome/$$lang,jar:chrome/$$lang.jar!," chrome.manifest; \
 	done
 
 .if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)

Modified: trunk/www/firefox-i18n/distinfo
==============================================================================
--- trunk/www/firefox-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,164 +1,164 @@
-SHA256 (xpi/firefox-i18n-5.0/af.xpi) = a2e8b93b72193ec4eeca255a1cc735f548e77cb90a459b8c55eb4908a8f9f6b0
-SIZE (xpi/firefox-i18n-5.0/af.xpi) = 221342
-SHA256 (xpi/firefox-i18n-5.0/ak.xpi) = dffb31551d27180204aa74509f36a0b31faf67a7bd46a38ce5783ecf38890652
-SIZE (xpi/firefox-i18n-5.0/ak.xpi) = 222856
-SHA256 (xpi/firefox-i18n-5.0/ar.xpi) = f40d36aa041dd5e6fb378ab7385a6c593513b07b6d18dcb1a347ddb0ae80d31c
-SIZE (xpi/firefox-i18n-5.0/ar.xpi) = 242499
-SHA256 (xpi/firefox-i18n-5.0/ast.xpi) = c5cdb9fccd6889cc81e935c3657fabf32ade2c0e633dfb117d439b662144b298
-SIZE (xpi/firefox-i18n-5.0/ast.xpi) = 218875
-SHA256 (xpi/firefox-i18n-5.0/be.xpi) = 39c2a84ec5b87b87d43bdd5fb853419496bac5a3468065b248d070bb72a6b346
-SIZE (xpi/firefox-i18n-5.0/be.xpi) = 232148
-SHA256 (xpi/firefox-i18n-5.0/bg.xpi) = 1359fc832811e1bd58e99a441aef1e97573b44ef1a8f4f644ef611f9684b8708
-SIZE (xpi/firefox-i18n-5.0/bg.xpi) = 255712
-SHA256 (xpi/firefox-i18n-5.0/bn-BD.xpi) = 5c3da96b4f16783b1dcfea19d1359924ec315c4478f38f226675a11b598ac637
-SIZE (xpi/firefox-i18n-5.0/bn-BD.xpi) = 264307
-SHA256 (xpi/firefox-i18n-5.0/bn-IN.xpi) = 25f88327fb65b9854425b19d0d36aabfddf08e367aeebf40930f969d02a286cd
-SIZE (xpi/firefox-i18n-5.0/bn-IN.xpi) = 294137
-SHA256 (xpi/firefox-i18n-5.0/br.xpi) = 7c7f8097edbefc427c21c97030bf9d8f4434f6530b95d75bf2b07450e3c154d0
-SIZE (xpi/firefox-i18n-5.0/br.xpi) = 229699
-SHA256 (xpi/firefox-i18n-5.0/bs.xpi) = 2a3b36f5795d8cf596a522b0da4eaadf6f9f5fe08e08d96e084e0bd56f76dc5a
-SIZE (xpi/firefox-i18n-5.0/bs.xpi) = 227566
-SHA256 (xpi/firefox-i18n-5.0/ca.xpi) = cf6968da5dcf725427d167f4ec66341c29f787be9f39bccce7829fafa5ae74c5
-SIZE (xpi/firefox-i18n-5.0/ca.xpi) = 228977
-SHA256 (xpi/firefox-i18n-5.0/cs.xpi) = 637a57375c30da3b97ae672de94ef0805c41e630884405fde8b04d05b3c94d6a
-SIZE (xpi/firefox-i18n-5.0/cs.xpi) = 230068
-SHA256 (xpi/firefox-i18n-5.0/cy.xpi) = 929378c8ec2859ecf5dd539e678f520459489cdc1c770847ed0ab5822582bca4
-SIZE (xpi/firefox-i18n-5.0/cy.xpi) = 222565
-SHA256 (xpi/firefox-i18n-5.0/da.xpi) = f7e4f0c488ba5a0a1da3895372b5087bcad8db5d0e7b48b53a856cce0f60adf5
-SIZE (xpi/firefox-i18n-5.0/da.xpi) = 222498
-SHA256 (xpi/firefox-i18n-5.0/de.xpi) = e112cee3947ffa02c9709a701404979a0098632b6813bd9278490d80351d0cba
-SIZE (xpi/firefox-i18n-5.0/de.xpi) = 230248
-SHA256 (xpi/firefox-i18n-5.0/el.xpi) = 3eb3d6a8f869242aa449afc040035bcaf1f3db901b5030ed6280fb091e78c25d
-SIZE (xpi/firefox-i18n-5.0/el.xpi) = 244653
-SHA256 (xpi/firefox-i18n-5.0/en-GB.xpi) = cf96c48cfbf09f7ca7d57f8a88735b320fcbe78cb41413dddf2f14e11e0f38b9
-SIZE (xpi/firefox-i18n-5.0/en-GB.xpi) = 214199
-SHA256 (xpi/firefox-i18n-5.0/en-US.xpi) = 64b89b850e9c522c848a43893d6a1d8daf6f6c23e10ef0c5f464059e7a2d7b80
-SIZE (xpi/firefox-i18n-5.0/en-US.xpi) = 213834
-SHA256 (xpi/firefox-i18n-5.0/en-ZA.xpi) = 8deb294e6a9f7ddddf880353fc2f70b47e7aa4f9dc66c3bba97c7da9b7c7010a
-SIZE (xpi/firefox-i18n-5.0/en-ZA.xpi) = 213782
-SHA256 (xpi/firefox-i18n-5.0/eo.xpi) = ea1d78e00db6eac107fe2352dedee06c59a704157493c92dcb0435cde5193c8b
-SIZE (xpi/firefox-i18n-5.0/eo.xpi) = 223122
-SHA256 (xpi/firefox-i18n-5.0/es-AR.xpi) = 406d1ec67efb2090c82c9140422d50cc4bcf47183b7aa593579840030539fa1d
-SIZE (xpi/firefox-i18n-5.0/es-AR.xpi) = 227033
-SHA256 (xpi/firefox-i18n-5.0/es-CL.xpi) = 15f44f3e16724d590fffd7eb6b0c36084a195f72ba74e312ea103ecf381e126e
-SIZE (xpi/firefox-i18n-5.0/es-CL.xpi) = 229573
-SHA256 (xpi/firefox-i18n-5.0/es-ES.xpi) = f28a77f348ac0697f772b12a57eed3ac1d453f068d4b1908db85b14034f989a2
-SIZE (xpi/firefox-i18n-5.0/es-ES.xpi) = 202968
-SHA256 (xpi/firefox-i18n-5.0/es-MX.xpi) = 051e78ae837da4d8cb5d77d58e15efc769d4fe169722a62dd1f2dfc0ca17f4b3
-SIZE (xpi/firefox-i18n-5.0/es-MX.xpi) = 203603
-SHA256 (xpi/firefox-i18n-5.0/et.xpi) = b026307d175afa1aaa554a3c922f038af1807f850b732db08e4977e990ef7c91
-SIZE (xpi/firefox-i18n-5.0/et.xpi) = 224313
-SHA256 (xpi/firefox-i18n-5.0/eu.xpi) = 92d585c82509b1dfb6f9f37d6507a74e2c70246db28542452ebf53cd790aac2e
-SIZE (xpi/firefox-i18n-5.0/eu.xpi) = 222260
-SHA256 (xpi/firefox-i18n-5.0/fa.xpi) = 4e323228d73084bfe9640e259b87461837783679cafb9345c07d824d707e1b69
-SIZE (xpi/firefox-i18n-5.0/fa.xpi) = 249669
-SHA256 (xpi/firefox-i18n-5.0/fi.xpi) = ea3ab6729e77ac12e1c0f63c29cd58d985aebf8a211953fe66121c76a76d3444
-SIZE (xpi/firefox-i18n-5.0/fi.xpi) = 225413
-SHA256 (xpi/firefox-i18n-5.0/fr.xpi) = 7174a6cd2bda7ac1ca2fb990fefdc056204c16b2a72d212a6273709a2ed6a90f
-SIZE (xpi/firefox-i18n-5.0/fr.xpi) = 231107
-SHA256 (xpi/firefox-i18n-5.0/fy-NL.xpi) = 664ffc517c326307a24ae5e81b599fa527bca1b4704473b19fc406f256ab4cce
-SIZE (xpi/firefox-i18n-5.0/fy-NL.xpi) = 228490
-SHA256 (xpi/firefox-i18n-5.0/ga-IE.xpi) = 11591862978c1475a83102500270596f0c4b1a18e234a6ac8ed5e2fc1ead1c95
-SIZE (xpi/firefox-i18n-5.0/ga-IE.xpi) = 233448
-SHA256 (xpi/firefox-i18n-5.0/gl.xpi) = e645891f96c31e832bb12bc23e7b8d1819ddd642c26720cb151541d342d8aede
-SIZE (xpi/firefox-i18n-5.0/gl.xpi) = 225236
-SHA256 (xpi/firefox-i18n-5.0/gu-IN.xpi) = f426ca547c83be254ae3e110c6fb0c919c74a2bc99fc46942705286e36197849
-SIZE (xpi/firefox-i18n-5.0/gu-IN.xpi) = 253576
-SHA256 (xpi/firefox-i18n-5.0/he.xpi) = 75338fc5821e688d6dd113089cebe5321cf961b25d465abd623f09273200c470
-SIZE (xpi/firefox-i18n-5.0/he.xpi) = 235116
-SHA256 (xpi/firefox-i18n-5.0/hi-IN.xpi) = 1a54f1a8693ac489e6422d2d99db5d8bf5804b7d131d594a3dda0f4a0cada9d6
-SIZE (xpi/firefox-i18n-5.0/hi-IN.xpi) = 258506
-SHA256 (xpi/firefox-i18n-5.0/hr.xpi) = 0b5f555cf3218a8dea482862ef9c0fe21f48fb15c42b7b00822267d6dbed315f
-SIZE (xpi/firefox-i18n-5.0/hr.xpi) = 235177
-SHA256 (xpi/firefox-i18n-5.0/hu.xpi) = c7d0a9cb17fec754758241ec977d4fcfc8cd50fc61a19f36f749de045b87f02a
-SIZE (xpi/firefox-i18n-5.0/hu.xpi) = 235650
-SHA256 (xpi/firefox-i18n-5.0/hy-AM.xpi) = 5f89db48c14c1c88ae3d34e28416804f9b758185711fe0755349b1d00ae73ff4
-SIZE (xpi/firefox-i18n-5.0/hy-AM.xpi) = 420343
-SHA256 (xpi/firefox-i18n-5.0/id.xpi) = 6d2f2918a5628ae0f06fd64007448e7884704718921ad2e9cd3b1fb602d7934e
-SIZE (xpi/firefox-i18n-5.0/id.xpi) = 219287
-SHA256 (xpi/firefox-i18n-5.0/is.xpi) = d606131a39efcae6cbc082cda5a95366f8c443993027f2d84d3c1c77a0258c8b
-SIZE (xpi/firefox-i18n-5.0/is.xpi) = 225064
-SHA256 (xpi/firefox-i18n-5.0/it.xpi) = 788fbc67421c1e2e3a681cfb7a9c6ca333f39631803109e63c1537ce4997f763
-SIZE (xpi/firefox-i18n-5.0/it.xpi) = 200504
-SHA256 (xpi/firefox-i18n-5.0/ja.xpi) = fd2940c200de8271c055b4eed20798a18408b7473109bfb4a672376f2c95b212
-SIZE (xpi/firefox-i18n-5.0/ja.xpi) = 253532
-SHA256 (xpi/firefox-i18n-5.0/kk.xpi) = db1cea7c63226275a7e8ded104222f6cff37d8d94cedff7a3095db0d73a93bb3
-SIZE (xpi/firefox-i18n-5.0/kk.xpi) = 257652
-SHA256 (xpi/firefox-i18n-5.0/kn.xpi) = dd658af2b106ed1ae292afc7d3009def4f9d9c7745ccd6e6429b56df0872204d
-SIZE (xpi/firefox-i18n-5.0/kn.xpi) = 275000
-SHA256 (xpi/firefox-i18n-5.0/ko.xpi) = 18637412840d5bc0caf55f08034ca908c5efb84e32e38a3d5e3662fdbd775040
-SIZE (xpi/firefox-i18n-5.0/ko.xpi) = 207948
-SHA256 (xpi/firefox-i18n-5.0/ku.xpi) = 8f9fbd41b099ae99aa4c2f88957636f0fcf2ba84f0d622d4f95ae0184ea0fd57
-SIZE (xpi/firefox-i18n-5.0/ku.xpi) = 232519
-SHA256 (xpi/firefox-i18n-5.0/lg.xpi) = 8f4823299cd377231e528f56e04d1e7fa653604fd36a33bd6001959983a89215
-SIZE (xpi/firefox-i18n-5.0/lg.xpi) = 229749
-SHA256 (xpi/firefox-i18n-5.0/lt.xpi) = f46ea7371becead269e7dc7441601f2bca5920d1ee8a4f6b1ebfd67b2034903e
-SIZE (xpi/firefox-i18n-5.0/lt.xpi) = 314962
-SHA256 (xpi/firefox-i18n-5.0/lv.xpi) = 5fde2474f968b20b5876f7f49c228ba0948e00f2fcefcd25f1ac343d4c2b5b1a
-SIZE (xpi/firefox-i18n-5.0/lv.xpi) = 226467
-SHA256 (xpi/firefox-i18n-5.0/mai.xpi) = 61f64a1634c74a8618e75b42e50f730775db1e9bfbcab33b8187f89282fb8f3a
-SIZE (xpi/firefox-i18n-5.0/mai.xpi) = 258290
-SHA256 (xpi/firefox-i18n-5.0/mk.xpi) = 0bfab372a3a79503a3d06dba43acd462caf1971f90b72d21d82e068c8da82029
-SIZE (xpi/firefox-i18n-5.0/mk.xpi) = 251524
-SHA256 (xpi/firefox-i18n-5.0/ml.xpi) = b8efc38640f4b1e7b3046800c9d0b23ac8ca4bc08572450c9450cba55d832d41
-SIZE (xpi/firefox-i18n-5.0/ml.xpi) = 283533
-SHA256 (xpi/firefox-i18n-5.0/mr.xpi) = e177b3506d5255e4127fd76dec257262a5ab9cebc70d853f46d437bbfb783432
-SIZE (xpi/firefox-i18n-5.0/mr.xpi) = 258813
-SHA256 (xpi/firefox-i18n-5.0/nb-NO.xpi) = 129eb4174605c4ccfd4bebb3cd583ff812d26008bae76f714f8150dd8678fd9b
-SIZE (xpi/firefox-i18n-5.0/nb-NO.xpi) = 223346
-SHA256 (xpi/firefox-i18n-5.0/nl.xpi) = aaf5e3cdbd604ab2bc8fc399825bcad48d48bc08067e5a340ed18a53a63737ff
-SIZE (xpi/firefox-i18n-5.0/nl.xpi) = 224641
-SHA256 (xpi/firefox-i18n-5.0/nn-NO.xpi) = 1a7c2d87d3179acd3d694261f301e86379b58d8669a8ef89b16b2608948d10e4
-SIZE (xpi/firefox-i18n-5.0/nn-NO.xpi) = 224672
-SHA256 (xpi/firefox-i18n-5.0/nso.xpi) = 3aff12e9447a2f4db5bc79c99b55e9db43a2c4308dd37a281c0e729868138ec5
-SIZE (xpi/firefox-i18n-5.0/nso.xpi) = 227969
-SHA256 (xpi/firefox-i18n-5.0/or.xpi) = a4c9d21982037242531587823aa1eaecac139c653f88b3d8029048d805e12182
-SIZE (xpi/firefox-i18n-5.0/or.xpi) = 262339
-SHA256 (xpi/firefox-i18n-5.0/pa-IN.xpi) = 759f7d9642a28cbb1798407725988e459eaeca569a94ed94f0b023bfa9d30d6a
-SIZE (xpi/firefox-i18n-5.0/pa-IN.xpi) = 260036
-SHA256 (xpi/firefox-i18n-5.0/pl.xpi) = 363fcc2c6e9f04bf683ce9fe06564f30a0d4e02416f6903e382f40555833a236
-SIZE (xpi/firefox-i18n-5.0/pl.xpi) = 233164
-SHA256 (xpi/firefox-i18n-5.0/pt-BR.xpi) = d5223a1f479394d0c3e1e3b84b0ce94fa52efadeedeb88af20eae43ac6afc6f8
-SIZE (xpi/firefox-i18n-5.0/pt-BR.xpi) = 228668
-SHA256 (xpi/firefox-i18n-5.0/pt-PT.xpi) = ec9bba62e2646d01d33c5d18396980d0c7e45ae35e1b035acf993c4b43db9916
-SIZE (xpi/firefox-i18n-5.0/pt-PT.xpi) = 228030
-SHA256 (xpi/firefox-i18n-5.0/rm.xpi) = 76108978d4b9d816f1fcbb76c36159f8c75f5314cd3cd6329b2e247e5e6b10cf
-SIZE (xpi/firefox-i18n-5.0/rm.xpi) = 227680
-SHA256 (xpi/firefox-i18n-5.0/ro.xpi) = 97a2644d9a5103d9694209a7fde031ec54087a9ab89ee1e375a29f71a42abf43
-SIZE (xpi/firefox-i18n-5.0/ro.xpi) = 230861
-SHA256 (xpi/firefox-i18n-5.0/ru.xpi) = 31f7d8a72337a0dcbff611d13825f39e0845354d4b413e6296aeaa5bc6b54bd3
-SIZE (xpi/firefox-i18n-5.0/ru.xpi) = 240318
-SHA256 (xpi/firefox-i18n-5.0/si.xpi) = 85ad3f3bb028fe27696ef340a47760a8e261e7a2b0a2e5a1d22f14a0284d3b4c
-SIZE (xpi/firefox-i18n-5.0/si.xpi) = 252297
-SHA256 (xpi/firefox-i18n-5.0/sk.xpi) = 249427c900e5be9d6a485be9dc9811255f8434651e0e0446fcd42069d8b28bf0
-SIZE (xpi/firefox-i18n-5.0/sk.xpi) = 235237
-SHA256 (xpi/firefox-i18n-5.0/sl.xpi) = 9f10154128b19ee00e07990e98429a0c701f755f65d60c0537fee9a5903f14ee
-SIZE (xpi/firefox-i18n-5.0/sl.xpi) = 223110
-SHA256 (xpi/firefox-i18n-5.0/son.xpi) = e412bac4ae30ca6c5a10577ff0b92adda666cd681a3ae7dd6c4b2b315037e00c
-SIZE (xpi/firefox-i18n-5.0/son.xpi) = 221301
-SHA256 (xpi/firefox-i18n-5.0/sq.xpi) = 4c473f7c4f7ff2d02475eb263e029d0bb36807140d658643e7e2af35a173639d
-SIZE (xpi/firefox-i18n-5.0/sq.xpi) = 208379
-SHA256 (xpi/firefox-i18n-5.0/sr.xpi) = 448f085fa3448dc7a04214097a5e495a20047e08c23b5e7fb5a0b97d6222aad7
-SIZE (xpi/firefox-i18n-5.0/sr.xpi) = 204265
-SHA256 (xpi/firefox-i18n-5.0/sv-SE.xpi) = 1f5060773f8ca6ee30adae54dccc8b9b9b8bd79170f2716c5e1ff1f681a757c0
-SIZE (xpi/firefox-i18n-5.0/sv-SE.xpi) = 261675
-SHA256 (xpi/firefox-i18n-5.0/ta-LK.xpi) = 91be63dfdda892d304cace8c6b1e365f38161cff0f0effb996125b8a916936bf
-SIZE (xpi/firefox-i18n-5.0/ta-LK.xpi) = 268411
-SHA256 (xpi/firefox-i18n-5.0/ta.xpi) = 97bf49b15d9dfffbdac6106ceeefe15776fba9eeb5d024dba6fa46053d10eb89
-SIZE (xpi/firefox-i18n-5.0/ta.xpi) = 253294
-SHA256 (xpi/firefox-i18n-5.0/te.xpi) = ee3dad3dd509519e5e433aa5313aadb2e1a795b0be504696b5595c2d69392d21
-SIZE (xpi/firefox-i18n-5.0/te.xpi) = 267869
-SHA256 (xpi/firefox-i18n-5.0/th.xpi) = cb4c0100e22c82a50a7bc05d8a9888235c4a67a9b4e66b10b6eeaae34063fac5
-SIZE (xpi/firefox-i18n-5.0/th.xpi) = 254357
-SHA256 (xpi/firefox-i18n-5.0/tr.xpi) = 43e2ee2ca92d6992656b6b297b63b897a9a08fc20297a636e7793f1af4c6557a
-SIZE (xpi/firefox-i18n-5.0/tr.xpi) = 227980
-SHA256 (xpi/firefox-i18n-5.0/uk.xpi) = 5bf6b7f1fca042015e75669e1baa1741b29db0e95d9f9e12da1c8066f482ea42
-SIZE (xpi/firefox-i18n-5.0/uk.xpi) = 261247
-SHA256 (xpi/firefox-i18n-5.0/vi.xpi) = 7b17b6bdd0d68a45a1fe6b6080fc266f33e501278895eb0735beec90e2e6f41e
-SIZE (xpi/firefox-i18n-5.0/vi.xpi) = 240934
-SHA256 (xpi/firefox-i18n-5.0/zh-CN.xpi) = e94fb218286c20ef5d273d2e895da482d73f430b5f704f1d49f0603ca3aeda80
-SIZE (xpi/firefox-i18n-5.0/zh-CN.xpi) = 237222
-SHA256 (xpi/firefox-i18n-5.0/zh-TW.xpi) = 238422319c1c764f0eca0b96a5f6d23a27e1024cc15dc40b17b09b8dc09a545e
-SIZE (xpi/firefox-i18n-5.0/zh-TW.xpi) = 238052
-SHA256 (xpi/firefox-i18n-5.0/zu.xpi) = d5ba9b23b342502d2012b78405c1ba07307fe48f21f23542e38c2fd59a32c15b
-SIZE (xpi/firefox-i18n-5.0/zu.xpi) = 228727
+SHA256 (xpi/firefox-i18n-6.0/af.xpi) = a6e372754cfa913dd04b1d75f202a548a9d4de3939e122db88dc34f6ea43d7b8
+SIZE (xpi/firefox-i18n-6.0/af.xpi) = 225575
+SHA256 (xpi/firefox-i18n-6.0/ak.xpi) = dc82d5c1a5ed8ca5029e162783900090a8221616d415bfee950d5c6ee048fc25
+SIZE (xpi/firefox-i18n-6.0/ak.xpi) = 227074
+SHA256 (xpi/firefox-i18n-6.0/ar.xpi) = 97201c6c93b03cf5a6decfaa0ccc17c2f8c04806fcc9bc1799bf64e4b1350acf
+SIZE (xpi/firefox-i18n-6.0/ar.xpi) = 246750
+SHA256 (xpi/firefox-i18n-6.0/ast.xpi) = 3e831245801884d344b380169bdc018b56117e828ee369d64afdd171c560bf20
+SIZE (xpi/firefox-i18n-6.0/ast.xpi) = 221231
+SHA256 (xpi/firefox-i18n-6.0/be.xpi) = 646b52a83632b50f38a1c0a12db620195e7c9fd112cf9277851d312da88c5959
+SIZE (xpi/firefox-i18n-6.0/be.xpi) = 234765
+SHA256 (xpi/firefox-i18n-6.0/bg.xpi) = fb0d195c388eaa84e35545a6498774cd6d25bab19bb8a021ce33dc0fb1071184
+SIZE (xpi/firefox-i18n-6.0/bg.xpi) = 260541
+SHA256 (xpi/firefox-i18n-6.0/bn-BD.xpi) = fdb44cf1a29248ac0212c965d25415a4dd80d5c4cab1bc07a1949bd416dc71dc
+SIZE (xpi/firefox-i18n-6.0/bn-BD.xpi) = 270802
+SHA256 (xpi/firefox-i18n-6.0/bn-IN.xpi) = bc8145a430806b2723855a34369c746e1c6fce28eaaee83543dd8eee2b95bc29
+SIZE (xpi/firefox-i18n-6.0/bn-IN.xpi) = 300026
+SHA256 (xpi/firefox-i18n-6.0/br.xpi) = 04540a7adbcbff81e34cf486ed9e751b2ea50ff051727aca52492f96491662d4
+SIZE (xpi/firefox-i18n-6.0/br.xpi) = 234142
+SHA256 (xpi/firefox-i18n-6.0/bs.xpi) = 03be7c41389039d0784b475b24131da9ef092df416b23644eca62e224479fa4c
+SIZE (xpi/firefox-i18n-6.0/bs.xpi) = 231947
+SHA256 (xpi/firefox-i18n-6.0/ca.xpi) = 1ec16d06e29aa7f583bae928fd96095878d34076bba1f8fdd72c934af2cf09e0
+SIZE (xpi/firefox-i18n-6.0/ca.xpi) = 233434
+SHA256 (xpi/firefox-i18n-6.0/cs.xpi) = da556af47d9660eeb5ca195b6f1e4642ec42428fad0286c29c07a1bf8166b879
+SIZE (xpi/firefox-i18n-6.0/cs.xpi) = 234785
+SHA256 (xpi/firefox-i18n-6.0/cy.xpi) = c2ecd8b64a45f6cdfc4a0668e26c05ee9bf510391714513d92e69b7fcf651800
+SIZE (xpi/firefox-i18n-6.0/cy.xpi) = 227478
+SHA256 (xpi/firefox-i18n-6.0/da.xpi) = c0440750c18b5ff6dd3c227ee9561a2d7494beaf42fe8c151101275e9401457d
+SIZE (xpi/firefox-i18n-6.0/da.xpi) = 226958
+SHA256 (xpi/firefox-i18n-6.0/de.xpi) = aaf7a6faa1f13fc92dd19b8cd9c18cdc8cbecfc170bfcc9f8f032ad2f905590f
+SIZE (xpi/firefox-i18n-6.0/de.xpi) = 234956
+SHA256 (xpi/firefox-i18n-6.0/el.xpi) = 4a7a2ca8f8842d1235ed71121dc0a96b1825167b277835f9ad7131a97d99310f
+SIZE (xpi/firefox-i18n-6.0/el.xpi) = 249677
+SHA256 (xpi/firefox-i18n-6.0/en-GB.xpi) = 0b24f6af5483b0217d9d5a66740a786f2adff208a841a0be9417de1eeb303d5c
+SIZE (xpi/firefox-i18n-6.0/en-GB.xpi) = 218288
+SHA256 (xpi/firefox-i18n-6.0/en-US.xpi) = 283702493ca185300068df07314737efa6c445dab34e9ebc78b592e0d4febf3c
+SIZE (xpi/firefox-i18n-6.0/en-US.xpi) = 217901
+SHA256 (xpi/firefox-i18n-6.0/en-ZA.xpi) = ddce1431f14524edb8ac138f4dc4fbbbc1e0a582f2035020ff9b3541c705e80c
+SIZE (xpi/firefox-i18n-6.0/en-ZA.xpi) = 218608
+SHA256 (xpi/firefox-i18n-6.0/eo.xpi) = af77ccfad8e918eb0fc7dbab3966b2ce2c3e0a85f895ac944ce2aba82a2c1e14
+SIZE (xpi/firefox-i18n-6.0/eo.xpi) = 227527
+SHA256 (xpi/firefox-i18n-6.0/es-AR.xpi) = 14e1ae6618b44ef724cc154732fd69cd5ebde8775e22d6ef2f11b6ddb865f375
+SIZE (xpi/firefox-i18n-6.0/es-AR.xpi) = 231473
+SHA256 (xpi/firefox-i18n-6.0/es-CL.xpi) = cd8e563ac6c6e2888efdf70dcbd0a854eb9dcd3b42ace20d87dd5c24896f377c
+SIZE (xpi/firefox-i18n-6.0/es-CL.xpi) = 233763
+SHA256 (xpi/firefox-i18n-6.0/es-ES.xpi) = 3fa104b9d031c36084572bc773edf5a731f11166385f0f618d0ff4c18aade5d1
+SIZE (xpi/firefox-i18n-6.0/es-ES.xpi) = 205206
+SHA256 (xpi/firefox-i18n-6.0/es-MX.xpi) = b40f3b08e22f9bd44196cc9f51bf3da5666d587287bd3252f3ac9f3792fd80e7
+SIZE (xpi/firefox-i18n-6.0/es-MX.xpi) = 205887
+SHA256 (xpi/firefox-i18n-6.0/et.xpi) = d92e543c080e29979aab9d47f65a9e6623eebd437844ff0a1f1450f1a0d36335
+SIZE (xpi/firefox-i18n-6.0/et.xpi) = 228894
+SHA256 (xpi/firefox-i18n-6.0/eu.xpi) = 14e0ddb5c426bff2081e3befe23aaf4e15bcbce9bc13d668eaa625f495fddf75
+SIZE (xpi/firefox-i18n-6.0/eu.xpi) = 226724
+SHA256 (xpi/firefox-i18n-6.0/fa.xpi) = 9c9747638a65c54ff0362be78c011f5b52ec48dc8b85c534a88922c3cf86a5ed
+SIZE (xpi/firefox-i18n-6.0/fa.xpi) = 254646
+SHA256 (xpi/firefox-i18n-6.0/fi.xpi) = 19b4e3a34df89bd30308fd8e306eca1a4c7e0a2f552c6dcbf0a448f0237f522d
+SIZE (xpi/firefox-i18n-6.0/fi.xpi) = 229827
+SHA256 (xpi/firefox-i18n-6.0/fr.xpi) = cb6f55ff11c445d433b8c1347c82c53aab39b90d8c7a54b94baf8054e0ca05fd
+SIZE (xpi/firefox-i18n-6.0/fr.xpi) = 235512
+SHA256 (xpi/firefox-i18n-6.0/fy-NL.xpi) = f3e020540b27666694901ccb9921ff2856f5d0a1b4c15e9b893857116a5b2d46
+SIZE (xpi/firefox-i18n-6.0/fy-NL.xpi) = 232894
+SHA256 (xpi/firefox-i18n-6.0/ga-IE.xpi) = 7a65aa3ebf2fb7830cad88dd8b234ac4826a6cc126a7cc0005c957cd0072def7
+SIZE (xpi/firefox-i18n-6.0/ga-IE.xpi) = 237689
+SHA256 (xpi/firefox-i18n-6.0/gl.xpi) = c3504e161a9bc80f2acbe4ff4ecd0310938b08bb333d1ce8e507e25af38c3ecf
+SIZE (xpi/firefox-i18n-6.0/gl.xpi) = 229665
+SHA256 (xpi/firefox-i18n-6.0/gu-IN.xpi) = 703a224eb1651de895cc1efc9225c8f4cda1c0016becfb3d72c40bfa8fc97bb7
+SIZE (xpi/firefox-i18n-6.0/gu-IN.xpi) = 257764
+SHA256 (xpi/firefox-i18n-6.0/he.xpi) = c94ca5e8178fe6f4ed1c6cd9e1410f21bc54c182571ce364f940ae0864db6bf4
+SIZE (xpi/firefox-i18n-6.0/he.xpi) = 239581
+SHA256 (xpi/firefox-i18n-6.0/hi-IN.xpi) = 4f617a857918494f470e8c848daa690d083ed744bb623a6ad90d20cd0e7a4721
+SIZE (xpi/firefox-i18n-6.0/hi-IN.xpi) = 263278
+SHA256 (xpi/firefox-i18n-6.0/hr.xpi) = 953e27c8dad0bcf5e1ede9e1e77572577476d9a3b690c86fa0a76534e20e0b43
+SIZE (xpi/firefox-i18n-6.0/hr.xpi) = 240046
+SHA256 (xpi/firefox-i18n-6.0/hu.xpi) = f01be08eaf477777f35138fa2b1d0f202c289cf2ae02df9ae97a9fe241f0ed8a
+SIZE (xpi/firefox-i18n-6.0/hu.xpi) = 240258
+SHA256 (xpi/firefox-i18n-6.0/hy-AM.xpi) = 280f8b4e132ab00e4ce213ef4404a63ec1ed0e29fc62e6cdc65afbfff74cb7cd
+SIZE (xpi/firefox-i18n-6.0/hy-AM.xpi) = 424394
+SHA256 (xpi/firefox-i18n-6.0/id.xpi) = 50138424e8adb1a5c135d1c4fccb054f5d3b491bb8dcd24e1a30e9f5fb89e1d6
+SIZE (xpi/firefox-i18n-6.0/id.xpi) = 223599
+SHA256 (xpi/firefox-i18n-6.0/is.xpi) = b68b294e888432ad446fe5f3b8a37f03a28c234296d2a7e0d27478204a767fde
+SIZE (xpi/firefox-i18n-6.0/is.xpi) = 229422
+SHA256 (xpi/firefox-i18n-6.0/it.xpi) = 10691c720286febef91b221ecc66ee89279c41abf32fef86bc59a17da43f415b
+SIZE (xpi/firefox-i18n-6.0/it.xpi) = 202637
+SHA256 (xpi/firefox-i18n-6.0/ja.xpi) = fe301ba3ab532194d71c1f60f6a576c1d8da20e0ae27a3ebfb2857548417df54
+SIZE (xpi/firefox-i18n-6.0/ja.xpi) = 258440
+SHA256 (xpi/firefox-i18n-6.0/kk.xpi) = 6ef01f609ea580fa8c8d8b12a7ea2be787dc00efc29642e5f8af886773b2c0cd
+SIZE (xpi/firefox-i18n-6.0/kk.xpi) = 262254
+SHA256 (xpi/firefox-i18n-6.0/kn.xpi) = 5b06985f5f10ddf153814370562f756242c458375e9d98e7ed3dd8c6c2c4ae72
+SIZE (xpi/firefox-i18n-6.0/kn.xpi) = 281002
+SHA256 (xpi/firefox-i18n-6.0/ko.xpi) = 0dcbad96b428623d434749d47da9786ee451afa0d857db56f7055c8ae1a4e87d
+SIZE (xpi/firefox-i18n-6.0/ko.xpi) = 212862
+SHA256 (xpi/firefox-i18n-6.0/ku.xpi) = 544393cb438abe3636b36c6e689dd5d24ee51267c17a47826c4e58c5893e7603
+SIZE (xpi/firefox-i18n-6.0/ku.xpi) = 236375
+SHA256 (xpi/firefox-i18n-6.0/lg.xpi) = 213ea7ac604538328e8c3160c35b5000ce12451ccf1e78f96536bdb7092d6646
+SIZE (xpi/firefox-i18n-6.0/lg.xpi) = 234042
+SHA256 (xpi/firefox-i18n-6.0/lt.xpi) = 2de613ce3f9571e2c87b0f783b82fe7950a1548833ff0b5634ea41064ebb2a66
+SIZE (xpi/firefox-i18n-6.0/lt.xpi) = 319722
+SHA256 (xpi/firefox-i18n-6.0/lv.xpi) = 416b2631e2c8dc1f72b7a6fff25468e32838a796e9fd54744a6d0aad031f268b
+SIZE (xpi/firefox-i18n-6.0/lv.xpi) = 230398
+SHA256 (xpi/firefox-i18n-6.0/mai.xpi) = 3053fb2cd83b0bdb036796d000f03919da2526fff1d828fedf6f1c6521de4a81
+SIZE (xpi/firefox-i18n-6.0/mai.xpi) = 262934
+SHA256 (xpi/firefox-i18n-6.0/mk.xpi) = c35676cb390d255f51f228ff3ec22cf4aab2502c5ff79e678614c7773b552629
+SIZE (xpi/firefox-i18n-6.0/mk.xpi) = 256537
+SHA256 (xpi/firefox-i18n-6.0/ml.xpi) = e4363f186a7bfb34754b3f4f4b5fca5e538475b144a685f313fb8fb23ce7687f
+SIZE (xpi/firefox-i18n-6.0/ml.xpi) = 287988
+SHA256 (xpi/firefox-i18n-6.0/mr.xpi) = 7c645f2c36c48b2fd34fcdd5e6b282c6a5a4f6704c73817da84b3b8ac0f961b9
+SIZE (xpi/firefox-i18n-6.0/mr.xpi) = 263497
+SHA256 (xpi/firefox-i18n-6.0/nb-NO.xpi) = aa2e552b9136c1b149795021884a4e04f3c345e1cdfa81dbd74684a7d63ec3d0
+SIZE (xpi/firefox-i18n-6.0/nb-NO.xpi) = 227700
+SHA256 (xpi/firefox-i18n-6.0/nl.xpi) = 9d3cc96d4f9f72991ac7099dd4df1b06f49fb2be885a3cb4f4736be75d784136
+SIZE (xpi/firefox-i18n-6.0/nl.xpi) = 229019
+SHA256 (xpi/firefox-i18n-6.0/nn-NO.xpi) = 190b4c5f2638d010a09860c35c75a27256b15697b1ae7a3c05d14848a286dc3c
+SIZE (xpi/firefox-i18n-6.0/nn-NO.xpi) = 228845
+SHA256 (xpi/firefox-i18n-6.0/nso.xpi) = 8fec475ad68c5807b0cd544b254a006c3c72e3b7b26c4d70a30a0109a2ffe545
+SIZE (xpi/firefox-i18n-6.0/nso.xpi) = 232420
+SHA256 (xpi/firefox-i18n-6.0/or.xpi) = d1a15c171f59882821325f58942bd48b15d0cc8d52a8a7be3bbc7e11ea51c11a
+SIZE (xpi/firefox-i18n-6.0/or.xpi) = 266744
+SHA256 (xpi/firefox-i18n-6.0/pa-IN.xpi) = d6577e72ea8f4aabd086f2fda7bb76ee5a51d5ee91013ac6ced399e44480f07f
+SIZE (xpi/firefox-i18n-6.0/pa-IN.xpi) = 264584
+SHA256 (xpi/firefox-i18n-6.0/pl.xpi) = 524b668eb02715fd23f0f0368b65165c81648cba266a804dbcc5dd4bc72303c4
+SIZE (xpi/firefox-i18n-6.0/pl.xpi) = 237909
+SHA256 (xpi/firefox-i18n-6.0/pt-BR.xpi) = e1b0ea66df64e88e02cf05105aab887cd75acc1e8506f8abe80c2422c3ab4ca8
+SIZE (xpi/firefox-i18n-6.0/pt-BR.xpi) = 233073
+SHA256 (xpi/firefox-i18n-6.0/pt-PT.xpi) = 8d467fdd9bc9a1c9a8801543e4f2577ed7ae7d6d6862580dd9ba61c795f216f2
+SIZE (xpi/firefox-i18n-6.0/pt-PT.xpi) = 232662
+SHA256 (xpi/firefox-i18n-6.0/rm.xpi) = 0b7b73c657e15af3fdf00016525ef8934446add2669715789cff340934a4b9b3
+SIZE (xpi/firefox-i18n-6.0/rm.xpi) = 232094
+SHA256 (xpi/firefox-i18n-6.0/ro.xpi) = 0d48c600f1ce7d38989eff627a1a2a478a989efe73a6ec38e37ffc322f8bd382
+SIZE (xpi/firefox-i18n-6.0/ro.xpi) = 235303
+SHA256 (xpi/firefox-i18n-6.0/ru.xpi) = a5a2c25c83605ccfc8e372fbca074bbfc186a31f4a96bea59bb684000400adfe
+SIZE (xpi/firefox-i18n-6.0/ru.xpi) = 243043
+SHA256 (xpi/firefox-i18n-6.0/si.xpi) = 01080fb0721b32b845512e2f43875977550e8bee9e709939413f45d7849d10ca
+SIZE (xpi/firefox-i18n-6.0/si.xpi) = 258004
+SHA256 (xpi/firefox-i18n-6.0/sk.xpi) = 681d10e1514be5c34e690f2df4ffdb400f27cb3b24274df6613730cd7604c9de
+SIZE (xpi/firefox-i18n-6.0/sk.xpi) = 239857
+SHA256 (xpi/firefox-i18n-6.0/sl.xpi) = c796ff7ffb64d175bf99bc16e77775ab6683c6f882674181f8115a0d030e7ad8
+SIZE (xpi/firefox-i18n-6.0/sl.xpi) = 227446
+SHA256 (xpi/firefox-i18n-6.0/son.xpi) = 0658aac50b3d0344f6679ddc597db1ae652954aa5022b135de02ba80124f7f8b
+SIZE (xpi/firefox-i18n-6.0/son.xpi) = 225686
+SHA256 (xpi/firefox-i18n-6.0/sq.xpi) = b4f13473c80a5a06f4e240fa3ff197b0bdfc610b559f58c32b1c1b6b118442b9
+SIZE (xpi/firefox-i18n-6.0/sq.xpi) = 212918
+SHA256 (xpi/firefox-i18n-6.0/sr.xpi) = b4a4cd84cd8df382f4fdebb50f482eac6e34b736d5ae729f29a1ef2857fa6496
+SIZE (xpi/firefox-i18n-6.0/sr.xpi) = 261928
+SHA256 (xpi/firefox-i18n-6.0/sv-SE.xpi) = 0b54939f5f3c58cc09573274288186b330d18b93a56a17a03d2a4dbdb49b61e1
+SIZE (xpi/firefox-i18n-6.0/sv-SE.xpi) = 265341
+SHA256 (xpi/firefox-i18n-6.0/ta-LK.xpi) = 67b4292aa6b7c15902cea10d5bbc5866fbccc9faf7b69e9c45f6acfc63dd7ae3
+SIZE (xpi/firefox-i18n-6.0/ta-LK.xpi) = 273382
+SHA256 (xpi/firefox-i18n-6.0/ta.xpi) = 718efb5dd19391bcccb640ad7644b0b1a13dba8362e34da66928b2a66071c8ef
+SIZE (xpi/firefox-i18n-6.0/ta.xpi) = 258053
+SHA256 (xpi/firefox-i18n-6.0/te.xpi) = 1d2d80d89223778cb8093c0244328aee3fcc0638fb48de855a7903a7aae4bd2d
+SIZE (xpi/firefox-i18n-6.0/te.xpi) = 272285
+SHA256 (xpi/firefox-i18n-6.0/th.xpi) = 637e45b381cdfffeaeddb57bf2837e37aa04c29a87ac8bc8217a405621194619
+SIZE (xpi/firefox-i18n-6.0/th.xpi) = 259124
+SHA256 (xpi/firefox-i18n-6.0/tr.xpi) = 486bd8fac72d0de5479dc0ae0c544167f5a776c03e9b794c20eaffe840fef9c0
+SIZE (xpi/firefox-i18n-6.0/tr.xpi) = 232347
+SHA256 (xpi/firefox-i18n-6.0/uk.xpi) = dfedb8b15b42f58fb10b7ac5e51b7a87340aa2b8c223b5f47e46123e2a734851
+SIZE (xpi/firefox-i18n-6.0/uk.xpi) = 266235
+SHA256 (xpi/firefox-i18n-6.0/vi.xpi) = cc83a4f55ffc537a4fd9ff99fb2898bbfb7f687c5a030352883be413054c6f16
+SIZE (xpi/firefox-i18n-6.0/vi.xpi) = 245639
+SHA256 (xpi/firefox-i18n-6.0/zh-CN.xpi) = 72ae15d06f826de529312a81b1345fd5e057adc38d2c2c9db15e5eb29b650ead
+SIZE (xpi/firefox-i18n-6.0/zh-CN.xpi) = 241868
+SHA256 (xpi/firefox-i18n-6.0/zh-TW.xpi) = 5b5d3cd6ee368007415b82e338204d3fe658291f4f4d454fcc1efc7e93d0563c
+SIZE (xpi/firefox-i18n-6.0/zh-TW.xpi) = 242787
+SHA256 (xpi/firefox-i18n-6.0/zu.xpi) = 7e6aa854e7e606f00c8e238c11c634b5fd5d068156840736b5997ecb6f6ad6d9
+SIZE (xpi/firefox-i18n-6.0/zu.xpi) = 233159

Modified: trunk/www/firefox-i18n/pkg-descr
==============================================================================
--- trunk/www/firefox-i18n/pkg-descr	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox-i18n/pkg-descr	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,3 +1,3 @@
-Language packs for Firefox 4.0
+Language packs for Firefox
 
 WWW: http://www.mozilla.org/projects/l10n/

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.242 2011/07/04 17:28:33 flo Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.246 2011/08/24 23:34:00 flo Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	5.0
+DISTVERSION=	6.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -16,19 +17,19 @@
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.8.8:${PORTSDIR}/devel/nspr \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		event-1.4:${PORTSDIR}/devel/libevent
 
+CONFLICTS_BUILD=	spidermonkey-*
+
 USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZILLA_NAME=	Firefox
 MOZ_TOOLKIT=	cairo-gtk2
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
-			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 
 MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
@@ -39,7 +40,6 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
-MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
 
 FIREFOX_ICON=		${MOZILLA}.png
@@ -53,15 +53,12 @@
 		--with-system-libevent=${LOCALBASE}
 
 OPTIONS=	DBUS "Enable D-BUS support" on \
-		PGO "Enable Profile-Guided Optimization" off \
-		SMB "Enable smb:// URI support using gnomevfs" off
+		PGO "Enable Profile-Guided Optimization" off
 
 .include <bsd.port.pre.mk>
 
 WRKSRC:=	${WRKDIR}/mozilla-release
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -73,7 +70,7 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
 .if defined(WITH_PGO)
@@ -104,7 +101,7 @@
 	@sleep 10
 .endif
 
-post-extract::
+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
@@ -113,7 +110,7 @@
 	@${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:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${WRKSRC}/storage/build/Makefile.in \
 		${WRKSRC}/toolkit/library/Makefile.in \
 		${WRKSRC}/db/sqlite3/src/Makefile.in

Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (firefox-5.0.source.tar.bz2) = 6bf97d80c8296f6ac576a07a87460e68066066de8bf23afe5f271cb7e1eedf44
-SIZE (firefox-5.0.source.tar.bz2) = 68782151
+SHA256 (firefox-6.0.source.tar.bz2) = cc3fb554ca02358e000502a1023d5ba01e6d18ae30c719f5a3b1ce1ad8334973
+SIZE (firefox-6.0.source.tar.bz2) = 67919174

Added: trunk/www/firefox/files/patch-bugzilla-659932
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bugzilla-659932	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,35 @@
+--- toolkit/xre/glxtest.cpp.orig	2011-08-11 17:41:31.000000000 -0400
++++ toolkit/xre/glxtest.cpp	2011-08-23 15:09:48.000000000 -0400
+@@ -114,6 +114,9 @@
+   typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *);
+   PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension"));
+ 
++  typedef GLXFBConfig* (* PFNGLXQUERYVERSION) (Display *, int *, int *);
++  PFNGLXQUERYVERSION glXQueryVersion = cast<PFNGLXQUERYVERSION>(dlsym(libgl, "glXQueryVersion"));
++
+   typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *);
+   PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig"));
+ 
+@@ -139,6 +142,7 @@
+   PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString"));
+ 
+   if (!glXQueryExtension ||
++      !glXQueryVersion ||
+       !glXChooseFBConfig ||
+       !glXGetVisualFromFBConfig ||
+       !glXCreatePixmap ||
+@@ -158,6 +162,14 @@
+   ///// Check that the GLX extension is present /////
+   if (!glXQueryExtension(dpy, NULL, NULL))
+     fatal_error("GLX extension missing");
++  
++  ///// Check that the GLX version is >= 1.3, needed for glXCreatePixmap, bug 659932 /////
++  int majorVersion, minorVersion;
++  if (!glXQueryVersion(dpy, &majorVersion, &minorVersion))
++    fatal_error("Unable to query GLX version");
++
++  if (majorVersion < 1 || (majorVersion == 1 && minorVersion < 3))
++    fatal_error("GLX version older than the required 1.3");
+ 
+   XSetErrorHandler(x_error_handler);
+ 

Modified: trunk/www/firefox/files/patch-js-src-Makefile.in
==============================================================================
--- trunk/www/firefox/files/patch-js-src-Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox/files/patch-js-src-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,25 @@
---- js/src/Makefile.in.orig	2011-03-17 18:51:39.000000000 +0100
-+++ js/src/Makefile.in	2011-03-18 19:41:09.000000000 +0100
-@@ -612,7 +612,7 @@
+--- js/src/Makefile.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ js/src/Makefile.in	2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+@@ -469,6 +469,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
+@@ -739,7 +742,7 @@
  # to reliably get limit macros defined, we'd always have to define the
  # one below before including any header, but that's obscure and
  # fragile, so we do it here.
@@ -9,13 +28,14 @@
  
  INCLUDES	+= -I$(srcdir)
  
-@@ -666,7 +666,8 @@
- endif # WINNT
- 
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS	+= -pthread
-+DEFINES		+= -DFREEBSD
-+EXTRA_LIBS	+= -pthread -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
+
+-@@ -793,7 +796,8 @@
++@@ -793,7 +796,7 @@
+  endif # WINNT
+  
+  ifeq ($(OS_ARCH),FreeBSD)
+ -EXTRA_LIBS += -pthread
+-+DEFINES           += -DFREEBSD
+ +EXTRA_LIBS       += -pthread -lc
+  endif
+  ifeq ($(OS_ARCH),IRIX)

Modified: trunk/www/firefox/files/patch-js-src-configure.in
==============================================================================
--- trunk/www/firefox/files/patch-js-src-configure.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox/files/patch-js-src-configure.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,32 +1,72 @@
---- js/src/configure.in.orig	2010-11-04 21:05:48.000000000 +0100
-+++ js/src/configure.in	2010-11-22 21:30:24.000000000 +0100
-@@ -2621,7 +2621,7 @@
+--- js/src/configure.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ js/src/configure.in	2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+@@ -1495,7 +1495,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
+ esac
+ 
+@@ -2713,7 +2713,7 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
 -x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
      ENABLE_TRACEJIT=1
      NANOJIT_ARCH=X64
      ENABLE_METHODJIT=1
-@@ -2638,11 +2638,6 @@
-     AC_DEFINE(JS_CPU_ARM)
-     AC_DEFINE(JS_NUNBOX32)
+@@ -2723,23 +2723,23 @@
+     AC_DEFINE(JS_CPU_X64)
+     AC_DEFINE(JS_PUNBOX64)
+     ;;
+-arm*-*)
++x86_64*-*)
+     ENABLE_TRACEJIT=1
+-    NANOJIT_ARCH=ARM
++    NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    AC_DEFINE(JS_CPU_ARM)
+-    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_POLYIC_TYPED_ARRAY=1
++    AC_DEFINE(JS_CPU_X64)
++    AC_DEFINE(JS_PUNBOX64)
      ;;
 -sparc*-*)
--    ENABLE_TRACEJIT=1
++arm*-*)
+     ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
++    NANOJIT_ARCH=ARM
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    ENABLE_POLYIC_TYPED_ARRAY=1
 -    AC_DEFINE(JS_CPU_SPARC)
--    ;;
++    AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
  esac
- 
- MOZ_ARG_DISABLE_BOOL(methodjit,
-@@ -2693,7 +2688,7 @@
+@@ -2796,6 +2796,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
++    AC_DEFINE(AVMPLUS_AMD64)
++    AC_DEFINE(AVMPLUS_64BIT)
++    ;;
+ x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
-     ;;

Deleted: trunk/www/firefox/files/patch-js-src-jsnativestack.cpp
==============================================================================
--- trunk/www/firefox/files/patch-js-src-jsnativestack.cpp	Sun Aug 28 15:08:27 2011	(r614)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,12 +0,0 @@
---- js/src/jsnativestack.cpp~
-+++ js/src/jsnativestack.cpp
-@@ -50,7 +50,8 @@
- #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
- # include <pthread.h>
- 
--# if defined(__FreeBSD__)
-+# if defined(FREEBSD)
-+#  include <cstddef>
- #  include <pthread_np.h>
- # endif
- 

Modified: trunk/www/firefox/files/patch-js_src_jsnum.cpp
==============================================================================
--- trunk/www/firefox/files/patch-js_src_jsnum.cpp	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox/files/patch-js_src_jsnum.cpp	Sun Aug 28 15:08:27 2011	(r615)
@@ -14,7 +14,7 @@
  
  #else
  
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#if defined(__FreeBSD__)
 +#if __BSD_VISIBLE == 0
 +#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
 +#endif

Modified: trunk/www/firefox/files/patch-layout_generic_Makefile.in
==============================================================================
--- trunk/www/firefox/files/patch-layout_generic_Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox/files/patch-layout_generic_Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,9 +1,9 @@
---- layout/generic/Makefile.in.orig	2011-04-26 23:21:46.000000000 +0200
-+++ layout/generic/Makefile.in	2011-04-26 23:44:09.096445086 +0200
-@@ -147,9 +147,10 @@
+--- 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)/../../modules/plugin/base/src \
+ 		-I$(srcdir)/../../dom/plugins/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  

Modified: trunk/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h
==============================================================================
--- trunk/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h	Sun Aug 28 15:08:27 2011	(r615)
@@ -15,7 +15,7 @@
  #define _PR_IPV6_V6ONLY_PROBE
  #endif
  
-+#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)
++#if (__FreeBSD_version >= 700016)
 +#if defined(_PR_PTHREADS)
 +#define _PR_HAVE_GETPROTO_R
 +#define _PR_HAVE_5_ARG_GETPROTO_R

Modified: trunk/www/firefox36-i18n/Makefile
==============================================================================
--- trunk/www/firefox36-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox36-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.54 2011/06/21 20:35:48 flo Exp $
+# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.56 2011/08/18 10:01:12 ale Exp $
 #
 
 PORTNAME=	firefox36-i18n
-PORTVERSION=	3.6.18
+PORTVERSION=	3.6.20
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	firefox/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -17,7 +18,7 @@
 COMMENT=	Localized interface for Firefox 3.6
 
 USE_FIREFOX=	36
-USE_XPI=	*firefox3
+USE_XPI=	firefox3 linux-firefox
 
 USE_SUBMAKE=	yes
 

Modified: trunk/www/firefox36-i18n/distinfo
==============================================================================
--- trunk/www/firefox36-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox36-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,146 +1,146 @@
-SHA256 (xpi/firefox36-i18n-3.6.18/af.xpi) = a1b0fa31710b8ba3df8a7fda96c853c7c45188810322e9b21141bce4b26a62f0
-SIZE (xpi/firefox36-i18n-3.6.18/af.xpi) = 121613
-SHA256 (xpi/firefox36-i18n-3.6.18/ar.xpi) = 3a5df27a72432451f704fa02696de8a1c347540b2c311f3b418138e087a1bc2a
-SIZE (xpi/firefox36-i18n-3.6.18/ar.xpi) = 132124
-SHA256 (xpi/firefox36-i18n-3.6.18/as.xpi) = ef08c529c7b52567423c729154581b1bd04f134854d0fcb0e3c5f9060154bc44
-SIZE (xpi/firefox36-i18n-3.6.18/as.xpi) = 134267
-SHA256 (xpi/firefox36-i18n-3.6.18/be.xpi) = ad36a4c6b5fbbdd0138006a912b89d19a92031c8429aa254a879661efbe4841d
-SIZE (xpi/firefox36-i18n-3.6.18/be.xpi) = 122232
-SHA256 (xpi/firefox36-i18n-3.6.18/bg.xpi) = a0e4d4f183cc1e6a5dc5894ddfaf9585093fbf90a3f9083de2cb5348b09970a3
-SIZE (xpi/firefox36-i18n-3.6.18/bg.xpi) = 134079
-SHA256 (xpi/firefox36-i18n-3.6.18/bn-BD.xpi) = 09def7ad8f8da291fcf3d112e14e4f0431dddde4c6f82f96e86f739d4cca4c0f
-SIZE (xpi/firefox36-i18n-3.6.18/bn-BD.xpi) = 141151
-SHA256 (xpi/firefox36-i18n-3.6.18/bn-IN.xpi) = 24753735a38e55436b762cd38752daa5bc1f7515390d76b7e1539de0e1dc214f
-SIZE (xpi/firefox36-i18n-3.6.18/bn-IN.xpi) = 160115
-SHA256 (xpi/firefox36-i18n-3.6.18/ca.xpi) = d5949320a48ec9e43ce86e4b5f459df571d8f541719403ce68a6b9b3f7dc682d
-SIZE (xpi/firefox36-i18n-3.6.18/ca.xpi) = 127932
-SHA256 (xpi/firefox36-i18n-3.6.18/cs.xpi) = ccc9a1ce0ea15d60dcffc48abfd795e32bf93a04c0e299fd3b183842d77e9b93
-SIZE (xpi/firefox36-i18n-3.6.18/cs.xpi) = 126731
-SHA256 (xpi/firefox36-i18n-3.6.18/cy.xpi) = 2526f732d3a4daf0cc39c04f64340884607fd6f31166c5c34b2c9aa29bf627e1
-SIZE (xpi/firefox36-i18n-3.6.18/cy.xpi) = 121945
-SHA256 (xpi/firefox36-i18n-3.6.18/da.xpi) = 055d8400f3907aa076ef6f7d857308436755b28b2c1b71e31546cebe10de0a89
-SIZE (xpi/firefox36-i18n-3.6.18/da.xpi) = 125595
-SHA256 (xpi/firefox36-i18n-3.6.18/de.xpi) = dee89a61db082a968f33fda58a1d135f5b64d3fcefd68bfd1a5c34c989234906
-SIZE (xpi/firefox36-i18n-3.6.18/de.xpi) = 128970
-SHA256 (xpi/firefox36-i18n-3.6.18/el.xpi) = 6f52dcfda307377ee857aa4060796b00e2700060ab6bc1595f8802c08ef846da
-SIZE (xpi/firefox36-i18n-3.6.18/el.xpi) = 135214
-SHA256 (xpi/firefox36-i18n-3.6.18/en-GB.xpi) = 0abb01e8ca676f20b536a36c2e21b558d8300cf44a345bb790180e19b8c5d277
-SIZE (xpi/firefox36-i18n-3.6.18/en-GB.xpi) = 119211
-SHA256 (xpi/firefox36-i18n-3.6.18/eo.xpi) = 172061e9960daf7c49159f0920becc4aeb72c0180ba3d64b2c4e1b993425573a
-SIZE (xpi/firefox36-i18n-3.6.18/eo.xpi) = 121874
-SHA256 (xpi/firefox36-i18n-3.6.18/es-AR.xpi) = df17796983994946c7987e93b7f23abe90ff98ea4d973c9d5bad11ce6f8e7168
-SIZE (xpi/firefox36-i18n-3.6.18/es-AR.xpi) = 127774
-SHA256 (xpi/firefox36-i18n-3.6.18/es-CL.xpi) = 0be1099a2c5208f60f51e48ba926a52b5f3757a0e5d103d033dd0db28fe86614
-SIZE (xpi/firefox36-i18n-3.6.18/es-CL.xpi) = 129439
-SHA256 (xpi/firefox36-i18n-3.6.18/es-ES.xpi) = 986330e0f66ec1237ce2024071817f8ffe36259f5453b7ac65dbc5b2b9f92f0e
-SIZE (xpi/firefox36-i18n-3.6.18/es-ES.xpi) = 108673
-SHA256 (xpi/firefox36-i18n-3.6.18/es-MX.xpi) = dbaa7291b59d54566963b43c42297bd5df56fec476aa82c5f4ec1120a19309ae
-SIZE (xpi/firefox36-i18n-3.6.18/es-MX.xpi) = 127401
-SHA256 (xpi/firefox36-i18n-3.6.18/et.xpi) = 6b5f14c2b0c4ea27841a7a052e1d954b972870dc5909f1be423aa553adfc416f
-SIZE (xpi/firefox36-i18n-3.6.18/et.xpi) = 127406
-SHA256 (xpi/firefox36-i18n-3.6.18/eu.xpi) = d7af33f55efa957f8e6cd628bc70f4bdbbb941c4d3cf2019a7c3e937edd7eca1
-SIZE (xpi/firefox36-i18n-3.6.18/eu.xpi) = 121855
-SHA256 (xpi/firefox36-i18n-3.6.18/fa.xpi) = cbc01d12756d2b4509c0185065506d17faa35837c909b8eaf990785ae822c829
-SIZE (xpi/firefox36-i18n-3.6.18/fa.xpi) = 138416
-SHA256 (xpi/firefox36-i18n-3.6.18/fi.xpi) = dce7f169e54e1f111f0e10880b0ff7284e9645793c13a779645b4c6783e67980
-SIZE (xpi/firefox36-i18n-3.6.18/fi.xpi) = 126795
-SHA256 (xpi/firefox36-i18n-3.6.18/fr.xpi) = 9110f090694a94884a181d184c60d922cebb8c8990f758f62df88f87d49481a8
-SIZE (xpi/firefox36-i18n-3.6.18/fr.xpi) = 128984
-SHA256 (xpi/firefox36-i18n-3.6.18/fy-NL.xpi) = 162f6940217a4197aa4b9e5c43ea62cab285f5dcbb4cca05d04132ce9595169a
-SIZE (xpi/firefox36-i18n-3.6.18/fy-NL.xpi) = 129187
-SHA256 (xpi/firefox36-i18n-3.6.18/ga-IE.xpi) = d6ee30e5b49e474a9b8d03d276411af0eac8a6088f84b20e63f5439a2c0f5e21
-SIZE (xpi/firefox36-i18n-3.6.18/ga-IE.xpi) = 127755
-SHA256 (xpi/firefox36-i18n-3.6.18/gl.xpi) = a819931b970ad05bebe91966346a89a99982f6da5bebb2659f87300147bfd672
-SIZE (xpi/firefox36-i18n-3.6.18/gl.xpi) = 124818
-SHA256 (xpi/firefox36-i18n-3.6.18/gu-IN.xpi) = 4df2b639899d0b8ebdd0bc28b20edffedf915c24c56271edd0485640f5cbdbae
-SIZE (xpi/firefox36-i18n-3.6.18/gu-IN.xpi) = 146303
-SHA256 (xpi/firefox36-i18n-3.6.18/he.xpi) = af62604fc0a0fe51446321de5317934466a32ce34040d65a90d11abae8f77914
-SIZE (xpi/firefox36-i18n-3.6.18/he.xpi) = 123135
-SHA256 (xpi/firefox36-i18n-3.6.18/hi-IN.xpi) = ecd84ecce3c63e60f808435535ee34cfa15bea20fb998a0b67568fe8a7f0994c
-SIZE (xpi/firefox36-i18n-3.6.18/hi-IN.xpi) = 141884
-SHA256 (xpi/firefox36-i18n-3.6.18/hr.xpi) = 0a86fb86f9c3765871bdd330bcc597ae44026a4ceb22ba483493e95e6eb894f1
-SIZE (xpi/firefox36-i18n-3.6.18/hr.xpi) = 127008
-SHA256 (xpi/firefox36-i18n-3.6.18/hu.xpi) = 9baa83ee4a8219b6ca61455c34ba2a03bd4ac7019c4b5d32356d150355c71213
-SIZE (xpi/firefox36-i18n-3.6.18/hu.xpi) = 131098
-SHA256 (xpi/firefox36-i18n-3.6.18/id.xpi) = 36fc15eabce3eb24ee46e126a665eda0d6edb71834b404791ac67c752b749850
-SIZE (xpi/firefox36-i18n-3.6.18/id.xpi) = 103931
-SHA256 (xpi/firefox36-i18n-3.6.18/is.xpi) = c4a279774167ec8d636fbc1b01437198b6777a614ccd7ab177908ec32ca2e4de
-SIZE (xpi/firefox36-i18n-3.6.18/is.xpi) = 123393
-SHA256 (xpi/firefox36-i18n-3.6.18/it.xpi) = e874190f33de28eaca3f2e3f0ebe77a1e75429a6183be7f26dcf1e25fb5d8b51
-SIZE (xpi/firefox36-i18n-3.6.18/it.xpi) = 107942
-SHA256 (xpi/firefox36-i18n-3.6.18/ja.xpi) = c0012b22c405c7380d6f3d53b92be979d190fb4cba8eb362392f18403fdbe429
-SIZE (xpi/firefox36-i18n-3.6.18/ja.xpi) = 136986
-SHA256 (xpi/firefox36-i18n-3.6.18/ka.xpi) = 5e99fd2dd3c22361be842d2877ad21046b2ad964a67e3723dff4e92d7bccadf8
-SIZE (xpi/firefox36-i18n-3.6.18/ka.xpi) = 154120
-SHA256 (xpi/firefox36-i18n-3.6.18/kk.xpi) = e74de19fee473090a2b405898342bcd588d8f4159312ba29ed5055b65f8bb31c
-SIZE (xpi/firefox36-i18n-3.6.18/kk.xpi) = 137723
-SHA256 (xpi/firefox36-i18n-3.6.18/kn.xpi) = 719551c71cfaff6b9bb07aa96a7e6787c2c726ee5b0e35cddd580fb368918fce
-SIZE (xpi/firefox36-i18n-3.6.18/kn.xpi) = 148714
-SHA256 (xpi/firefox36-i18n-3.6.18/ko.xpi) = e0d4a66b781c9771e5f6535f392193062799edb06b1fc400b90c262e77e2cf1a
-SIZE (xpi/firefox36-i18n-3.6.18/ko.xpi) = 115633
-SHA256 (xpi/firefox36-i18n-3.6.18/ku.xpi) = c548eb9793b465f00908e214009d79374046cfaf5f6adf59cf96144a631dc562
-SIZE (xpi/firefox36-i18n-3.6.18/ku.xpi) = 130831
-SHA256 (xpi/firefox36-i18n-3.6.18/lt.xpi) = f0dddc79169c5fceb8e56030c4275bea71e8ff957c73beca9af71c39a0e77f22
-SIZE (xpi/firefox36-i18n-3.6.18/lt.xpi) = 139690
-SHA256 (xpi/firefox36-i18n-3.6.18/lv.xpi) = dfcf1ab0223b280e491076271b8b17bba1c9d8f65603c2cca09ba48a12ff0854
-SIZE (xpi/firefox36-i18n-3.6.18/lv.xpi) = 124806
-SHA256 (xpi/firefox36-i18n-3.6.18/mk.xpi) = f0f9f9e0b54c3f3a78232b49a6c69c3b73856b6602492840d8dc44aa1c64e12d
-SIZE (xpi/firefox36-i18n-3.6.18/mk.xpi) = 128238
-SHA256 (xpi/firefox36-i18n-3.6.18/ml.xpi) = 94b6c84fd152c96cf727d82f1672310ac895d3af12c71526bd04018c9264164d
-SIZE (xpi/firefox36-i18n-3.6.18/ml.xpi) = 152168
-SHA256 (xpi/firefox36-i18n-3.6.18/mr.xpi) = c00de19360ddb043e79e456652f278e1b6e8dc8bc80e941c26e303b1bb06d9be
-SIZE (xpi/firefox36-i18n-3.6.18/mr.xpi) = 141125
-SHA256 (xpi/firefox36-i18n-3.6.18/nb-NO.xpi) = 7743cc5245067d9e30b2c42e11200fbe267133d5d4ecc64d7f4d461995c689e5
-SIZE (xpi/firefox36-i18n-3.6.18/nb-NO.xpi) = 124100
-SHA256 (xpi/firefox36-i18n-3.6.18/nl.xpi) = 7b9df9856d705d5cda89df08104d548cff989304bf25c3630a6de67467edc0f8
-SIZE (xpi/firefox36-i18n-3.6.18/nl.xpi) = 126409
-SHA256 (xpi/firefox36-i18n-3.6.18/nn-NO.xpi) = 46a9df1d094ff4a8152b80892b43d784621534d2ad7bf5fe9deebce9dd876e40
-SIZE (xpi/firefox36-i18n-3.6.18/nn-NO.xpi) = 125131
-SHA256 (xpi/firefox36-i18n-3.6.18/oc.xpi) = 2129db9be63bc3e1237555c38384e756523a7ca2f28ec4006c8f0c67c739fdb2
-SIZE (xpi/firefox36-i18n-3.6.18/oc.xpi) = 108301
-SHA256 (xpi/firefox36-i18n-3.6.18/or.xpi) = 2cc812d8465aee3645c004a104b86b89dc1b945fe430b69e0bb80f671326bba6
-SIZE (xpi/firefox36-i18n-3.6.18/or.xpi) = 142445
-SHA256 (xpi/firefox36-i18n-3.6.18/pa-IN.xpi) = 00d6ec8adda6ec9c49417844c9b4165d0ba3ce98d677467dbf0672c5ea5d41ab
-SIZE (xpi/firefox36-i18n-3.6.18/pa-IN.xpi) = 142084
-SHA256 (xpi/firefox36-i18n-3.6.18/pl.xpi) = 9141a13fec4533112ff2953fd8f21f85982c42f3e79d8a99f4a94ceaad5a49f1
-SIZE (xpi/firefox36-i18n-3.6.18/pl.xpi) = 131038
-SHA256 (xpi/firefox36-i18n-3.6.18/pt-BR.xpi) = ea0dfda721f85b74b1b1a6621b8a180f618a1583d088f01546c2c385eb460173
-SIZE (xpi/firefox36-i18n-3.6.18/pt-BR.xpi) = 125364
-SHA256 (xpi/firefox36-i18n-3.6.18/pt-PT.xpi) = e26e496b4e02b1833a38258877de428e4d98294de5b09eca8b3668418601fa86
-SIZE (xpi/firefox36-i18n-3.6.18/pt-PT.xpi) = 125422
-SHA256 (xpi/firefox36-i18n-3.6.18/rm.xpi) = 565be68d618f55dabbab755538854edc0760318a202f40411627919a0ca8f4ac
-SIZE (xpi/firefox36-i18n-3.6.18/rm.xpi) = 127397
-SHA256 (xpi/firefox36-i18n-3.6.18/ro.xpi) = 7aa806b49d31849bd82ed5a711757a99b78fe1bae55deca2ff4b09523be5db15
-SIZE (xpi/firefox36-i18n-3.6.18/ro.xpi) = 129116
-SHA256 (xpi/firefox36-i18n-3.6.18/ru.xpi) = 2763a4bb49e7fc220424434ea249e8b4102033895f03e205a40a48e715cbd55d
-SIZE (xpi/firefox36-i18n-3.6.18/ru.xpi) = 124942
-SHA256 (xpi/firefox36-i18n-3.6.18/si.xpi) = 5c864c6703d7b51eb5dd4990f8d78dd487b4658c378c30dfc2afdde99ca58227
-SIZE (xpi/firefox36-i18n-3.6.18/si.xpi) = 142189
-SHA256 (xpi/firefox36-i18n-3.6.18/sk.xpi) = 4e8dcb87bbc74670c974dfa5101e09db5804aac2ecb6ad5aa11288570342ad0d
-SIZE (xpi/firefox36-i18n-3.6.18/sk.xpi) = 131107
-SHA256 (xpi/firefox36-i18n-3.6.18/sl.xpi) = ea3fe79b466408496d36a2ff1d22641b6d6c4a8db493271e50ecf9915b0c3cbc
-SIZE (xpi/firefox36-i18n-3.6.18/sl.xpi) = 124289
-SHA256 (xpi/firefox36-i18n-3.6.18/sq.xpi) = 96a6bbcb711d8cb3a2b07df4baf7652a6d8108368684f98e2ffd4bb366929331
-SIZE (xpi/firefox36-i18n-3.6.18/sq.xpi) = 121259
-SHA256 (xpi/firefox36-i18n-3.6.18/sr.xpi) = d0a54c5479d271365d8a58f60aa9bb08aea1354549eed803009841c06635418d
-SIZE (xpi/firefox36-i18n-3.6.18/sr.xpi) = 135921
-SHA256 (xpi/firefox36-i18n-3.6.18/sv-SE.xpi) = 06498200807e9a4a937c95a9b30a7bbd4a1160c3807bf431538b34c10edb8776
-SIZE (xpi/firefox36-i18n-3.6.18/sv-SE.xpi) = 128436
-SHA256 (xpi/firefox36-i18n-3.6.18/ta-LK.xpi) = 93b0fc2c6bba0feb0e8d086d52efc615a885cce9713b12f1c246da90553187ae
-SIZE (xpi/firefox36-i18n-3.6.18/ta-LK.xpi) = 149287
-SHA256 (xpi/firefox36-i18n-3.6.18/ta.xpi) = 85fc93015b2d28841a218c415c915f538be4bd094d4eefb5c9d9ba07f489ad09
-SIZE (xpi/firefox36-i18n-3.6.18/ta.xpi) = 137230
-SHA256 (xpi/firefox36-i18n-3.6.18/te.xpi) = 7fb2e988697396d35acb6b60dc4a00b2acd7e71e9613bb936cce78c28344615b
-SIZE (xpi/firefox36-i18n-3.6.18/te.xpi) = 147869
-SHA256 (xpi/firefox36-i18n-3.6.18/th.xpi) = cb30bc1cf6fa8867764325b81f3574ebf04fa50726d174c59fc046614301b50f
-SIZE (xpi/firefox36-i18n-3.6.18/th.xpi) = 134398
-SHA256 (xpi/firefox36-i18n-3.6.18/tr.xpi) = 23b49730637422c34ac58cd043081627eb06f6f08567509f286e827443040321
-SIZE (xpi/firefox36-i18n-3.6.18/tr.xpi) = 125362
-SHA256 (xpi/firefox36-i18n-3.6.18/uk.xpi) = e95f83a5fb6cfe6adb546485ab9c249248c6a67621e404ce645f8f3ce3db3740
-SIZE (xpi/firefox36-i18n-3.6.18/uk.xpi) = 143185
-SHA256 (xpi/firefox36-i18n-3.6.18/vi.xpi) = 22ce8a29d3ab0d15ccb2b38e454abe4383a6029221881960b192787a378c4718
-SIZE (xpi/firefox36-i18n-3.6.18/vi.xpi) = 129032
-SHA256 (xpi/firefox36-i18n-3.6.18/zh-CN.xpi) = 0af247e771a6dbd4c17dc07e818dfe4cf32838ea6d61429e0294730ab665e494
-SIZE (xpi/firefox36-i18n-3.6.18/zh-CN.xpi) = 127099
-SHA256 (xpi/firefox36-i18n-3.6.18/zh-TW.xpi) = bf44a6af56589808f77a760f8c36ee0515bfda957817aa21ebe063d993c99124
-SIZE (xpi/firefox36-i18n-3.6.18/zh-TW.xpi) = 128516
+SHA256 (xpi/firefox36-i18n-3.6.20/af.xpi) = 2b07c056a1790905dd9a0b81b87d16181b7209c1d57eea5389538b8b95f386ff
+SIZE (xpi/firefox36-i18n-3.6.20/af.xpi) = 121642
+SHA256 (xpi/firefox36-i18n-3.6.20/ar.xpi) = d32b4beae719721b28b499f1d89f93af33f043f7a534914d406269d225d477c3
+SIZE (xpi/firefox36-i18n-3.6.20/ar.xpi) = 132121
+SHA256 (xpi/firefox36-i18n-3.6.20/as.xpi) = 8b1399e2d9d17b8273044259eaee3aa2f94885e8260e7132e75bac7ee60cc2a0
+SIZE (xpi/firefox36-i18n-3.6.20/as.xpi) = 134264
+SHA256 (xpi/firefox36-i18n-3.6.20/be.xpi) = 1b9e8f07394e60e601cd3bfe438d4e5d746b348aed30c522c6cc38d8ce669817
+SIZE (xpi/firefox36-i18n-3.6.20/be.xpi) = 122270
+SHA256 (xpi/firefox36-i18n-3.6.20/bg.xpi) = 34c76fc3ef15c193a7cc85d6bd971f81ba73b40973c6dbca1d91ead31f68c38d
+SIZE (xpi/firefox36-i18n-3.6.20/bg.xpi) = 134075
+SHA256 (xpi/firefox36-i18n-3.6.20/bn-BD.xpi) = 6008cb24195cbde7bc95fb0d3259df4b41e0e69ce120c46427156c76092aee4e
+SIZE (xpi/firefox36-i18n-3.6.20/bn-BD.xpi) = 141179
+SHA256 (xpi/firefox36-i18n-3.6.20/bn-IN.xpi) = c984fb202812d8e5b73435ce20678d06d221dfe865c55d90824e183d6ea15754
+SIZE (xpi/firefox36-i18n-3.6.20/bn-IN.xpi) = 160075
+SHA256 (xpi/firefox36-i18n-3.6.20/ca.xpi) = 85a18150a46d294a4710db46f075c3bf16d481bc6cc60243e510a5691c82c1c7
+SIZE (xpi/firefox36-i18n-3.6.20/ca.xpi) = 127934
+SHA256 (xpi/firefox36-i18n-3.6.20/cs.xpi) = 46fd7d8433bfd2a873ab5953d3979eb5c130666912d0a90d7e985ce8b438f0b3
+SIZE (xpi/firefox36-i18n-3.6.20/cs.xpi) = 126764
+SHA256 (xpi/firefox36-i18n-3.6.20/cy.xpi) = 1cabe8ab106b6b9fea64b46fe9e8cc530f4c06a1fe76322be080d520c04dab7b
+SIZE (xpi/firefox36-i18n-3.6.20/cy.xpi) = 121947
+SHA256 (xpi/firefox36-i18n-3.6.20/da.xpi) = cdb8ca7e001a0d561a8852590836bcb0d458b2b75605b4f32b25a1bc6729fe31
+SIZE (xpi/firefox36-i18n-3.6.20/da.xpi) = 125571
+SHA256 (xpi/firefox36-i18n-3.6.20/de.xpi) = 52c80f3ed136750a939ab32a542e707f75c2f32c997add2df53f92dbc60e059d
+SIZE (xpi/firefox36-i18n-3.6.20/de.xpi) = 128968
+SHA256 (xpi/firefox36-i18n-3.6.20/el.xpi) = 2fe939a5aa9f0324b18da9955e061e25ac692615b4e3413d02b7aae55acca5d8
+SIZE (xpi/firefox36-i18n-3.6.20/el.xpi) = 135212
+SHA256 (xpi/firefox36-i18n-3.6.20/en-GB.xpi) = d7a602a83925b317567cd2623f08cd9066ffcc47b3111076c80c6b0f3c6acd47
+SIZE (xpi/firefox36-i18n-3.6.20/en-GB.xpi) = 119245
+SHA256 (xpi/firefox36-i18n-3.6.20/eo.xpi) = f17b526ef77f3c4fa18410d28b39dea853b913bbab2bd18542e5d93429cef4b5
+SIZE (xpi/firefox36-i18n-3.6.20/eo.xpi) = 121845
+SHA256 (xpi/firefox36-i18n-3.6.20/es-AR.xpi) = cc2e1446fec321c6d2ac9a8ce52402c66cc4a3616f850666a6eec40461a94641
+SIZE (xpi/firefox36-i18n-3.6.20/es-AR.xpi) = 127758
+SHA256 (xpi/firefox36-i18n-3.6.20/es-CL.xpi) = 4c7e3e066b25b114ecb004ee0bb2c54e71e536d0fb4264777e56f2673af10379
+SIZE (xpi/firefox36-i18n-3.6.20/es-CL.xpi) = 129467
+SHA256 (xpi/firefox36-i18n-3.6.20/es-ES.xpi) = 1d2f99a59e8ac5af5c9bfb17ac02447f5e7162c2d34ba85b7ba3296381f7f509
+SIZE (xpi/firefox36-i18n-3.6.20/es-ES.xpi) = 108666
+SHA256 (xpi/firefox36-i18n-3.6.20/es-MX.xpi) = a86af87dca5dd93efe0fa4a3dc5f8f0539b778f29d2463fbac7e9c291bef10c3
+SIZE (xpi/firefox36-i18n-3.6.20/es-MX.xpi) = 127396
+SHA256 (xpi/firefox36-i18n-3.6.20/et.xpi) = c16e20cc1fa28889a76fc3c6fff6dad7c2c03014336a1480a03ca4f132953174
+SIZE (xpi/firefox36-i18n-3.6.20/et.xpi) = 127368
+SHA256 (xpi/firefox36-i18n-3.6.20/eu.xpi) = ba8f2a0b8c623f462a68db9d3d81116834e53d8611090166efe767c76312c4f4
+SIZE (xpi/firefox36-i18n-3.6.20/eu.xpi) = 121825
+SHA256 (xpi/firefox36-i18n-3.6.20/fa.xpi) = 4786bc73dfea8dec915c3513b64a3725b6741932baa83659343d73231f3c036e
+SIZE (xpi/firefox36-i18n-3.6.20/fa.xpi) = 138375
+SHA256 (xpi/firefox36-i18n-3.6.20/fi.xpi) = 18312d777fdb954e074199d884caa6da9f980b066a334c9dc0ac3aaa22609611
+SIZE (xpi/firefox36-i18n-3.6.20/fi.xpi) = 126821
+SHA256 (xpi/firefox36-i18n-3.6.20/fr.xpi) = 894ac3b62de2f019bb3ffd9f13560cb91d41d22efac6be590db6eeb7c6f5dc02
+SIZE (xpi/firefox36-i18n-3.6.20/fr.xpi) = 129000
+SHA256 (xpi/firefox36-i18n-3.6.20/fy-NL.xpi) = 54394cc2221a0e9cc9d318121f919edc9f404a837fef2e0c385bd82a808fecd2
+SIZE (xpi/firefox36-i18n-3.6.20/fy-NL.xpi) = 129185
+SHA256 (xpi/firefox36-i18n-3.6.20/ga-IE.xpi) = 1ce534d9fd48ece4bf63c8d97c10678655e42310afbe8f89e6457a203686a83d
+SIZE (xpi/firefox36-i18n-3.6.20/ga-IE.xpi) = 127774
+SHA256 (xpi/firefox36-i18n-3.6.20/gl.xpi) = 9b73cf10001d39c46d574171fcf99491e50ffae882bce5c5e0dc946f81f4418c
+SIZE (xpi/firefox36-i18n-3.6.20/gl.xpi) = 124796
+SHA256 (xpi/firefox36-i18n-3.6.20/gu-IN.xpi) = a6926155a9c9e4bc39112372b3b2d4797131fa04b262af9b13132da66baa4c00
+SIZE (xpi/firefox36-i18n-3.6.20/gu-IN.xpi) = 146300
+SHA256 (xpi/firefox36-i18n-3.6.20/he.xpi) = a7f336c12a0e9295194f8dca63acb9acdccd77a64211851c74864ba683c130cc
+SIZE (xpi/firefox36-i18n-3.6.20/he.xpi) = 123103
+SHA256 (xpi/firefox36-i18n-3.6.20/hi-IN.xpi) = 914205b7eb19ed5b5ddfb1484ed4481070d237a25389a7ffe3ba32a33c569184
+SIZE (xpi/firefox36-i18n-3.6.20/hi-IN.xpi) = 141886
+SHA256 (xpi/firefox36-i18n-3.6.20/hr.xpi) = 4ae7fb5ec4f76b53d007e9f9c9ba9554f55e9c5e2e1ca3fbca3525810126d430
+SIZE (xpi/firefox36-i18n-3.6.20/hr.xpi) = 126982
+SHA256 (xpi/firefox36-i18n-3.6.20/hu.xpi) = cd7b4080404a1df1bd01f024af2a834b9e1d3236d947be8cab96c9707cf502bb
+SIZE (xpi/firefox36-i18n-3.6.20/hu.xpi) = 131099
+SHA256 (xpi/firefox36-i18n-3.6.20/id.xpi) = d057296c9d9601b34c2c4bb58e4d6aa1af30be540e9ae8a1b74038e0bb37a65a
+SIZE (xpi/firefox36-i18n-3.6.20/id.xpi) = 103928
+SHA256 (xpi/firefox36-i18n-3.6.20/is.xpi) = f96d27c4c18b28fc2d86adad2118eb9ec1f9702bd32e1a64c2a87b0e4d0e52a0
+SIZE (xpi/firefox36-i18n-3.6.20/is.xpi) = 123424
+SHA256 (xpi/firefox36-i18n-3.6.20/it.xpi) = 1a4a84b0f0f32927a6660748cb4e348683cd969d759882f78a2c8a59fa5b7628
+SIZE (xpi/firefox36-i18n-3.6.20/it.xpi) = 107972
+SHA256 (xpi/firefox36-i18n-3.6.20/ja.xpi) = a60eb63ad0128072c1b282476f4cdf9d0898489f0f3778bf961f87313ed9e183
+SIZE (xpi/firefox36-i18n-3.6.20/ja.xpi) = 137012
+SHA256 (xpi/firefox36-i18n-3.6.20/ka.xpi) = 3e483772663f978ca1e263262156d682ec1762d1d2f600d8495d2f5a1678c5e1
+SIZE (xpi/firefox36-i18n-3.6.20/ka.xpi) = 154149
+SHA256 (xpi/firefox36-i18n-3.6.20/kk.xpi) = ed2edcc7ac43e1361ef3d511ec5e2e3a1c2e04aacab033880ed6b8d4d1f6b48d
+SIZE (xpi/firefox36-i18n-3.6.20/kk.xpi) = 137753
+SHA256 (xpi/firefox36-i18n-3.6.20/kn.xpi) = 705ffc4da7aa0a7c77f26f46fbfe6db782ea9b6a7d530264adad50a4430dd59a
+SIZE (xpi/firefox36-i18n-3.6.20/kn.xpi) = 148708
+SHA256 (xpi/firefox36-i18n-3.6.20/ko.xpi) = dfa3c5b0127f8fdf1d44198f01f66d1553996961dcf7e9cdf4eb716ac60981f0
+SIZE (xpi/firefox36-i18n-3.6.20/ko.xpi) = 115633
+SHA256 (xpi/firefox36-i18n-3.6.20/ku.xpi) = 980993c883f6ee82539c927fba6221977396e30b4399e2f614e4e426ee78ee6c
+SIZE (xpi/firefox36-i18n-3.6.20/ku.xpi) = 130807
+SHA256 (xpi/firefox36-i18n-3.6.20/lt.xpi) = 6d75f49612aef91500705b997cf6e9341943d77b834907cdae7bef4ef5272db2
+SIZE (xpi/firefox36-i18n-3.6.20/lt.xpi) = 139686
+SHA256 (xpi/firefox36-i18n-3.6.20/lv.xpi) = c2a422308855a895ff63a4581f2df04b3d2fc43b4be49a56364ad4bc1733b0dd
+SIZE (xpi/firefox36-i18n-3.6.20/lv.xpi) = 124814
+SHA256 (xpi/firefox36-i18n-3.6.20/mk.xpi) = 52bbeb4103ca76a41f988db139ffdfccc278325e2ca8c47594cb3bcc9c52e0e0
+SIZE (xpi/firefox36-i18n-3.6.20/mk.xpi) = 128266
+SHA256 (xpi/firefox36-i18n-3.6.20/ml.xpi) = 6d34b1d5a93a174d7a176d6f718925feec8987cede4d9b3afe6ea573526ebf0f
+SIZE (xpi/firefox36-i18n-3.6.20/ml.xpi) = 152168
+SHA256 (xpi/firefox36-i18n-3.6.20/mr.xpi) = bfdd5f6efad9d792fc465d974fce2874a4ca640f18a55a606e400ff286ccb9f5
+SIZE (xpi/firefox36-i18n-3.6.20/mr.xpi) = 141117
+SHA256 (xpi/firefox36-i18n-3.6.20/nb-NO.xpi) = 5fe9abe93b0b0b635c517350bf6367c3f1c2c5a6c831ecbc284bcdc257edca96
+SIZE (xpi/firefox36-i18n-3.6.20/nb-NO.xpi) = 124101
+SHA256 (xpi/firefox36-i18n-3.6.20/nl.xpi) = 460ead617e9535dfff93bff7e1948ce23695eb65280cd2178317d4bf2f82c457
+SIZE (xpi/firefox36-i18n-3.6.20/nl.xpi) = 126413
+SHA256 (xpi/firefox36-i18n-3.6.20/nn-NO.xpi) = 93934069fabcf268c1e52ea97410727570848c90e5c9da3c96c0e332ee8a2c13
+SIZE (xpi/firefox36-i18n-3.6.20/nn-NO.xpi) = 125104
+SHA256 (xpi/firefox36-i18n-3.6.20/oc.xpi) = 0799a3b93b09d694fff714072d0e44daf9fc4ef7290458585f096ee8f20b3b73
+SIZE (xpi/firefox36-i18n-3.6.20/oc.xpi) = 108305
+SHA256 (xpi/firefox36-i18n-3.6.20/or.xpi) = 1290c4488730c06e42883181dfbd316e0bbdfda9ffd58b0cd68aa69e81b206c6
+SIZE (xpi/firefox36-i18n-3.6.20/or.xpi) = 142446
+SHA256 (xpi/firefox36-i18n-3.6.20/pa-IN.xpi) = 568be3631fad035b4e1d57b10fe4fcdddd3305a77ae4819b23e4bc17431661be
+SIZE (xpi/firefox36-i18n-3.6.20/pa-IN.xpi) = 142118
+SHA256 (xpi/firefox36-i18n-3.6.20/pl.xpi) = 4687703863826186c186819fbdff9fc6769019ba398ea88e4fb4306d9952b6f8
+SIZE (xpi/firefox36-i18n-3.6.20/pl.xpi) = 131010
+SHA256 (xpi/firefox36-i18n-3.6.20/pt-BR.xpi) = 7dcf3798c55c314b25b625b000ea0bce1613d57392151f0909ae4d1c74c86dae
+SIZE (xpi/firefox36-i18n-3.6.20/pt-BR.xpi) = 125361
+SHA256 (xpi/firefox36-i18n-3.6.20/pt-PT.xpi) = cab49b8ba2433ae7cda92b48d6814d37fb4c14418c6e1a13a2973e86a93832ba
+SIZE (xpi/firefox36-i18n-3.6.20/pt-PT.xpi) = 125384
+SHA256 (xpi/firefox36-i18n-3.6.20/rm.xpi) = bb75ac2dc6c37caa2b6bf9b506fe2a19ca5b2d1c19c8f4aedea9afc05e07f02e
+SIZE (xpi/firefox36-i18n-3.6.20/rm.xpi) = 127396
+SHA256 (xpi/firefox36-i18n-3.6.20/ro.xpi) = 61cf46aa559f6863d2838cc73a8c5496fe9b7e81f424d35390d9b15b449ce455
+SIZE (xpi/firefox36-i18n-3.6.20/ro.xpi) = 129135
+SHA256 (xpi/firefox36-i18n-3.6.20/ru.xpi) = 0779469667d0c6520844de7f960b6977640527152a89ce9911ed584949150901
+SIZE (xpi/firefox36-i18n-3.6.20/ru.xpi) = 124911
+SHA256 (xpi/firefox36-i18n-3.6.20/si.xpi) = 767f681e3c023313651b1679f83953977cebcf41690686e23931851c9803c0bd
+SIZE (xpi/firefox36-i18n-3.6.20/si.xpi) = 142227
+SHA256 (xpi/firefox36-i18n-3.6.20/sk.xpi) = 9bd3bac36b73e7b66c529f03dc267784843d81e3ba21e37d445102645dc523a9
+SIZE (xpi/firefox36-i18n-3.6.20/sk.xpi) = 131112
+SHA256 (xpi/firefox36-i18n-3.6.20/sl.xpi) = eaa75ea0ac57fda525773a0fe4f9add4767c84c7800fb5774b5648d0093ad11d
+SIZE (xpi/firefox36-i18n-3.6.20/sl.xpi) = 124259
+SHA256 (xpi/firefox36-i18n-3.6.20/sq.xpi) = 04307e85a43313c9e3108a435aaabd84713dc9dd24c09026216579b587ea4714
+SIZE (xpi/firefox36-i18n-3.6.20/sq.xpi) = 121273
+SHA256 (xpi/firefox36-i18n-3.6.20/sr.xpi) = 2a290c335cff6622030ebcf3e4104812e00f40c8d2723e60ea79de81b66ea446
+SIZE (xpi/firefox36-i18n-3.6.20/sr.xpi) = 135921
+SHA256 (xpi/firefox36-i18n-3.6.20/sv-SE.xpi) = 12aa332d6e01209231ec2da2dd8ceaed8eb219cac85383d3c8f5cd09495c2bb2
+SIZE (xpi/firefox36-i18n-3.6.20/sv-SE.xpi) = 128408
+SHA256 (xpi/firefox36-i18n-3.6.20/ta-LK.xpi) = b06f123cf08690aa5ce0a76d6cf85d42d87548fad1099e89b071330b1cbb7361
+SIZE (xpi/firefox36-i18n-3.6.20/ta-LK.xpi) = 149288
+SHA256 (xpi/firefox36-i18n-3.6.20/ta.xpi) = 5239c863c5f470a3e52dfc97ff0057d770e4ccff97d58aaefc580bad83f09739
+SIZE (xpi/firefox36-i18n-3.6.20/ta.xpi) = 137231
+SHA256 (xpi/firefox36-i18n-3.6.20/te.xpi) = 706ac758aeeaf52b0ba3fe97fe2e5e314a8b3ffb222e78a6be77e5b9d81e7ac6
+SIZE (xpi/firefox36-i18n-3.6.20/te.xpi) = 147868
+SHA256 (xpi/firefox36-i18n-3.6.20/th.xpi) = 0bc1cce51220a03b3697d9d304d9f0c422a7abc2783671e97c59d122dd31b8b6
+SIZE (xpi/firefox36-i18n-3.6.20/th.xpi) = 134397
+SHA256 (xpi/firefox36-i18n-3.6.20/tr.xpi) = 3cae56d25286de466e4133f7ed1c3c9a8f4da76634703b28b090239f972bb1a5
+SIZE (xpi/firefox36-i18n-3.6.20/tr.xpi) = 125330
+SHA256 (xpi/firefox36-i18n-3.6.20/uk.xpi) = 5954d62a55694a26f9b5a8355e78b95b4322e55191baa37266de1067f2a4d545
+SIZE (xpi/firefox36-i18n-3.6.20/uk.xpi) = 143217
+SHA256 (xpi/firefox36-i18n-3.6.20/vi.xpi) = 8986d199d6251ea1325698edcf351c559bf5ebba1083773eb07b72f6b0872453
+SIZE (xpi/firefox36-i18n-3.6.20/vi.xpi) = 129024
+SHA256 (xpi/firefox36-i18n-3.6.20/zh-CN.xpi) = c8b90c078dbfa497040662566b00c6fe54a80c3781b1c840c71adc11f8e335bc
+SIZE (xpi/firefox36-i18n-3.6.20/zh-CN.xpi) = 127092
+SHA256 (xpi/firefox36-i18n-3.6.20/zh-TW.xpi) = 521b0964814ce374e758e046dffc9980c5d7ab1eae3253942705fb3ce5fcd1a2
+SIZE (xpi/firefox36-i18n-3.6.20/zh-TW.xpi) = 128541

Modified: trunk/www/firefox36/Makefile
==============================================================================
--- trunk/www/firefox36/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox36/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox36/Makefile,v 1.242 2011/06/21 20:35:48 flo Exp $
+# $FreeBSD: ports/www/firefox36/Makefile,v 1.245 2011/08/23 18:39:15 kwm Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.6.18
+DISTVERSION=	3.6.20
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -27,8 +28,6 @@
 MOZILLA_SUFX=	3
 MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
 MOZ_TOOLKIT=	cairo-gtk2
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
-			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 
 MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
@@ -38,9 +37,7 @@
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
-CONFLICTS_INSTALL=	firefox-3.5.*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
@@ -75,8 +72,6 @@
 
 WRKSRC:=	${WRKSRC}-1.9.2
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -88,16 +83,16 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
-post-extract::
+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:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${WRKSRC}/storage/build/Makefile.in \
 		${WRKSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \

Modified: trunk/www/firefox36/distinfo
==============================================================================
--- trunk/www/firefox36/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/firefox36/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (firefox-3.6.18.source.tar.bz2) = 6780185e0ea8e112e337c36bb7b3900ec7b72dd4445e0bd2983b748b84049e04
-SIZE (firefox-3.6.18.source.tar.bz2) = 51553263
+SHA256 (firefox-3.6.20.source.tar.bz2) = 0e8e3110c8cd1f4ad913c3c7424952b1aeebf6b375e8f6b5ccfe3e0b6d8abb18
+SIZE (firefox-3.6.20.source.tar.bz2) = 51564376

Modified: trunk/www/kompozer/Makefile
==============================================================================
--- trunk/www/kompozer/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/kompozer/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,7 +2,7 @@
 # Date created:		August 21, 2004
 # Whom:			Thierry Thomas <thierry@pompo.net>
 #
-# $FreeBSD: ports/www/kompozer/Makefile,v 1.48 2010/03/28 06:44:51 dinoex Exp $
+# $FreeBSD: ports/www/kompozer/Makefile,v 1.50 2011/08/16 18:36:10 flo Exp $
 #    $MCom: ports/www/nvu/Makefile,v 1.5 2006/07/18 15:07:36 ahze Exp $
 #
 
@@ -39,13 +39,8 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH}=="powerpc"
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED
-} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-.endif
-
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${WRKSRC}/storage/build/Makefile.in
 	@${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache
 	@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/libxul/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		2006-02-20
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD: ports/www/libxul/Makefile,v 1.27 2011/03/24 13:18:39 beat Exp $
+# $FreeBSD: ports/www/libxul/Makefile,v 1.30 2011/08/23 18:39:15 kwm Exp $
 #
 
 PORTNAME=	libxul
 DISTVERSION=	1.9.2.17
+PORTREVISION=	1
 CATEGORIES?=	www devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	xulrunner/releases/${DISTVERSION}/source
@@ -51,8 +52,6 @@
 
 .include <bsd.port.pre.mk>
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${OSVERSION} < 700000
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
@@ -73,11 +72,11 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 	    	${WRKSRC}/storage/build/Makefile.in \
 		${WRKSRC}/db/sqlite3/src/Makefile.in
 	${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \

Modified: trunk/www/seamonkey-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.2 2011/08/10 21:32:08 flo Exp $
+# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.5 2011/08/23 08:00:17 ale Exp $
 #
 
 PORTNAME=	seamonkey-i18n
-PORTVERSION=	2.2
+PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	seamonkey/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
@@ -14,12 +15,12 @@
 DIST_SUBDIR=	xpi/${DISTNAME}
 
 MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Localized interface for SeaMonkey 2.2
+COMMENT=	Localized interface for SeaMonkey 2.3
 
 EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
-USE_SEAMONKEY=	yes
-USE_XPI=	*seamonkey
+USE_SEAMONKEY=	23
+USE_XPI=	seamonkey
 
 USE_SUBMAKE=	yes
 
@@ -55,8 +56,10 @@
 		then \
 			exit 1; \
 		fi; \
-		cd ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org/chrome; \
-		${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \
+		cd ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org/chrome/$$lang; \
+		${LOCALBASE}/bin/zip -r ../$$lang.jar locale; \
+		cd ..; ${RM} -rf $$lang; cd ..; \
+		${REINPLACE_CMD} -i "" "s,chrome/$$lang,jar:chrome/$$lang.jar!," chrome.manifest; \
 	done
 
 do-install:

Modified: trunk/www/seamonkey-i18n/distinfo
==============================================================================
--- trunk/www/seamonkey-i18n/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey-i18n/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,44 +1,44 @@
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ca.langpack.xpi) = 433a6e1dea81a1dbe9fc5f0e360845affb71dec9e3c5a669cc355281f17d70d9
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ca.langpack.xpi) = 811514
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.cs.langpack.xpi) = 666d504cf2d216a7a8de8a13898719da89a42166e4ee1d4c2d2bfcb4c9e39b6e
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.cs.langpack.xpi) = 814944
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.de.langpack.xpi) = 13c3f08bcda947e5c20111a73bee995d5ac8bd97defd8ad235530b61d75de72a
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.de.langpack.xpi) = 857283
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-GB.langpack.xpi) = 8133dc83554f01712330682c2b269ccb2917ee3064ef7394ef9f82db26845932
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-GB.langpack.xpi) = 787529
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-US.langpack.xpi) = 8ac1ce65dc5044deabd9e1b49234f448cff3435b0660e42e091ddb611d219cda
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-US.langpack.xpi) = 786992
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-AR.langpack.xpi) = 4db1673c306b821dca7de124415b4b92c339a076bc7cd38892ae06927659c982
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-AR.langpack.xpi) = 813118
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-ES.langpack.xpi) = 08158721a1122ad6a74f688792e5f7e6e33ce078e1118dd8f13386da6eda6bd9
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-ES.langpack.xpi) = 785711
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fi.langpack.xpi) = a1350aa978c30a71f5ea2a7983bf2bb3f27ad46ad2572d355b565664ebe66804
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fi.langpack.xpi) = 807217
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fr.langpack.xpi) = fcac0a2c51cf193fa2c712670a6c73e94ed58588ddd8dc0ad3e708b777f81842
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fr.langpack.xpi) = 896104
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.hu.langpack.xpi) = 95a1e3f685b74a8d655bdeec7bdb7a8ce88699dff9432483b5cadab3bbe10982
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.hu.langpack.xpi) = 827308
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.it.langpack.xpi) = 28e7b90ff8d7596d7fca6c253d8fd2b1fc9464217cb7fe1a86a4ae9b832a1f8c
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.it.langpack.xpi) = 739672
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja-JP-mac.langpack.xpi) = a83857fdebb8df144e725ccbc399e68447dc887d3539c27be4c2e5dd8ed43796
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja-JP-mac.langpack.xpi) = 885812
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja.langpack.xpi) = ad3d03f42747427c3c862a6a30cb4b513a66fb21a8fee778cc56f3f3a013761e
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja.langpack.xpi) = 861377
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.lt.langpack.xpi) = d129bc0278ca8637df4fe377c29ffcc687d2d20b4de35b7144d83508bfeb6713
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.lt.langpack.xpi) = 959540
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nb-NO.langpack.xpi) = 15818961fa34bc4610fcce26f8bd8885495f030d2ddf5d3f05fa0ee69aafbf96
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nb-NO.langpack.xpi) = 805675
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nl.langpack.xpi) = 34385a5ae09d976b7124366cea2304ce6b4489119c337b175fb9340529324a76
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nl.langpack.xpi) = 804311
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pl.langpack.xpi) = 44e0e2883601f7a71c64e8fad1e5653904dab5f25834cc96b479f7d3efa73f01
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pl.langpack.xpi) = 825438
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pt-PT.langpack.xpi) = d733234dc5b11ea32b611d54efefea31eea331d21555db91712f9810d1f2493c
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pt-PT.langpack.xpi) = 842511
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ru.langpack.xpi) = 15700e56b4ead24fb08c8a65b615343a56f364dee311dc5e808f1055c9277c5a
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ru.langpack.xpi) = 889516
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sk.langpack.xpi) = a25e78e2c9e682910bd6fcdc7639ac7902d07f99ac9ccb85e567bb28606dcfcd
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sk.langpack.xpi) = 840212
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sv-SE.langpack.xpi) = 83b5e7572ed550e299b2813a0826d3760e18fd49b56a3e852f3be32cd133a1fc
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sv-SE.langpack.xpi) = 869508
-SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.tr.langpack.xpi) = 0bb342f7845493c35f743b3f8589e9fa0d7ed1c283f400eeb929617c13f26f56
-SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.tr.langpack.xpi) = 805151
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ca.langpack.xpi) = f939aeab00dd7261ed20292b398cb076b279612814289e30665cdba8c44cb50a
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ca.langpack.xpi) = 812149
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.cs.langpack.xpi) = f47e9a26e8124980dd5fce7cb01e56e1196934896a0d753778864fb3d1d94fca
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.cs.langpack.xpi) = 815818
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.de.langpack.xpi) = 275132b2a76da4597510fc5d72fce1840ec580c7a564932a5b94e05511a08e8c
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.de.langpack.xpi) = 858157
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.en-GB.langpack.xpi) = c6cb14d30fd87b2e0d0b250999cfd93bd4475fd3fb2246eb29052a0c351566e2
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.en-GB.langpack.xpi) = 788274
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.en-US.langpack.xpi) = 9cdae61ae3ad0eca8d1f6434cb74b7d838fa8e2c4ab36e84adcf0b7fede34960
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.en-US.langpack.xpi) = 787693
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.es-AR.langpack.xpi) = 883332c947fc4cfd3d81fd1fb9e04df4ba27effd825f702b8a68086995431f3a
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.es-AR.langpack.xpi) = 813751
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.es-ES.langpack.xpi) = ef98e845c899b4ce3649ec657ec879d82fc2a757243d79824871549051f17512
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.es-ES.langpack.xpi) = 786103
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.fi.langpack.xpi) = 860c3283f5358f3bc6fa932c303e2a26f5da14a0200be586641b787b4dc8111d
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.fi.langpack.xpi) = 807886
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.fr.langpack.xpi) = 869c575724c45bc1706b31bdc27b4f7d447fe2b21ec3fb47dd1c25c71e7421f2
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.fr.langpack.xpi) = 896690
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.hu.langpack.xpi) = e61a5870ea87ae690b3f6590ea76ccc43a3074ae30d7f6f58731afc7d8eb98a1
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.hu.langpack.xpi) = 829753
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.it.langpack.xpi) = 889460f7a20d64af6ee6dda56fd7151d301b4c4cdfdb29c7e0184ed84eed4215
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.it.langpack.xpi) = 737251
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ja-JP-mac.langpack.xpi) = 5cddac55b523d88ef02d8a9a2c22bd05d53a6ef2d5aa3101c3249ccbfad26bce
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ja-JP-mac.langpack.xpi) = 886678
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ja.langpack.xpi) = 65b8364f105b62acad9022aadefc79615fc52172d3c84ef9bd51df50b018201d
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ja.langpack.xpi) = 862244
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.lt.langpack.xpi) = bb038f4aea2728f50a3af52e2325a8e798230585f912f0f4eec486699f60f242
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.lt.langpack.xpi) = 960314
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.nb-NO.langpack.xpi) = c2280f1940b79ba1eff704d7cd41a9153c6e065cd742c17edd32a3def70ebbbb
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.nb-NO.langpack.xpi) = 806302
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.nl.langpack.xpi) = 7504a0fb10a25b2af1922ad50914fdb1a0c33f7e8119c34c5ef5638ba06f0a1c
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.nl.langpack.xpi) = 804973
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.pl.langpack.xpi) = 2dca139d0c1f8a002338466cc10e53e34c6cfdb3b43624d36bc9db3e6f95ccc0
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.pl.langpack.xpi) = 826227
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.pt-PT.langpack.xpi) = 04f9e49df4216f4b61df08bdc4e33afe50f908119c0a71705413b850b211055e
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.pt-PT.langpack.xpi) = 843400
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ru.langpack.xpi) = 571f7b6a4e1ebbdb7d0cb0b77dbe379010954fb1570d9fc34054407ff69d12ee
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.ru.langpack.xpi) = 889852
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.sk.langpack.xpi) = b8e49d47578eb090f1f10314b687fd815ea2e36a482533d9c1ff00f9854974a0
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.sk.langpack.xpi) = 840864
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.sv-SE.langpack.xpi) = 7f99bb693372633a7f1eec491abcd782b2595aac4783f870bb15d603796fb627
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.sv-SE.langpack.xpi) = 870149
+SHA256 (xpi/seamonkey-i18n-2.3/seamonkey-2.3.tr.langpack.xpi) = 4cfd13af28f092337b5224b1821fa6258f94eddc7763777292c30b8a58742f94
+SIZE (xpi/seamonkey-i18n-2.3/seamonkey-2.3.tr.langpack.xpi) = 805726

Modified: trunk/www/seamonkey-i18n/pkg-descr
==============================================================================
--- trunk/www/seamonkey-i18n/pkg-descr	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey-i18n/pkg-descr	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,3 +1,3 @@
-Language packs for SeaMonkey 2.1
+Language packs for SeaMonkey
 
 WWW: http://www.seamonkey-project.org/releases/#langpacks

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,12 +2,12 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.301 2011/08/10 21:25:33 flo Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.305 2011/08/25 08:35:59 ale Exp $
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.2
-PORTREVISION=	1
+DISTVERSION=	2.3
+PORTREVISION=	3
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -22,7 +22,6 @@
 
 USE_AUTOTOOLS=	autoconf213
 CONFLICTS_BUILD=	spidermonkey-1.[0-7]*
-CONFLICTS_INSTALL=	seamonkey-2.0*
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GECKO=	gecko
@@ -39,10 +38,9 @@
 
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 
-MOZILLA=	${PORTNAME}-${PORTVERSION}
-MOZILLA_EXEC_NAME=	${PORTNAME}
 MOZ_EXTENSIONS=	default
-MOZ_OPTIONS+=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+MOZ_OPTIONS+=	--program-transform-name='s/seamonkey/${MOZILLA}/' \
+		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 		--enable-svg \
 		--enable-application=suite	\
 		--enable-svg-renderer=cairo	\
@@ -72,8 +70,6 @@
 MOZSRC:=	${WRKDIR}/comm-release/mozilla
 WRKSRC=		${WRKDIR}/comm-release
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -110,7 +106,7 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
+		notify.4:${PORTSDIR}/devel/libnotify
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
@@ -131,7 +127,7 @@
 	@${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:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/toolkit/library/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in
@@ -156,17 +152,18 @@
 		${WRKSRC}/mozilla/js/src/configure.in \
 		${WRKSRC}/mozilla/configure.in \
 		${WRKSRC}/configure.in
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
-		${WRKDIR}/seamonkey.desktop
+		${WRKDIR}/${MOZILLA}.desktop
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})
 	(cd ${MOZSRC} && ${AUTOCONF})
 	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
 
 pre-install:
-	${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST}
+	${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}
 .if defined(WITH_LIGHTNING)
 	@${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \
 		${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST}
@@ -174,7 +171,9 @@
 
 do-install:
 	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${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)

Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey/distinfo	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.2.source.tar.bz2) = 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a
-SIZE (seamonkey-2.2.source.tar.bz2) = 87478968
+SHA256 (seamonkey-2.3.source.tar.bz2) = a709ac32c166448da4c9558ca17809ddbfa87f7e0e2a0638387ae080fb6758a4
+SIZE (seamonkey-2.3.source.tar.bz2) = 87002565

Added: trunk/www/seamonkey/files/patch-calendar-base-src-calDateTime.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-calendar-base-src-calDateTime.cpp	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,8 @@
+--- calendar/base/src/calDateTime.cpp.orig	2011-08-03 20:08:23.361859978 +0200
++++ calendar/base/src/calDateTime.cpp	2011-08-03 20:08:32.351860948 +0200
+@@ -1,4 +1,4 @@
+-/* ***** BEGIN LICENSE BLOCK *****
++/* ***** BEGIN LICENSE BLOCK *****
+  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+  *
+  * The contents of this file are subject to the Mozilla Public License Version

Modified: trunk/www/seamonkey/files/patch-config_autoconf.mk.in
==============================================================================
--- trunk/www/seamonkey/files/patch-config_autoconf.mk.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey/files/patch-config_autoconf.mk.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig	2009-07-17 15:18:04.000000000 +0200
-+++ config/autoconf.mk.in	2009-08-25 01:15:47.000000000 +0200
-@@ -61,7 +61,7 @@
+--- 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@
@@ -9,3 +9,13 @@
  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

Modified: trunk/www/seamonkey/files/patch-configure.in
==============================================================================
--- trunk/www/seamonkey/files/patch-configure.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey/files/patch-configure.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,5 +1,5 @@
---- configure.in.orig	2011-07-28 00:58:59.534861026 +0200
-+++ configure.in	2011-07-28 01:00:05.591863508 +0200
+--- configure.in.orig	2011-07-15 07:42:33.000000000 +0200
++++ configure.in	2011-07-22 13:43:44.000000000 +0200
 @@ -1438,7 +1438,7 @@
      CPU_ARCH=sparc
      ;;
@@ -18,3 +18,104 @@
        INTEL_ARCHITECTURE=1
  esac
  
+@@ -1781,7 +1781,7 @@
+     esac
+ 
+     case "${host_cpu}" in
+-    x86_64)
++    amd64 | x86_64)
+         HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
+         ;;
+     esac
+@@ -2437,6 +2437,9 @@
+     x86_64-*)
+     	AC_DEFINE(_AMD64_)
+ 	;;
++    amd64*)
++    	AC_DEFINE(_AMD64_)
++	;;
+     *)
+     	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
+ 	;;
+@@ -2508,7 +2511,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'
+@@ -3326,11 +3329,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
+                 )
+@@ -3405,18 +3408,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
+@@ -3591,7 +3594,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("", "");
+@@ -3612,7 +3615,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";
+@@ -4409,7 +4412,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
+@@ -5966,7 +5969,7 @@
+     i*86)
+       MOZ_CRT_CPU_ARCH=intel
+       ;;
+-    x86_64)
++    amd64 | x86_64)
+       MOZ_CRT_CPU_ARCH=amd64
+       ;;
+     *)

Modified: trunk/www/seamonkey/files/patch-mozilla-js-src-Makefile.in
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-js-src-Makefile.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey/files/patch-mozilla-js-src-Makefile.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,10 +1,41 @@
---- mozilla/js/src/Makefile.in.orig	2009-08-25 18:58:30.000000000 +0200
-+++ mozilla/js/src/Makefile.in	2009-08-25 18:58:47.000000000 +0200
-@@ -428,6 +428,7 @@
+--- mozilla/js/src/Makefile.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/Makefile.in	2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+@@ -469,6 +469,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
+@@ -739,7 +742,7 @@
+ # to reliably get limit macros defined, we'd always have to define the
+ # one below before including any header, but that's obscure and
+ # fragile, so we do it here.
+-DEFINES		+= -D__STDC_LIMIT_MACROS
++DEFINES		+= -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
+ 
+ INCLUDES	+= -I$(srcdir)
+ 
+@@ -793,7 +796,8 @@
+ endif # WINNT
  
  ifeq ($(OS_ARCH),FreeBSD)
- EXTRA_LIBS	+= -pthread
-+LDFLAGS		+= -lc
+-EXTRA_LIBS	+= -pthread
++DEFINES		+= -DFREEBSD
++EXTRA_LIBS	+= -pthread -lc
  endif
  ifeq ($(OS_ARCH),IRIX)
  ifdef USE_N32
+

Deleted: trunk/www/seamonkey/files/patch-mozilla-js-src-configure
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-js-src-configure	Sun Aug 28 15:08:27 2011	(r614)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,26 +0,0 @@
---- mozilla/js/src/configure.orig	2010-10-08 21:56:36.000000000 +0200
-+++ mozilla/js/src/configure	2010-10-10 21:48:36.000000000 +0200
-@@ -5373,7 +5373,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- 
-@@ -7346,14 +7346,6 @@
- EOF
- 
-     ;;
--sparc*-*)
--    ENABLE_TRACEJIT=1
--    NANOJIT_ARCH=Sparc
--    cat >> confdefs.h <<\EOF
--#define JS_CPU_SPARC 1
--EOF
--
--    ;;
- esac
- 
- # Check whether --enable-methodjit or --disable-methodjit was given.

Added: trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,72 @@
+--- mozilla/js/src/configure.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/configure.in	2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+@@ -1495,7 +1495,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
+ esac
+ 
+@@ -2713,7 +2713,7 @@
+     AC_DEFINE(JS_CPU_X86)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
+-x86_64*-*)
++amd64*-*)
+     ENABLE_TRACEJIT=1
+     NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+@@ -2723,23 +2723,23 @@
+     AC_DEFINE(JS_CPU_X64)
+     AC_DEFINE(JS_PUNBOX64)
+     ;;
+-arm*-*)
++x86_64*-*)
+     ENABLE_TRACEJIT=1
+-    NANOJIT_ARCH=ARM
++    NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    AC_DEFINE(JS_CPU_ARM)
+-    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_POLYIC_TYPED_ARRAY=1
++    AC_DEFINE(JS_CPU_X64)
++    AC_DEFINE(JS_PUNBOX64)
+     ;;
+-sparc*-*)
++arm*-*)
+     ENABLE_TRACEJIT=1
+-    NANOJIT_ARCH=Sparc
++    NANOJIT_ARCH=ARM
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    ENABLE_POLYIC_TYPED_ARRAY=1
+-    AC_DEFINE(JS_CPU_SPARC)
++    AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
+ esac
+@@ -2796,6 +2796,10 @@
+ i?86-*)
+     AC_DEFINE(AVMPLUS_IA32)
+     ;;
++amd64*-*)
++    AC_DEFINE(AVMPLUS_AMD64)
++    AC_DEFINE(AVMPLUS_64BIT)
++    ;;
+ x86_64*-*)
+     AC_DEFINE(AVMPLUS_AMD64)
+     AC_DEFINE(AVMPLUS_64BIT)

Added: trunk/www/seamonkey/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,43 @@
+--- 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
+ 

Added: trunk/www/seamonkey/files/patch-mozilla_toolkit_xre_glxtest.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla_toolkit_xre_glxtest.cpp	Sun Aug 28 15:08:27 2011	(r615)
@@ -0,0 +1,25 @@
+--- 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);
+ }

Modified: trunk/www/seamonkey/files/seamonkey.desktop.in
==============================================================================
--- trunk/www/seamonkey/files/seamonkey.desktop.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey/files/seamonkey.desktop.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -160,10 +160,10 @@
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=seamonkey %U
+Exec=%%MOZILLA%% %U
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=%%PREFIX%%/lib/seamonkey-2.2/chrome/icons/default/default48.png
+Icon=%%MOZILLA%%.png
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;

Modified: trunk/www/seamonkey2-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey2-i18n/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey2-i18n/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
-# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.17 2011/03/03 04:39:49 beat Exp $
+# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.22 2011/08/23 08:01:58 ale Exp $
 #
 
 PORTNAME=	seamonkey2-i18n
 PORTVERSION=	2.0.14
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	seamonkey/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
@@ -16,12 +17,12 @@
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Localized interface for SeaMonkey 2
 
-USE_SEAMONKEY=	yes
-USE_XPI=	*seamonkey
+USE_SEAMONKEY=	20
+USE_XPI=	seamonkey2 linux-seamonkey
 
 USE_SUBMAKE=	yes
 
-WDIR=	langpack-*@seamonkey.mozilla.org
+WDIR=	langpack2-*@seamonkey.mozilla.org
 
 XPI_DISTNAMES=	${SEAMONKEY_I18N_}
 
@@ -36,7 +37,7 @@
 SEAMONKEY_I18N_?=	${SEAMONKEY_I18N}
 
 .for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}=		langpack-${dist}@seamonkey.mozilla.org
+XPI_ID_${dist}=		langpack2-${dist}@seamonkey.mozilla.org
 XPI_FILES_${dist}=	chrome.manifest install.rdf chrome/${dist}.jar
 XPI_DIRS_${dist}=	chrome
 .endfor
@@ -49,7 +50,7 @@
 
 do-extract:
 	@for lang in ${SEAMONKEY_I18N_}; do \
-		if ! (${EXTRACT_CMD} ${_DISTDIR}/seamonkey-${PORTVERSION}.$$lang.langpack.xpi -d ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org);\
+		if ! (${EXTRACT_CMD} ${_DISTDIR}/seamonkey-${PORTVERSION}.$$lang.langpack.xpi -d ${WRKSRC}/langpack2-$$lang@seamonkey.mozilla.org);\
 		then \
 			exit 1; \
 		fi \
@@ -70,7 +71,8 @@
 
 post-patch:
 	${FIND} ${WRKSRC} -name install.rdf -print0 | \
-		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d'
+		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d' \
+			-e 's/\(langpack\)/\12/'
 
 List-Langs:
 	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/${PORTVERSION}/langpack"|\

Modified: trunk/www/seamonkey2/Makefile
==============================================================================
--- trunk/www/seamonkey2/Makefile	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey2/Makefile	Sun Aug 28 15:08:27 2011	(r615)
@@ -2,11 +2,12 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.318 2011/03/06 19:46:51 beat Exp $
+# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.322 2011/08/18 09:57:39 ale Exp $
 #
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.0.14
+PORTREVISION=	1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -16,7 +17,6 @@
 COMMENT=	The open source, standards compliant web browser
 
 CONFLICTS_BUILD=	spidermonkey-1.[0-7]*
-CONFLICTS_INSTALL=	seamonkey-1*
 LATEST_LINK=	seamonkey2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -33,7 +33,10 @@
 USE_GCC=	4.2+
 
 MOZ_EXTENSIONS=	default
-MOZ_OPTIONS+=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+MOZILLA_SUFX=	2
+MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
+MOZ_OPTIONS+=	--program-transform-name='s/seamonkey/${MOZILLA}/' \
+		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 		--enable-svg \
 		--enable-application=suite	\
 		--enable-svg-renderer=cairo	\
@@ -74,9 +77,6 @@
 MOZSRC:=	${WRKDIR}/comm-1.9.1/mozilla
 WRKSRC=		${WRKDIR}/comm-1.9.1
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED
-} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -125,7 +125,7 @@
 	@${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:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${WRKSRC}/mozilla/storage/build/Makefile.in
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
 		${WRKSRC}/mozilla/modules/libpref/src/init/all.js
@@ -144,22 +144,19 @@
 		${WRKSRC}/mozilla/js/src/configure \
 		${WRKSRC}/mozilla/configure \
 		${WRKSRC}/configure
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	@${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
-		${WRKDIR}/seamonkey.desktop
-
-port-pre-install:
-	@${REINPLACE_CMD} -e 's|seamonkey-${PORTVERSION}|seamonkey|' \
-		${FAKEDIR}/bin/seamonkey
-	@${RM} -f ${FAKEDIR}/bin/seamonkey.bak
-	${MV} ${FAKEDIR}/lib/seamonkey-${PORTVERSION} ${FAKEDIR}/lib/seamonkey
+		${WRKDIR}/${MOZILLA}.desktop
 
 pre-install:
-	${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST}
+	${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}/seamonkey.desktop ${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
 
 .include <bsd.port.post.mk>

Modified: trunk/www/seamonkey2/files/patch-config_autoconf.mk.in
==============================================================================
--- trunk/www/seamonkey2/files/patch-config_autoconf.mk.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey2/files/patch-config_autoconf.mk.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig	2009-07-17 15:18:04.000000000 +0200
-+++ config/autoconf.mk.in	2009-08-25 01:15:47.000000000 +0200
-@@ -61,7 +61,7 @@
+--- config/autoconf.mk.in.orig	2011-08-17 10:28:51.000000000 +0200
++++ config/autoconf.mk.in	2011-08-17 10:29:26.000000000 +0200
+@@ -62,14 +62,14 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
@@ -9,3 +9,13 @@
  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

Modified: trunk/www/seamonkey2/files/seamonkey.desktop.in
==============================================================================
--- trunk/www/seamonkey2/files/seamonkey.desktop.in	Sun Aug 28 15:01:08 2011	(r614)
+++ trunk/www/seamonkey2/files/seamonkey.desktop.in	Sun Aug 28 15:08:27 2011	(r615)
@@ -160,10 +160,10 @@
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=seamonkey %U
+Exec=%%MOZILLA%% %U
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default48.png
+Icon=%%MOZILLA%%.png
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;

---

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

Legal Notices | © 1995-2024 The FreeBSD Project. All rights reserved.

Contact