Update to 4.9.1

4 files changed, 17 insertions, 35 deletions

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index ce1f2ae6f9ff..762823845640 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $
 
 PORTNAME=	nspr
-DISTVERSION=	4.9
+DISTVERSION=	4.9.1
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA
 MASTER_SITE_SUBDIR=	nspr/releases/v${PORTVERSION}/src
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index 3dfa2348b161..10a244f272ad 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.9.tar.gz) = ecc632bc578c125650999776673eeff952096afa6d151f6d91f6c3a93e1e716a
-SIZE (nspr-4.9.tar.gz) = 1218528
+SHA256 (nspr-4.9.1.tar.gz) = 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17
+SIZE (nspr-4.9.1.tar.gz) = 1172951
diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure
index f722535ee774..af7afd6b41ae 100644
--- a/devel/nspr/files/patch-..::configure
+++ b/devel/nspr/files/patch-..::configure
@@ -21,12 +21,4 @@
  	    ;;
      *-netbsd*)
  	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-@@ -6694,6 +6689,7 @@
-     config/nsprincl.mk
-     config/nsprincl.sh
-     config/nspr-config
-+    config/nspr.pc
-     lib/Makefile
-     lib/ds/Makefile
-     lib/libc/Makefile
 
diff --git a/devel/nspr/files/patch-tests b/devel/nspr/files/patch-tests
index d33d584643ce..dd43ef0a2a0f 100644
--- a/devel/nspr/files/patch-tests
+++ b/devel/nspr/files/patch-tests
@@ -148,24 +148,6 @@
 +            (long)retVal, (long)PR_GetError());
  	    exit(1);
          }
---- ../pr/tests/op_noacc.c	Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/op_noacc.c	Tue Jul 12 01:40:22 2005
-@@ -82,5 +82,5 @@
-     PR_STDIO_INIT();
- 	err01 = PR_Open("err01.tmp", PR_CREATE_FILE | PR_RDWR, 0);
--	if (err01 == NULL) 
-+	if (err01 == NULL) {
- 		if (PR_GetError() == PR_NO_ACCESS_RIGHTS_ERROR) {
- 				printf ("error code is %d\n",PR_GetError());
-@@ -92,3 +92,7 @@
- 			return 1;
- 		}
--}			
-+	} else {
-+		perror("err01.tmp");
-+		return 2;
-+	}
-+}
 --- ../pr/tests/peek.c	Sun Apr 25 11:01:02 2004
 +++ ../pr/tests/peek.c	Tue Jul 12 01:41:44 2005
 @@ -168,5 +168,5 @@
@@ -1841,36 +1823,44 @@
 +                (void*)(intptr_t)PR_SecondsToInterval(secs), PR_PRIORITY_NORMAL,
                  threadScopes[i], PR_JOINABLE_THREAD, 0);
              if (threads[idx] == NULL) {
---- ../pr/tests/zerolen.c	Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/zerolen.c	Mon Jul 25 23:04:19 2005
-@@ -78,5 +78,5 @@
+--- ../pr/tests/zerolen.c.orig	2012-03-06 14:14:33.000000000 +0100
++++ ../pr/tests/zerolen.c	2012-06-04 13:39:40.000000000 +0200
+@@ -45,7 +45,7 @@
+ {
      PRFileDesc *sock;
      PRNetAddr addr;
 -    PRUint16 port = (PRUint16) arg;
 +    PRUint16 port = (PRUint16)(uintptr_t)arg;
      char buf[1024];
      PRInt32 nbytes;
-@@ -157,5 +157,5 @@
+ 
+@@ -127,7 +127,7 @@
+      * First test PR_Writev.
       */
      clientThread = PR_CreateThread(PR_USER_THREAD,
 -            ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)),
 +            ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)),
              PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
      if (NULL == clientThread) {
-@@ -198,5 +198,5 @@
+         fprintf(stderr, "PR_CreateThread failed\n");
+@@ -171,7 +171,7 @@
+      * Then test PR_Write.
       */
      clientThread = PR_CreateThread(PR_USER_THREAD,
 -            ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)),
 +            ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)),
              PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
      if (NULL == clientThread) {
-@@ -237,5 +237,5 @@
+         fprintf(stderr, "PR_CreateThread failed\n");
+@@ -216,7 +216,7 @@
+      * Finally test PR_Send.
       */
      clientThread = PR_CreateThread(PR_USER_THREAD,
 -            ClientThread, (void *) PR_ntohs(PR_NetAddrInetPort(&addr)),
 +            ClientThread, (void *)(uintptr_t)PR_ntohs(PR_NetAddrInetPort(&addr)),
              PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
      if (NULL == clientThread) {
+         fprintf(stderr, "PR_CreateThread failed\n");
 --- ../pr/tests/runtests.sh	Sun Apr 25 11:01:02 2004
 +++ ../pr/tests/runtests.sh	Tue Jul 26 00:01:35 2005
 @@ -85,7 +85,4 @@