[SVN-Commit] r1127 - in trunk/www: firefox firefox-nightly firefox-nightly/files seamonkey

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Sun Dec 23 02:22:05 UTC 2012


Author: jbeich
Date: Sun Dec 23 02:21:51 2012
New Revision: 1127

Log:
update

Modified:
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox-nightly/Makefile.hgrev
   trunk/www/firefox-nightly/distinfo
   trunk/www/firefox-nightly/files/patch-bug807492
   trunk/www/firefox/Makefile
   trunk/www/firefox/distinfo
   trunk/www/seamonkey/Makefile
   trunk/www/seamonkey/distinfo

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Sun Dec 16 16:18:38 2012	(r1126)
+++ trunk/www/firefox-nightly/Makefile	Sun Dec 23 02:21:51 2012	(r1127)
@@ -18,18 +18,18 @@
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.9.4:${PORTSDIR}/devel/nspr \
-		nss>=3.14.1:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
 		unzip:${PORTSDIR}/archivers/unzip
+#		nss>=3.14.2:${PORTSDIR}/security/nss \
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	# empty
+USE_MOZILLA=	-nss
 MOZILLA_NAME=	Nightly
 MOZILLA_SUFX=	-nightly
 MOZILLA=	${PORTNAME}${MOZILLA_SUFX}

Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev	Sun Dec 16 16:18:38 2012	(r1126)
+++ trunk/www/firefox-nightly/Makefile.hgrev	Sun Dec 23 02:21:51 2012	(r1127)
@@ -1 +1 @@
-HGREV=		115909:8a72b2a22450
+HGREV=		116860:84320dffec6e

Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo	Sun Dec 16 16:18:38 2012	(r1126)
+++ trunk/www/firefox-nightly/distinfo	Sun Dec 23 02:21:51 2012	(r1127)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/8a72b2a22450.tar.bz2) = 44890b65e04452ad4941be406f2515cc61487892972d263c0ca788a600c3a535
-SIZE (firefox-nightly/8a72b2a22450.tar.bz2) = 97468989
+SHA256 (firefox-nightly/84320dffec6e.tar.bz2) = 49547c2ae2bc71ff4626929d0cac0225cc4893ec240bdcbdc46fa7f79d96415d
+SIZE (firefox-nightly/84320dffec6e.tar.bz2) = 98210863

Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492	Sun Dec 16 16:18:38 2012	(r1126)
+++ trunk/www/firefox-nightly/files/patch-bug807492	Sun Dec 23 02:21:51 2012	(r1127)
@@ -311,13 +311,13 @@
      if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0))))
          ABORT(R_NO_MEMORY);
  
-@@ -91,28 +99,28 @@ mbslen(const char *s, size_t *ncharsp)
-     if (!strstr(my_locale, "UTF-8"))
-         ABORT(R_NOT_FOUND);
+@@ -93,28 +101,28 @@ mbslen(const char *s, size_t *ncharsp)
  #else
-         /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */
-         if (! strcasestr(setlocale(LC_CTYPE, 0), "UTF-8"))
-             ABORT(R_NOT_FOUND);
+     /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */
+     /* null-checking setlocale is required because Android */
+     char *locale = setlocale(LC_CTYPE, 0);
+     if (!locale || !strcasestr(locale, "UTF-8"))
+         ABORT(R_NOT_FOUND);
  #endif
  
 -#ifdef DARWIN

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Sun Dec 16 16:18:38 2012	(r1126)
+++ trunk/www/firefox/Makefile	Sun Dec 23 02:21:51 2012	(r1127)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	18.0b4
+DISTVERSION=	18.0b5
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}

Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo	Sun Dec 16 16:18:38 2012	(r1126)
+++ trunk/www/firefox/distinfo	Sun Dec 23 02:21:51 2012	(r1127)
@@ -1,2 +1,2 @@
-SHA256 (firefox-18.0b4.source.tar.bz2) = 5b0a3eb952171b4bdf78b80e1b18f5cf6c31cdeb8bedc3aebd090a91abfb041b
-SIZE (firefox-18.0b4.source.tar.bz2) = 96916801
+SHA256 (firefox-18.0b5.source.tar.bz2) = 66a6670553db0593fa524e690b1abaa82566da8552503214c2588bda6b2720dc
+SIZE (firefox-18.0b5.source.tar.bz2) = 96992471

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Sun Dec 16 16:18:38 2012	(r1126)
+++ trunk/www/seamonkey/Makefile	Sun Dec 23 02:21:51 2012	(r1127)
@@ -2,7 +2,7 @@
 # $FreeBSD: ports/www/seamonkey/Makefile,v 1.326 2012/06/01 05:25:02 dinoex Exp $
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.15b3
+DISTVERSION=	2.15b5
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -13,7 +13,7 @@
 COMMENT=	The open source, standards compliant web browser
 
 BUILD_DEPENDS=	nspr>=4.9.3:${PORTSDIR}/devel/nspr \
-		nss>=3.14:${PORTSDIR}/security/nss \
+		nss>=3.14.1:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		unzip:${PORTSDIR}/archivers/unzip

Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo	Sun Dec 16 16:18:38 2012	(r1126)
+++ trunk/www/seamonkey/distinfo	Sun Dec 23 02:21:51 2012	(r1127)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.15b3.source.tar.bz2) = 87be84196bbf86039a6bc2773919ff42af1f56f673e8b1cedd8caa8b5b5b2eb9
-SIZE (seamonkey-2.15b3.source.tar.bz2) = 120120509
+SHA256 (seamonkey-2.15b5.source.tar.bz2) = 83969c1e38be9228ac2d91acd5c373e400b23440624377692d1321811d8d3c4f
+SIZE (seamonkey-2.15b5.source.tar.bz2) = 119838471
 SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036
 SIZE (enigmail-1.4.6.tar.gz) = 1262280


More information about the freebsd-gecko mailing list