Index: branches/2016Q2/devel/linux-c6-nspr/Makefile
===================================================================
--- branches/2016Q2/devel/linux-c6-nspr/Makefile	(revision 413890)
+++ branches/2016Q2/devel/linux-c6-nspr/Makefile	(revision 413891)
@@ -1,24 +1,23 @@
 # Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	nspr
-PORTVERSION=	4.10.8
-PORTREVISION=	2
+PORTVERSION=	4.11.0
 CATEGORIES=	devel linux
 MASTER_SITES=	CENTOS_LINUX_UPDATES
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Netscape Portable Runtime (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-f10-nspr-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
-RPMVERSION=	2.el6_7
+RPMVERSION=	0.1.el6_7
 USE_LINUX=	c6
 
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
Index: branches/2016Q2/devel/linux-c6-nspr/distinfo.i686
===================================================================
--- branches/2016Q2/devel/linux-c6-nspr/distinfo.i686	(revision 413890)
+++ branches/2016Q2/devel/linux-c6-nspr/distinfo.i686	(revision 413891)
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.7/nspr-4.10.8-2.el6_7.i686.rpm) = 4918a807ce01bae46183b6a1340c9df45625542a2ef912f305666dba8c60329b
-SIZE (rpm/i686/centos/6.7/nspr-4.10.8-2.el6_7.i686.rpm) = 118892
-SHA256 (rpm/i686/centos/6.7/nspr-4.10.8-2.el6_7.src.rpm) = 999b3e49fd18fc6982167b3e4059fb770ca228060b832804b2857018417ec3e9
-SIZE (rpm/i686/centos/6.7/nspr-4.10.8-2.el6_7.src.rpm) = 888909
+SHA256 (rpm/i686/centos/6.7/nspr-4.11.0-0.1.el6_7.i686.rpm) = 3b223ca6b209603975d7067ca45911b0f61f445196fb4b87e8e30b881ba9c2e5
+SIZE (rpm/i686/centos/6.7/nspr-4.11.0-0.1.el6_7.i686.rpm) = 119120
+SHA256 (rpm/i686/centos/6.7/nspr-4.11.0-0.1.el6_7.src.rpm) = 34bfff2b29fc9e980193a8cdc85aa65bae37e6c8e622de0882d0237365aa0c47
+SIZE (rpm/i686/centos/6.7/nspr-4.11.0-0.1.el6_7.src.rpm) = 904178
Index: branches/2016Q2/devel/linux-c6-nspr/distinfo.x86_64
===================================================================
--- branches/2016Q2/devel/linux-c6-nspr/distinfo.x86_64	(revision 413890)
+++ branches/2016Q2/devel/linux-c6-nspr/distinfo.x86_64	(revision 413891)
@@ -1,4 +1,6 @@
-SHA256 (rpm/x86_64/centos/6.7/nspr-4.10.8-2.el6_7.x86_64.rpm) = bfdb7611d0a5f624f7193a504c12dbf44c863caf3077c5572bc485fb29ae6704
-SIZE (rpm/x86_64/centos/6.7/nspr-4.10.8-2.el6_7.x86_64.rpm) = 116196
-SHA256 (rpm/x86_64/centos/6.7/nspr-4.10.8-2.el6_7.src.rpm) = 999b3e49fd18fc6982167b3e4059fb770ca228060b832804b2857018417ec3e9
-SIZE (rpm/x86_64/centos/6.7/nspr-4.10.8-2.el6_7.src.rpm) = 888909
+SHA256 (rpm/x86_64/centos/6.7/nspr-4.11.0-0.1.el6_7.x86_64.rpm) = 3d109fb2c496edf99f41fd9db08769239caef7758ea6abf118ffe72b1de57c94
+SIZE (rpm/x86_64/centos/6.7/nspr-4.11.0-0.1.el6_7.x86_64.rpm) = 116468
+SHA256 (rpm/x86_64/centos/6.7/nspr-4.11.0-0.1.el6_7.i686.rpm) = 3b223ca6b209603975d7067ca45911b0f61f445196fb4b87e8e30b881ba9c2e5
+SIZE (rpm/x86_64/centos/6.7/nspr-4.11.0-0.1.el6_7.i686.rpm) = 119120
+SHA256 (rpm/x86_64/centos/6.7/nspr-4.11.0-0.1.el6_7.src.rpm) = 34bfff2b29fc9e980193a8cdc85aa65bae37e6c8e622de0882d0237365aa0c47
+SIZE (rpm/x86_64/centos/6.7/nspr-4.11.0-0.1.el6_7.src.rpm) = 904178
Index: branches/2016Q2
===================================================================
--- branches/2016Q2	(revision 413890)
+++ branches/2016Q2	(revision 413891)

Property changes on: branches/2016Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r413889