Index: branches/2015Q4/devel/p4api/Makefile
===================================================================
--- branches/2015Q4/devel/p4api/Makefile	(revision 403610)
+++ branches/2015Q4/devel/p4api/Makefile	(revision 403611)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	p4api
-PORTVERSION=	2015.1.1126382
+PORTVERSION=	2015.1.1314399
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/:tar \
 		ftp://ftp.perforce.com/perforce/${P4VERSION}/doc/manuals/p4api/:pdf
 
 EXTRACT_SUFX=
 DISTFILES=	${TAR_FILES}:tar p4api.pdf:pdf
 EXTRACT_ONLY=	${TAR_FILES}
 
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce API (static libraries and header files)
 
 RESTRICTED=	Restricted distribution
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
 
 TAR_FILES=	p4api.tgz
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/perforce
 	cd ${WRKSRC}/include/p4 && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/perforce
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perforce
 	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/perforce
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/p4api.pdf ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/sample && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
Index: branches/2015Q4/devel/p4api/distinfo.freebsd100x86
===================================================================
--- branches/2015Q4/devel/p4api/distinfo.freebsd100x86	(revision 403610)
+++ branches/2015Q4/devel/p4api/distinfo.freebsd100x86	(revision 403611)
@@ -1,4 +1,4 @@
-SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4api.tgz) = 55273d0114caef8c44ba719199b523e7b88953727d815b29fecbe9f9bd7290eb
-SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4api.tgz) = 1432888
-SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd
-SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4api.pdf) = 1623596
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4api.tgz) = 2626d0dc8c95fb4790f008c2d41b488460a1c4e80dc0392adcd919b87a78c0d9
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4api.tgz) = 1433851
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86/p4api.pdf) = 1623596
Index: branches/2015Q4/devel/p4api/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q4/devel/p4api/distinfo.freebsd100x86_64	(revision 403610)
+++ branches/2015Q4/devel/p4api/distinfo.freebsd100x86_64	(revision 403611)
@@ -1,4 +1,4 @@
-SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.tgz) = 359708ab1aa8310eb4fb13ca2bdce5b5ac687c16090891b6c3ca2ef3b6d5ea5b
-SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.tgz) = 1468585
-SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd
-SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.pdf) = 1623596
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4api.tgz) = f1bf11c5ba3f202d0b0e5a9a1def5dabcf9dbcbb7fb51ca54c4baa7a6655ac96
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4api.tgz) = 1469314
+SHA256 (perforce/2015.1.1314399/bin.freebsd100x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd
+SIZE (perforce/2015.1.1314399/bin.freebsd100x86_64/p4api.pdf) = 1623596
Index: branches/2015Q4/devel/p4api/distinfo.freebsd70x86
===================================================================
--- branches/2015Q4/devel/p4api/distinfo.freebsd70x86	(revision 403610)
+++ branches/2015Q4/devel/p4api/distinfo.freebsd70x86	(revision 403611)
@@ -1,4 +1,4 @@
-SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4api.tgz) = f0d3289467083d139ffbc24af26a7e5224ca532479926ca1ec206c5e0cdf6bbb
-SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4api.tgz) = 1446584
-SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd
-SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4api.pdf) = 1623596
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4api.tgz) = e9029d5c1782e59505f696eadea6df6d7c681471a91473474ea66b7b92ecd814
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4api.tgz) = 1447306
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86/p4api.pdf) = 1623596
Index: branches/2015Q4/devel/p4api/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q4/devel/p4api/distinfo.freebsd70x86_64	(revision 403610)
+++ branches/2015Q4/devel/p4api/distinfo.freebsd70x86_64	(revision 403611)
@@ -1,4 +1,4 @@
-SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.tgz) = 9ecc33449e024b5f98a36621923c17fb6967fc32eb1e6dd67ea774d1e4475fc3
-SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.tgz) = 1466900
-SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd
-SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.pdf) = 1623596
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4api.tgz) = 2247c739c5875aa9d85056ce857c8db0a4182543fde4fc254907e5b8d401898d
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4api.tgz) = 1467450
+SHA256 (perforce/2015.1.1314399/bin.freebsd70x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd
+SIZE (perforce/2015.1.1314399/bin.freebsd70x86_64/p4api.pdf) = 1623596
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 403610)
+++ branches/2015Q4	(revision 403611)

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