diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 2d5fc0135192..9c4d55e5bb2c 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -1,112 +1,112 @@
 # New ports collection makefile for:	perforce
 # Date created:				3 Mai 2000
 # Whom:					sam@inf.enst.fr
 #
 # $FreeBSD$
 #
 
 PORTNAME=	perforce
 PORTVERSION=	${VERSION}
 PORTREVISION=	${REVISION}
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ \
 		ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/doc/man/:man
 EXTRACT_SUFX=
 DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
 # These variables are all configurable.
 PERFORCE_USER?=		p4admin
 PERFORCE_UID?=		94
 PERFORCE_GROUP?=	p4admin
 PERFORCE_GID?=		94
 PERFORCE_HOME?=		${LOCALBASE}/perforce
 PERFORCE_ROOT?=		${PERFORCE_HOME}/root
 PERFORCE_LOGS?=		${PERFORCE_HOME}/logs
 PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
 .if ${ARCH} == i386
 VERSION=	02.2
-REVISION=	3
+REVISION=	4
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
 PLATFORM=	freebsdaxp
 BIN_FILES=	p4
 SBIN_FILES=	p4d
 .else
 IGNORE=		"Unsupported platform, sorry."
 .endif
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
 		-e "s,@PERFORCE_LOGS@,${PERFORCE_LOGS},g" \
 		-e "s,@PERFORCE_USER@,${PERFORCE_USER},g" \
 		-e "s,@PERFORCE_PORT@,${PERFORCE_PORT},g" \
 		-e "s,@PERFORCE_CACHE@,${PERFORCE_CACHE},g" \
 		-e "s,@PERFORCE_TARGET@,${PERFORCE_TARGET},g" \
 		< ${FILESDIR}/perforce.conf.in > ${WRKSRC}/perforce.conf
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/perforce.sh.in > ${WRKSRC}/perforce.sh
 
 pre-install:
 	${SETENV} PKG_PREFIX=${PREFIX} \
 		PERFORCE_USER=${PERFORCE_USER} \
 		PERFORCE_UID=${PERFORCE_UID} \
 		PERFORCE_GROUP=${PERFORCE_GROUP} \
 		PERFORCE_GID=${PERFORCE_GID} \
 		PERFORCE_HOME=${PERFORCE_HOME} \
 		PERFORCE_ROOT=${PERFORCE_ROOT} \
 		PERFORCE_LOGS=${PERFORCE_LOGS} \
 		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
 
 do-install:
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/perforce.conf ${PREFIX}/etc/perforce.conf.default; \
 	if [ ! -f ${PREFIX}/etc/perforce.conf ]; then \
 		${CP} -p ${PREFIX}/etc/perforce.conf.default ${PREFIX}/etc/perforce.conf; \
 	fi
 	${INSTALL_SCRIPT} ${WRKSRC}/perforce.sh ${PREFIX}/etc/rc.d/
 .for f in ${MAN1}
 	${INSTALL_MAN} ${_DISTDIR}/${f} ${PREFIX}/man/man1/
 .endfor
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 
 post-install:
 .for f in ${BIN_FILES}
 	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
 	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4/distinfo b/devel/p4/distinfo
index 42771dd46c43..51a52c89c9b7 100644
--- a/devel/p4/distinfo
+++ b/devel/p4/distinfo
@@ -1,11 +1,11 @@
-MD5 (perforce/02.2/i386/p4) = 7985080db1f05e850469da15d5d64fe1
-MD5 (perforce/02.2/i386/p4web) = ccd7d116688c69cdb251300bc07d771f
-MD5 (perforce/02.2/i386/p4d) = d0660ce11086b7c22eab7a2f9b77b403
+MD5 (perforce/02.2/i386/p4) = ccdda346b56f082cb98297fb9ad4db0f
+MD5 (perforce/02.2/i386/p4web) = 06ecf4da5f3d0324ad6ce0ba83c34cbb
+MD5 (perforce/02.2/i386/p4d) = 6fd5d778cdf4e17990ec600602a8b404
 MD5 (perforce/02.2/i386/p4ftpd) = e9c921f222994c77a232b12cca6f5e89
-MD5 (perforce/02.2/i386/p4p) = f99fdaf83898b7c3b17d234030e6c24c
+MD5 (perforce/02.2/i386/p4p) = 3703a9ba4fef1560254a1dfda779bacb
 MD5 (perforce/02.2/i386/p4.1) = 88b8b8c33e32092a96cb409bf635b40d
 MD5 (perforce/02.2/i386/p4d.1) = 382614735981ad5a80b7b679b36f48c0
 MD5 (perforce/99.1/alpha/p4) = 7c1300a82ab03b7ede46cf8a02c48fd9
 MD5 (perforce/99.1/alpha/p4d) = 8f34c41c18185011ed848aaf450cffa5
 MD5 (perforce/99.1/alpha/p4.1) = 4a9d035eb5ef96342c2f701a02da40f9
 MD5 (perforce/99.1/alpha/p4d.1) = a08eb04e9668ba4d0abf47f3b12c56f7
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 2d5fc0135192..9c4d55e5bb2c 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -1,112 +1,112 @@
 # New ports collection makefile for:	perforce
 # Date created:				3 Mai 2000
 # Whom:					sam@inf.enst.fr
 #
 # $FreeBSD$
 #
 
 PORTNAME=	perforce
 PORTVERSION=	${VERSION}
 PORTREVISION=	${REVISION}
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ \
 		ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/doc/man/:man
 EXTRACT_SUFX=
 DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
 # These variables are all configurable.
 PERFORCE_USER?=		p4admin
 PERFORCE_UID?=		94
 PERFORCE_GROUP?=	p4admin
 PERFORCE_GID?=		94
 PERFORCE_HOME?=		${LOCALBASE}/perforce
 PERFORCE_ROOT?=		${PERFORCE_HOME}/root
 PERFORCE_LOGS?=		${PERFORCE_HOME}/logs
 PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
 .if ${ARCH} == i386
 VERSION=	02.2
-REVISION=	3
+REVISION=	4
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
 PLATFORM=	freebsdaxp
 BIN_FILES=	p4
 SBIN_FILES=	p4d
 .else
 IGNORE=		"Unsupported platform, sorry."
 .endif
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
 		-e "s,@PERFORCE_LOGS@,${PERFORCE_LOGS},g" \
 		-e "s,@PERFORCE_USER@,${PERFORCE_USER},g" \
 		-e "s,@PERFORCE_PORT@,${PERFORCE_PORT},g" \
 		-e "s,@PERFORCE_CACHE@,${PERFORCE_CACHE},g" \
 		-e "s,@PERFORCE_TARGET@,${PERFORCE_TARGET},g" \
 		< ${FILESDIR}/perforce.conf.in > ${WRKSRC}/perforce.conf
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/perforce.sh.in > ${WRKSRC}/perforce.sh
 
 pre-install:
 	${SETENV} PKG_PREFIX=${PREFIX} \
 		PERFORCE_USER=${PERFORCE_USER} \
 		PERFORCE_UID=${PERFORCE_UID} \
 		PERFORCE_GROUP=${PERFORCE_GROUP} \
 		PERFORCE_GID=${PERFORCE_GID} \
 		PERFORCE_HOME=${PERFORCE_HOME} \
 		PERFORCE_ROOT=${PERFORCE_ROOT} \
 		PERFORCE_LOGS=${PERFORCE_LOGS} \
 		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
 
 do-install:
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/perforce.conf ${PREFIX}/etc/perforce.conf.default; \
 	if [ ! -f ${PREFIX}/etc/perforce.conf ]; then \
 		${CP} -p ${PREFIX}/etc/perforce.conf.default ${PREFIX}/etc/perforce.conf; \
 	fi
 	${INSTALL_SCRIPT} ${WRKSRC}/perforce.sh ${PREFIX}/etc/rc.d/
 .for f in ${MAN1}
 	${INSTALL_MAN} ${_DISTDIR}/${f} ${PREFIX}/man/man1/
 .endfor
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 
 post-install:
 .for f in ${BIN_FILES}
 	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
 	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4d/distinfo b/devel/p4d/distinfo
index 42771dd46c43..51a52c89c9b7 100644
--- a/devel/p4d/distinfo
+++ b/devel/p4d/distinfo
@@ -1,11 +1,11 @@
-MD5 (perforce/02.2/i386/p4) = 7985080db1f05e850469da15d5d64fe1
-MD5 (perforce/02.2/i386/p4web) = ccd7d116688c69cdb251300bc07d771f
-MD5 (perforce/02.2/i386/p4d) = d0660ce11086b7c22eab7a2f9b77b403
+MD5 (perforce/02.2/i386/p4) = ccdda346b56f082cb98297fb9ad4db0f
+MD5 (perforce/02.2/i386/p4web) = 06ecf4da5f3d0324ad6ce0ba83c34cbb
+MD5 (perforce/02.2/i386/p4d) = 6fd5d778cdf4e17990ec600602a8b404
 MD5 (perforce/02.2/i386/p4ftpd) = e9c921f222994c77a232b12cca6f5e89
-MD5 (perforce/02.2/i386/p4p) = f99fdaf83898b7c3b17d234030e6c24c
+MD5 (perforce/02.2/i386/p4p) = 3703a9ba4fef1560254a1dfda779bacb
 MD5 (perforce/02.2/i386/p4.1) = 88b8b8c33e32092a96cb409bf635b40d
 MD5 (perforce/02.2/i386/p4d.1) = 382614735981ad5a80b7b679b36f48c0
 MD5 (perforce/99.1/alpha/p4) = 7c1300a82ab03b7ede46cf8a02c48fd9
 MD5 (perforce/99.1/alpha/p4d) = 8f34c41c18185011ed848aaf450cffa5
 MD5 (perforce/99.1/alpha/p4.1) = 4a9d035eb5ef96342c2f701a02da40f9
 MD5 (perforce/99.1/alpha/p4d.1) = a08eb04e9668ba4d0abf47f3b12c56f7
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index 2d5fc0135192..9c4d55e5bb2c 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -1,112 +1,112 @@
 # New ports collection makefile for:	perforce
 # Date created:				3 Mai 2000
 # Whom:					sam@inf.enst.fr
 #
 # $FreeBSD$
 #
 
 PORTNAME=	perforce
 PORTVERSION=	${VERSION}
 PORTREVISION=	${REVISION}
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ \
 		ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/doc/man/:man
 EXTRACT_SUFX=
 DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
 # These variables are all configurable.
 PERFORCE_USER?=		p4admin
 PERFORCE_UID?=		94
 PERFORCE_GROUP?=	p4admin
 PERFORCE_GID?=		94
 PERFORCE_HOME?=		${LOCALBASE}/perforce
 PERFORCE_ROOT?=		${PERFORCE_HOME}/root
 PERFORCE_LOGS?=		${PERFORCE_HOME}/logs
 PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
 .if ${ARCH} == i386
 VERSION=	02.2
-REVISION=	3
+REVISION=	4
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
 PLATFORM=	freebsdaxp
 BIN_FILES=	p4
 SBIN_FILES=	p4d
 .else
 IGNORE=		"Unsupported platform, sorry."
 .endif
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
 		-e "s,@PERFORCE_LOGS@,${PERFORCE_LOGS},g" \
 		-e "s,@PERFORCE_USER@,${PERFORCE_USER},g" \
 		-e "s,@PERFORCE_PORT@,${PERFORCE_PORT},g" \
 		-e "s,@PERFORCE_CACHE@,${PERFORCE_CACHE},g" \
 		-e "s,@PERFORCE_TARGET@,${PERFORCE_TARGET},g" \
 		< ${FILESDIR}/perforce.conf.in > ${WRKSRC}/perforce.conf
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/perforce.sh.in > ${WRKSRC}/perforce.sh
 
 pre-install:
 	${SETENV} PKG_PREFIX=${PREFIX} \
 		PERFORCE_USER=${PERFORCE_USER} \
 		PERFORCE_UID=${PERFORCE_UID} \
 		PERFORCE_GROUP=${PERFORCE_GROUP} \
 		PERFORCE_GID=${PERFORCE_GID} \
 		PERFORCE_HOME=${PERFORCE_HOME} \
 		PERFORCE_ROOT=${PERFORCE_ROOT} \
 		PERFORCE_LOGS=${PERFORCE_LOGS} \
 		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
 
 do-install:
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/perforce.conf ${PREFIX}/etc/perforce.conf.default; \
 	if [ ! -f ${PREFIX}/etc/perforce.conf ]; then \
 		${CP} -p ${PREFIX}/etc/perforce.conf.default ${PREFIX}/etc/perforce.conf; \
 	fi
 	${INSTALL_SCRIPT} ${WRKSRC}/perforce.sh ${PREFIX}/etc/rc.d/
 .for f in ${MAN1}
 	${INSTALL_MAN} ${_DISTDIR}/${f} ${PREFIX}/man/man1/
 .endfor
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 
 post-install:
 .for f in ${BIN_FILES}
 	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
 	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4ftpd/distinfo b/devel/p4ftpd/distinfo
index 42771dd46c43..51a52c89c9b7 100644
--- a/devel/p4ftpd/distinfo
+++ b/devel/p4ftpd/distinfo
@@ -1,11 +1,11 @@
-MD5 (perforce/02.2/i386/p4) = 7985080db1f05e850469da15d5d64fe1
-MD5 (perforce/02.2/i386/p4web) = ccd7d116688c69cdb251300bc07d771f
-MD5 (perforce/02.2/i386/p4d) = d0660ce11086b7c22eab7a2f9b77b403
+MD5 (perforce/02.2/i386/p4) = ccdda346b56f082cb98297fb9ad4db0f
+MD5 (perforce/02.2/i386/p4web) = 06ecf4da5f3d0324ad6ce0ba83c34cbb
+MD5 (perforce/02.2/i386/p4d) = 6fd5d778cdf4e17990ec600602a8b404
 MD5 (perforce/02.2/i386/p4ftpd) = e9c921f222994c77a232b12cca6f5e89
-MD5 (perforce/02.2/i386/p4p) = f99fdaf83898b7c3b17d234030e6c24c
+MD5 (perforce/02.2/i386/p4p) = 3703a9ba4fef1560254a1dfda779bacb
 MD5 (perforce/02.2/i386/p4.1) = 88b8b8c33e32092a96cb409bf635b40d
 MD5 (perforce/02.2/i386/p4d.1) = 382614735981ad5a80b7b679b36f48c0
 MD5 (perforce/99.1/alpha/p4) = 7c1300a82ab03b7ede46cf8a02c48fd9
 MD5 (perforce/99.1/alpha/p4d) = 8f34c41c18185011ed848aaf450cffa5
 MD5 (perforce/99.1/alpha/p4.1) = 4a9d035eb5ef96342c2f701a02da40f9
 MD5 (perforce/99.1/alpha/p4d.1) = a08eb04e9668ba4d0abf47f3b12c56f7
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index 2d5fc0135192..9c4d55e5bb2c 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -1,112 +1,112 @@
 # New ports collection makefile for:	perforce
 # Date created:				3 Mai 2000
 # Whom:					sam@inf.enst.fr
 #
 # $FreeBSD$
 #
 
 PORTNAME=	perforce
 PORTVERSION=	${VERSION}
 PORTREVISION=	${REVISION}
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ \
 		ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/doc/man/:man
 EXTRACT_SUFX=
 DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
 # These variables are all configurable.
 PERFORCE_USER?=		p4admin
 PERFORCE_UID?=		94
 PERFORCE_GROUP?=	p4admin
 PERFORCE_GID?=		94
 PERFORCE_HOME?=		${LOCALBASE}/perforce
 PERFORCE_ROOT?=		${PERFORCE_HOME}/root
 PERFORCE_LOGS?=		${PERFORCE_HOME}/logs
 PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
 .if ${ARCH} == i386
 VERSION=	02.2
-REVISION=	3
+REVISION=	4
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
 PLATFORM=	freebsdaxp
 BIN_FILES=	p4
 SBIN_FILES=	p4d
 .else
 IGNORE=		"Unsupported platform, sorry."
 .endif
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
 		-e "s,@PERFORCE_LOGS@,${PERFORCE_LOGS},g" \
 		-e "s,@PERFORCE_USER@,${PERFORCE_USER},g" \
 		-e "s,@PERFORCE_PORT@,${PERFORCE_PORT},g" \
 		-e "s,@PERFORCE_CACHE@,${PERFORCE_CACHE},g" \
 		-e "s,@PERFORCE_TARGET@,${PERFORCE_TARGET},g" \
 		< ${FILESDIR}/perforce.conf.in > ${WRKSRC}/perforce.conf
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/perforce.sh.in > ${WRKSRC}/perforce.sh
 
 pre-install:
 	${SETENV} PKG_PREFIX=${PREFIX} \
 		PERFORCE_USER=${PERFORCE_USER} \
 		PERFORCE_UID=${PERFORCE_UID} \
 		PERFORCE_GROUP=${PERFORCE_GROUP} \
 		PERFORCE_GID=${PERFORCE_GID} \
 		PERFORCE_HOME=${PERFORCE_HOME} \
 		PERFORCE_ROOT=${PERFORCE_ROOT} \
 		PERFORCE_LOGS=${PERFORCE_LOGS} \
 		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
 
 do-install:
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/perforce.conf ${PREFIX}/etc/perforce.conf.default; \
 	if [ ! -f ${PREFIX}/etc/perforce.conf ]; then \
 		${CP} -p ${PREFIX}/etc/perforce.conf.default ${PREFIX}/etc/perforce.conf; \
 	fi
 	${INSTALL_SCRIPT} ${WRKSRC}/perforce.sh ${PREFIX}/etc/rc.d/
 .for f in ${MAN1}
 	${INSTALL_MAN} ${_DISTDIR}/${f} ${PREFIX}/man/man1/
 .endfor
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 
 post-install:
 .for f in ${BIN_FILES}
 	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
 	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4p/distinfo b/devel/p4p/distinfo
index 42771dd46c43..51a52c89c9b7 100644
--- a/devel/p4p/distinfo
+++ b/devel/p4p/distinfo
@@ -1,11 +1,11 @@
-MD5 (perforce/02.2/i386/p4) = 7985080db1f05e850469da15d5d64fe1
-MD5 (perforce/02.2/i386/p4web) = ccd7d116688c69cdb251300bc07d771f
-MD5 (perforce/02.2/i386/p4d) = d0660ce11086b7c22eab7a2f9b77b403
+MD5 (perforce/02.2/i386/p4) = ccdda346b56f082cb98297fb9ad4db0f
+MD5 (perforce/02.2/i386/p4web) = 06ecf4da5f3d0324ad6ce0ba83c34cbb
+MD5 (perforce/02.2/i386/p4d) = 6fd5d778cdf4e17990ec600602a8b404
 MD5 (perforce/02.2/i386/p4ftpd) = e9c921f222994c77a232b12cca6f5e89
-MD5 (perforce/02.2/i386/p4p) = f99fdaf83898b7c3b17d234030e6c24c
+MD5 (perforce/02.2/i386/p4p) = 3703a9ba4fef1560254a1dfda779bacb
 MD5 (perforce/02.2/i386/p4.1) = 88b8b8c33e32092a96cb409bf635b40d
 MD5 (perforce/02.2/i386/p4d.1) = 382614735981ad5a80b7b679b36f48c0
 MD5 (perforce/99.1/alpha/p4) = 7c1300a82ab03b7ede46cf8a02c48fd9
 MD5 (perforce/99.1/alpha/p4d) = 8f34c41c18185011ed848aaf450cffa5
 MD5 (perforce/99.1/alpha/p4.1) = 4a9d035eb5ef96342c2f701a02da40f9
 MD5 (perforce/99.1/alpha/p4d.1) = a08eb04e9668ba4d0abf47f3b12c56f7
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index 2d5fc0135192..9c4d55e5bb2c 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -1,112 +1,112 @@
 # New ports collection makefile for:	perforce
 # Date created:				3 Mai 2000
 # Whom:					sam@inf.enst.fr
 #
 # $FreeBSD$
 #
 
 PORTNAME=	perforce
 PORTVERSION=	${VERSION}
 PORTREVISION=	${REVISION}
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ \
 		ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/doc/man/:man
 EXTRACT_SUFX=
 DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
 # These variables are all configurable.
 PERFORCE_USER?=		p4admin
 PERFORCE_UID?=		94
 PERFORCE_GROUP?=	p4admin
 PERFORCE_GID?=		94
 PERFORCE_HOME?=		${LOCALBASE}/perforce
 PERFORCE_ROOT?=		${PERFORCE_HOME}/root
 PERFORCE_LOGS?=		${PERFORCE_HOME}/logs
 PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
 .if ${ARCH} == i386
 VERSION=	02.2
-REVISION=	3
+REVISION=	4
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
 PLATFORM=	freebsdaxp
 BIN_FILES=	p4
 SBIN_FILES=	p4d
 .else
 IGNORE=		"Unsupported platform, sorry."
 .endif
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
 		-e "s,@PERFORCE_LOGS@,${PERFORCE_LOGS},g" \
 		-e "s,@PERFORCE_USER@,${PERFORCE_USER},g" \
 		-e "s,@PERFORCE_PORT@,${PERFORCE_PORT},g" \
 		-e "s,@PERFORCE_CACHE@,${PERFORCE_CACHE},g" \
 		-e "s,@PERFORCE_TARGET@,${PERFORCE_TARGET},g" \
 		< ${FILESDIR}/perforce.conf.in > ${WRKSRC}/perforce.conf
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/perforce.sh.in > ${WRKSRC}/perforce.sh
 
 pre-install:
 	${SETENV} PKG_PREFIX=${PREFIX} \
 		PERFORCE_USER=${PERFORCE_USER} \
 		PERFORCE_UID=${PERFORCE_UID} \
 		PERFORCE_GROUP=${PERFORCE_GROUP} \
 		PERFORCE_GID=${PERFORCE_GID} \
 		PERFORCE_HOME=${PERFORCE_HOME} \
 		PERFORCE_ROOT=${PERFORCE_ROOT} \
 		PERFORCE_LOGS=${PERFORCE_LOGS} \
 		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
 
 do-install:
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/perforce.conf ${PREFIX}/etc/perforce.conf.default; \
 	if [ ! -f ${PREFIX}/etc/perforce.conf ]; then \
 		${CP} -p ${PREFIX}/etc/perforce.conf.default ${PREFIX}/etc/perforce.conf; \
 	fi
 	${INSTALL_SCRIPT} ${WRKSRC}/perforce.sh ${PREFIX}/etc/rc.d/
 .for f in ${MAN1}
 	${INSTALL_MAN} ${_DISTDIR}/${f} ${PREFIX}/man/man1/
 .endfor
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 
 post-install:
 .for f in ${BIN_FILES}
 	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
 	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4web/distinfo b/devel/p4web/distinfo
index 42771dd46c43..51a52c89c9b7 100644
--- a/devel/p4web/distinfo
+++ b/devel/p4web/distinfo
@@ -1,11 +1,11 @@
-MD5 (perforce/02.2/i386/p4) = 7985080db1f05e850469da15d5d64fe1
-MD5 (perforce/02.2/i386/p4web) = ccd7d116688c69cdb251300bc07d771f
-MD5 (perforce/02.2/i386/p4d) = d0660ce11086b7c22eab7a2f9b77b403
+MD5 (perforce/02.2/i386/p4) = ccdda346b56f082cb98297fb9ad4db0f
+MD5 (perforce/02.2/i386/p4web) = 06ecf4da5f3d0324ad6ce0ba83c34cbb
+MD5 (perforce/02.2/i386/p4d) = 6fd5d778cdf4e17990ec600602a8b404
 MD5 (perforce/02.2/i386/p4ftpd) = e9c921f222994c77a232b12cca6f5e89
-MD5 (perforce/02.2/i386/p4p) = f99fdaf83898b7c3b17d234030e6c24c
+MD5 (perforce/02.2/i386/p4p) = 3703a9ba4fef1560254a1dfda779bacb
 MD5 (perforce/02.2/i386/p4.1) = 88b8b8c33e32092a96cb409bf635b40d
 MD5 (perforce/02.2/i386/p4d.1) = 382614735981ad5a80b7b679b36f48c0
 MD5 (perforce/99.1/alpha/p4) = 7c1300a82ab03b7ede46cf8a02c48fd9
 MD5 (perforce/99.1/alpha/p4d) = 8f34c41c18185011ed848aaf450cffa5
 MD5 (perforce/99.1/alpha/p4.1) = 4a9d035eb5ef96342c2f701a02da40f9
 MD5 (perforce/99.1/alpha/p4d.1) = a08eb04e9668ba4d0abf47f3b12c56f7
diff --git a/devel/perforce/Makefile b/devel/perforce/Makefile
index 2d5fc0135192..9c4d55e5bb2c 100644
--- a/devel/perforce/Makefile
+++ b/devel/perforce/Makefile
@@ -1,112 +1,112 @@
 # New ports collection makefile for:	perforce
 # Date created:				3 Mai 2000
 # Whom:					sam@inf.enst.fr
 #
 # $FreeBSD$
 #
 
 PORTNAME=	perforce
 PORTVERSION=	${VERSION}
 PORTREVISION=	${REVISION}
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ \
 		ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/doc/man/:man
 EXTRACT_SUFX=
 DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
 # These variables are all configurable.
 PERFORCE_USER?=		p4admin
 PERFORCE_UID?=		94
 PERFORCE_GROUP?=	p4admin
 PERFORCE_GID?=		94
 PERFORCE_HOME?=		${LOCALBASE}/perforce
 PERFORCE_ROOT?=		${PERFORCE_HOME}/root
 PERFORCE_LOGS?=		${PERFORCE_HOME}/logs
 PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
 .if ${ARCH} == i386
 VERSION=	02.2
-REVISION=	3
+REVISION=	4
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
 PLATFORM=	freebsdaxp
 BIN_FILES=	p4
 SBIN_FILES=	p4d
 .else
 IGNORE=		"Unsupported platform, sorry."
 .endif
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
 		-e "s,@PERFORCE_LOGS@,${PERFORCE_LOGS},g" \
 		-e "s,@PERFORCE_USER@,${PERFORCE_USER},g" \
 		-e "s,@PERFORCE_PORT@,${PERFORCE_PORT},g" \
 		-e "s,@PERFORCE_CACHE@,${PERFORCE_CACHE},g" \
 		-e "s,@PERFORCE_TARGET@,${PERFORCE_TARGET},g" \
 		< ${FILESDIR}/perforce.conf.in > ${WRKSRC}/perforce.conf
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/perforce.sh.in > ${WRKSRC}/perforce.sh
 
 pre-install:
 	${SETENV} PKG_PREFIX=${PREFIX} \
 		PERFORCE_USER=${PERFORCE_USER} \
 		PERFORCE_UID=${PERFORCE_UID} \
 		PERFORCE_GROUP=${PERFORCE_GROUP} \
 		PERFORCE_GID=${PERFORCE_GID} \
 		PERFORCE_HOME=${PERFORCE_HOME} \
 		PERFORCE_ROOT=${PERFORCE_ROOT} \
 		PERFORCE_LOGS=${PERFORCE_LOGS} \
 		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
 
 do-install:
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/perforce.conf ${PREFIX}/etc/perforce.conf.default; \
 	if [ ! -f ${PREFIX}/etc/perforce.conf ]; then \
 		${CP} -p ${PREFIX}/etc/perforce.conf.default ${PREFIX}/etc/perforce.conf; \
 	fi
 	${INSTALL_SCRIPT} ${WRKSRC}/perforce.sh ${PREFIX}/etc/rc.d/
 .for f in ${MAN1}
 	${INSTALL_MAN} ${_DISTDIR}/${f} ${PREFIX}/man/man1/
 .endfor
 .for f in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/bin/
 .endfor
 .for f in ${SBIN_FILES}
 	${INSTALL_PROGRAM} ${_DISTDIR}/${f} ${PREFIX}/sbin/
 .endfor
 
 post-install:
 .for f in ${BIN_FILES}
 	${ECHO_CMD} bin/${f} >> ${TMPPLIST}
 .endfor
 .for f in ${SBIN_FILES}
 	${ECHO_CMD} sbin/${f} >> ${TMPPLIST}
 .endfor
 	${ECHO_CMD} "@unexec ${RMDIR} ${PERFORCE_ROOT} ${PERFORCE_LOGS} ${PERFORCE_HOME} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/perforce/distinfo b/devel/perforce/distinfo
index 42771dd46c43..51a52c89c9b7 100644
--- a/devel/perforce/distinfo
+++ b/devel/perforce/distinfo
@@ -1,11 +1,11 @@
-MD5 (perforce/02.2/i386/p4) = 7985080db1f05e850469da15d5d64fe1
-MD5 (perforce/02.2/i386/p4web) = ccd7d116688c69cdb251300bc07d771f
-MD5 (perforce/02.2/i386/p4d) = d0660ce11086b7c22eab7a2f9b77b403
+MD5 (perforce/02.2/i386/p4) = ccdda346b56f082cb98297fb9ad4db0f
+MD5 (perforce/02.2/i386/p4web) = 06ecf4da5f3d0324ad6ce0ba83c34cbb
+MD5 (perforce/02.2/i386/p4d) = 6fd5d778cdf4e17990ec600602a8b404
 MD5 (perforce/02.2/i386/p4ftpd) = e9c921f222994c77a232b12cca6f5e89
-MD5 (perforce/02.2/i386/p4p) = f99fdaf83898b7c3b17d234030e6c24c
+MD5 (perforce/02.2/i386/p4p) = 3703a9ba4fef1560254a1dfda779bacb
 MD5 (perforce/02.2/i386/p4.1) = 88b8b8c33e32092a96cb409bf635b40d
 MD5 (perforce/02.2/i386/p4d.1) = 382614735981ad5a80b7b679b36f48c0
 MD5 (perforce/99.1/alpha/p4) = 7c1300a82ab03b7ede46cf8a02c48fd9
 MD5 (perforce/99.1/alpha/p4d) = 8f34c41c18185011ed848aaf450cffa5
 MD5 (perforce/99.1/alpha/p4.1) = 4a9d035eb5ef96342c2f701a02da40f9
 MD5 (perforce/99.1/alpha/p4d.1) = a08eb04e9668ba4d0abf47f3b12c56f7