Update to 2004.2.

PR:		ports/72427
Submitted by:	david marshall <marshall@chezmarshall.com> (maintainer)

19 files changed, 110 insertions, 150 deletions

diff --git a/UPDATING b/UPDATING
index 9421d606de92..0099085cdd4f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -7,6 +7,26 @@ time you update your ports collection, before attempting any port
 upgrades.
 
 20041012:
+  AFFECTS: users of devel/perforce
+  AUTHOR: marshall@chezmarshall.com
+
+  Upgrading from 2003.2 to 2004.2 is straightforward, it is highly
+  recommended to checkpoint and backup your server as follows:
+    p4 verify //...
+    p4 verify -u //... # possibly redundant
+    p4 admin checkpoint
+    p4 admin stop
+    <backup repository>
+
+  If you are upgrading from a version earlier than 2003.2, you should
+  consult the Perforce documentation
+    (http://www.perforce.com/perforce/technical.html)
+  before proceeding.
+
+  Also, it looks as though Perforce has stopped updating the man pages,
+  so they are no longer included in the port.
+
+20041012:
   AFFECTS: users of www/firefox
   AUTHOR: freebsd-gnome@FreeBSD.org
 
diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 832cf5bb0b6a..434a98c94f48 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -10,10 +10,9 @@ 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
+MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ 
 EXTRACT_SUFX=
-DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
+DISTFILES=	${BIN_FILES} ${SBIN_FILES}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
@@ -29,12 +28,12 @@ ARCH?= i386
 
 MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 .if ${ARCH} == i386
-VERSION=	03.2
-REVISION=	7
+VERSION=	04.2
+REVISION=	2
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
-REL_NOTES=	http://www.perforce.com/perforce/doc.032/user/relnotes.txt
+REL_NOTES=	http://www.perforce.com/perforce/doc.042/user/relnotes.txt
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
@@ -51,7 +50,6 @@ IGNORE=		"Unsupported platform, sorry."
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
-MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
@@ -117,9 +115,6 @@ do-install:
 		${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
diff --git a/devel/p4/distinfo.i386 b/devel/p4/distinfo.i386
index 015cd83e9425..f835403656db 100644
--- a/devel/p4/distinfo.i386
+++ b/devel/p4/distinfo.i386
@@ -1,14 +1,10 @@
-MD5 (perforce/03.2/i386/p4) = faff0e4d88276c30b5dfda5917968b0e
-SIZE (perforce/03.2/i386/p4) = 684712
-MD5 (perforce/03.2/i386/p4web) = ceb9038c44804de90a24bc009c8eb4ad
-SIZE (perforce/03.2/i386/p4web) = 1639614
-MD5 (perforce/03.2/i386/p4d) = 342de66804f6130e6acb06a812d2f7d7
-SIZE (perforce/03.2/i386/p4d) = 1346084
-MD5 (perforce/03.2/i386/p4ftpd) = ec22d7e1b1f55581127b24080418d822
-SIZE (perforce/03.2/i386/p4ftpd) = 800692
-MD5 (perforce/03.2/i386/p4p) = 018b501751db09328df2e553d7fcaed1
-SIZE (perforce/03.2/i386/p4p) = 672103
-MD5 (perforce/03.2/i386/p4.1) = 097de5d5637cff5d66a94cbf9b95e6a8
-SIZE (perforce/03.2/i386/p4.1) = 72954
-MD5 (perforce/03.2/i386/p4d.1) = 6b31c4f65fd8165b72a5b9d639f40548
-SIZE (perforce/03.2/i386/p4d.1) = 4529
+MD5 (perforce/04.2/i386/p4) = ddf5d2fc8c397983f1615b044dd03d6e
+SIZE (perforce/04.2/i386/p4) = 698264
+MD5 (perforce/04.2/i386/p4web) = 5696cef6ad2488bef291ef03eef08185
+SIZE (perforce/04.2/i386/p4web) = 1724496
+MD5 (perforce/04.2/i386/p4d) = e4ca2b67e27bc17425c47a5996f54b82
+SIZE (perforce/04.2/i386/p4d) = 1396396
+MD5 (perforce/04.2/i386/p4ftpd) = a4a676c8a34be8e75fda633d0fcc7d0c
+SIZE (perforce/04.2/i386/p4ftpd) = 813292
+MD5 (perforce/04.2/i386/p4p) = faa9384dc4e60a1fe870365b1eda6d07
+SIZE (perforce/04.2/i386/p4p) = 696069
diff --git a/devel/p4/pkg-install b/devel/p4/pkg-install
index b1c9c5d72e22..88b4d17472f4 100644
--- a/devel/p4/pkg-install
+++ b/devel/p4/pkg-install
@@ -44,7 +44,6 @@ PRE-INSTALL)
 	fi
 
 	if [ ! -d $PERFORCE_HOME ] ; then 
-echo hey
 		mkdir -p $PERFORCE_HOME $PERFORCE_LOGS $PERFORCE_ROOT
 		chown -R $USER:$GROUP $PERFORCE_HOME
 	fi
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 832cf5bb0b6a..434a98c94f48 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -10,10 +10,9 @@ 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
+MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ 
 EXTRACT_SUFX=
-DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
+DISTFILES=	${BIN_FILES} ${SBIN_FILES}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
@@ -29,12 +28,12 @@ ARCH?= i386
 
 MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 .if ${ARCH} == i386
-VERSION=	03.2
-REVISION=	7
+VERSION=	04.2
+REVISION=	2
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
-REL_NOTES=	http://www.perforce.com/perforce/doc.032/user/relnotes.txt
+REL_NOTES=	http://www.perforce.com/perforce/doc.042/user/relnotes.txt
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
@@ -51,7 +50,6 @@ IGNORE=		"Unsupported platform, sorry."
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
-MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
@@ -117,9 +115,6 @@ do-install:
 		${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
diff --git a/devel/p4d/distinfo.i386 b/devel/p4d/distinfo.i386
index 015cd83e9425..f835403656db 100644
--- a/devel/p4d/distinfo.i386
+++ b/devel/p4d/distinfo.i386
@@ -1,14 +1,10 @@
-MD5 (perforce/03.2/i386/p4) = faff0e4d88276c30b5dfda5917968b0e
-SIZE (perforce/03.2/i386/p4) = 684712
-MD5 (perforce/03.2/i386/p4web) = ceb9038c44804de90a24bc009c8eb4ad
-SIZE (perforce/03.2/i386/p4web) = 1639614
-MD5 (perforce/03.2/i386/p4d) = 342de66804f6130e6acb06a812d2f7d7
-SIZE (perforce/03.2/i386/p4d) = 1346084
-MD5 (perforce/03.2/i386/p4ftpd) = ec22d7e1b1f55581127b24080418d822
-SIZE (perforce/03.2/i386/p4ftpd) = 800692
-MD5 (perforce/03.2/i386/p4p) = 018b501751db09328df2e553d7fcaed1
-SIZE (perforce/03.2/i386/p4p) = 672103
-MD5 (perforce/03.2/i386/p4.1) = 097de5d5637cff5d66a94cbf9b95e6a8
-SIZE (perforce/03.2/i386/p4.1) = 72954
-MD5 (perforce/03.2/i386/p4d.1) = 6b31c4f65fd8165b72a5b9d639f40548
-SIZE (perforce/03.2/i386/p4d.1) = 4529
+MD5 (perforce/04.2/i386/p4) = ddf5d2fc8c397983f1615b044dd03d6e
+SIZE (perforce/04.2/i386/p4) = 698264
+MD5 (perforce/04.2/i386/p4web) = 5696cef6ad2488bef291ef03eef08185
+SIZE (perforce/04.2/i386/p4web) = 1724496
+MD5 (perforce/04.2/i386/p4d) = e4ca2b67e27bc17425c47a5996f54b82
+SIZE (perforce/04.2/i386/p4d) = 1396396
+MD5 (perforce/04.2/i386/p4ftpd) = a4a676c8a34be8e75fda633d0fcc7d0c
+SIZE (perforce/04.2/i386/p4ftpd) = 813292
+MD5 (perforce/04.2/i386/p4p) = faa9384dc4e60a1fe870365b1eda6d07
+SIZE (perforce/04.2/i386/p4p) = 696069
diff --git a/devel/p4d/pkg-install b/devel/p4d/pkg-install
index b1c9c5d72e22..88b4d17472f4 100644
--- a/devel/p4d/pkg-install
+++ b/devel/p4d/pkg-install
@@ -44,7 +44,6 @@ PRE-INSTALL)
 	fi
 
 	if [ ! -d $PERFORCE_HOME ] ; then 
-echo hey
 		mkdir -p $PERFORCE_HOME $PERFORCE_LOGS $PERFORCE_ROOT
 		chown -R $USER:$GROUP $PERFORCE_HOME
 	fi
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index 832cf5bb0b6a..434a98c94f48 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -10,10 +10,9 @@ 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
+MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ 
 EXTRACT_SUFX=
-DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
+DISTFILES=	${BIN_FILES} ${SBIN_FILES}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
@@ -29,12 +28,12 @@ ARCH?= i386
 
 MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 .if ${ARCH} == i386
-VERSION=	03.2
-REVISION=	7
+VERSION=	04.2
+REVISION=	2
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
-REL_NOTES=	http://www.perforce.com/perforce/doc.032/user/relnotes.txt
+REL_NOTES=	http://www.perforce.com/perforce/doc.042/user/relnotes.txt
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
@@ -51,7 +50,6 @@ IGNORE=		"Unsupported platform, sorry."
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
-MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
@@ -117,9 +115,6 @@ do-install:
 		${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
diff --git a/devel/p4ftpd/distinfo.i386 b/devel/p4ftpd/distinfo.i386
index 015cd83e9425..f835403656db 100644
--- a/devel/p4ftpd/distinfo.i386
+++ b/devel/p4ftpd/distinfo.i386
@@ -1,14 +1,10 @@
-MD5 (perforce/03.2/i386/p4) = faff0e4d88276c30b5dfda5917968b0e
-SIZE (perforce/03.2/i386/p4) = 684712
-MD5 (perforce/03.2/i386/p4web) = ceb9038c44804de90a24bc009c8eb4ad
-SIZE (perforce/03.2/i386/p4web) = 1639614
-MD5 (perforce/03.2/i386/p4d) = 342de66804f6130e6acb06a812d2f7d7
-SIZE (perforce/03.2/i386/p4d) = 1346084
-MD5 (perforce/03.2/i386/p4ftpd) = ec22d7e1b1f55581127b24080418d822
-SIZE (perforce/03.2/i386/p4ftpd) = 800692
-MD5 (perforce/03.2/i386/p4p) = 018b501751db09328df2e553d7fcaed1
-SIZE (perforce/03.2/i386/p4p) = 672103
-MD5 (perforce/03.2/i386/p4.1) = 097de5d5637cff5d66a94cbf9b95e6a8
-SIZE (perforce/03.2/i386/p4.1) = 72954
-MD5 (perforce/03.2/i386/p4d.1) = 6b31c4f65fd8165b72a5b9d639f40548
-SIZE (perforce/03.2/i386/p4d.1) = 4529
+MD5 (perforce/04.2/i386/p4) = ddf5d2fc8c397983f1615b044dd03d6e
+SIZE (perforce/04.2/i386/p4) = 698264
+MD5 (perforce/04.2/i386/p4web) = 5696cef6ad2488bef291ef03eef08185
+SIZE (perforce/04.2/i386/p4web) = 1724496
+MD5 (perforce/04.2/i386/p4d) = e4ca2b67e27bc17425c47a5996f54b82
+SIZE (perforce/04.2/i386/p4d) = 1396396
+MD5 (perforce/04.2/i386/p4ftpd) = a4a676c8a34be8e75fda633d0fcc7d0c
+SIZE (perforce/04.2/i386/p4ftpd) = 813292
+MD5 (perforce/04.2/i386/p4p) = faa9384dc4e60a1fe870365b1eda6d07
+SIZE (perforce/04.2/i386/p4p) = 696069
diff --git a/devel/p4ftpd/pkg-install b/devel/p4ftpd/pkg-install
index b1c9c5d72e22..88b4d17472f4 100644
--- a/devel/p4ftpd/pkg-install
+++ b/devel/p4ftpd/pkg-install
@@ -44,7 +44,6 @@ PRE-INSTALL)
 	fi
 
 	if [ ! -d $PERFORCE_HOME ] ; then 
-echo hey
 		mkdir -p $PERFORCE_HOME $PERFORCE_LOGS $PERFORCE_ROOT
 		chown -R $USER:$GROUP $PERFORCE_HOME
 	fi
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index 832cf5bb0b6a..434a98c94f48 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -10,10 +10,9 @@ 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
+MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ 
 EXTRACT_SUFX=
-DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
+DISTFILES=	${BIN_FILES} ${SBIN_FILES}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
@@ -29,12 +28,12 @@ ARCH?= i386
 
 MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 .if ${ARCH} == i386
-VERSION=	03.2
-REVISION=	7
+VERSION=	04.2
+REVISION=	2
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
-REL_NOTES=	http://www.perforce.com/perforce/doc.032/user/relnotes.txt
+REL_NOTES=	http://www.perforce.com/perforce/doc.042/user/relnotes.txt
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
@@ -51,7 +50,6 @@ IGNORE=		"Unsupported platform, sorry."
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
-MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
@@ -117,9 +115,6 @@ do-install:
 		${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
diff --git a/devel/p4p/distinfo.i386 b/devel/p4p/distinfo.i386
index 015cd83e9425..f835403656db 100644
--- a/devel/p4p/distinfo.i386
+++ b/devel/p4p/distinfo.i386
@@ -1,14 +1,10 @@
-MD5 (perforce/03.2/i386/p4) = faff0e4d88276c30b5dfda5917968b0e
-SIZE (perforce/03.2/i386/p4) = 684712
-MD5 (perforce/03.2/i386/p4web) = ceb9038c44804de90a24bc009c8eb4ad
-SIZE (perforce/03.2/i386/p4web) = 1639614
-MD5 (perforce/03.2/i386/p4d) = 342de66804f6130e6acb06a812d2f7d7
-SIZE (perforce/03.2/i386/p4d) = 1346084
-MD5 (perforce/03.2/i386/p4ftpd) = ec22d7e1b1f55581127b24080418d822
-SIZE (perforce/03.2/i386/p4ftpd) = 800692
-MD5 (perforce/03.2/i386/p4p) = 018b501751db09328df2e553d7fcaed1
-SIZE (perforce/03.2/i386/p4p) = 672103
-MD5 (perforce/03.2/i386/p4.1) = 097de5d5637cff5d66a94cbf9b95e6a8
-SIZE (perforce/03.2/i386/p4.1) = 72954
-MD5 (perforce/03.2/i386/p4d.1) = 6b31c4f65fd8165b72a5b9d639f40548
-SIZE (perforce/03.2/i386/p4d.1) = 4529
+MD5 (perforce/04.2/i386/p4) = ddf5d2fc8c397983f1615b044dd03d6e
+SIZE (perforce/04.2/i386/p4) = 698264
+MD5 (perforce/04.2/i386/p4web) = 5696cef6ad2488bef291ef03eef08185
+SIZE (perforce/04.2/i386/p4web) = 1724496
+MD5 (perforce/04.2/i386/p4d) = e4ca2b67e27bc17425c47a5996f54b82
+SIZE (perforce/04.2/i386/p4d) = 1396396
+MD5 (perforce/04.2/i386/p4ftpd) = a4a676c8a34be8e75fda633d0fcc7d0c
+SIZE (perforce/04.2/i386/p4ftpd) = 813292
+MD5 (perforce/04.2/i386/p4p) = faa9384dc4e60a1fe870365b1eda6d07
+SIZE (perforce/04.2/i386/p4p) = 696069
diff --git a/devel/p4p/pkg-install b/devel/p4p/pkg-install
index b1c9c5d72e22..88b4d17472f4 100644
--- a/devel/p4p/pkg-install
+++ b/devel/p4p/pkg-install
@@ -44,7 +44,6 @@ PRE-INSTALL)
 	fi
 
 	if [ ! -d $PERFORCE_HOME ] ; then 
-echo hey
 		mkdir -p $PERFORCE_HOME $PERFORCE_LOGS $PERFORCE_ROOT
 		chown -R $USER:$GROUP $PERFORCE_HOME
 	fi
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index 832cf5bb0b6a..434a98c94f48 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -10,10 +10,9 @@ 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
+MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ 
 EXTRACT_SUFX=
-DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
+DISTFILES=	${BIN_FILES} ${SBIN_FILES}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
@@ -29,12 +28,12 @@ ARCH?= i386
 
 MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 .if ${ARCH} == i386
-VERSION=	03.2
-REVISION=	7
+VERSION=	04.2
+REVISION=	2
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
-REL_NOTES=	http://www.perforce.com/perforce/doc.032/user/relnotes.txt
+REL_NOTES=	http://www.perforce.com/perforce/doc.042/user/relnotes.txt
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
@@ -51,7 +50,6 @@ IGNORE=		"Unsupported platform, sorry."
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
-MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
@@ -117,9 +115,6 @@ do-install:
 		${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
diff --git a/devel/p4web/distinfo.i386 b/devel/p4web/distinfo.i386
index 015cd83e9425..f835403656db 100644
--- a/devel/p4web/distinfo.i386
+++ b/devel/p4web/distinfo.i386
@@ -1,14 +1,10 @@
-MD5 (perforce/03.2/i386/p4) = faff0e4d88276c30b5dfda5917968b0e
-SIZE (perforce/03.2/i386/p4) = 684712
-MD5 (perforce/03.2/i386/p4web) = ceb9038c44804de90a24bc009c8eb4ad
-SIZE (perforce/03.2/i386/p4web) = 1639614
-MD5 (perforce/03.2/i386/p4d) = 342de66804f6130e6acb06a812d2f7d7
-SIZE (perforce/03.2/i386/p4d) = 1346084
-MD5 (perforce/03.2/i386/p4ftpd) = ec22d7e1b1f55581127b24080418d822
-SIZE (perforce/03.2/i386/p4ftpd) = 800692
-MD5 (perforce/03.2/i386/p4p) = 018b501751db09328df2e553d7fcaed1
-SIZE (perforce/03.2/i386/p4p) = 672103
-MD5 (perforce/03.2/i386/p4.1) = 097de5d5637cff5d66a94cbf9b95e6a8
-SIZE (perforce/03.2/i386/p4.1) = 72954
-MD5 (perforce/03.2/i386/p4d.1) = 6b31c4f65fd8165b72a5b9d639f40548
-SIZE (perforce/03.2/i386/p4d.1) = 4529
+MD5 (perforce/04.2/i386/p4) = ddf5d2fc8c397983f1615b044dd03d6e
+SIZE (perforce/04.2/i386/p4) = 698264
+MD5 (perforce/04.2/i386/p4web) = 5696cef6ad2488bef291ef03eef08185
+SIZE (perforce/04.2/i386/p4web) = 1724496
+MD5 (perforce/04.2/i386/p4d) = e4ca2b67e27bc17425c47a5996f54b82
+SIZE (perforce/04.2/i386/p4d) = 1396396
+MD5 (perforce/04.2/i386/p4ftpd) = a4a676c8a34be8e75fda633d0fcc7d0c
+SIZE (perforce/04.2/i386/p4ftpd) = 813292
+MD5 (perforce/04.2/i386/p4p) = faa9384dc4e60a1fe870365b1eda6d07
+SIZE (perforce/04.2/i386/p4p) = 696069
diff --git a/devel/p4web/pkg-install b/devel/p4web/pkg-install
index b1c9c5d72e22..88b4d17472f4 100644
--- a/devel/p4web/pkg-install
+++ b/devel/p4web/pkg-install
@@ -44,7 +44,6 @@ PRE-INSTALL)
 	fi
 
 	if [ ! -d $PERFORCE_HOME ] ; then 
-echo hey
 		mkdir -p $PERFORCE_HOME $PERFORCE_LOGS $PERFORCE_ROOT
 		chown -R $USER:$GROUP $PERFORCE_HOME
 	fi
diff --git a/devel/perforce/Makefile b/devel/perforce/Makefile
index 832cf5bb0b6a..434a98c94f48 100644
--- a/devel/perforce/Makefile
+++ b/devel/perforce/Makefile
@@ -10,10 +10,9 @@ 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
+MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r${PORTVERSION}/bin.${PLATFORM}/ 
 EXTRACT_SUFX=
-DISTFILES=	${BIN_FILES} ${SBIN_FILES} ${MAN1:S/$/:man/}
+DISTFILES=	${BIN_FILES} ${SBIN_FILES}
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 EXTRACT_ONLY=	# none
 
@@ -29,12 +28,12 @@ ARCH?= i386
 
 MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 .if ${ARCH} == i386
-VERSION=	03.2
-REVISION=	7
+VERSION=	04.2
+REVISION=	2
 PLATFORM=	freebsd4
 BIN_FILES=	p4 p4web
 SBIN_FILES=	p4d p4ftpd p4p
-REL_NOTES=	http://www.perforce.com/perforce/doc.032/user/relnotes.txt
+REL_NOTES=	http://www.perforce.com/perforce/doc.042/user/relnotes.txt
 .elif ${ARCH} == alpha
 VERSION=	99.1
 REVISION=	1
@@ -51,7 +50,6 @@ IGNORE=		"Unsupported platform, sorry."
 
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
-MAN1=		p4.1 p4d.1
 
 NO_WRKSUBDIR=	yes
 
@@ -117,9 +115,6 @@ do-install:
 		${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
diff --git a/devel/perforce/distinfo.i386 b/devel/perforce/distinfo.i386
index 015cd83e9425..f835403656db 100644
--- a/devel/perforce/distinfo.i386
+++ b/devel/perforce/distinfo.i386
@@ -1,14 +1,10 @@
-MD5 (perforce/03.2/i386/p4) = faff0e4d88276c30b5dfda5917968b0e
-SIZE (perforce/03.2/i386/p4) = 684712
-MD5 (perforce/03.2/i386/p4web) = ceb9038c44804de90a24bc009c8eb4ad
-SIZE (perforce/03.2/i386/p4web) = 1639614
-MD5 (perforce/03.2/i386/p4d) = 342de66804f6130e6acb06a812d2f7d7
-SIZE (perforce/03.2/i386/p4d) = 1346084
-MD5 (perforce/03.2/i386/p4ftpd) = ec22d7e1b1f55581127b24080418d822
-SIZE (perforce/03.2/i386/p4ftpd) = 800692
-MD5 (perforce/03.2/i386/p4p) = 018b501751db09328df2e553d7fcaed1
-SIZE (perforce/03.2/i386/p4p) = 672103
-MD5 (perforce/03.2/i386/p4.1) = 097de5d5637cff5d66a94cbf9b95e6a8
-SIZE (perforce/03.2/i386/p4.1) = 72954
-MD5 (perforce/03.2/i386/p4d.1) = 6b31c4f65fd8165b72a5b9d639f40548
-SIZE (perforce/03.2/i386/p4d.1) = 4529
+MD5 (perforce/04.2/i386/p4) = ddf5d2fc8c397983f1615b044dd03d6e
+SIZE (perforce/04.2/i386/p4) = 698264
+MD5 (perforce/04.2/i386/p4web) = 5696cef6ad2488bef291ef03eef08185
+SIZE (perforce/04.2/i386/p4web) = 1724496
+MD5 (perforce/04.2/i386/p4d) = e4ca2b67e27bc17425c47a5996f54b82
+SIZE (perforce/04.2/i386/p4d) = 1396396
+MD5 (perforce/04.2/i386/p4ftpd) = a4a676c8a34be8e75fda633d0fcc7d0c
+SIZE (perforce/04.2/i386/p4ftpd) = 813292
+MD5 (perforce/04.2/i386/p4p) = faa9384dc4e60a1fe870365b1eda6d07
+SIZE (perforce/04.2/i386/p4p) = 696069
diff --git a/devel/perforce/pkg-install b/devel/perforce/pkg-install
index b1c9c5d72e22..88b4d17472f4 100644
--- a/devel/perforce/pkg-install
+++ b/devel/perforce/pkg-install
@@ -44,7 +44,6 @@ PRE-INSTALL)
 	fi
 
 	if [ ! -d $PERFORCE_HOME ] ; then 
-echo hey
 		mkdir -p $PERFORCE_HOME $PERFORCE_LOGS $PERFORCE_ROOT
 		chown -R $USER:$GROUP $PERFORCE_HOME
 	fi