Update to 2006.1, based on PR pkg/35287 by Marc Tooley. From the changelog:

* Client file tamper checking
* New client option 'SubmitOptions'
* Speedup of 'p4 submit' branched files
* 'Automatic' labels
* Improved management of remote depots
* New MaxLockTime in 'p4 group'
* Improved license file handling
* User file access tracking
* 'p4 integrate' improvements
* Optimization of head revision operations
* Speedup for the 'integ' command
* Early release of db.working/db.resolve during sync
* Server Performance Tracking
* Spec depot interferes less with other commands
* Special handling for @changelist
* Speedup for clients with many opened files
* External authentication triggers
* UTF-16 support
* Speedup for the 'dirs' command
* Speedup for the 'obliterate' command
* Btree passive reorganization
* MapState simplification
* Spec depot
* Partial filetypes
* Delete triggers
* Authorization and security levels
* New login/logout commands
* New trigger support
* New indirect integration default
* New smart resolve logic
* Filepaths that contain characters @#%* can be added to the depot
* New tag command provides easy way to assign a label to a filelist
* Optimization for frequent syncs
* Label use speedups
* Locking and memory use improvements
* Speedups for large client views and protections tables
* Indirect integration much faster
* New monitor command displays status of running p4 processes
* Integrate across distant branches
* New annotate command shows history of lines in a file
* Sharing clients using multiple client roots
* Sprucing up diffs
* tempobj filetype redux
* New protection level for semi-super users

and a bunch of other features and bug fixes.

7 files changed, 140 insertions, 335 deletions

diff --git a/devel/p4-docs/Makefile b/devel/p4-docs/Makefile
index 48bbf1bdba4..b1a2ebdc2cd 100644
--- a/devel/p4-docs/Makefile
+++ b/devel/p4-docs/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:51 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/03/15 07:14:27 schmonz Exp $
 #
 
 DISTNAME=	p4-docs
-PKGREVISION=	2
 COMMENT=	Perforce SCM documentation
 
 .include "../../devel/p4/Makefile.common"
 
 # override, since the docs have changed at least once more often
 # than the binaries for NetBSD
-DIST_SUBDIR=	perforce-20040716
+DIST_SUBDIR=	perforce-20070118
 
 HOMEPAGE=	http://www.perforce.com/perforce/technical.html
 
@@ -17,55 +16,34 @@ DISTFILES=	p4.1
 DISTFILES+=	p4d.1
 DISTFILES+=	relnotes.txt
 DISTFILES+=	platformnotes.html
-DISTFILES+=	cmdref_html.zip
-DISTFILES+=	p4ftp_html.zip
-DISTFILES+=	p4guide_html.zip
-DISTFILES+=	p4sag_html.zip
+DISTFILES+=	cmdref.pdf
+DISTFILES+=	p4ftp.pdf
+DISTFILES+=	p4guide.pdf
+DISTFILES+=	p4sag.pdf
 
-P4_DOCURL_PREFIX=		http://www.perforce.com/perforce/doc.021
+P4_DOCURL_PREFIX=		http://www.perforce.com/perforce/doc.062
+P4_MANURL_PREFIX=		http://www.perforce.com/perforce/doc.052
 
-SITES.p4.1=			${P4_DOCURL_PREFIX}/man/
-SITES.p4d.1=			${P4_DOCURL_PREFIX}/man/
+SITES.p4.1=			${P4_MANURL_PREFIX}/man/
+SITES.p4d.1=			${P4_MANURL_PREFIX}/man/
 SITES.relnotes.txt=		${P4_DOCURL_PREFIX}/user/
 SITES.platformnotes.html=	${P4_DOCURL_PREFIX}/user/
-SITES.cmdref_html.zip=		${P4_DOCURL_PREFIX}/manuals/cmdref/
-SITES.p4ftp_html.zip=		${P4_DOCURL_PREFIX}/manuals/p4ftp/
-SITES.p4guide_html.zip=		${P4_DOCURL_PREFIX}/manuals/p4guide/
-SITES.p4sag_html.zip=		${P4_DOCURL_PREFIX}/manuals/p4sag/
-
-EXTRACT_ONLY=		cmdref_html.zip p4ftp_html.zip
-EXTRACT_ONLY+=		p4guide_html.zip p4sag_html.zip
-EXTRACT_OPTS+=		-d `${BASENAME} "$$extract_file" _html.zip`
-EXTRACT_OPTS_ZIP=	-Laq
+SITES.cmdref.pdf=		${P4_DOCURL_PREFIX}/manuals/cmdref/
+SITES.p4ftp.pdf=		${P4_DOCURL_PREFIX}/manuals/p4ftp/
+SITES.p4guide.pdf=		${P4_DOCURL_PREFIX}/manuals/p4guide/
+SITES.p4sag.pdf=		${P4_DOCURL_PREFIX}/manuals/p4sag/
 
 DOCDIR=		share/doc/p4
-HTMLDIR=	share/doc/html/p4
 PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
-PLIST_SUBST+=	HTMLDIR=${HTMLDIR:Q}
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1
+INSTALLATION_DIRS=	${DOCDIR} ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/*.1 ${PREFIX}/${PKGMANDIR}/man1
 
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/relnotes.txt \
-		${PREFIX}/${DOCDIR}
-
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/platformnotes.html \
-		${PREFIX}/${HTMLDIR}
-
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}/cmdref
-	${INSTALL_DATA} ${WRKSRC}/cmdref/* ${PREFIX}/${HTMLDIR}/cmdref
-
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}/p4ftp
-	${INSTALL_DATA} ${WRKSRC}/p4ftp/* ${PREFIX}/${HTMLDIR}/p4ftp
-
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}/p4guide
-	${INSTALL_DATA} ${WRKSRC}/p4guide/* ${PREFIX}/${HTMLDIR}/p4guide
-
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}/p4sag
-	${INSTALL_DATA} ${WRKSRC}/p4sag/* ${PREFIX}/${HTMLDIR}/p4sag
+	cd ${WRKSRC};							\
+	for f in *.html *.pdf *.txt; do					\
+		${INSTALL_DATA} $${f} ${PREFIX}/${DOCDIR};		\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p4-docs/PLIST b/devel/p4-docs/PLIST
index 9a33a88b262..4ff6b958ccb 100644
--- a/devel/p4-docs/PLIST
+++ b/devel/p4-docs/PLIST
@@ -1,151 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/01 02:34:37 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/03/15 07:14:27 schmonz Exp $
 man/man1/p4.1
 man/man1/p4d.1
-${HTMLDIR}/cmdref/_about.html
-${HTMLDIR}/cmdref/_cmdrefIX.html
-${HTMLDIR}/cmdref/_env.html
-${HTMLDIR}/cmdref/_other.html
-${HTMLDIR}/cmdref/add.html
-${HTMLDIR}/cmdref/admin.html
-${HTMLDIR}/cmdref/branch.html
-${HTMLDIR}/cmdref/branches.html
-${HTMLDIR}/cmdref/change.html
-${HTMLDIR}/cmdref/changes.html
-${HTMLDIR}/cmdref/client.html
-${HTMLDIR}/cmdref/clients.html
-${HTMLDIR}/cmdref/counter.html
-${HTMLDIR}/cmdref/counters.html
-${HTMLDIR}/cmdref/delete.html
-${HTMLDIR}/cmdref/depot.html
-${HTMLDIR}/cmdref/depots.html
-${HTMLDIR}/cmdref/describe.html
-${HTMLDIR}/cmdref/diff.html
-${HTMLDIR}/cmdref/diff2.html
-${HTMLDIR}/cmdref/dirs.html
-${HTMLDIR}/cmdref/edit.html
-${HTMLDIR}/cmdref/env.P4CHARSET.html
-${HTMLDIR}/cmdref/env.P4CLIENT.html
-${HTMLDIR}/cmdref/env.P4CONFIG.html
-${HTMLDIR}/cmdref/env.P4DEBUG.html
-${HTMLDIR}/cmdref/env.P4DIFF.html
-${HTMLDIR}/cmdref/env.P4EDITOR.html
-${HTMLDIR}/cmdref/env.P4HOST.html
-${HTMLDIR}/cmdref/env.P4JOURNAL.html
-${HTMLDIR}/cmdref/env.P4LANGUAGE.html
-${HTMLDIR}/cmdref/env.P4LOG.html
-${HTMLDIR}/cmdref/env.P4MERGE.html
-${HTMLDIR}/cmdref/env.P4PAGER.html
-${HTMLDIR}/cmdref/env.P4PASSWD.html
-${HTMLDIR}/cmdref/env.P4PORT.html
-${HTMLDIR}/cmdref/env.P4ROOT.html
-${HTMLDIR}/cmdref/env.P4USER.html
-${HTMLDIR}/cmdref/env.PWD.html
-${HTMLDIR}/cmdref/env.TMP.html
-${HTMLDIR}/cmdref/filelog.html
-${HTMLDIR}/cmdref/files.html
-${HTMLDIR}/cmdref/fix.html
-${HTMLDIR}/cmdref/fixes.html
-${HTMLDIR}/cmdref/flush.html
-${HTMLDIR}/cmdref/fstat.html
-${HTMLDIR}/cmdref/greendot.gif
-${HTMLDIR}/cmdref/group.html
-${HTMLDIR}/cmdref/groups.html
-${HTMLDIR}/cmdref/have.html
-${HTMLDIR}/cmdref/help.html
-${HTMLDIR}/cmdref/index.html
-${HTMLDIR}/cmdref/info.html
-${HTMLDIR}/cmdref/integrate.html
-${HTMLDIR}/cmdref/integrated.html
-${HTMLDIR}/cmdref/job.html
-${HTMLDIR}/cmdref/jobs.html
-${HTMLDIR}/cmdref/jobspec.html
-${HTMLDIR}/cmdref/label.html
-${HTMLDIR}/cmdref/labels.html
-${HTMLDIR}/cmdref/labelsync.html
-${HTMLDIR}/cmdref/lock.html
-${HTMLDIR}/cmdref/logger.html
-${HTMLDIR}/cmdref/o.fspecs.html
-${HTMLDIR}/cmdref/o.ftypes.html
-${HTMLDIR}/cmdref/o.gopts.html
-${HTMLDIR}/cmdref/o.views.html
-${HTMLDIR}/cmdref/obliterate.html
-${HTMLDIR}/cmdref/opened.html
-${HTMLDIR}/cmdref/passwd.html
-${HTMLDIR}/cmdref/print.html
-${HTMLDIR}/cmdref/protect.html
-${HTMLDIR}/cmdref/protecta.gif
-${HTMLDIR}/cmdref/rename.html
-${HTMLDIR}/cmdref/reopen.html
-${HTMLDIR}/cmdref/resolve.html
-${HTMLDIR}/cmdref/resolved.html
-${HTMLDIR}/cmdref/revert.html
-${HTMLDIR}/cmdref/review.html
-${HTMLDIR}/cmdref/reviews.html
-${HTMLDIR}/cmdref/set.html
-${HTMLDIR}/cmdref/submit.html
-${HTMLDIR}/cmdref/sync.html
-${HTMLDIR}/cmdref/triggers.html
-${HTMLDIR}/cmdref/typemap.html
-${HTMLDIR}/cmdref/unlock.html
-${HTMLDIR}/cmdref/user.html
-${HTMLDIR}/cmdref/users.html
-${HTMLDIR}/cmdref/verify.html
-${HTMLDIR}/cmdref/where.html
-${HTMLDIR}/p4ftp/00_p4ftpIX.html
-${HTMLDIR}/p4ftp/00_preface.html
-${HTMLDIR}/p4ftp/01_install.html
-${HTMLDIR}/p4ftp/01_install_001.gif
-${HTMLDIR}/p4ftp/01_install_002.gif
-${HTMLDIR}/p4ftp/01_install_003.gif
-${HTMLDIR}/p4ftp/01_install_004.gif
-${HTMLDIR}/p4ftp/01_install_005.gif
-${HTMLDIR}/p4ftp/01_install_006.gif
-${HTMLDIR}/p4ftp/01_install_007.gif
-${HTMLDIR}/p4ftp/01_installa.gif
-${HTMLDIR}/p4ftp/02_troubleshoot.html
-${HTMLDIR}/p4ftp/03_differences.html
-${HTMLDIR}/p4ftp/greendot.gif
-${HTMLDIR}/p4ftp/index.html
-${HTMLDIR}/p4guide/00_p4guideIX.html
-${HTMLDIR}/p4guide/00_preface.html
-${HTMLDIR}/p4guide/01_concepts.html
-${HTMLDIR}/p4guide/02_connect.html
-${HTMLDIR}/p4guide/03_quickstart.html
-${HTMLDIR}/p4guide/04_details.html
-${HTMLDIR}/p4guide/05_conflicts.html
-${HTMLDIR}/p4guide/06_misc.html
-${HTMLDIR}/p4guide/07_changelists.html
-${HTMLDIR}/p4guide/08_labels.html
-${HTMLDIR}/p4guide/09_branching.html
-${HTMLDIR}/p4guide/10_jobtrack.html
-${HTMLDIR}/p4guide/11_reporting.html
-${HTMLDIR}/p4guide/aa_install.html
-${HTMLDIR}/p4guide/ab_envvars.html
-${HTMLDIR}/p4guide/ac_glossary.html
-${HTMLDIR}/p4guide/greendot.gif
-${HTMLDIR}/p4guide/index.html
-${HTMLDIR}/p4sag/00_p4sagIX.html
-${HTMLDIR}/p4sag/00_preface.html
-${HTMLDIR}/p4sag/01_install.html
-${HTMLDIR}/p4sag/02_backup.html
-${HTMLDIR}/p4sag/03_superuser.html
-${HTMLDIR}/p4sag/03_superuser1.gif
-${HTMLDIR}/p4sag/03_superuser3.gif
-${HTMLDIR}/p4sag/03_superusera.gif
-${HTMLDIR}/p4sag/03_superusera3.gif
-${HTMLDIR}/p4sag/04_protect.html
-${HTMLDIR}/p4sag/05_jobspec.html
-${HTMLDIR}/p4sag/06_scripting.html
-${HTMLDIR}/p4sag/07_perftune.html
-${HTMLDIR}/p4sag/08_nt.html
-${HTMLDIR}/p4sag/aa_p4d.html
-${HTMLDIR}/p4sag/greendot.gif
-${HTMLDIR}/p4sag/index.html
-${HTMLDIR}/platformnotes.html
+${DOCDIR}/cmdref.pdf
+${DOCDIR}/p4ftp.pdf
+${DOCDIR}/p4guide.pdf
+${DOCDIR}/p4sag.pdf
+${DOCDIR}/platformnotes.html
 ${DOCDIR}/relnotes.txt
 @dirrm ${DOCDIR}
-@dirrm ${HTMLDIR}/p4sag
-@dirrm ${HTMLDIR}/p4guide
-@dirrm ${HTMLDIR}/p4ftp
-@dirrm ${HTMLDIR}/cmdref
-@dirrm ${HTMLDIR}
diff --git a/devel/p4-docs/distinfo b/devel/p4-docs/distinfo
index 6f7b531c21d..bdc033d7479 100644
--- a/devel/p4-docs/distinfo
+++ b/devel/p4-docs/distinfo
@@ -1,26 +1,26 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:22 agc Exp $
+$NetBSD: distinfo,v 1.6 2007/03/15 07:14:27 schmonz Exp $
 
-SHA1 (perforce-20040716/p4.1) = b0ba4933132d513bd4082fc6ec85d6768e179e16
-RMD160 (perforce-20040716/p4.1) = a9307097238eb4d670eeee2ec5786f68e8cc9a65
-Size (perforce-20040716/p4.1) = 72954 bytes
-SHA1 (perforce-20040716/p4d.1) = df3033843830ef17c781ef7b84dcbadc958834b1
-RMD160 (perforce-20040716/p4d.1) = 4fdedc2b11930eaac3585ad3e38a723611cd2923
-Size (perforce-20040716/p4d.1) = 4343 bytes
-SHA1 (perforce-20040716/relnotes.txt) = 93bed5eba7cd0eda00a98a81709dcd14cb38e00a
-RMD160 (perforce-20040716/relnotes.txt) = 5512a7174a020a496e88d5377a115d7d7a19a819
-Size (perforce-20040716/relnotes.txt) = 131837 bytes
-SHA1 (perforce-20040716/platformnotes.html) = ee866da6ebf818c1d6d61e0383b4305537665e40
-RMD160 (perforce-20040716/platformnotes.html) = e313cd1dc6d2e623d0f7f03c70652d1fc697ffda
-Size (perforce-20040716/platformnotes.html) = 16151 bytes
-SHA1 (perforce-20040716/cmdref_html.zip) = 7747580482a5ec3842c7e4910d24c3e01bba1080
-RMD160 (perforce-20040716/cmdref_html.zip) = 8df4d86691a4dfa63ae414e4dc07599f9a123376
-Size (perforce-20040716/cmdref_html.zip) = 240693 bytes
-SHA1 (perforce-20040716/p4ftp_html.zip) = 7df4c9ff4db77cc08bd24a7442b52150e6101496
-RMD160 (perforce-20040716/p4ftp_html.zip) = fa012953f8db94c0c7c831ccd893516715967816
-Size (perforce-20040716/p4ftp_html.zip) = 145833 bytes
-SHA1 (perforce-20040716/p4guide_html.zip) = b76ffcd28092b6d06fff66c220e77a9801acab54
-RMD160 (perforce-20040716/p4guide_html.zip) = bf573d7f620f8ceb40b0fecfdd07790214e3b39b
-Size (perforce-20040716/p4guide_html.zip) = 133887 bytes
-SHA1 (perforce-20040716/p4sag_html.zip) = 818f811345b322913e2d5e581f9e2cea5680be4e
-RMD160 (perforce-20040716/p4sag_html.zip) = c394eac7e9290d61ad1a6f06fab262a7abde40fc
-Size (perforce-20040716/p4sag_html.zip) = 151860 bytes
+SHA1 (perforce-20070118/cmdref.pdf) = dc760d0d87ce93f396c323cf6df1f13c55b64d8b
+RMD160 (perforce-20070118/cmdref.pdf) = 399334f64cf175687f3f9d647181bebf1bb58471
+Size (perforce-20070118/cmdref.pdf) = 2402173 bytes
+SHA1 (perforce-20070118/p4.1) = f0740627c5232e2eb72a278fd62d5764b7fcbdbb
+RMD160 (perforce-20070118/p4.1) = c32ac846dfa8110fadba131ca4c7a3782cf1c180
+Size (perforce-20070118/p4.1) = 72954 bytes
+SHA1 (perforce-20070118/p4d.1) = 0383e5eb515ff1a4ecd6fb148aa544a49e68eb59
+RMD160 (perforce-20070118/p4d.1) = 913efbe9b299030a143e3c6a1fbf672ec526d7b7
+Size (perforce-20070118/p4d.1) = 4529 bytes
+SHA1 (perforce-20070118/p4ftp.pdf) = 2ad78ba6aa9a2dd987dbaeda7d3a8570afc9bac2
+RMD160 (perforce-20070118/p4ftp.pdf) = 7f1e5a410b1334d93911952a526e997f3f532180
+Size (perforce-20070118/p4ftp.pdf) = 480949 bytes
+SHA1 (perforce-20070118/p4guide.pdf) = ae8b38f59c8551cd380fd13177064ba82d8b9cca
+RMD160 (perforce-20070118/p4guide.pdf) = cf5f4ed7caba774e0ac228dff3d1a6a3ae36641e
+Size (perforce-20070118/p4guide.pdf) = 977323 bytes
+SHA1 (perforce-20070118/p4sag.pdf) = f71d09edde77874635ba4c703ce15c38af27ee33
+RMD160 (perforce-20070118/p4sag.pdf) = 73b99ae72a10f84875b5f230bccd018587b87a7e
+Size (perforce-20070118/p4sag.pdf) = 1418556 bytes
+SHA1 (perforce-20070118/platformnotes.html) = f7939595e49bb00959c9c4620fc22be239417d6d
+RMD160 (perforce-20070118/platformnotes.html) = 94ef9fc7366419639e04bdb678c215393dd2de8e
+Size (perforce-20070118/platformnotes.html) = 15987 bytes
+SHA1 (perforce-20070118/relnotes.txt) = b460d33767fc0687b63cf47265ba1ca99313a27b
+RMD160 (perforce-20070118/relnotes.txt) = c983a91ea4539c8c0b5de9e31b0e626e53132526
+Size (perforce-20070118/relnotes.txt) = 239876 bytes
diff --git a/devel/p4/Makefile.common b/devel/p4/Makefile.common
index 3074b014281..e0db12f89c3 100644
--- a/devel/p4/Makefile.common
+++ b/devel/p4/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.10 2007/02/17 20:59:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.11 2007/03/15 07:14:27 schmonz Exp $
 #
 
-P4_VERS=	2002.1
+P4_VERS=	2006.1
 PKGNAME=	${DISTNAME}-${P4_VERS}
-CATEGORIES=	devel p4
+CATEGORIES=	devel scm
 MAINTAINER=	schmonz@NetBSD.org
 
 NO_CONFIGURE=	yes
@@ -15,7 +15,7 @@ DIST_SUBDIR=	perforce
 .if defined(P4BINONLY)
 
 DIST_SUBDIR=	perforce/${P4ARCH}
-MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r02.1/bin.${P4ARCH}/
+MASTER_SITES=	ftp://ftp.perforce.com/pub/perforce/r06.1/bin.${P4ARCH}/
 DISTFILES=	${DISTNAME}
 EXTRACT_ONLY=	# none
 
@@ -24,38 +24,32 @@ _STRIPFLAG_INSTALL=	# none
 .include "../../mk/bsd.prefs.mk"
 
 .  if ${OPSYS} == "Darwin"
-.    if ${MACHINE_ARCH} == "powerpc"
-P4ARCH?=	darwinppc
+.    if ${OS_VERSION:M8.*}
+.      if ${MACHINE_ARCH} == "i386"
+P4ARCH?=	darwin80x86
+.      elif ${MACHINE_ARCH} == "powerpc"
+P4ARCH?=	darwin80ppc
+.      endif
 .    endif
 .  elif ${OPSYS} == "Linux"
-.    if ${MACHINE_ARCH} == "arm"
-P4ARCH?=	linuxarm
-.    elif ${MACHINE_ARCH} == "i386"
+.    if ${OS_VERSION:M2.6.*}
+.      if ${MACHINE_ARCH} == "i386"
+P4ARCH?=	linux26x86
+.      elif ${MACHINE_ARCH} == "x86_64"
+P4ARCH?=	linux26x86_64
+.      endif
+.    elif ${OS_VERSION:M2.4.*}
+.      if ${MACHINE_ARCH} == "i386"
 P4ARCH?=	linux24x86
-.    elif ${MACHINE_ARCH} == "powerpc"
-P4ARCH?=	linuxppc
-.    elif ${MACHINE_ARCH} == "sparc"
-P4ARCH?=	linux52sparc
+.      endif
 .    endif
 .  elif ${OPSYS} == "NetBSD"
-.    if ${MACHINE_ARCH} == "alpha"
-P4ARCH?=	netbsdaxp
-.    elif ${MACHINE_ARCH} == "i386"
-.      if ${DISTNAME} == "p4web"
-P4ARCH?=	freebsd22		# XXX COMPAT_FREEBSD
-.      else
-P4ARCH?=	netbsdx86
+.    if ${OS_VERSION:M3.1.*} || ${OS_VERSION:M4.*}
+.      if ${MACHINE_ARCH} == "i386"
+P4ARCH?=	netbsd31x86
+.      elif ${MACHINE_ARCH} == "x86_64"
+P4ARCH?=	netbsd31x86_64
 .      endif
-.    elif ${MACHINE_ARCH} == "powerpc"
-P4ARCH?=	linuxppc		# XXX COMPAT_LINUX
-.    elif ${MACHINE_ARCH} == "sparc"
-P4ARCH?=	sunos			# XXX COMPAT_SUNOS
-.    endif
-.  elif ${OPSYS} == "SunOS"
-.    if ${MACHINE_ARCH} == "i386"
-P4ARCH?=	solaris26x86
-.    elif ${MACHINE_ARCH} == "sparc"
-P4ARCH?=	solaris26
 .    endif
 .  endif
 
diff --git a/devel/p4/distinfo b/devel/p4/distinfo
index 05b1b9c2f82..5d78f6ed8d8 100644
--- a/devel/p4/distinfo
+++ b/devel/p4/distinfo
@@ -1,32 +1,23 @@
-$NetBSD: distinfo,v 1.4 2005/10/20 17:59:49 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/03/15 07:14:27 schmonz Exp $
 
-SHA1 (perforce/darwinppc/p4) = 6e8e92ca35d15dd112c81785745a896f377eaaff
-RMD160 (perforce/darwinppc/p4) = e009a34790094e7c602f64694817f407ae9f79ce
-Size (perforce/darwinppc/p4) = 500120 bytes
-SHA1 (perforce/linux24x86/p4) = 83bc0824494aee612b71ce141ab71b7bedfa66fd
-RMD160 (perforce/linux24x86/p4) = de8e8390de02200d98bac5b2e4280e87cc5a9c79
-Size (perforce/linux24x86/p4) = 451808 bytes
-SHA1 (perforce/linux52sparc/p4) = 7f8ce1b8974d8a07e0f9a0a89c4051f1d64d764b
-RMD160 (perforce/linux52sparc/p4) = 6630a4ef7d731a73a2f9a5750130b830eb43975e
-Size (perforce/linux52sparc/p4) = 436892 bytes
-SHA1 (perforce/linuxarm/p4) = fdfe0f9179d163662b09371d22c04d2e4b266d70
-RMD160 (perforce/linuxarm/p4) = 93f4e95b7946b0f27347dd474057e07812c10028
-Size (perforce/linuxarm/p4) = 472656 bytes
-SHA1 (perforce/linuxppc/p4) = 3f48346303291383b62ce23c2857a21a9666c658
-RMD160 (perforce/linuxppc/p4) = 5b3cc8ca4652340c160cddb6e9754c5dc9bff5ee
-Size (perforce/linuxppc/p4) = 840812 bytes
-SHA1 (perforce/netbsdaxp/p4) = b39fb6ade9b37a84cbc600cd8fa1550d80198780
-RMD160 (perforce/netbsdaxp/p4) = 94a950c8db347a7aa4abb5d56d861bf5957eec61
-Size (perforce/netbsdaxp/p4) = 607552 bytes
-SHA1 (perforce/netbsdx86/p4) = 778266ebc5c8051b24090ba5a1857b65abaaa2e9
-RMD160 (perforce/netbsdx86/p4) = 690db4f37dd49d57a78cd4a8cff89bed058da906
-Size (perforce/netbsdx86/p4) = 447312 bytes
-SHA1 (perforce/solaris26/p4) = e22b8d1b616d5c300330eb1b5946e68e60fff2ff
-RMD160 (perforce/solaris26/p4) = 19558a7e34682146e168d33fc5298e2488390026
-Size (perforce/solaris26/p4) = 607448 bytes
-SHA1 (perforce/solaris26x86/p4) = 8218891d7be40643f2034a6661a81fb0b57c870b
-RMD160 (perforce/solaris26x86/p4) = 75f83700cbd039be3b39aa26c842cbfcd8965d47
-Size (perforce/solaris26x86/p4) = 426116 bytes
-SHA1 (perforce/sunos/p4) = cb690dc9333f73eba9b629ce6968c69e8ef8124d
-RMD160 (perforce/sunos/p4) = 39089a6e6addf7ed238a30fc1b3c211156d64e6e
-Size (perforce/sunos/p4) = 548864 bytes
+SHA1 (perforce/darwin80ppc/p4) = f4b6f2c03955daad7167ef419139c63919b58c78
+RMD160 (perforce/darwin80ppc/p4) = 91963107b57c1e4aacf89e4ecfd85c13a6c2e558
+Size (perforce/darwin80ppc/p4) = 527728 bytes
+SHA1 (perforce/darwin80x86/p4) = b3b3c12f6984e6019b6b6ffbf4bbb7beb1759383
+RMD160 (perforce/darwin80x86/p4) = cc142543950760048672169417eed29e7fce5ef8
+Size (perforce/darwin80x86/p4) = 506368 bytes
+SHA1 (perforce/linux24x86/p4) = 6d3ba774f9e87ed6c547b2f95672cdb2ff99090f
+RMD160 (perforce/linux24x86/p4) = b9442740ac15ab4ab5d9cc014e55a80bc7427e85
+Size (perforce/linux24x86/p4) = 532180 bytes
+SHA1 (perforce/linux26x86/p4) = 9d4c7f7fc0a17328160580a84359f1f6ca8a0afd
+RMD160 (perforce/linux26x86/p4) = 6f37538eab5432c7b9e03cfa29d64222ddc6532a
+Size (perforce/linux26x86/p4) = 529608 bytes
+SHA1 (perforce/linux26x86/p4) = 9d4c7f7fc0a17328160580a84359f1f6ca8a0afd
+RMD160 (perforce/linux26x86/p4) = 6f37538eab5432c7b9e03cfa29d64222ddc6532a
+Size (perforce/linux26x86/p4) = 529608 bytes
+SHA1 (perforce/netbsd31x86/p4) = 7414e62d366e3cd39c1c6ae07bfb7a5d1d831a5e
+RMD160 (perforce/netbsd31x86/p4) = 61dc9b520bcbd0e37293131e3107e23069fe57e7
+Size (perforce/netbsd31x86/p4) = 462852 bytes
+SHA1 (perforce/netbsd31x86_64/p4) = 5c6128bef9c5fbf73aa8a475df3e72bdb5cc8084
+RMD160 (perforce/netbsd31x86_64/p4) = a9b21be35fd7d7db47b2f57d02dd268091f708f3
+Size (perforce/netbsd31x86_64/p4) = 512976 bytes
diff --git a/devel/p4d/distinfo b/devel/p4d/distinfo
index b34b00e9cb8..9194efcef49 100644
--- a/devel/p4d/distinfo
+++ b/devel/p4d/distinfo
@@ -1,31 +1,23 @@
-$NetBSD: distinfo,v 1.3 2005/10/20 21:26:57 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/03/15 07:14:27 schmonz Exp $
 
-SHA1 (perforce/darwinppc/p4d) = 749e716e08227e2a711e641e20e0e3948c12e9b2
-RMD160 (perforce/darwinppc/p4d) = 076b04569531b81e03e81f684937c5a75a80b850
-Size (perforce/darwinppc/p4d) = 1285352 bytes
-SHA1 (perforce/linux24x86/p4d) = 156282fea8fdab66fd4a2c5524fcb8cdbdf7019b
-Size (perforce/linux24x86/p4d) = 1122120 bytes
-SHA1 (perforce/linux52sparc/p4d) = dd94e8c2f9acd01f17103de21e7bab06481aa126
-RMD160 (perforce/linux52sparc/p4d) = c1909957ce0a165b374bc51aed519e0a88f6d9d2
-Size (perforce/linux52sparc/p4d) = 1044836 bytes
-SHA1 (perforce/linuxarm/p4d) = 00351c4e649ac4dd31b61938198e6518719e1404
-RMD160 (perforce/linuxarm/p4d) = 48e9d7568fca929d0bf20c4efb82172860da47f7
-Size (perforce/linuxarm/p4d) = 1459148 bytes
-SHA1 (perforce/linuxppc/p4d) = 22a4071a5763e9d68c8f4870be5d28210b1d3271
-RMD160 (perforce/linuxppc/p4d) = 537c72e1b17663fe9f113c8afc2aba8e65954ea6
-Size (perforce/linuxppc/p4d) = 1703324 bytes
-SHA1 (perforce/netbsdaxp/p4d) = d5779f27d204bbc9fceac6c2571f8ef409c482fe
-RMD160 (perforce/netbsdaxp/p4d) = bb24dce3ae2ae8bf9b74d005d270b7b90b86b7aa
-Size (perforce/netbsdaxp/p4d) = 1991936 bytes
-SHA1 (perforce/netbsdx86/p4d) = 3edca6ab97c1974f69339df120c69d6764d3965b
-RMD160 (perforce/netbsdx86/p4d) = d787b1439520ffe7860aa37a0fa96b5083e5a7e6
-Size (perforce/netbsdx86/p4d) = 1174524 bytes
-SHA1 (perforce/solaris26/p4d) = 6c5fe8a455d055218ca36c280ebaaa6265a6da2b
-RMD160 (perforce/solaris26/p4d) = 3452b507c884ced084f1aa7abc74cf3dbef47733
-Size (perforce/solaris26/p4d) = 1505272 bytes
-SHA1 (perforce/solaris26x86/p4d) = 4ed4ffd657cbf5c44ecd61b1fbe9d528d05a3092
-RMD160 (perforce/solaris26x86/p4d) = 7b5caa34cb49da62320f6704c94850a380eebc74
-Size (perforce/solaris26x86/p4d) = 927208 bytes
-SHA1 (perforce/sunos/p4d) = b6ca9a7b4e6ed3ae781515d6c43a2e0eacaca619
-RMD160 (perforce/sunos/p4d) = 2412ebfe1e8781e3c58b4c482ca3c870ac188420
-Size (perforce/sunos/p4d) = 933888 bytes
+SHA1 (perforce/darwin80ppc/p4d) = 9d30ce95b8df900b9a4fa6ec7d47a474d2b0e003
+RMD160 (perforce/darwin80ppc/p4d) = 9c3da43293e04759297015b04f9ca6d24835facd
+Size (perforce/darwin80ppc/p4d) = 1418828 bytes
+SHA1 (perforce/darwin80x86/p4d) = a239f8070c88cd3fc3d70896e169ae08b8d31529
+RMD160 (perforce/darwin80x86/p4d) = f6da44b58cae48bc338f74c045034d9e9b39110f
+Size (perforce/darwin80x86/p4d) = 1459020 bytes
+SHA1 (perforce/linux24x86/p4d) = 3941923c83b1fc86a2ac4481c483e279cdd649f4
+RMD160 (perforce/linux24x86/p4d) = 211591bc16bfa2724d4d5d91fc1012a12d1b3099
+Size (perforce/linux24x86/p4d) = 1467128 bytes
+SHA1 (perforce/linux26x86/p4d) = 97cd718c7e106bf50b6fa8a454c5995f31b08e19
+RMD160 (perforce/linux26x86/p4d) = 4bacf6e35c0db0c080ac73a89fa070fea4902db1
+Size (perforce/linux26x86/p4d) = 1464984 bytes
+SHA1 (perforce/linux26x86_64/p4d) = 482f9291ca560afd2676554e0da6ddbd194953cc
+RMD160 (perforce/linux26x86_64/p4d) = 57500b1320ddc095fb688674e6583847dd273811
+Size (perforce/linux26x86_64/p4d) = 1555160 bytes
+SHA1 (perforce/netbsd31x86/p4d) = aaa63006ca82ee14d2becdb392859d742315b2a3
+RMD160 (perforce/netbsd31x86/p4d) = 11f58e44df7bb6f8a64d8ed1e46b6d6f61c2db9a
+Size (perforce/netbsd31x86/p4d) = 1306996 bytes
+SHA1 (perforce/netbsd31x86_64/p4d) = 882703b6e2dd585678f8dc64a4032c35a2fc36fa
+RMD160 (perforce/netbsd31x86_64/p4d) = 9071dba8c8f279a7f457fb5009a57df97cebda96
+Size (perforce/netbsd31x86_64/p4d) = 1423040 bytes
diff --git a/devel/p4web/distinfo b/devel/p4web/distinfo
index e6384aab788..254e3055816 100644
--- a/devel/p4web/distinfo
+++ b/devel/p4web/distinfo
@@ -1,32 +1,23 @@
-$NetBSD: distinfo,v 1.3 2005/10/20 21:31:47 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/03/15 07:14:27 schmonz Exp $
 
-SHA1 (perforce/darwinppc/p4web) = ccb0ffbd70f0b0c96fdfe6e3b3cab23d6cee16d3
-RMD160 (perforce/darwinppc/p4web) = a069eff77400d4cf6d0ad2f0398ba9a3474b3224
-Size (perforce/darwinppc/p4web) = 1406196 bytes
-SHA1 (perforce/freebsd22/p4web) = 213d7ea4f6c84b72944741b3036348caa382ca2c
-RMD160 (perforce/freebsd22/p4web) = 1b67de3439c3922f3f822b7236354cae831e70c9
-Size (perforce/freebsd22/p4web) = 1260996 bytes
-SHA1 (perforce/linux24x86/p4web) = 21fa01cc816816f45ed3abc674c1f839f2d27224
-RMD160 (perforce/linux24x86/p4web) = f3a8cc85a4c17cce1cca2cf11452ad762e4263f4
-Size (perforce/linux24x86/p4web) = 1579861 bytes
-SHA1 (perforce/linux52sparc/p4web) = 38f83e86681b0e41f20cac4cc9277148a22f5eea
-RMD160 (perforce/linux52sparc/p4web) = 1117901fdd86208229de20eb0df4fc5935496f68
-Size (perforce/linux52sparc/p4web) = 1333522 bytes
-SHA1 (perforce/linuxarm/p4web) = 63c1a48f1a69ce60ca5d166229071279bf8cf2f0
-RMD160 (perforce/linuxarm/p4web) = 83b52600eb3987d5d6a345c94d170529a004465c
-Size (perforce/linuxarm/p4web) = 1392352 bytes
-SHA1 (perforce/linuxppc/p4web) = 6a18f523d2473fc9d9022a228485cfd1926ccab0
-RMD160 (perforce/linuxppc/p4web) = a92091323aeed9c79b33bb885e5d676a8b91efb4
-Size (perforce/linuxppc/p4web) = 1957707 bytes
-SHA1 (perforce/netbsdaxp/p4web) = 5f1d58eabd01f01741d147e37e169870870bef5c
-RMD160 (perforce/netbsdaxp/p4web) = 40b64dfa849001062aa354b3efc50a91456c6f94
-Size (perforce/netbsdaxp/p4web) = 2251641 bytes
-SHA1 (perforce/solaris26/p4web) = 4e10126570b9c7382da410c2b7f25167d3f8d487
-RMD160 (perforce/solaris26/p4web) = 6ac33ffeaa529f964ded040ce806a503e51e8bfe
-Size (perforce/solaris26/p4web) = 1770204 bytes
-SHA1 (perforce/solaris26x86/p4web) = 1b3d2bb130e20a408d59621313b3c22a22829cd3
-RMD160 (perforce/solaris26x86/p4web) = 1858661e77a6a93a194f9ececdfdd9d7938e432e
-Size (perforce/solaris26x86/p4web) = 1234896 bytes
-SHA1 (perforce/sunos/p4web) = 637155101dd1e669449871a8a716384ca3fec299
-RMD160 (perforce/sunos/p4web) = 44b94fe5778843f893234a91579b100d6233d396
-Size (perforce/sunos/p4web) = 1306857 bytes
+SHA1 (perforce/darwin80ppc/p4web) = d58d8fbb2f9e60a7e30f955919b41700c66e7753
+RMD160 (perforce/darwin80ppc/p4web) = 54ef27a56e01fc2c82f5b21d63d8900767d74f19
+Size (perforce/darwin80ppc/p4web) = 1719984 bytes
+SHA1 (perforce/darwin80x86/p4web) = 75dfebcc32620535a86fd918b55e8643012f3503
+RMD160 (perforce/darwin80x86/p4web) = 6c74b035cd750e380e1a8e70a924e3b1566cf9d6
+Size (perforce/darwin80x86/p4web) = 1804876 bytes
+SHA1 (perforce/linux24x86/p4web) = b188d9c074c41c32a861b33b3d0be39973c7c3a3
+RMD160 (perforce/linux24x86/p4web) = b3ba0dae74b1c257912bdeb6b23ca25568e5761a
+Size (perforce/linux24x86/p4web) = 1791341 bytes
+SHA1 (perforce/linux26x86/p4web) = e706ed8235d05d6a466364901697e5905990b9c5
+RMD160 (perforce/linux26x86/p4web) = af7de6fb6f817b9f868d6d46be591d08b6d1fc69
+Size (perforce/linux26x86/p4web) = 1802262 bytes
+SHA1 (perforce/linux26x86/p4web) = e706ed8235d05d6a466364901697e5905990b9c5
+RMD160 (perforce/linux26x86/p4web) = af7de6fb6f817b9f868d6d46be591d08b6d1fc69
+Size (perforce/linux26x86/p4web) = 1802262 bytes
+SHA1 (perforce/netbsd31x86/p4web) = f74e04ec9e963800378c2a59e10f20dce2bb59ec
+RMD160 (perforce/netbsd31x86/p4web) = 90b6a56244d0ed35843e591abd623ab508adf97c
+Size (perforce/netbsd31x86/p4web) = 1502336 bytes
+SHA1 (perforce/netbsd31x86_64/p4web) = d258ff8b0c46a1d67c03ae0c85ea3952bbe6d4e4
+RMD160 (perforce/netbsd31x86_64/p4web) = 27400f95368084cacce7f006b61b8fd96a5baa3a
+Size (perforce/netbsd31x86_64/p4web) = 1656519 bytes