[SVN-Commit] r1280 - in trunk: security/ca_root_nss security/nss www/firefox www/firefox-nightly www/firefox-nightly/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Jul 13 19:20:15 2013
New Revision: 1280

Log:
update

Modified:
   trunk/security/ca_root_nss/Makefile
   trunk/security/ca_root_nss/distinfo
   trunk/security/nss/Makefile
   trunk/security/nss/distinfo
   trunk/www/firefox-nightly/Makefile.hgrev
   trunk/www/firefox-nightly/distinfo
   trunk/www/firefox-nightly/files/patch-bug783463
   trunk/www/firefox/Makefile
   trunk/www/firefox/distinfo

Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile	Thu Jul 11 14:50:05 2013	(r1279)
+++ trunk/security/ca_root_nss/Makefile	Sat Jul 13 19:20:15 2013	(r1280)
@@ -24,7 +24,7 @@
 # !!!  Please DO NOT submit patches for new version until it has !!!
 # !!!  been committed there first.                               !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=	3.15
+VERSION_NSS=	3.15.1
 #NSS_SUFFIX=	.with.ckbi.1.93
 CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl

Modified: trunk/security/ca_root_nss/distinfo
==============================================================================
--- trunk/security/ca_root_nss/distinfo	Thu Jul 11 14:50:05 2013	(r1279)
+++ trunk/security/ca_root_nss/distinfo	Sat Jul 13 19:20:15 2013	(r1280)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.15.tar.gz) = c139f331ddcff4d5485590ee1b4489d3731aa520d4f5d942e2e40bba1e23a3cd
-SIZE (nss-3.15.tar.gz) = 6276213
+SHA256 (nss-3.15.1.tar.gz) = f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284
+SIZE (nss-3.15.1.tar.gz) = 6286561

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile	Thu Jul 11 14:50:05 2013	(r1279)
+++ trunk/security/nss/Makefile	Sat Jul 13 19:20:15 2013	(r1280)
@@ -2,7 +2,7 @@
 # $FreeBSD: head/security/nss/Makefile 310165 2013-01-09 23:28:19Z flo $
 
 PORTNAME=	nss
-PORTVERSION=	3.15
+PORTVERSION=	3.15.1
 #DISTVERSIONSUFFIX=	.with.ckbi.1.93
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src

Modified: trunk/security/nss/distinfo
==============================================================================
--- trunk/security/nss/distinfo	Thu Jul 11 14:50:05 2013	(r1279)
+++ trunk/security/nss/distinfo	Sat Jul 13 19:20:15 2013	(r1280)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.15.tar.gz) = c139f331ddcff4d5485590ee1b4489d3731aa520d4f5d942e2e40bba1e23a3cd
-SIZE (nss-3.15.tar.gz) = 6276213
+SHA256 (nss-3.15.1.tar.gz) = f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284
+SIZE (nss-3.15.1.tar.gz) = 6286561

Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev	Thu Jul 11 14:50:05 2013	(r1279)
+++ trunk/www/firefox-nightly/Makefile.hgrev	Sat Jul 13 19:20:15 2013	(r1280)
@@ -1 +1 @@
-HGREV=		137216:2cae857c17cb
+HGREV=		138350:18467a85acf6

Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo	Thu Jul 11 14:50:05 2013	(r1279)
+++ trunk/www/firefox-nightly/distinfo	Sat Jul 13 19:20:15 2013	(r1280)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/2cae857c17cb.tar.bz2) = e582ebfb9e1dc61d89778ff0979187574a996c1f6e17fbc33927810c1300c105
-SIZE (firefox-nightly/2cae857c17cb.tar.bz2) = 116852816
+SHA256 (firefox-nightly/18467a85acf6.tar.bz2) = 1df9e2ca1273b0699a4b538fed5968c5c072923ca5bba0f80294bb2e81b4a55f
+SIZE (firefox-nightly/18467a85acf6.tar.bz2) = 124287274

Modified: trunk/www/firefox-nightly/files/patch-bug783463
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug783463	Thu Jul 11 14:50:05 2013	(r1279)
+++ trunk/www/firefox-nightly/files/patch-bug783463	Sat Jul 13 19:20:15 2013	(r1280)
@@ -1,14 +1,11 @@
 --- gfx/skia/moz.build~
 +++ gfx/skia/moz.build
-@@ -188,10 +188,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
-         'SkMMapStream.cpp',
+@@ -190,7 +190,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+         'SkFontHost_FreeType_common.cpp',
          'SkOSFile.cpp',
      ]
 -    if CONFIG['OS_TARGET'] == 'Linux':
 +    if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux':
-         CPP_SOURCES += [
-             'SkFontHost_linux.cpp',
--            'SkFontHost_tables.cpp',
-             'SkThread_pthread.cpp',
-             'SkTime_Unix.cpp',
+         EXPORTS.skia += [
+             'include/ports/SkTypeface_cairo.h',
          ]

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Thu Jul 11 14:50:05 2013	(r1279)
+++ trunk/www/firefox/Makefile	Sat Jul 13 19:20:15 2013	(r1280)
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
 
 PORTNAME=	firefox
-DISTVERSION=	23.0b2
+DISTVERSION=	23.0b5
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source

Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo	Thu Jul 11 14:50:05 2013	(r1279)
+++ trunk/www/firefox/distinfo	Sat Jul 13 19:20:15 2013	(r1280)
@@ -1,2 +1,2 @@
-SHA256 (firefox-23.0b2.source.tar.bz2) = 3d95bf9c578aed8ec153c292576ad777e8362a78436aca60568caf8f7b2cf4a8
-SIZE (firefox-23.0b2.source.tar.bz2) = 115799917
+SHA256 (firefox-23.0b5.source.tar.bz2) = 145673113148caef5b00b98570a44c13d80f22fda330da4b5fccd89c00848e8b
+SIZE (firefox-23.0b5.source.tar.bz2) = 115978652