Index: branches/2015Q4/devel/p4p/Makefile
===================================================================
--- branches/2015Q4/devel/p4p/Makefile	(revision 399079)
+++ branches/2015Q4/devel/p4p/Makefile	(revision 399080)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4p
-PORTVERSION=	2015.1.1227227
+PORTVERSION=	2015.1.1240625
 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 399079)
+++ branches/2015Q4/devel/p4p/distinfo.freebsd100x86	(revision 399080)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd100x86/p4p) = c11abfc70aa0e3601f5f2ce22e0360ec9e41b83b629a64af2c73f7d719745821
-SIZE (perforce/2015.1.1227227/bin.freebsd100x86/p4p) = 2362784
+SHA256 (perforce/2015.1.1240625/bin.freebsd100x86/p4p) = a306d9eeba4f5c19a074d2751cf6f2075db14f11fb3547a11adf1d64a69be4be
+SIZE (perforce/2015.1.1240625/bin.freebsd100x86/p4p) = 2362784
Index: branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64	(revision 399079)
+++ branches/2015Q4/devel/p4p/distinfo.freebsd100x86_64	(revision 399080)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd100x86_64/p4p) = cf0e02061e4cf0083e538fef6601ca3be114fce4508e794c4410b7fe4197e57c
-SIZE (perforce/2015.1.1227227/bin.freebsd100x86_64/p4p) = 2628656
+SHA256 (perforce/2015.1.1240625/bin.freebsd100x86_64/p4p) = 6ebaad1447fa66d41e58fb3d772f0667dd55b9790e287b44b1b14d4c5db1f7f8
+SIZE (perforce/2015.1.1240625/bin.freebsd100x86_64/p4p) = 2628656
Index: branches/2015Q4/devel/p4p/distinfo.freebsd70x86
===================================================================
--- branches/2015Q4/devel/p4p/distinfo.freebsd70x86	(revision 399079)
+++ branches/2015Q4/devel/p4p/distinfo.freebsd70x86	(revision 399080)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd70x86/p4p) = 9f10efa7dff4bcd87f8270769f52a137fa7a2598e33b1287a2a3fbf304ecd6e9
-SIZE (perforce/2015.1.1227227/bin.freebsd70x86/p4p) = 2404256
+SHA256 (perforce/2015.1.1240625/bin.freebsd70x86/p4p) = 64b484473dd47af3b38e1e0584da6ec19a5615e463bd7dfe4f74db15fc0f5e65
+SIZE (perforce/2015.1.1240625/bin.freebsd70x86/p4p) = 2404320
Index: branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64	(revision 399079)
+++ branches/2015Q4/devel/p4p/distinfo.freebsd70x86_64	(revision 399080)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd70x86_64/p4p) = 43321600030a85712b829beab35e38375a5d68978dcac5dd11a23ce905c3a56c
-SIZE (perforce/2015.1.1227227/bin.freebsd70x86_64/p4p) = 2602424
+SHA256 (perforce/2015.1.1240625/bin.freebsd70x86_64/p4p) = 711f2184940470eca32aac874321cba94ed491ad5e3cfa71333c8578e1e2cf66
+SIZE (perforce/2015.1.1240625/bin.freebsd70x86_64/p4p) = 2602552
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 399079)
+++ branches/2015Q4	(revision 399080)

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