Index: branches/2015Q4/devel/p4ftpd/Makefile
===================================================================
--- branches/2015Q4/devel/p4ftpd/Makefile	(revision 403609)
+++ branches/2015Q4/devel/p4ftpd/Makefile	(revision 403610)
@@ -1,37 +1,37 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4ftpd
-PORTVERSION=	2015.1.1024208
+PORTVERSION=	2015.1.1314399
 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/2015Q4/devel/p4ftpd/distinfo.freebsd100x86
===================================================================
--- branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86	(revision 403609)
+++ branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86	(revision 403610)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1024208/bin.freebsd100x86/p4ftpd) = f9c63fafb8bf114286a778704c16a7a5b8d6b6fc5e8201a2f75218e416c7f067
-SIZE (perforce/2015.1.1024208/bin.freebsd100x86/p4ftpd) = 2596224
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4ftpd) = d90b0e993a29dd60280a97d86fb13ed1e2f7f9e59d1563d9ac51b740a9116e4d
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4ftpd) = 2608260
Index: branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86_64	(revision 403609)
+++ branches/2015Q4/devel/p4ftpd/distinfo.freebsd100x86_64	(revision 403610)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1024208/bin.freebsd100x86_64/p4ftpd) = ef79956f0e17e26e16d1b7d486e6611263cce9fa64a733b7e6976f1dbc7cfc01
-SIZE (perforce/2015.1.1024208/bin.freebsd100x86_64/p4ftpd) = 2852272
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4ftpd) = f449248eb9d6498757a976b84a3d0f292c5a049b5e8f8b35881258b876c33995
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4ftpd) = 2864960
Index: branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86
===================================================================
--- branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86	(revision 403609)
+++ branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86	(revision 403610)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1024208/bin.freebsd70x86/p4ftpd) = 4e13ffd9ecc6fa773917f3da73f85220e0e934d09d8fd8736b06645023cab264
-SIZE (perforce/2015.1.1024208/bin.freebsd70x86/p4ftpd) = 2671092
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4ftpd) = d49255f672c5f1325ac5f28e91d425b230611fb11e95c07e7e1796f65d5f2d3e
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4ftpd) = 2682900
Index: branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86_64	(revision 403609)
+++ branches/2015Q4/devel/p4ftpd/distinfo.freebsd70x86_64	(revision 403610)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1024208/bin.freebsd70x86_64/p4ftpd) = 6fa08dda4fad1e1c0ad5b5a5d267110c509ee240bb7c611433abb5ceb46056b7
-SIZE (perforce/2015.1.1024208/bin.freebsd70x86_64/p4ftpd) = 2840144
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4ftpd) = 8dc217e132a5d4a458bfb48ecec0d5cffbab88eb4477e7b45bbd7812e7bf481c
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4ftpd) = 2851664
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 403609)
+++ branches/2015Q4	(revision 403610)

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