Index: devel/p4api/Makefile
===================================================================
--- devel/p4api/Makefile
+++ devel/p4api/Makefile
@@ -1,41 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	p4api
-PORTVERSION=	${VERSION}
+PORTVERSION=	2014.2.978861
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}${PLATFORM_SUFX}/:tar \
-		http://www.perforce.com/perforce/doc.${DOCVER}/manuals/p4api/:pdf
+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
-DIST_SUBDIR=	perforce/${VERSION}/${ARCH}-${PLATFORM}
+DIST_SUBDIR=	perforce/${PORTVERSION}/bin.${PLATFORM}
+DISTINFO_FILE=	${MASTERDIR}/distinfo.${PLATFORM}
 EXTRACT_ONLY=	${TAR_FILES}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce API (static libraries and header files)
 
+ONLY_FOR_ARCHS=	amd64 i386
+
+RESTRICTED=	Restricted distribution
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/p4api-2008.1.158777
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-PLATFORM=	freebsd60
-VERSION=	08.1
+P4VERSION=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == i386
-PLATFORM_SUFX=	x86
-.elif ${ARCH} == amd64
-PLATFORM_SUFX=	x86_64
-.else
-IGNORE=		Unsupported platform, sorry.
-.endif
+.include "${.CURDIR}/../p4/Makefile.inc"
 
 TAR_FILES=	p4api.tgz
 
-DOCVER=		${VERSION:S/.//}
-
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/perforce
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perforce
Index: devel/p4api/distinfo
===================================================================
--- devel/p4api/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-SHA256 (perforce/08.1/amd64-freebsd60/p4api.tgz) = 628e503e1a2cc1aba9f4d641242e2a465dd1bd988ecd6ddff7fd72fbd97393a9
-SIZE (perforce/08.1/amd64-freebsd60/p4api.tgz) = 616892
-SHA256 (perforce/08.1/amd64-freebsd60/p4api.pdf) = 672ce46eb76f57198d410bedc616ac856fe68065527c2f835b6f3c8b65bfc78a
-SIZE (perforce/08.1/amd64-freebsd60/p4api.pdf) = 1318445
-SHA256 (perforce/08.1/i386-freebsd60/p4api.tgz) = 272d9f34a149061b6706acf15a101914e567ede78a9d5a5ea9fff127183674e9
-SIZE (perforce/08.1/i386-freebsd60/p4api.tgz) = 594445
-SHA256 (perforce/08.1/i386-freebsd60/p4api.pdf) = 672ce46eb76f57198d410bedc616ac856fe68065527c2f835b6f3c8b65bfc78a
-SIZE (perforce/08.1/i386-freebsd60/p4api.pdf) = 1318445
Index: devel/p4api/distinfo.freebsd100x86
===================================================================
--- /dev/null
+++ devel/p4api/distinfo.freebsd100x86
@@ -0,0 +1,4 @@
+SHA256 (perforce/2014.2.978861/bin.freebsd100x86/p4api.tgz) = f8a8be20dbf2816d9f0f066b99b123ffba52be7ba9a160cace5a8214b82f311c
+SIZE (perforce/2014.2.978861/bin.freebsd100x86/p4api.tgz) = 1354203
+SHA256 (perforce/2014.2.978861/bin.freebsd100x86/p4api.pdf) = 916c1cad730aed184ce5bd836a023b9c070fb09ade0bc1f420b774bce1b364c7
+SIZE (perforce/2014.2.978861/bin.freebsd100x86/p4api.pdf) = 1583688
Index: devel/p4api/distinfo.freebsd100x86_64
===================================================================
--- /dev/null
+++ devel/p4api/distinfo.freebsd100x86_64
@@ -0,0 +1,4 @@
+SHA256 (perforce/2014.2.978861/bin.freebsd100x86_64/p4api.tgz) = 13bf3660e74bff958ebadbb358595202471be122c1f71dcdead2b501b406256c
+SIZE (perforce/2014.2.978861/bin.freebsd100x86_64/p4api.tgz) = 1387999
+SHA256 (perforce/2014.2.978861/bin.freebsd100x86_64/p4api.pdf) = 916c1cad730aed184ce5bd836a023b9c070fb09ade0bc1f420b774bce1b364c7
+SIZE (perforce/2014.2.978861/bin.freebsd100x86_64/p4api.pdf) = 1583688
Index: devel/p4api/distinfo.freebsd70x86
===================================================================
--- /dev/null
+++ devel/p4api/distinfo.freebsd70x86
@@ -0,0 +1,4 @@
+SHA256 (perforce/2014.2.978861/bin.freebsd70x86/p4api.tgz) = c0d9261bef27c4b070266765d027aef1e1a732102871652ffb0cc876c8ccf713
+SIZE (perforce/2014.2.978861/bin.freebsd70x86/p4api.tgz) = 1371008
+SHA256 (perforce/2014.2.978861/bin.freebsd70x86/p4api.pdf) = 916c1cad730aed184ce5bd836a023b9c070fb09ade0bc1f420b774bce1b364c7
+SIZE (perforce/2014.2.978861/bin.freebsd70x86/p4api.pdf) = 1583688
Index: devel/p4api/distinfo.freebsd70x86_64
===================================================================
--- /dev/null
+++ devel/p4api/distinfo.freebsd70x86_64
@@ -0,0 +1,4 @@
+SHA256 (perforce/2014.2.978861/bin.freebsd70x86_64/p4api.tgz) = 73ed2051b157af76c80cd3f89b1b4f561ddba7ea5d3bdf90fb1e89d86a1d79a0
+SIZE (perforce/2014.2.978861/bin.freebsd70x86_64/p4api.tgz) = 1390801
+SHA256 (perforce/2014.2.978861/bin.freebsd70x86_64/p4api.pdf) = 916c1cad730aed184ce5bd836a023b9c070fb09ade0bc1f420b774bce1b364c7
+SIZE (perforce/2014.2.978861/bin.freebsd70x86_64/p4api.pdf) = 1583688
Index: devel/p4api/pkg-plist
===================================================================
--- devel/p4api/pkg-plist
+++ devel/p4api/pkg-plist
@@ -1,5 +1,10 @@
+include/perforce/charcvt.h
+include/perforce/charman.h
+include/perforce/charset.h
 include/perforce/clientapi.h
 include/perforce/clientmerge.h
+include/perforce/clientprog.h
+include/perforce/clientresolvea.h
 include/perforce/clientuser.h
 include/perforce/datetime.h
 include/perforce/debug.h
@@ -14,11 +19,17 @@
 include/perforce/hostenv.h
 include/perforce/i18napi.h
 include/perforce/ident.h
+include/perforce/ignore.h
 include/perforce/keepalive.h
+include/perforce/macfile.h
 include/perforce/mapapi.h
+include/perforce/md5.h
 include/perforce/msgclient.h
 include/perforce/msgserver.h
+include/perforce/netbuffer.h
 include/perforce/netconnect.h
+include/perforce/netportparser.h
+include/perforce/ntmangle.h
 include/perforce/ntservice.h
 include/perforce/options.h
 include/perforce/p4tags.h
@@ -32,13 +43,17 @@
 include/perforce/strdict.h
 include/perforce/strops.h
 include/perforce/strtable.h
+include/perforce/strxml.h
 include/perforce/threading.h
+include/perforce/validate.h
 include/perforce/vararray.h
+include/perforce/web822.h
 lib/perforce/libclient.a
+lib/perforce/libp4sslstub.a
 lib/perforce/librpc.a
 lib/perforce/libsupp.a
 %%PORTDOCS%%%%DOCSDIR%%/p4api.pdf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Jamfile.api
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Jamfile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Jamrules
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Version
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clientuser.cc