Index: branches/2015Q4/devel/p4p/Makefile
===================================================================
--- branches/2015Q4/devel/p4p/Makefile	(revision 403613)
+++ branches/2015Q4/devel/p4p/Makefile	(revision 403614)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4p
-PORTVERSION=	2015.1.1252202
+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=	p4p
 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
 
 P4CACHE?=	/var/db/p4p
 P4LOG?=		/var/log/p4p.log
 
 PLIST_SUB=	P4CACHE=${P4CACHE}
 
 SUB_LIST=	P4CACHE=${P4CACHE} \
 		P4LOG=${P4LOG}
 
 USE_RC_SUBR=	p4p
 
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
 
 USERS=	p4admin
 GROUPS=	p4admin
 
 do-install:
 	${INSTALL_PROGRAM} ${_DISTDIR}/p4p ${STAGEDIR}${PREFIX}/sbin/
 	${MKDIR} ${STAGEDIR}${P4CACHE}
 
 .include <bsd.port.post.mk>
Index: branches/2015Q4/devel/p4p/distinfo.freebsd100x86
===================================================================
--- branches/2015Q4/devel/p4p/distinfo.freebsd100x86	(revision 403613)
+++ branches/2015Q4/devel/p4p/distinfo.freebsd100x86	(revision 403614)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1252202/bin.freebsd100x86/p4p) = a9b8d4b27c82014c7e635463e523fdaf1643a0724fdc163b850ca07bbfdce412
-SIZE (perforce/2015.1.1252202/bin.freebsd100x86/p4p) = 2362792
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4p) = 9794d98f7d2deb5b5a71bd0782322356f2bbe941c926679a9b5a887b443e3d09
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4p) = 2366920
Index: branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64	(revision 403613)
+++ branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64	(revision 403614)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1252202/bin.freebsd100x86_64/p4p) = 0545cc33f05960f71a75c1c9d5388bad50e5b433862d12b504feafa47e384688
-SIZE (perforce/2015.1.1252202/bin.freebsd100x86_64/p4p) = 2628672
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4p) = 735df6b68873f48cb0d09f6923881d43b85dde778baac7cda431446a73da0786
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4p) = 2630640
Index: branches/2015Q4/devel/p4p/distinfo.freebsd70x86
===================================================================
--- branches/2015Q4/devel/p4p/distinfo.freebsd70x86	(revision 403613)
+++ branches/2015Q4/devel/p4p/distinfo.freebsd70x86	(revision 403614)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1252202/bin.freebsd70x86/p4p) = 94bd6157b751bcba3ba3cc300163a25e8a51cde83d77509e968ed198c42f17de
-SIZE (perforce/2015.1.1252202/bin.freebsd70x86/p4p) = 2404448
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4p) = a891571cd4fe1b9d256e996961e822798f5bbfab1567f49eafe2a5b9615b4f80
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4p) = 2405728
Index: branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64	(revision 403613)
+++ branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64	(revision 403614)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1252202/bin.freebsd70x86_64/p4p) = d2f652fd0baa1f495683b868310e2f74ec1642be3cb864bc6dae15500e5109ab
-SIZE (perforce/2015.1.1252202/bin.freebsd70x86_64/p4p) = 2605560
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4p) = e6bb227f9d47fde41fb2f8bace628de02b25ccfdd49c461355391b7ede312453
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4p) = 2605656
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 403613)
+++ branches/2015Q4	(revision 403614)

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