Index: head/devel/nspr/Makefile
===================================================================
--- head/devel/nspr/Makefile	(revision 459459)
+++ head/devel/nspr/Makefile	(revision 459460)
@@ -1,49 +1,49 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nspr
-DISTVERSION=	4.17
+DISTVERSION=	4.18
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Platform-neutral API for system level and libc like functions
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe gmake pathfix
 CPE_VENDOR=	mozilla
 CPE_PRODUCT=	netscape_portable_runtime
 WRKSRC_SUBDIR=	nspr
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DEBUG TEST
 
 DEBUG_CONFIGURE_ENABLE=debug
 
 post-patch:
 # Do not install tools to build itself
 	@${REINPLACE_CMD} -e '/RELEASE_BINS/d' \
 		${WRKSRC}/pr/src/misc/Makefile.in
 
 post-build-TEST-on:
 	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/lib/tests
 	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/pr/tests
 	@${LN} -fs libmy.so.1 ${BUILD_WRKSRC}/pr/tests/dll/libmy.so
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 do-test-TEST-on:
 	${TEST_WRKSRC}/lib/tests/string
 	${TEST_WRKSRC}/lib/tests/base64t
 	cd ${TEST_WRKSRC}/pr/tests && ${WRKSRC}/pr/tests/runtests.sh
 	# The test below is commented out, because arena requires
 	# command-line arguments. If you can provide reasonable values
 	# for it, please contact ${MAINTAINER}. Thank you.
 	#	${TEST_WRKSRC}/lib/tests/arena
 	#
 
 .include <bsd.port.mk>
Index: head/devel/nspr/distinfo
===================================================================
--- head/devel/nspr/distinfo	(revision 459459)
+++ head/devel/nspr/distinfo	(revision 459460)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505838746
-SHA256 (nspr-4.17.tar.gz) = 590a0aea29412ae22d7728038c21ef2ab42646e48172a47d2e4bb782846d1095
-SIZE (nspr-4.17.tar.gz) = 1141300
+TIMESTAMP = 1516279034
+SHA256 (nspr-4.18.tar.gz) = b89657c09bf88707d06ac238b8930d3ae08de68cb3edccfdc2e3dc97f9c8fb34
+SIZE (nspr-4.18.tar.gz) = 1139663
Index: head/devel/nspr/files/patch-bug301986
===================================================================
--- head/devel/nspr/files/patch-bug301986	(revision 459459)
+++ head/devel/nspr/files/patch-bug301986	(revision 459460)
@@ -1,41 +1,38 @@
 pthread_t can well be a 64-bit value -- on FreeBSD/amd64, for example.
 Better to just keep calling it pthread_t isntead of casting to anything.
 
 	-mi
 
 --- pr/include/private/pprthred.h.orig	2015-10-16 13:22:19 UTC
 +++ pr/include/private/pprthred.h
 @@ -11,6 +11,7 @@
  ** developers only.
  */
  #include "nspr.h"
 +#include <pthread.h>
  
  #if defined(XP_OS2)
  #define INCL_DOS
 @@ -59,7 +60,7 @@ NSPR_API(void) PR_DetachThread(void);
  ** Get the id of the named thread. Each thread is assigned a unique id
  ** when it is created or attached.
  */
 -NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
 +NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread);
  
  /*
  ** Set the procedure that is called when a thread is dumped. The procedure
---- pr/src/pthreads/ptthread.c.orig	2015-10-16 13:22:19 UTC
+--- pr/src/pthreads/ptthread.c.orig	2018-01-18 12:37:14 UTC
 +++ pr/src/pthreads/ptthread.c
-@@ -1155,12 +1155,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
+@@ -1122,9 +1122,9 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn status)
      _exit(status);
  }
  
 -PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
 +PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
  {
- #if defined(_PR_DCETHREADS)
-     return (PRUint32)&thred->id;  /* this is really a sham! */
- #else
 -    return (PRUint32)thred->id;  /* and I don't know what they will do with it */
 +    return thred->id;  /* and I don't know what they will do with it */
- #endif
  }
  
+ /*