3 files changed, 65 insertions, 28 deletions

diff --git a/devel/p4api/Makefile b/devel/p4api/Makefile
index 26c3d7452643..82bd5bb5373e 100644
--- a/devel/p4api/Makefile
+++ b/devel/p4api/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	p4api
 PORTVERSION=	${VERSION}
-PORTREVISION=	${REVISION}
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/:tar \
-		http://www.perforce.com/perforce/doc.${DOCVER}/user/:txt
+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
+
 EXTRACT_SUFX=
-DISTFILES=	${TAR_FILES}:tar p4api.txt:txt
+DISTFILES=	${TAR_FILES}:tar p4api.pdf:pdf
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}-${PLATFORM}
 EXTRACT_ONLY=	${TAR_FILES}
 
@@ -20,22 +20,26 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perforce API (static libraries and header files)
 
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/p4api-2008.1.158777
 
-VERSION=	03.1
-REVISION=	1
+VERSION=	08.1
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
-.if ${OSVERSION} >= 501103
-PLATFORM=	freebsd5
+PLATFORM_SUFX=	x86
+.elif ${ARCH} == amd64
+PLATFORM_SUFX=	x86_64
 .else
-PLATFORM=	freebsd4
+IGNORE=		"Unsupported platform, sorry."
 .endif
-TAR_FILES=	p4api.tar
+
+TAR_FILES=	p4api.tgz
+
+.if ${OSVERSION} >= 600034
+PLATFORM=	freebsd60
 .else
-IGNORE=		"Unsupported platform, sorry."
+PLATFORM=	freebsd54
 .endif
 
 DOCVER=		${VERSION:S/.//}
@@ -43,14 +47,24 @@ DOCVER=		${VERSION:S/.//}
 do-install:
 	${MKDIR} ${PREFIX}/include/perforce
 	${MKDIR} ${PREFIX}/lib/perforce
-	cd ${WRKSRC}; \
+	cd ${WRKSRC}/include/p4; \
 	 for i in *.h; \
 	 do ${INSTALL_DATA} $${i} ${PREFIX}/include/perforce; \
 	 done
-	cd ${WRKSRC}; \
+	cd ${WRKSRC}/lib; \
 	 for i in lib*.a; \
 	 do ${INSTALL_DATA} $${i} ${PREFIX}/lib/perforce; \
 	 done
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/p4api.txt ${PREFIX}/include/perforce
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/p4api.pdf ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/sample; \
+	 for i in *; \
+	 do ${INSTALL_DATA} $${i} ${EXAMPLESDIR}; \
+	 done
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4api/distinfo b/devel/p4api/distinfo
index 3df4b3fe2030..55c46040ecef 100644
--- a/devel/p4api/distinfo
+++ b/devel/p4api/distinfo
@@ -1,12 +1,24 @@
-MD5 (perforce/03.1/i386-freebsd4/p4api.tar) = 6402ce08a4a49e20cb34a06b30be1dbc
-SHA256 (perforce/03.1/i386-freebsd4/p4api.tar) = eeb678d13ee621f4394d6835812b57f0b7eb1efaaa83d8cfca3776b11ad6a943
-SIZE (perforce/03.1/i386-freebsd4/p4api.tar) = 1218560
-MD5 (perforce/03.1/i386-freebsd4/p4api.txt) = f49132a4c5529e1901521ace157ef3ef
-SHA256 (perforce/03.1/i386-freebsd4/p4api.txt) = 3f627f8e6241e74ce286d7256ec6b61d7a3693b6a0c6df70eb95cca6b7a980e9
-SIZE (perforce/03.1/i386-freebsd4/p4api.txt) = 16266
-MD5 (perforce/03.1/i386-freebsd5/p4api.tar) = e2a71c3b57212deae1943e84847ffd4f
-SHA256 (perforce/03.1/i386-freebsd5/p4api.tar) = 9513ada334699481730c0366fc8feccadce2867be077b237dc3437ad7040b239
-SIZE (perforce/03.1/i386-freebsd5/p4api.tar) = 1208320
-MD5 (perforce/03.1/i386-freebsd5/p4api.txt) = f49132a4c5529e1901521ace157ef3ef
-SHA256 (perforce/03.1/i386-freebsd5/p4api.txt) = 3f627f8e6241e74ce286d7256ec6b61d7a3693b6a0c6df70eb95cca6b7a980e9
-SIZE (perforce/03.1/i386-freebsd5/p4api.txt) = 16266
+MD5 (perforce/08.1/amd64-freebsd60/p4api.tgz) = 106262c7f72b525f1cdf5649c285aed7
+SHA256 (perforce/08.1/amd64-freebsd60/p4api.tgz) = 628e503e1a2cc1aba9f4d641242e2a465dd1bd988ecd6ddff7fd72fbd97393a9
+SIZE (perforce/08.1/amd64-freebsd60/p4api.tgz) = 616892
+MD5 (perforce/08.1/amd64-freebsd60/p4api.pdf) = f4953a608f95f52683c6b83c08bc5d84
+SHA256 (perforce/08.1/amd64-freebsd60/p4api.pdf) = 672ce46eb76f57198d410bedc616ac856fe68065527c2f835b6f3c8b65bfc78a
+SIZE (perforce/08.1/amd64-freebsd60/p4api.pdf) = 1318445
+MD5 (perforce/08.1/i386-freebsd60/p4api.tgz) = fc7682b4e2bd9802869c070388a7d537
+SHA256 (perforce/08.1/i386-freebsd60/p4api.tgz) = 272d9f34a149061b6706acf15a101914e567ede78a9d5a5ea9fff127183674e9
+SIZE (perforce/08.1/i386-freebsd60/p4api.tgz) = 594445
+MD5 (perforce/08.1/i386-freebsd60/p4api.pdf) = f4953a608f95f52683c6b83c08bc5d84
+SHA256 (perforce/08.1/i386-freebsd60/p4api.pdf) = 672ce46eb76f57198d410bedc616ac856fe68065527c2f835b6f3c8b65bfc78a
+SIZE (perforce/08.1/i386-freebsd60/p4api.pdf) = 1318445
+MD5 (perforce/08.1/amd64-freebsd54/p4api.pdf) = f4953a608f95f52683c6b83c08bc5d84
+SHA256 (perforce/08.1/amd64-freebsd54/p4api.pdf) = 672ce46eb76f57198d410bedc616ac856fe68065527c2f835b6f3c8b65bfc78a
+SIZE (perforce/08.1/amd64-freebsd54/p4api.pdf) = 1318445
+MD5 (perforce/08.1/i386-freebsd54/p4api.pdf) = f4953a608f95f52683c6b83c08bc5d84
+SHA256 (perforce/08.1/i386-freebsd54/p4api.pdf) = 672ce46eb76f57198d410bedc616ac856fe68065527c2f835b6f3c8b65bfc78a
+SIZE (perforce/08.1/i386-freebsd54/p4api.pdf) = 1318445
+MD5 (perforce/08.1/i386-freebsd54/p4api.tgz) = 206137fdd0129e7d56378c4a3e6a12fb
+SHA256 (perforce/08.1/i386-freebsd54/p4api.tgz) = 886a4b113bcdd8c9f07aaa4a1fa88b9fca254486026c0b69d8e0453b32db1013
+SIZE (perforce/08.1/i386-freebsd54/p4api.tgz) = 593933
+MD5 (perforce/08.1/amd64-freebsd54/p4api.tgz) = 9e79a43355f0c8fb23dd2c5b3c1b3616
+SHA256 (perforce/08.1/amd64-freebsd54/p4api.tgz) = 30513087739f376d114e0796e6da51a36c8acec5ef1b4a144f9f73428c6a1b31
+SIZE (perforce/08.1/amd64-freebsd54/p4api.tgz) = 616862
diff --git a/devel/p4api/pkg-plist b/devel/p4api/pkg-plist
index 2dcf5992953c..0fc19662e4b5 100644
--- a/devel/p4api/pkg-plist
+++ b/devel/p4api/pkg-plist
@@ -15,16 +15,19 @@ include/perforce/hostenv.h
 include/perforce/i18napi.h
 include/perforce/ident.h
 include/perforce/keepalive.h
+include/perforce/mapapi.h
 include/perforce/msgclient.h
+include/perforce/msgserver.h
 include/perforce/netconnect.h
 include/perforce/ntservice.h
 include/perforce/options.h
-include/perforce/p4api.txt
 include/perforce/p4tags.h
 include/perforce/pathsys.h
+include/perforce/runcmd.h
 include/perforce/signaler.h
 include/perforce/spec.h
 include/perforce/stdhdrs.h
+include/perforce/strarray.h
 include/perforce/strbuf.h
 include/perforce/strdict.h
 include/perforce/strops.h
@@ -34,5 +37,13 @@ include/perforce/vararray.h
 lib/perforce/libclient.a
 lib/perforce/librpc.a
 lib/perforce/libsupp.a
+%%PORTDOCS%%%%DOCSDIR%%/p4api.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Jamfile.api
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Jamrules
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Version
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clientuser.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/p4api.cc
 @dirrm include/perforce
 @dirrm lib/perforce
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%