diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 8137e1e715f..e4212799f7f 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2006/12/06 17:43:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2007/03/01 22:37:48 robert Exp $
 # $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
@@ -6,14 +6,14 @@ ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
 COMMENT-main=		"Netscape Portable Runtime"
 COMMENT-docs=		"HTML Documentation for NSPR"
 
-VER=			4.6.4
+VER=			4.6.5
 DISTNAME=		nspr-${VER}
-PKGNAME-main=		${DISTNAME}p1
+PKGNAME-main=		${DISTNAME}
 PKGNAME-docs=		nspr-docs-${VER}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			nspr-reference${EXTRACT_SUFX}:0
 
-SO_VERSION=		18.0
+SO_VERSION=		18.1
 .for _lib in nspr4 plc4 plds4
 SHARED_LIBS+=		${_lib} ${SO_VERSION}
 .endfor
@@ -72,8 +72,9 @@ do-install:
 do-regress:
 	${MAKE_PROGRAM} -C ${WRKSRC}/pr/tests
 	${MAKE_PROGRAM} -C ${WRKSRC}/lib/tests
-	@cd ${WRKSRC}/pr/tests && ulimit -Sn 192 && /bin/ksh runtests.ksh
-	LD_LIBRARY_PATH=${WRKSRC}/dist/lib/ ${WRKSRC}/lib/tests/string
-	LD_LIBRARY_PATH=${WRKSRC}/dist/lib/ ${WRKSRC}/lib/tests/base64t
+	@cd ${WRKSRC}/pr/tests && ulimit -Sn 192 && env TZ=gmt \
+		LD_LIBRARY_PATH=${WRKSRC}/dist/lib /bin/ksh runtests.ksh
+	LD_LIBRARY_PATH=${WRKSRC}/dist/lib ${WRKSRC}/lib/tests/string
+	LD_LIBRARY_PATH=${WRKSRC}/dist/lib ${WRKSRC}/lib/tests/base64t
 
 .include <bsd.port.mk>
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index f1f58005609..74db8dfacec 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,8 +1,10 @@
-MD5 (nspr-4.6.4.tar.gz) = 43db60ab2ff1599c17d3a3f55caa7d47
+MD5 (nspr-4.6.5.tar.gz) = 9bf15436496cb6bd96c1939f3ffb839f
 MD5 (nspr-reference.tar.gz) = 8d94503a793e3b322252761c8b48f3e0
-RMD160 (nspr-4.6.4.tar.gz) = d893554bc49c13787ec33bd2c7580f51bf8e89ac
+RMD160 (nspr-4.6.5.tar.gz) = d01785db70bf949aefb09f0095911794f31b7769
 RMD160 (nspr-reference.tar.gz) = e1e438a5923ae2ca4d6a07e521f858a3e0f7c1c6
-SHA1 (nspr-4.6.4.tar.gz) = 0c6a5e3efc5366b96b027df61398762c2de30b41
+SHA1 (nspr-4.6.5.tar.gz) = 1939369fc6313cb4a9f935817e1e77fd5750b6b1
 SHA1 (nspr-reference.tar.gz) = 9a2842d729c1de498fa184667afb63939a9d71e7
-SIZE (nspr-4.6.4.tar.gz) = 1301886
+SHA256 (nspr-4.6.5.tar.gz) = 335c5e541af65632a57b7ea70b4c47e3e1f33e758cd146ff7154f547ef836c74
+SHA256 (nspr-reference.tar.gz) = ce1859aca361d954d531a27ea91ec0cd9c16f25b2c234993d44e7e7758078b0a
+SIZE (nspr-4.6.5.tar.gz) = 1284497
 SIZE (nspr-reference.tar.gz) = 195121
diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
index e06e5b98fe9..f3b45fee9f5 100644
--- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
+++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.4 2006/11/30 16:53:53 kurt Exp $
+$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.5 2007/03/01 22:37:48 robert Exp $
 --- mozilla/nsprpub/pr/include/md/_openbsd.h.orig	Sun Apr 25 17:00:47 2004
-+++ mozilla/nsprpub/pr/include/md/_openbsd.h	Fri Nov 10 20:13:55 2006
++++ mozilla/nsprpub/pr/include/md/_openbsd.h	Thu Mar  1 23:09:56 2007
 @@ -54,9 +54,11 @@
  #define _PR_SI_ARCHITECTURE "powerpc"
  #elif defined(__sparc__)
diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_private_primpl_h b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_private_primpl_h
index c7c4683f76a..8af1e69369a 100644
--- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_private_primpl_h
+++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_include_private_primpl_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_nsprpub_pr_include_private_primpl_h,v 1.2 2006/11/06 14:35:45 ajacoutot Exp $
---- mozilla/nsprpub/pr/include/private/primpl.h.orig	Tue Jun 21 00:05:20 2005
-+++ mozilla/nsprpub/pr/include/private/primpl.h	Sat Nov  4 13:15:01 2006
-@@ -1867,6 +1867,7 @@ extern void _PR_DestroyZones(void);
+$OpenBSD: patch-mozilla_nsprpub_pr_include_private_primpl_h,v 1.3 2007/03/01 22:37:48 robert Exp $
+--- mozilla/nsprpub/pr/include/private/primpl.h.orig	Fri Dec  1 02:34:11 2006
++++ mozilla/nsprpub/pr/include/private/primpl.h	Wed Feb  7 13:14:08 2007
+@@ -1869,6 +1869,7 @@ extern void _PR_DestroyZones(void);
          && !defined(DARWIN) \
          && !defined(NEXTSTEP) \
          && !defined(QNX) \
diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c
index 66576cebb8b..af1d427880f 100644
--- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c
+++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.1 2006/11/06 14:35:45 ajacoutot Exp $
---- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig	Fri Jul  1 03:19:30 2005
-+++ mozilla/nsprpub/pr/src/misc/prdtoa.c	Mon Nov  6 10:06:35 2006
+$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.2 2007/03/01 22:37:48 robert Exp $
+--- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig	Fri Dec 22 00:45:54 2006
++++ mozilla/nsprpub/pr/src/misc/prdtoa.c	Wed Feb  7 15:06:43 2007
 @@ -37,41 +37,14 @@
  
  #include "primpl.h"
@@ -3057,7 +3057,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.1 2006/11/06 14:35:45 a
 -				goto no_digits;
 -			goto one_digit;
 -			}
--		for(i = 1;; i++, dval(d) *= 10.) {
+-		for(i = 1; i <= k+1; i++, dval(d) *= 10.) {
 -			L = (Long)(dval(d) / ds);
 -			dval(d) -= L*ds;
 -#ifdef Check_FLT_ROUNDS
diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c
index 91e978c20b9..eb8388ed96d 100644
--- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c
+++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.2 2006/11/06 14:35:45 ajacoutot Exp $
---- mozilla/nsprpub/pr/src/misc/prinit.c.orig	Sun Apr 25 17:01:01 2004
-+++ mozilla/nsprpub/pr/src/misc/prinit.c	Sat Nov  4 13:15:16 2006
-@@ -433,6 +433,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.3 2007/03/01 22:37:48 robert Exp $
+--- mozilla/nsprpub/pr/src/misc/prinit.c.orig	Fri Dec  1 02:34:11 2006
++++ mozilla/nsprpub/pr/src/misc/prinit.c	Wed Feb  7 13:14:08 2007
+@@ -435,6 +435,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
  	    _PR_LogCleanup();
  
          /*
@@ -14,7 +14,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.2 2006/11/06 14:35:45 a
           * This part should look like the end of _PR_NativeRunThread
           * and _PR_UserRunThread.
           */
-@@ -444,6 +450,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+@@ -446,6 +452,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
              PR_DELETE(me->stack);
              PR_DELETE(me);
          }
@@ -22,7 +22,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.2 2006/11/06 14:35:45 a
  
          /*
           * XXX: We are freeing the heap memory here so that Purify won't
-@@ -452,8 +459,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+@@ -454,8 +461,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
           * Ideally, for each _PR_InitXXX(), there should be a corresponding
           * _PR_XXXCleanup() that we can call here.
           */
diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_runtests_ksh b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_runtests_ksh
index 78ff0db49f4..4574442bc71 100644
--- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_runtests_ksh
+++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_runtests_ksh
@@ -1,4 +1,4 @@
-$OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_ksh,v 1.3 2006/11/15 09:05:36 ajacoutot Exp $
+$OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_ksh,v 1.4 2007/03/01 22:37:48 robert Exp $
 --- mozilla/nsprpub/pr/tests/runtests.ksh.orig	Sun Apr 25 17:01:02 2004
 +++ mozilla/nsprpub/pr/tests/runtests.ksh	Mon Nov 13 12:44:03 2006
 @@ -84,11 +84,10 @@ fi
@@ -41,12 +41,3 @@ $OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_ksh,v 1.3 2006/11/15 09:05:36
  sendzlf
  server_test
  servr_kk
-@@ -250,7 +248,7 @@ else
- 		echo "$prog\c"
- 		echo "\nBEGIN TEST: $prog\n" >> ${LOGFILE} 2>&1
- 		export test_rval
--		./$prog >> ${LOGFILE} 2>&1 &
-+		LD_LIBRARY_PATH=../../dist/lib/ ./$prog >> ${LOGFILE} 2>&1 &
- 		test_pid=$!
- 		sleep_pid=0
- 		if [ "$TEST_TIMEOUT" -gt 0 ]