Index: branches/2015Q3/devel/p4/Makefile
===================================================================
--- branches/2015Q3/devel/p4/Makefile	(revision 398551)
+++ branches/2015Q3/devel/p4/Makefile	(revision 398552)
@@ -1,30 +1,30 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4
-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=	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/2015Q3/devel/p4/distinfo.freebsd100x86
===================================================================
--- branches/2015Q3/devel/p4/distinfo.freebsd100x86	(revision 398551)
+++ branches/2015Q3/devel/p4/distinfo.freebsd100x86	(revision 398552)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd100x86/p4) = 535904f55bcf7eaa282d4a6cb43a0efacbad7576e3f9179badd214d0a76d01d7
-SIZE (perforce/2015.1.1227227/bin.freebsd100x86/p4) = 2562676
+SHA256 (perforce/2015.1.1240625/bin.freebsd100x86/p4) = 285fead5f1a78de96cb9263faa6334ed1b5c869c0603c54beb59bc10761f61b3
+SIZE (perforce/2015.1.1240625/bin.freebsd100x86/p4) = 2562676
Index: branches/2015Q3/devel/p4/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q3/devel/p4/distinfo.freebsd100x86_64	(revision 398551)
+++ branches/2015Q3/devel/p4/distinfo.freebsd100x86_64	(revision 398552)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd100x86_64/p4) = aaf002e6a669c1db05dc0f4e4217b8f2c1473a88a155b04d0627365a0befac92
-SIZE (perforce/2015.1.1227227/bin.freebsd100x86_64/p4) = 2816032
+SHA256 (perforce/2015.1.1240625/bin.freebsd100x86_64/p4) = 4dc114927f913c759b81428af8b3ae5c2130164304103f87713b58959296f4bc
+SIZE (perforce/2015.1.1240625/bin.freebsd100x86_64/p4) = 2816032
Index: branches/2015Q3/devel/p4/distinfo.freebsd70x86
===================================================================
--- branches/2015Q3/devel/p4/distinfo.freebsd70x86	(revision 398551)
+++ branches/2015Q3/devel/p4/distinfo.freebsd70x86	(revision 398552)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd70x86/p4) = 9a276567ed44762721d3304e469f3758297097b5d064e440031c5d54d7301737
-SIZE (perforce/2015.1.1227227/bin.freebsd70x86/p4) = 2634656
+SHA256 (perforce/2015.1.1240625/bin.freebsd70x86/p4) = e47df6e7993ee433e60666071e8e6d14157e318f194a542c3ee6f295eaa6d5d0
+SIZE (perforce/2015.1.1240625/bin.freebsd70x86/p4) = 2634656
Index: branches/2015Q3/devel/p4/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q3/devel/p4/distinfo.freebsd70x86_64	(revision 398551)
+++ branches/2015Q3/devel/p4/distinfo.freebsd70x86_64	(revision 398552)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd70x86_64/p4) = 288b88d9379c1130474a98c3d0a9c8a640fd4576305db7b029dbfe1c5a220ec1
-SIZE (perforce/2015.1.1227227/bin.freebsd70x86_64/p4) = 2796024
+SHA256 (perforce/2015.1.1240625/bin.freebsd70x86_64/p4) = 2afb7a6b9afa38287910dcf366434e2cd3bfab531507429d201464ea84767a62
+SIZE (perforce/2015.1.1240625/bin.freebsd70x86_64/p4) = 2796024
Index: branches/2015Q3/devel/p4d/Makefile
===================================================================
--- branches/2015Q3/devel/p4d/Makefile	(revision 398551)
+++ branches/2015Q3/devel/p4d/Makefile	(revision 398552)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4d
-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=	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/2015Q3/devel/p4d/distinfo.freebsd100x86
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd100x86	(revision 398551)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86	(revision 398552)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd100x86/p4d) = 8a4a69b06b4835e4ec310477531c05b05c2708d53b91bd526c745cca5e9e343f
-SIZE (perforce/2015.1.1227227/bin.freebsd100x86/p4d) = 5222196
+SHA256 (perforce/2015.1.1240625/bin.freebsd100x86/p4d) = e9f7339b7dd410619a8bd758eb559294ca22d7fde483dcd51eb61e9f4b5f6244
+SIZE (perforce/2015.1.1240625/bin.freebsd100x86/p4d) = 5222196
Index: branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64	(revision 398551)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64	(revision 398552)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd100x86_64/p4d) = df33472048c581abd4cacc3a8a2f6f7de5bd6043ae0bf42af7107f135b9f0a87
-SIZE (perforce/2015.1.1227227/bin.freebsd100x86_64/p4d) = 5372656
+SHA256 (perforce/2015.1.1240625/bin.freebsd100x86_64/p4d) = 466e1f81a825b3029d19fb8c05e68b466cbf6086aa0b83dae3636207549788dc
+SIZE (perforce/2015.1.1240625/bin.freebsd100x86_64/p4d) = 5375856
Index: branches/2015Q3/devel/p4d/distinfo.freebsd70x86
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd70x86	(revision 398551)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86	(revision 398552)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd70x86/p4d) = 287ff3c5655abc0df8334f38bdeb77f093fd1629412d517033ba73c0d1126e0c
-SIZE (perforce/2015.1.1227227/bin.freebsd70x86/p4d) = 5587744
+SHA256 (perforce/2015.1.1240625/bin.freebsd70x86/p4d) = 41ec9fe9aa7f70ae0ecee5d79965b505a8fe5436be7f22c44eaaf6749c801acd
+SIZE (perforce/2015.1.1240625/bin.freebsd70x86/p4d) = 5587776
Index: branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64	(revision 398551)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64	(revision 398552)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1227227/bin.freebsd70x86_64/p4d) = 8cd945b188d8c083363edaf40f6f2a3785bab37f50e01f11dbdcc0f9419dee25
-SIZE (perforce/2015.1.1227227/bin.freebsd70x86_64/p4d) = 5763616
+SHA256 (perforce/2015.1.1240625/bin.freebsd70x86_64/p4d) = 00af9c635e9b955ab17d4bdeb09f265dd24189b1bc93e4fd49129acb280d4456
+SIZE (perforce/2015.1.1240625/bin.freebsd70x86_64/p4d) = 5764384
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 398551)
+++ branches/2015Q3	(revision 398552)

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