Index: branches/2017Q4/devel/p4d/Makefile
===================================================================
--- branches/2017Q4/devel/p4d/Makefile	(revision 456883)
+++ branches/2017Q4/devel/p4d/Makefile	(revision 456884)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4d
-PORTVERSION=	2016.1.1504544
+PORTVERSION=	2016.1.1598719
 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: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/2017Q4/devel/p4d/distinfo.freebsd100x86
===================================================================
--- branches/2017Q4/devel/p4d/distinfo.freebsd100x86	(revision 456883)
+++ branches/2017Q4/devel/p4d/distinfo.freebsd100x86	(revision 456884)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492402218
-SHA256 (perforce/2016.1.1504544/bin.freebsd100x86/p4d) = 652276298bc7d9b32a0147fde28ab7a788f2d68efd6ff486a09074d4d448aa77
-SIZE (perforce/2016.1.1504544/bin.freebsd100x86/p4d) = 5876924
+TIMESTAMP = 1513828975
+SHA256 (perforce/2016.1.1598719/bin.freebsd100x86/p4d) = 089f8d1d83aa2386f7aad2461561d62a31eea029e184ab2b471016e8f9eb43fb
+SIZE (perforce/2016.1.1598719/bin.freebsd100x86/p4d) = 5885136
Index: branches/2017Q4/devel/p4d/distinfo.freebsd100x86_64
===================================================================
--- branches/2017Q4/devel/p4d/distinfo.freebsd100x86_64	(revision 456883)
+++ branches/2017Q4/devel/p4d/distinfo.freebsd100x86_64	(revision 456884)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492402214
-SHA256 (perforce/2016.1.1504544/bin.freebsd100x86_64/p4d) = 1d1d713ab18c2a169f306ee7708227a04f83300f555a971a8e79a9a267aea19e
-SIZE (perforce/2016.1.1504544/bin.freebsd100x86_64/p4d) = 6257576
+TIMESTAMP = 1513828937
+SHA256 (perforce/2016.1.1598719/bin.freebsd100x86_64/p4d) = a3d5fc07cb7b207f537894b5723279ec8aef9b50699f086dcf9df8a46b4ca356
+SIZE (perforce/2016.1.1598719/bin.freebsd100x86_64/p4d) = 6261704
Index: branches/2017Q4/devel/p4p/Makefile
===================================================================
--- branches/2017Q4/devel/p4p/Makefile	(revision 456883)
+++ branches/2017Q4/devel/p4p/Makefile	(revision 456884)
@@ -1,44 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4p
-PORTVERSION=	2016.1.1492381
+PORTVERSION=	2016.1.1598719
 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: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/2017Q4/devel/p4p/distinfo.freebsd100x86
===================================================================
--- branches/2017Q4/devel/p4p/distinfo.freebsd100x86	(revision 456883)
+++ branches/2017Q4/devel/p4p/distinfo.freebsd100x86	(revision 456884)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488697380
-SHA256 (perforce/2016.1.1492381/bin.freebsd100x86/p4p) = 951af6f30b39300e30530727772abb588d438d0afa2fa50b203397b13da60248
-SIZE (perforce/2016.1.1492381/bin.freebsd100x86/p4p) = 2546204
+TIMESTAMP = 1513828893
+SHA256 (perforce/2016.1.1598719/bin.freebsd100x86/p4p) = 6063de546f8d305024d54dd69d93bdbb29d3a89ff9c224fa81de857ab8d3e79c
+SIZE (perforce/2016.1.1598719/bin.freebsd100x86/p4p) = 2550320
Index: branches/2017Q4/devel/p4p/distinfo.freebsd100x86_64
===================================================================
--- branches/2017Q4/devel/p4p/distinfo.freebsd100x86_64	(revision 456883)
+++ branches/2017Q4/devel/p4p/distinfo.freebsd100x86_64	(revision 456884)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488697377
-SHA256 (perforce/2016.1.1492381/bin.freebsd100x86_64/p4p) = 58cbc97ebc16f2bf6c2194a04aa458d2619293b114f740f2531f159b7ddc4b0d
-SIZE (perforce/2016.1.1492381/bin.freebsd100x86_64/p4p) = 3063368
+TIMESTAMP = 1513828886
+SHA256 (perforce/2016.1.1598719/bin.freebsd100x86_64/p4p) = c0cfd944df914f81db74c70e0ca6643f0b9034267238e7bbeeb8708ee8a2ce0b
+SIZE (perforce/2016.1.1598719/bin.freebsd100x86_64/p4p) = 3067480
Index: branches/2017Q4
===================================================================
--- branches/2017Q4	(revision 456883)
+++ branches/2017Q4	(revision 456884)

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