Index: branches/2015Q4/devel/p4/Makefile
===================================================================
--- branches/2015Q4/devel/p4/Makefile	(revision 400661)
+++ branches/2015Q4/devel/p4/Makefile	(revision 400662)
@@ -1,32 +1,30 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4
-PORTVERSION=	2015.1.1240625
+PORTVERSION=	2015.1.1252202
 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
-
-BROKEN=		checksum mismatch
 
 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/2015Q4/devel/p4/distinfo.freebsd100x86
===================================================================
--- branches/2015Q4/devel/p4/distinfo.freebsd100x86	(revision 400661)
+++ branches/2015Q4/devel/p4/distinfo.freebsd100x86	(revision 400662)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1240625/bin.freebsd100x86/p4) = 285fead5f1a78de96cb9263faa6334ed1b5c869c0603c54beb59bc10761f61b3
-SIZE (perforce/2015.1.1240625/bin.freebsd100x86/p4) = 2562676
+SHA256 (perforce/2015.1.1252202/bin.freebsd100x86/p4) = 79177ad4fbd68e90846f3a01009eb5d46d3fd2123c568c5193fc2fcf542bfd1c
+SIZE (perforce/2015.1.1252202/bin.freebsd100x86/p4) = 2562676
Index: branches/2015Q4/devel/p4/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q4/devel/p4/distinfo.freebsd100x86_64	(revision 400661)
+++ branches/2015Q4/devel/p4/distinfo.freebsd100x86_64	(revision 400662)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1240625/bin.freebsd100x86_64/p4) = 4dc114927f913c759b81428af8b3ae5c2130164304103f87713b58959296f4bc
-SIZE (perforce/2015.1.1240625/bin.freebsd100x86_64/p4) = 2816032
+SHA256 (perforce/2015.1.1252202/bin.freebsd100x86_64/p4) = 5e4d42cd93c9ec21f9a04c6ef6dab3dc2c3801fa31247c05ef55fe77253cabc1
+SIZE (perforce/2015.1.1252202/bin.freebsd100x86_64/p4) = 2816032
Index: branches/2015Q4/devel/p4/distinfo.freebsd70x86
===================================================================
--- branches/2015Q4/devel/p4/distinfo.freebsd70x86	(revision 400661)
+++ branches/2015Q4/devel/p4/distinfo.freebsd70x86	(revision 400662)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1240625/bin.freebsd70x86/p4) = e47df6e7993ee433e60666071e8e6d14157e318f194a542c3ee6f295eaa6d5d0
-SIZE (perforce/2015.1.1240625/bin.freebsd70x86/p4) = 2634656
+SHA256 (perforce/2015.1.1252202/bin.freebsd70x86/p4) = 6c0316f2d4a8220e9634a1e1ddba48cc3294937f80e5086b4693d3df204d9cda
+SIZE (perforce/2015.1.1252202/bin.freebsd70x86/p4) = 2634656
Index: branches/2015Q4/devel/p4/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q4/devel/p4/distinfo.freebsd70x86_64	(revision 400661)
+++ branches/2015Q4/devel/p4/distinfo.freebsd70x86_64	(revision 400662)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2015.1.1240625/bin.freebsd70x86_64/p4) = 2afb7a6b9afa38287910dcf366434e2cd3bfab531507429d201464ea84767a62
-SIZE (perforce/2015.1.1240625/bin.freebsd70x86_64/p4) = 2796024
+SHA256 (perforce/2015.1.1252202/bin.freebsd70x86_64/p4) = 7fdc0bb9c8e57df97c1e932e1ac82d1c4224560db9d32d1fc4f33d47e7c86a4e
+SIZE (perforce/2015.1.1252202/bin.freebsd70x86_64/p4) = 2796024
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 400661)
+++ branches/2015Q4	(revision 400662)

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