8 files changed, 36 insertions, 52 deletions

diff --git a/LEGAL b/LEGAL
index 294fcfa21ae1..36c69a342dc0 100644
--- a/LEGAL
+++ b/LEGAL
@@ -203,6 +203,11 @@ oracle/sqldeveloper*	databases/sqldeveloper	This software is under license and e
 palmos-sdk-*-1.tar.gz	palm/palmos-sdk		License agreement is required
 pcsv*fb.tar.gz		lang/petite-chez	User must accept license terms before installation
 PDFlib-Lite-*.tar.gz	print/pdflib		Many odd restrictions on usage and distribution
+perforce/*/p4		devel/p4		Restricted distribution
+perforce/*/p4d		devel/p4d		Restricted distribution
+perforce/*/p4ftpd	devel/p4ftpd		Restricted distribution
+perforce/*/p4p		devel/p4p		Restricted distribution
+perforce/*/p4web	devel/p4web		Restricted distribution
 platon*			biology/platon		$5000 USD for commercial users, free for academic
 poseidonCE-*		java/poseidon		Redistribution is not permitted
 ppsmall-*		archivers/ppunpack	No commercial redistribution
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index d734b9f46468..ae044b48a636 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	p4d
-PORTVERSION=	2012.1.549175
+PORTVERSION=	2012.1.876219
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
@@ -34,7 +34,6 @@ SUB_LIST=	P4ROOT=${P4ROOT} \
 
 USE_RC_SUBR=	p4d
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
@@ -43,21 +42,14 @@ USERS=	p4admin
 GROUPS=	p4admin
 
 do-install:
-	${INSTALL_PROGRAM} ${_DISTDIR}/p4d ${PREFIX}/sbin/
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-	${MKDIR} ${DESTDIR}${P4ROOT}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4ROOT}
-	${CHMOD} 750 ${DESTDIR}${P4ROOT}
-	${TOUCH} ${DESTDIR}${P4LOG}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}
-	${CHMOD} 640 ${DESTDIR}${P4LOG}
-	@${ECHO_CMD} "@exec ${MKDIR} ${DESTDIR}${P4ROOT}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4ROOT}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 750 ${DESTDIR}${P4ROOT}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${TOUCH} ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 640 ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
+	${INSTALL_PROGRAM} ${_DISTDIR}/p4d ${STAGEDIR}${PREFIX}/sbin/
+	@${MKDIR} ${STAGEDIR}${P4ROOT}
+	@${ECHO_CMD} "@exec ${MKDIR} ${P4ROOT}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4ROOT}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHMOD} 750 ${P4ROOT}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ${RMDIR} ${P4ROOT} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4d/distinfo.freebsd60x86 b/devel/p4d/distinfo.freebsd60x86
index 41dc0ffd13c9..507559cf7efc 100644
--- a/devel/p4d/distinfo.freebsd60x86
+++ b/devel/p4d/distinfo.freebsd60x86
@@ -1,2 +1,2 @@
-SHA256 (perforce/2012.1.549175/bin.freebsd60x86/p4d) = cd88fb8c6e5d43f43ee2b3e244d912636f09947f36edce0a9bbb14214343ff08
-SIZE (perforce/2012.1.549175/bin.freebsd60x86/p4d) = 3567456
+SHA256 (perforce/2012.1.876219/bin.freebsd60x86/p4d) = fc5564c148fdfaa9f23d2f232f515039d69b2721352129d76d1f4b0d61f9a782
+SIZE (perforce/2012.1.876219/bin.freebsd60x86/p4d) = 3825092
diff --git a/devel/p4d/distinfo.freebsd60x86_64 b/devel/p4d/distinfo.freebsd60x86_64
index 9bd7f81056eb..1d73e4185574 100644
--- a/devel/p4d/distinfo.freebsd60x86_64
+++ b/devel/p4d/distinfo.freebsd60x86_64
@@ -1,2 +1,2 @@
-SHA256 (perforce/2012.1.549175/bin.freebsd60x86_64/p4d) = fb86084a79fee2a59918235c4e1564adb7b8bff136336d18fe349c2e8c8bfafb
-SIZE (perforce/2012.1.549175/bin.freebsd60x86_64/p4d) = 4006728
+SHA256 (perforce/2012.1.876219/bin.freebsd60x86_64/p4d) = b7e4381940f963822cca7c591e987b36f5f67e1771594a83bfc8cd8a7dec92e5
+SIZE (perforce/2012.1.876219/bin.freebsd60x86_64/p4d) = 4377688
diff --git a/devel/p4d/distinfo.freebsd70x86 b/devel/p4d/distinfo.freebsd70x86
index 60f6b84044d3..012d85d0de8e 100644
--- a/devel/p4d/distinfo.freebsd70x86
+++ b/devel/p4d/distinfo.freebsd70x86
@@ -1,2 +1,2 @@
-SHA256 (perforce/2012.1.549175/bin.freebsd70x86/p4d) = 5ba231667936803121485bd5706e1f7f60a9a69ebfc19f001b94f3e7004dc639
-SIZE (perforce/2012.1.549175/bin.freebsd70x86/p4d) = 3779540
+SHA256 (perforce/2012.1.876219/bin.freebsd70x86/p4d) = 44b114233e9ed3d3e0f84ec010d82ae9d52de40fb26bae37d3fe43f4ab501192
+SIZE (perforce/2012.1.876219/bin.freebsd70x86/p4d) = 4096716
diff --git a/devel/p4d/distinfo.freebsd70x86_64 b/devel/p4d/distinfo.freebsd70x86_64
index 1196d05237a7..55bfd070ffd5 100644
--- a/devel/p4d/distinfo.freebsd70x86_64
+++ b/devel/p4d/distinfo.freebsd70x86_64
@@ -1,2 +1,2 @@
-SHA256 (perforce/2012.1.549175/bin.freebsd70x86_64/p4d) = 2fa04daa1cb450e5c9b3c356cefc6c3b6f7a115d08adbd863f447caf1de758f1
-SIZE (perforce/2012.1.549175/bin.freebsd70x86_64/p4d) = 3875944
+SHA256 (perforce/2012.1.876219/bin.freebsd70x86_64/p4d) = da2452b263d36dfeba2548dc3292e94ab543ca3b10bce2706578ab8bcb8eacc3
+SIZE (perforce/2012.1.876219/bin.freebsd70x86_64/p4d) = 4264112
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index 541c459ea451..12bc89ebc5a5 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -30,7 +30,6 @@ SUB_LIST=	P4LOG=${P4LOG}
 
 USE_RC_SUBR=	p4ftpd
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
@@ -39,14 +38,9 @@ USERS=	p4admin
 GROUPS=	p4admin
 
 do-install:
-	${INSTALL_PROGRAM} ${_DISTDIR}/p4ftpd ${PREFIX}/sbin/
-
-post-install:
-	${TOUCH} ${DESTDIR}${P4LOG}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}
-	${CHMOD} 640 ${DESTDIR}${P4LOG}
-	@${ECHO_CMD} "@exec ${TOUCH} ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 640 ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
+	${INSTALL_PROGRAM} ${_DISTDIR}/p4ftpd ${STAGEDIR}${PREFIX}/sbin/
+	@${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index 99ee08339912..b14313d3f800 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -34,7 +34,6 @@ SUB_LIST=	P4CACHE=${P4CACHE} \
 
 USE_RC_SUBR=	p4p
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
@@ -43,20 +42,14 @@ USERS=	p4admin
 GROUPS=	p4admin
 
 do-install:
-	${INSTALL_PROGRAM} ${_DISTDIR}/p4p ${PREFIX}/sbin/
-
-post-install:
-	${MKDIR} ${DESTDIR}${P4CACHE}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4CACHE}
-	${CHMOD} 750 ${DESTDIR}${P4CACHE}
-	${TOUCH} ${DESTDIR}${P4LOG}
-	${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}
-	${CHMOD} 640 ${DESTDIR}${P4LOG}
-	@${ECHO_CMD} "@exec ${MKDIR} ${DESTDIR}${P4CACHE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4CACHE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 750 ${DESTDIR}${P4CACHE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${TOUCH} ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 640 ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
+	${INSTALL_PROGRAM} ${_DISTDIR}/p4p ${STAGEDIR}${PREFIX}/sbin/
+	@${MKDIR} ${STAGEDIR}${P4CACHE}
+	@${ECHO_CMD} "@exec ${MKDIR} ${P4CACHE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4CACHE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHMOD} 750 ${P4CACHE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ${RMDIR} ${P4CACHE} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>