Index: branches/2015Q4/devel/p4d/Makefile
===================================================================
--- branches/2015Q4/devel/p4d/Makefile	(revision 403612)
+++ branches/2015Q4/devel/p4d/Makefile	(revision 403613)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4d
-PORTVERSION=	2015.1.1256673
+PORTVERSION=	2015.1.1314399
 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/2015Q4/devel/p4d/distinfo.freebsd100x86
===================================================================
--- branches/2015Q4/devel/p4d/distinfo.freebsd100x86	(revision 403612)
+++ branches/2015Q4/devel/p4d/distinfo.freebsd100x86	(revision 403613)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1256673/bin.freebsd100x86/p4d) = a500c4c90db1f8a88cc2dc1a98b36c55457207780352b327a4630568c4ba8291
-SIZE (perforce/2015.1.1256673/bin.freebsd100x86/p4d) = 5226300
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4d) = 26087ddf1b213f865c4e7bcc6e6bd511fc80de870188ee1eb201cf2dafdf2de6
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4d) = 5226524
Index: branches/2015Q4/devel/p4d/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q4/devel/p4d/distinfo.freebsd100x86_64	(revision 403612)
+++ branches/2015Q4/devel/p4d/distinfo.freebsd100x86_64	(revision 403613)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1256673/bin.freebsd100x86_64/p4d) = 26df0e94bf7f144774eb3773c967a709446cd2b82fcfff7141899d237e24607e
-SIZE (perforce/2015.1.1256673/bin.freebsd100x86_64/p4d) = 5375872
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4d) = 0b6149f8292c1da50c2b702d98e3708ee97994cf92773adb0b3934ee353f6b01
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4d) = 5380032
Index: branches/2015Q4/devel/p4d/distinfo.freebsd70x86
===================================================================
--- branches/2015Q4/devel/p4d/distinfo.freebsd70x86	(revision 403612)
+++ branches/2015Q4/devel/p4d/distinfo.freebsd70x86	(revision 403613)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1256673/bin.freebsd70x86/p4d) = f4aa2fe2a55014c858afaa104a0b6c53cd783c687f52fc8a6cbdc1000506dd35
-SIZE (perforce/2015.1.1256673/bin.freebsd70x86/p4d) = 5592064
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4d) = 980e432b6a0d8f5e58b37e7e3f863420b59e097ed4415f09b325de23dae10b25
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4d) = 5592512
Index: branches/2015Q4/devel/p4d/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q4/devel/p4d/distinfo.freebsd70x86_64	(revision 403612)
+++ branches/2015Q4/devel/p4d/distinfo.freebsd70x86_64	(revision 403613)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1256673/bin.freebsd70x86_64/p4d) = 685bdd8e0c01d8cc4ee07017b49f6ea3adb8f1c7b00a48b9e88fe7a727695fc8
-SIZE (perforce/2015.1.1256673/bin.freebsd70x86_64/p4d) = 5767648
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4d) = e40bb691eff4c53aeb13a25e443f9761fb601a5fc302f6a1eeac6c86ede02d76
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4d) = 5770400
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 403612)
+++ branches/2015Q4	(revision 403613)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r403585