Index: branches/2016Q1/devel/p4/Makefile
===================================================================
--- branches/2016Q1/devel/p4/Makefile	(revision 411237)
+++ branches/2016Q1/devel/p4/Makefile	(revision 411238)
@@ -1,30 +1,30 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4
-PORTVERSION=	2015.1.1341249
+PORTVERSION=	2015.1.1362963
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
 DISTNAME=	p4
 EXTRACT_SUFX=
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce client
 
 RESTRICTED=	Restricted distribution
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/p4
 
 .include <bsd.port.pre.mk>
 
 .include "Makefile.inc"
 
 do-install:
 	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/p4 ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>
Index: branches/2016Q1/devel/p4/distinfo.freebsd100x86
===================================================================
--- branches/2016Q1/devel/p4/distinfo.freebsd100x86	(revision 411237)
+++ branches/2016Q1/devel/p4/distinfo.freebsd100x86	(revision 411238)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4) = ff6e04f9770eaf93dba4dd8cc8b534ab8efcb516003d450ccb512d0085b42605
-SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4) = 2563220
+SHA256 (perforce/2015.1.1362963/bin.freebsd100x86/p4) = 4f06d63cbd56cc7ce2a0e927bc4390df74966149bd7f9aa1f206894e492d4d14
+SIZE (perforce/2015.1.1362963/bin.freebsd100x86/p4) = 2537176
Index: branches/2016Q1/devel/p4/distinfo.freebsd100x86_64
===================================================================
--- branches/2016Q1/devel/p4/distinfo.freebsd100x86_64	(revision 411237)
+++ branches/2016Q1/devel/p4/distinfo.freebsd100x86_64	(revision 411238)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4) = 09e19fa80598484c80c746f183ed3f91dc1b2bec829c3f0124ec835a8e79a25e
-SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4) = 2818912
+SHA256 (perforce/2015.1.1362963/bin.freebsd100x86_64/p4) = 83b4d67f32b5dbc580ffa6938773dca58addb02b9632ba8e0197628240d5c1d6
+SIZE (perforce/2015.1.1362963/bin.freebsd100x86_64/p4) = 2794288
Index: branches/2016Q1/devel/p4/distinfo.freebsd70x86
===================================================================
--- branches/2016Q1/devel/p4/distinfo.freebsd70x86	(revision 411237)
+++ branches/2016Q1/devel/p4/distinfo.freebsd70x86	(revision 411238)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4) = b9f4ee0be5519563340ca41b5b85e3615b2591d30b96c46116c010be049a6ec8
-SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4) = 2638400
+SHA256 (perforce/2015.1.1362963/bin.freebsd70x86/p4) = bfda38380947b27241faec8a3214f40866fe780c44e16f812b8818e3ae5c3740
+SIZE (perforce/2015.1.1362963/bin.freebsd70x86/p4) = 2612124
Index: branches/2016Q1/devel/p4/distinfo.freebsd70x86_64
===================================================================
--- branches/2016Q1/devel/p4/distinfo.freebsd70x86_64	(revision 411237)
+++ branches/2016Q1/devel/p4/distinfo.freebsd70x86_64	(revision 411238)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4) = 761045e866eebf8dd95faa4d6f6e72a19215208f5fe3c223d2ef7e53ff692750
-SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4) = 2798936
+SHA256 (perforce/2015.1.1362963/bin.freebsd70x86_64/p4) = acba9fcaef4ee055fb897961828e1811a058e1a0cc7f7560f790f9ea09a58163
+SIZE (perforce/2015.1.1362963/bin.freebsd70x86_64/p4) = 2778456
Index: branches/2016Q1/devel/p4d/Makefile
===================================================================
--- branches/2016Q1/devel/p4d/Makefile	(revision 411237)
+++ branches/2016Q1/devel/p4d/Makefile	(revision 411238)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4d
-PORTVERSION=	2015.1.1341249
+PORTVERSION=	2015.1.1362963
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
 DISTNAME=	p4d
 EXTRACT_SUFX=
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce server
 
 RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
 
 RESTRICTED=	Restricted distribution
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 P4ROOT?=	/var/db/p4d
 P4LOG?=		/var/log/p4d.log
 
 PLIST_SUB=	P4ROOT=${P4ROOT}
 
 SUB_LIST=	P4ROOT=${P4ROOT} \
 		P4LOG=${P4LOG}
 
 USE_RC_SUBR=	p4d
 
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
 
 USERS=	p4admin
 GROUPS=	p4admin
 
 do-install:
 	${INSTALL_PROGRAM} ${_DISTDIR}/p4d ${STAGEDIR}${PREFIX}/sbin/
 	${MKDIR} ${STAGEDIR}${P4ROOT}
 
 .include <bsd.port.post.mk>
Index: branches/2016Q1/devel/p4d/distinfo.freebsd100x86
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd100x86	(revision 411237)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd100x86	(revision 411238)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4d) = b0fe845bd8f0f0c6395081ea7942ab32c94b7c9c02de0ef30e352f55b4701f7c
-SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4d) = 5230444
+SHA256 (perforce/2015.1.1362963/bin.freebsd100x86/p4d) = e324264e18195dac3230845d3d3f7b596536e9498c3c5bd58ce66af0a1f36595
+SIZE (perforce/2015.1.1362963/bin.freebsd100x86/p4d) = 5205568
Index: branches/2016Q1/devel/p4d/distinfo.freebsd100x86_64
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd100x86_64	(revision 411237)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd100x86_64	(revision 411238)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4d) = 549e0cd83f726c8b28ba120c04739657536e773b9192e6b1462b88f15d0f2a60
-SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4d) = 5381376
+SHA256 (perforce/2015.1.1362963/bin.freebsd100x86_64/p4d) = d6a6cf2585f1da2a998b92c4b5af8ac73bbd368be8660258830764475660182f
+SIZE (perforce/2015.1.1362963/bin.freebsd100x86_64/p4d) = 5360992
Index: branches/2016Q1/devel/p4d/distinfo.freebsd70x86
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd70x86	(revision 411237)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd70x86	(revision 411238)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4d) = e74da0a7791cd10b25665fd9505385ea43b7121b346b9f90d319300f5cf6f6ba
-SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4d) = 5596608
+SHA256 (perforce/2015.1.1362963/bin.freebsd70x86/p4d) = fee2f14b4e45c7eeab9d77de44d72e79215deb615e9d9689bbc35d77b2a26d99
+SIZE (perforce/2015.1.1362963/bin.freebsd70x86/p4d) = 5572380
Index: branches/2016Q1/devel/p4d/distinfo.freebsd70x86_64
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd70x86_64	(revision 411237)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd70x86_64	(revision 411238)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4d) = 194ee7b310613349cadf1c6512d5cd2784176f3aa4d27ccff773404ab335f5b7
-SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4d) = 5775072
+SHA256 (perforce/2015.1.1362963/bin.freebsd70x86_64/p4d) = bf2992a7fa09ac7387b8f2267c4356e2ea5aca7986af7521f782a79e714d029f
+SIZE (perforce/2015.1.1362963/bin.freebsd70x86_64/p4d) = 5754712
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 411237)
+++ branches/2016Q1	(revision 411238)

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