Index: branches/2016Q1/devel/p4/Makefile
===================================================================
--- branches/2016Q1/devel/p4/Makefile	(revision 409119)
+++ branches/2016Q1/devel/p4/Makefile	(revision 409120)
@@ -1,30 +1,30 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4
-PORTVERSION=	2015.1.1314399
+PORTVERSION=	2015.1.1341249
 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/2016Q1/devel/p4/distinfo.freebsd100x86
===================================================================
--- branches/2016Q1/devel/p4/distinfo.freebsd100x86	(revision 409119)
+++ branches/2016Q1/devel/p4/distinfo.freebsd100x86	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4) = 04cd983ef267e132f7729cd1eebea27f966e319459a9448782c6ea2349a17089
-SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4) = 2562708
+SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4) = ff6e04f9770eaf93dba4dd8cc8b534ab8efcb516003d450ccb512d0085b42605
+SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4) = 2563220
Index: branches/2016Q1/devel/p4/distinfo.freebsd100x86_64
===================================================================
--- branches/2016Q1/devel/p4/distinfo.freebsd100x86_64	(revision 409119)
+++ branches/2016Q1/devel/p4/distinfo.freebsd100x86_64	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4) = e637bd877ecc6ee9855ca354d33e1522e3573cbf7ccac337f819abf3a8c88f5c
-SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4) = 2818912
+SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4) = 09e19fa80598484c80c746f183ed3f91dc1b2bec829c3f0124ec835a8e79a25e
+SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4) = 2818912
Index: branches/2016Q1/devel/p4/distinfo.freebsd70x86
===================================================================
--- branches/2016Q1/devel/p4/distinfo.freebsd70x86	(revision 409119)
+++ branches/2016Q1/devel/p4/distinfo.freebsd70x86	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4) = b0a021228b7d6e3a0d50e23dd28dd45464aca38a0838c11adae1656f757f2cbc
-SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4) = 2638400
+SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4) = b9f4ee0be5519563340ca41b5b85e3615b2591d30b96c46116c010be049a6ec8
+SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4) = 2638400
Index: branches/2016Q1/devel/p4/distinfo.freebsd70x86_64
===================================================================
--- branches/2016Q1/devel/p4/distinfo.freebsd70x86_64	(revision 409119)
+++ branches/2016Q1/devel/p4/distinfo.freebsd70x86_64	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4) = 36d2b34282eedaf83d44d750ea79b6c02e2d0f156e25469265a5bd8e58a9a1d4
-SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4) = 2798936
+SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4) = 761045e866eebf8dd95faa4d6f6e72a19215208f5fe3c223d2ef7e53ff692750
+SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4) = 2798936
Index: branches/2016Q1/devel/p4d/Makefile
===================================================================
--- branches/2016Q1/devel/p4d/Makefile	(revision 409119)
+++ branches/2016Q1/devel/p4d/Makefile	(revision 409120)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4d
-PORTVERSION=	2015.1.1321385
+PORTVERSION=	2015.1.1341249
 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/2016Q1/devel/p4d/distinfo.freebsd100x86
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd100x86	(revision 409119)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd100x86	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1321385/bin.freebsd100x86/p4d) = a85f521e46bcd918d4e02749bb45f31536c07baa04e5ffeb0e160f3c97d0024b
-SIZE (perforce/2015.1.1321385/bin.freebsd100x86/p4d) = 5230428
+SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4d) = b0fe845bd8f0f0c6395081ea7942ab32c94b7c9c02de0ef30e352f55b4701f7c
+SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4d) = 5230444
Index: branches/2016Q1/devel/p4d/distinfo.freebsd100x86_64
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd100x86_64	(revision 409119)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd100x86_64	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1321385/bin.freebsd100x86_64/p4d) = 141da1ed5f3a1752ca4fb9be63b9697ad84624768e1eaa775ad77b5e89abe20a
-SIZE (perforce/2015.1.1321385/bin.freebsd100x86_64/p4d) = 5380032
+SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4d) = 549e0cd83f726c8b28ba120c04739657536e773b9192e6b1462b88f15d0f2a60
+SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4d) = 5381376
Index: branches/2016Q1/devel/p4d/distinfo.freebsd70x86
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd70x86	(revision 409119)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd70x86	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1321385/bin.freebsd70x86/p4d) = 8f199a5b09e68454860b60c37d4bd432f0622d26dcc4863a8720a9bfacb111df
-SIZE (perforce/2015.1.1321385/bin.freebsd70x86/p4d) = 5592928
+SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4d) = e74da0a7791cd10b25665fd9505385ea43b7121b346b9f90d319300f5cf6f6ba
+SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4d) = 5596608
Index: branches/2016Q1/devel/p4d/distinfo.freebsd70x86_64
===================================================================
--- branches/2016Q1/devel/p4d/distinfo.freebsd70x86_64	(revision 409119)
+++ branches/2016Q1/devel/p4d/distinfo.freebsd70x86_64	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1321385/bin.freebsd70x86_64/p4d) = d412f0b922b7700d2d2332f1026c01b1c0267d0313941305d8533b6a42ad4590
-SIZE (perforce/2015.1.1321385/bin.freebsd70x86_64/p4d) = 5770528
+SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4d) = 194ee7b310613349cadf1c6512d5cd2784176f3aa4d27ccff773404ab335f5b7
+SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4d) = 5775072
Index: branches/2016Q1/devel/p4ftpd/Makefile
===================================================================
--- branches/2016Q1/devel/p4ftpd/Makefile	(revision 409119)
+++ branches/2016Q1/devel/p4ftpd/Makefile	(revision 409120)
@@ -1,37 +1,37 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4ftpd
-PORTVERSION=	2015.1.1314399
+PORTVERSION=	2015.1.1341249
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
 DISTNAME=	p4ftpd
 EXTRACT_SUFX=
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce server
 
 RESTRICTED=	Restricted distribution
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 P4LOG?=		/var/log/p4ftpd.log
 
 SUB_LIST=	P4LOG=${P4LOG}
 
 USE_RC_SUBR=	p4ftpd
 
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
 
 USERS=	p4admin
 GROUPS=	p4admin
 
 do-install:
 	${INSTALL_PROGRAM} ${_DISTDIR}/p4ftpd ${STAGEDIR}${PREFIX}/sbin/
 
 .include <bsd.port.post.mk>
Index: branches/2016Q1/devel/p4ftpd/distinfo.freebsd100x86
===================================================================
--- branches/2016Q1/devel/p4ftpd/distinfo.freebsd100x86	(revision 409119)
+++ branches/2016Q1/devel/p4ftpd/distinfo.freebsd100x86	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4ftpd) = d90b0e993a29dd60280a97d86fb13ed1e2f7f9e59d1563d9ac51b740a9116e4d
-SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4ftpd) = 2608260
+SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4ftpd) = 0b5b0fad62f54e5dbd150de7f47e8212d6e985f040750888980cd2b1c41ba793
+SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4ftpd) = 2608260
Index: branches/2016Q1/devel/p4ftpd/distinfo.freebsd100x86_64
===================================================================
--- branches/2016Q1/devel/p4ftpd/distinfo.freebsd100x86_64	(revision 409119)
+++ branches/2016Q1/devel/p4ftpd/distinfo.freebsd100x86_64	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4ftpd) = f449248eb9d6498757a976b84a3d0f292c5a049b5e8f8b35881258b876c33995
-SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4ftpd) = 2864960
+SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4ftpd) = 0330b0737ca4737ab0ce2d84e7697896cdceae765fb8ab91af9de3d3bffb76ad
+SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4ftpd) = 2864960
Index: branches/2016Q1/devel/p4ftpd/distinfo.freebsd70x86
===================================================================
--- branches/2016Q1/devel/p4ftpd/distinfo.freebsd70x86	(revision 409119)
+++ branches/2016Q1/devel/p4ftpd/distinfo.freebsd70x86	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4ftpd) = d49255f672c5f1325ac5f28e91d425b230611fb11e95c07e7e1796f65d5f2d3e
-SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4ftpd) = 2682900
+SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4ftpd) = e564944605b0ba8ff8fe1e5e41d1a8a1ecaa09757982c3035c5ef53c75cab049
+SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4ftpd) = 2682900
Index: branches/2016Q1/devel/p4ftpd/distinfo.freebsd70x86_64
===================================================================
--- branches/2016Q1/devel/p4ftpd/distinfo.freebsd70x86_64	(revision 409119)
+++ branches/2016Q1/devel/p4ftpd/distinfo.freebsd70x86_64	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4ftpd) = 8dc217e132a5d4a458bfb48ecec0d5cffbab88eb4477e7b45bbd7812e7bf481c
-SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4ftpd) = 2851664
+SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4ftpd) = 391b82747b67f30b7b62be9f56d5ff64ac5d97defddba35051a2236088cd5cee
+SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4ftpd) = 2851664
Index: branches/2016Q1/devel/p4p/Makefile
===================================================================
--- branches/2016Q1/devel/p4p/Makefile	(revision 409119)
+++ branches/2016Q1/devel/p4p/Makefile	(revision 409120)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4p
-PORTVERSION=	2015.1.1314399
+PORTVERSION=	2015.1.1341249
 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/2016Q1/devel/p4p/distinfo.freebsd100x86
===================================================================
--- branches/2016Q1/devel/p4p/distinfo.freebsd100x86	(revision 409119)
+++ branches/2016Q1/devel/p4p/distinfo.freebsd100x86	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4p) = 9794d98f7d2deb5b5a71bd0782322356f2bbe941c926679a9b5a887b443e3d09
-SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4p) = 2366920
+SHA256 (perforce/2015.1.1341249/bin.freebsd100x86/p4p) = 9914cdd21a46abded4c66ada5d276929b7bf2a6da1551e3f570f5d6cfa8865b0
+SIZE (perforce/2015.1.1341249/bin.freebsd100x86/p4p) = 2366920
Index: branches/2016Q1/devel/p4p/distinfo.freebsd100x86_64
===================================================================
--- branches/2016Q1/devel/p4p/distinfo.freebsd100x86_64	(revision 409119)
+++ branches/2016Q1/devel/p4p/distinfo.freebsd100x86_64	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4p) = 735df6b68873f48cb0d09f6923881d43b85dde778baac7cda431446a73da0786
-SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4p) = 2630640
+SHA256 (perforce/2015.1.1341249/bin.freebsd100x86_64/p4p) = f761106f72d3f18411932db2ff4eb9265fd4ce289b2db9658701249bdce456c1
+SIZE (perforce/2015.1.1341249/bin.freebsd100x86_64/p4p) = 2630896
Index: branches/2016Q1/devel/p4p/distinfo.freebsd70x86
===================================================================
--- branches/2016Q1/devel/p4p/distinfo.freebsd70x86	(revision 409119)
+++ branches/2016Q1/devel/p4p/distinfo.freebsd70x86	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4p) = a891571cd4fe1b9d256e996961e822798f5bbfab1567f49eafe2a5b9615b4f80
-SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4p) = 2405728
+SHA256 (perforce/2015.1.1341249/bin.freebsd70x86/p4p) = 927801fe2c4298bea836eb50c77a23a26a4863e6bedba766c57b0a9b3371127a
+SIZE (perforce/2015.1.1341249/bin.freebsd70x86/p4p) = 2405888
Index: branches/2016Q1/devel/p4p/distinfo.freebsd70x86_64
===================================================================
--- branches/2016Q1/devel/p4p/distinfo.freebsd70x86_64	(revision 409119)
+++ branches/2016Q1/devel/p4p/distinfo.freebsd70x86_64	(revision 409120)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4p) = e6bb227f9d47fde41fb2f8bace628de02b25ccfdd49c461355391b7ede312453
-SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4p) = 2605656
+SHA256 (perforce/2015.1.1341249/bin.freebsd70x86_64/p4p) = 6b7bd7355b673b6277d6729f816c7cbc710480ecae974eb50ea2eba449e48635
+SIZE (perforce/2015.1.1341249/bin.freebsd70x86_64/p4p) = 2605656
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 409119)
+++ branches/2016Q1	(revision 409120)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r409115