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.

2 files changed, 46 insertions, 61 deletions

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