Pullup ticket 3009 - requested by tnn

security and bug fixes

Revisions pulled up:
- pkgsrc/devel/nspr/Makefile		by patch to equiv of 1.34
- pkgsrc/devel/xulrunner/dist.mk	by patch to equiv of 1.7
- pkgsrc/devel/xulrunner/distinfo	by patch to equiv of 1.24
- pkgsrc/www/firefox/Makefile		by patch to equiv of 1.70

   --------------------------------------------------------------------
   The attached diff against 2009Q4 updates firefox to 3.5.8.
   This is a security and bugfix update.

4 files changed, 10 insertions, 10 deletions

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index a0ac1823d21..cb4471e0258 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2009/11/10 16:48:20 tnn Exp $
+# $NetBSD: Makefile,v 1.32.2.1 2010/02/17 22:24:32 spz Exp $
 #
 
 .include "../../devel/xulrunner/dist.mk"
 PKGNAME=	${DISTNAME:S/firefox/nspr/:S/3.5/${NSPR_RELEASE}/:S/.source//}
-NSPR_RELEASE=	4.8.2
+NSPR_RELEASE=	4.8.3
 CATEGORIES=	devel
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index b5b155567e1..0b8d3adefaa 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,11 +1,11 @@
-# $NetBSD: dist.mk,v 1.3 2009/12/16 08:18:32 tnn Exp $
+# $NetBSD: dist.mk,v 1.3.2.1 2010/02/17 22:24:32 spz Exp $
 #
 # used by devel/nspr/Makefile
 # used by devel/xulrunner/Makefile
 # used by www/firefox/Makefile
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
-FIREFOX_VER=	3.5.6
+FIREFOX_VER=	3.5.8
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 2598903bfc4..3fd0cfa42cb 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2010/01/10 09:43:06 tron Exp $
+$NetBSD: distinfo,v 1.22.2.1 2010/02/17 22:24:32 spz Exp $
 
-SHA1 (firefox-3.5.6.source.tar.bz2) = fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4
-RMD160 (firefox-3.5.6.source.tar.bz2) = 1002ff196eb8e281c06ef451154b64a903104664
-Size (firefox-3.5.6.source.tar.bz2) = 46914620 bytes
+SHA1 (firefox-3.5.8.source.tar.bz2) = 4bfb9a274113fb9ee590c00da69d995dc500d4cc
+RMD160 (firefox-3.5.8.source.tar.bz2) = 97a4394d895fc0d8e7be34c090ebe75540108a90
+Size (firefox-3.5.8.source.tar.bz2) = 46954234 bytes
 SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
 SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 4f78f560e96..981444ba394 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2009/12/16 08:18:33 tnn Exp $
+# $NetBSD: Makefile,v 1.65.2.1 2010/02/17 22:24:32 spz Exp $
 #
 
 .include "../../devel/xulrunner/dist.mk"
@@ -51,7 +51,7 @@ post-install:
 	rm -f ${DESTDIR}${PREFIX}/bin/firefox
 	${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
 
-BUILDLINK_API_DEPENDS.xulrunner+=	xulrunner-1.9.1.6{,nb*}
+BUILDLINK_API_DEPENDS.xulrunner+=	xulrunner-1.9.1.8{,nb*}
 .include "../../devel/xulrunner/buildlink3.mk"
 PLIST_VARS+=	gnome
 .if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)