svn commit: r394866 - in head/devel/nspr: . files

[Jan Beich]

Author: jbeich
Date: Thu Aug 20 13:13:18 2015
New Revision: 394866
URL: https://svnweb.freebsd.org/changeset/ports/394866

Log:
  devel/nspr: update to 4.10.9
  
  Changes:	http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-10-9-Release-td343441.html

Deleted:
  head/devel/nspr/files/patch-bug1163346
Modified:
  head/devel/nspr/Makefile   (contents, props changed)
  head/devel/nspr/distinfo   (contents, props changed)
  head/devel/nspr/files/patch-warnings   (contents, props changed)

Modified: head/devel/nspr/Makefile
==============================================================================
--- head/devel/nspr/Makefile	Thu Aug 20 13:12:47 2015	(r394865)
+++ head/devel/nspr/Makefile	Thu Aug 20 13:13:18 2015	(r394866)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nspr
-DISTVERSION=	4.10.8
-PORTREVISION=	1
+DISTVERSION=	4.10.9
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
 

Modified: head/devel/nspr/distinfo
==============================================================================
--- head/devel/nspr/distinfo	Thu Aug 20 13:12:47 2015	(r394865)
+++ head/devel/nspr/distinfo	Thu Aug 20 13:13:18 2015	(r394866)
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.10.8.tar.gz) = 507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15
-SIZE (nspr-4.10.8.tar.gz) = 1131130
+SHA256 (nspr-4.10.9.tar.gz) = 4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881
+SIZE (nspr-4.10.9.tar.gz) = 1134015

Modified: head/devel/nspr/files/patch-warnings
==============================================================================
--- head/devel/nspr/files/patch-warnings	Thu Aug 20 13:12:47 2015	(r394865)
+++ head/devel/nspr/files/patch-warnings	Thu Aug 20 13:13:18 2015	(r394866)
@@ -26,38 +26,6 @@
 +#if defined(FREEBSD) && (defined(DEBUG) || defined(FORCE_PR_ASSERT))
  /*
   * On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
-@@ -343,5 +343,8 @@
-     if (cv != NULL)
-     {
--        int rv = _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-+#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-+        int rv =
-+#endif
-+	    _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-         PR_ASSERT(0 == rv);
-         cv->lock = lock;
-@@ -358,5 +361,9 @@
-     if (0 > PR_AtomicDecrement(&cvar->notify_pending))
-     {
--        PRIntn rv = pthread_cond_destroy(&cvar->cv); PR_ASSERT(0 == rv);
-+#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-+        PRIntn rv =
-+#endif
-+	    pthread_cond_destroy(&cvar->cv);
-+	PR_ASSERT(0 == rv);
- #if defined(DEBUG)
-         memset(cvar, 0xaf, sizeof(PRCondVar));
-@@ -1080,6 +1087,9 @@
-     if (cv != NULL)
-     {
-+#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-         int rv;
--        rv = _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-+        rv =
-+#endif
-+	    _PT_PTHREAD_COND_INIT(cv->cv, _pt_cvar_attr); 
-         PR_ASSERT(0 == rv);
-         cv->lock = _PR_NAKED_CV_LOCK;
 --- ../pr/include/prcountr.h	Sun Apr 25 11:00:47 2004
 +++ ../pr/include/prcountr.h	Mon Jul 25 20:43:03 2005
 @@ -427,5 +427,5 @@
@@ -117,20 +85,6 @@
 +	int bbits, b2, b5, be, dig, i, ieps, ilim = -1, ilim0, ilim1 = -1,
  		j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
  		spec_case, try_quick;
---- ../pr/src/misc/prenv.c	2009-05-06 01:40:37.000000000 -0400
-+++ ../pr/src/misc/prenv.c	2009-11-04 15:02:32.000000000 -0500
-@@ -94,5 +94,10 @@
- 
-     _PR_LOCK_ENV();
--    result = _PR_MD_PUT_ENV(string);
-+    /*
-+     * putenv() does not modify the contents, but allows
-+     * the caller to modify it later. So, it is Ok to
-+     * drop the const-ness here...
-+     */
-+    result = _PR_MD_PUT_ENV((char *)string);
-     _PR_UNLOCK_ENV();
-     return (result)? PR_FAILURE : PR_SUCCESS;
 --- ../pr/src/misc/prtpool.c	2005-04-28 18:37:25.000000000 -0400
 +++ ../pr/src/misc/prtpool.c	2009-11-04 15:08:05.000000000 -0500
 @@ -314,6 +314,6 @@