Index: branches/2015Q3/devel/p4/Makefile
===================================================================
--- branches/2015Q3/devel/p4/Makefile	(revision 395743)
+++ branches/2015Q3/devel/p4/Makefile	(revision 395744)
@@ -1,30 +1,30 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4
-PORTVERSION=	2015.1.1204891
+PORTVERSION=	2015.1.1227227
 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 395743)
+++ branches/2015Q3/devel/p4/distinfo.freebsd100x86	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1204891/bin.freebsd100x86/p4) = 84f6d1b18ed20f1b7c2f7f0b23c4683823ae59479a7950f6d6dee15f343d8052
-SIZE (perforce/2015.1.1204891/bin.freebsd100x86/p4) = 2562676
+SHA256 (perforce/2015.1.1227227/bin.freebsd100x86/p4) = 535904f55bcf7eaa282d4a6cb43a0efacbad7576e3f9179badd214d0a76d01d7
+SIZE (perforce/2015.1.1227227/bin.freebsd100x86/p4) = 2562676
Index: branches/2015Q3/devel/p4/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q3/devel/p4/distinfo.freebsd100x86_64	(revision 395743)
+++ branches/2015Q3/devel/p4/distinfo.freebsd100x86_64	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1204891/bin.freebsd100x86_64/p4) = 591499e2a69b52c028d856ce4c1871333013ca4ccd324c7664fdf5d4a13309a1
-SIZE (perforce/2015.1.1204891/bin.freebsd100x86_64/p4) = 2815536
+SHA256 (perforce/2015.1.1227227/bin.freebsd100x86_64/p4) = aaf002e6a669c1db05dc0f4e4217b8f2c1473a88a155b04d0627365a0befac92
+SIZE (perforce/2015.1.1227227/bin.freebsd100x86_64/p4) = 2816032
Index: branches/2015Q3/devel/p4/distinfo.freebsd70x86
===================================================================
--- branches/2015Q3/devel/p4/distinfo.freebsd70x86	(revision 395743)
+++ branches/2015Q3/devel/p4/distinfo.freebsd70x86	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1204891/bin.freebsd70x86/p4) = 8d6f6c979de4bb9b7f5cbce45dfb57115cf11a860282a860df78606c82a18464
-SIZE (perforce/2015.1.1204891/bin.freebsd70x86/p4) = 2634272
+SHA256 (perforce/2015.1.1227227/bin.freebsd70x86/p4) = 9a276567ed44762721d3304e469f3758297097b5d064e440031c5d54d7301737
+SIZE (perforce/2015.1.1227227/bin.freebsd70x86/p4) = 2634656
Index: branches/2015Q3/devel/p4/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q3/devel/p4/distinfo.freebsd70x86_64	(revision 395743)
+++ branches/2015Q3/devel/p4/distinfo.freebsd70x86_64	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1204891/bin.freebsd70x86_64/p4) = 720ea24181733a84652938d93e055220d608d92d38f99311f9ac5d9a2dc91e11
-SIZE (perforce/2015.1.1204891/bin.freebsd70x86_64/p4) = 2795384
+SHA256 (perforce/2015.1.1227227/bin.freebsd70x86_64/p4) = 288b88d9379c1130474a98c3d0a9c8a640fd4576305db7b029dbfe1c5a220ec1
+SIZE (perforce/2015.1.1227227/bin.freebsd70x86_64/p4) = 2796024
Index: branches/2015Q3/devel/p4d/Makefile
===================================================================
--- branches/2015Q3/devel/p4d/Makefile	(revision 395743)
+++ branches/2015Q3/devel/p4d/Makefile	(revision 395744)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4d
-PORTVERSION=	2015.1.1217912
+PORTVERSION=	2015.1.1227227
 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 395743)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1217912/bin.freebsd100x86/p4d) = 3510941abfcf76c46198fd00103d1ee5e235067a429916aafd129240089491b0
-SIZE (perforce/2015.1.1217912/bin.freebsd100x86/p4d) = 5222196
+SHA256 (perforce/2015.1.1227227/bin.freebsd100x86/p4d) = 8a4a69b06b4835e4ec310477531c05b05c2708d53b91bd526c745cca5e9e343f
+SIZE (perforce/2015.1.1227227/bin.freebsd100x86/p4d) = 5222196
Index: branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64	(revision 395743)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1217912/bin.freebsd100x86_64/p4d) = e7fe058462393084941533cae5dbc6ea8676855c850edc22eac8649eba5cc615
-SIZE (perforce/2015.1.1217912/bin.freebsd100x86_64/p4d) = 5371920
+SHA256 (perforce/2015.1.1227227/bin.freebsd100x86_64/p4d) = df33472048c581abd4cacc3a8a2f6f7de5bd6043ae0bf42af7107f135b9f0a87
+SIZE (perforce/2015.1.1227227/bin.freebsd100x86_64/p4d) = 5372656
Index: branches/2015Q3/devel/p4d/distinfo.freebsd70x86
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd70x86	(revision 395743)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1217912/bin.freebsd70x86/p4d) = e4513dca951a8c342463b63b6b9261ee529835d7a8a13ecf51495227444fd08a
-SIZE (perforce/2015.1.1217912/bin.freebsd70x86/p4d) = 5587712
+SHA256 (perforce/2015.1.1227227/bin.freebsd70x86/p4d) = 287ff3c5655abc0df8334f38bdeb77f093fd1629412d517033ba73c0d1126e0c
+SIZE (perforce/2015.1.1227227/bin.freebsd70x86/p4d) = 5587744
Index: branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64	(revision 395743)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1217912/bin.freebsd70x86_64/p4d) = 627d057c844456823629f0f48c4a65bdf2cc4b10c86ca658679b9faeec7673f8
-SIZE (perforce/2015.1.1217912/bin.freebsd70x86_64/p4d) = 5762752
+SHA256 (perforce/2015.1.1227227/bin.freebsd70x86_64/p4d) = 8cd945b188d8c083363edaf40f6f2a3785bab37f50e01f11dbdcc0f9419dee25
+SIZE (perforce/2015.1.1227227/bin.freebsd70x86_64/p4d) = 5763616
Index: branches/2015Q3/devel/p4p/Makefile
===================================================================
--- branches/2015Q3/devel/p4p/Makefile	(revision 395743)
+++ branches/2015Q3/devel/p4p/Makefile	(revision 395744)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4p
-PORTVERSION=	2015.1.1204891
+PORTVERSION=	2015.1.1227227
 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/2015Q3/devel/p4p/distinfo.freebsd100x86
===================================================================
--- branches/2015Q3/devel/p4p/distinfo.freebsd100x86	(revision 395743)
+++ branches/2015Q3/devel/p4p/distinfo.freebsd100x86	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1204891/bin.freebsd100x86/p4p) = 634fdfb2b2cd3d5b074ffff1cffe2a5707280a624590544faafcecc249a6d418
-SIZE (perforce/2015.1.1204891/bin.freebsd100x86/p4p) = 2362776
+SHA256 (perforce/2015.1.1227227/bin.freebsd100x86/p4p) = c11abfc70aa0e3601f5f2ce22e0360ec9e41b83b629a64af2c73f7d719745821
+SIZE (perforce/2015.1.1227227/bin.freebsd100x86/p4p) = 2362784
Index: branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64	(revision 395743)
+++ branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1204891/bin.freebsd100x86_64/p4p) = 7de3d40b46eb14a52bdd55926cb8284e0a8cecadb8cd6e04b5ee85dd3f812b7e
-SIZE (perforce/2015.1.1204891/bin.freebsd100x86_64/p4p) = 2627456
+SHA256 (perforce/2015.1.1227227/bin.freebsd100x86_64/p4p) = cf0e02061e4cf0083e538fef6601ca3be114fce4508e794c4410b7fe4197e57c
+SIZE (perforce/2015.1.1227227/bin.freebsd100x86_64/p4p) = 2628656
Index: branches/2015Q3/devel/p4p/distinfo.freebsd70x86
===================================================================
--- branches/2015Q3/devel/p4p/distinfo.freebsd70x86	(revision 395743)
+++ branches/2015Q3/devel/p4p/distinfo.freebsd70x86	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1204891/bin.freebsd70x86/p4p) = 97ab59f5849aa020d9511b1b0599eb7de73f3a69e5e2ec37cfbd28f0ced19018
-SIZE (perforce/2015.1.1204891/bin.freebsd70x86/p4p) = 2404096
+SHA256 (perforce/2015.1.1227227/bin.freebsd70x86/p4p) = 9f10efa7dff4bcd87f8270769f52a137fa7a2598e33b1287a2a3fbf304ecd6e9
+SIZE (perforce/2015.1.1227227/bin.freebsd70x86/p4p) = 2404256
Index: branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64	(revision 395743)
+++ branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64	(revision 395744)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1204891/bin.freebsd70x86_64/p4p) = 277b992b3e6ee69a651c7d867fef8bb9da81e857282b2256a30eb497f9f0349b
-SIZE (perforce/2015.1.1204891/bin.freebsd70x86_64/p4p) = 2601560
+SHA256 (perforce/2015.1.1227227/bin.freebsd70x86_64/p4p) = 43321600030a85712b829beab35e38375a5d68978dcac5dd11a23ce905c3a56c
+SIZE (perforce/2015.1.1227227/bin.freebsd70x86_64/p4p) = 2602424
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 395743)
+++ branches/2015Q3	(revision 395744)

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