Index: branches/2016Q1/devel/p4d/Makefile
===================================================================
--- branches/2016Q1/devel/p4d/Makefile	(revision 405601)
+++ branches/2016Q1/devel/p4d/Makefile	(revision 405602)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4d
-PORTVERSION=	2015.1.1314399
+PORTVERSION=	2015.1.1321385
 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 405601)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd100x86	(revision 405602)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4d) = 26087ddf1b213f865c4e7bcc6e6bd511fc80de870188ee1eb201cf2dafdf2de6
-SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4d) = 5226524
+SHA256 (perforce/2015.1.1321385/bin.freebsd100x86/p4d) = a85f521e46bcd918d4e02749bb45f31536c07baa04e5ffeb0e160f3c97d0024b
+SIZE (perforce/2015.1.1321385/bin.freebsd100x86/p4d) = 5230428
Index: branches/2016Q1/devel/p4d/distinfo.freebsd100x86_64
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd100x86_64	(revision 405601)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd100x86_64	(revision 405602)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4d) = 0b6149f8292c1da50c2b702d98e3708ee97994cf92773adb0b3934ee353f6b01
-SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4d) = 5380032
+SHA256 (perforce/2015.1.1321385/bin.freebsd100x86_64/p4d) = 141da1ed5f3a1752ca4fb9be63b9697ad84624768e1eaa775ad77b5e89abe20a
+SIZE (perforce/2015.1.1321385/bin.freebsd100x86_64/p4d) = 5380032
Index: branches/2016Q1/devel/p4d/distinfo.freebsd70x86
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd70x86	(revision 405601)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd70x86	(revision 405602)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4d) = 980e432b6a0d8f5e58b37e7e3f863420b59e097ed4415f09b325de23dae10b25
-SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4d) = 5592512
+SHA256 (perforce/2015.1.1321385/bin.freebsd70x86/p4d) = 8f199a5b09e68454860b60c37d4bd432f0622d26dcc4863a8720a9bfacb111df
+SIZE (perforce/2015.1.1321385/bin.freebsd70x86/p4d) = 5592928
Index: branches/2016Q1/devel/p4d/distinfo.freebsd70x86_64
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd70x86_64	(revision 405601)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd70x86_64	(revision 405602)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4d) = e40bb691eff4c53aeb13a25e443f9761fb601a5fc302f6a1eeac6c86ede02d76
-SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4d) = 5770400
+SHA256 (perforce/2015.1.1321385/bin.freebsd70x86_64/p4d) = d412f0b922b7700d2d2332f1026c01b1c0267d0313941305d8533b6a42ad4590
+SIZE (perforce/2015.1.1321385/bin.freebsd70x86_64/p4d) = 5770528
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 405601)
+++ branches/2016Q1	(revision 405602)

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