Index: branches/2018Q3/devel/nspr/Makefile
===================================================================
--- branches/2018Q3/devel/nspr/Makefile	(revision 478586)
+++ branches/2018Q3/devel/nspr/Makefile	(revision 478587)
@@ -1,49 +1,49 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nspr
-DISTVERSION=	4.19
+DISTVERSION=	4.20
 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: branches/2018Q3/devel/nspr/distinfo
===================================================================
--- branches/2018Q3/devel/nspr/distinfo	(revision 478586)
+++ branches/2018Q3/devel/nspr/distinfo	(revision 478587)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520265028
-SHA256 (nspr-4.19.tar.gz) = 2ed95917fa2277910d1d1cf36030607dccc0ba522bba08e2af13c113dcd8f729
-SIZE (nspr-4.19.tar.gz) = 1139967
+TIMESTAMP = 1535460148
+SHA256 (nspr-4.20.tar.gz) = 2c8964913da89ffbaf464d49ce44d79e8804e1794ef9a8c52a7bff7224d1556e
+SIZE (nspr-4.20.tar.gz) = 1140892
Index: branches/2018Q3/devel/nspr/files/patch-bug1445193
===================================================================
--- branches/2018Q3/devel/nspr/files/patch-bug1445193	(revision 478586)
+++ branches/2018Q3/devel/nspr/files/patch-bug1445193	(nonexistent)
@@ -1,16 +0,0 @@
-Unbreak build on FreeBSD 12 or later
-
-diff --git pr/src/pthreads/ptsynch.c pr/src/pthreads/ptsynch.c
-index a93b74795..126bed670 100644
---- pr/src/pthreads/ptsynch.c
-+++ pr/src/pthreads/ptsynch.c
-@@ -911,7 +911,8 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *name)
-  * From the semctl(2) man page in glibc 2.0
-  */
- #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \
--    || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \
-+    || (defined(FREEBSD) && __FreeBSD_version < 1200059) \
-+    || defined(OPENBSD) || defined(BSDI) \
-     || defined(DARWIN) || defined(SYMBIAN)
- /* union semun is defined by including <sys/sem.h> */
- #else

Property changes on: branches/2018Q3/devel/nspr/files/patch-bug1445193
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q3/devel/nspr/files/patch-bug1487579
===================================================================
--- branches/2018Q3/devel/nspr/files/patch-bug1487579	(nonexistent)
+++ branches/2018Q3/devel/nspr/files/patch-bug1487579	(revision 478587)
@@ -0,0 +1,11 @@
+--- pr/tests/abstract.c.orig	2018-08-28 12:42:28 UTC
++++ pr/tests/abstract.c
+@@ -151,7 +151,7 @@ main()
+ int
+ main()
+ {
+-  prinf("PASS\n");
++  printf("PASS\n");
+   return 0;
+ }
+ #endif

Property changes on: branches/2018Q3/devel/nspr/files/patch-bug1487579
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 478586)
+++ branches/2018Q3	(revision 478587)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r478508