Update to 06.1

PR:		ports/102375
Submitted by:	Mike Meyer <mwm@mired.org>

6 files changed, 74 insertions, 24 deletions

diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index ecce54ce53c2..8555493bd9aa 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -18,6 +18,10 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perforce client and server
 
+ONLY_FOR_ARCHS=	i386 amd64 alpha
+DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
+MD5_FILE=	${MASTERDIR}/distinfo.${PLATFORM}
+
 #
 # This is a kludge.  I don't know a better way to set PORTVERSION and
 # PORTREVISION such that pkg_version figures out an update is needed
@@ -26,26 +30,20 @@ ARCH!=	/usr/bin/uname -p
 ARCH?=	i386
 
 .if (${ARCH} == i386) || (${ARCH} == amd64)
-DIST_SUBDIR=	perforce/${VERSION}/i386
-VERSION=	05.2
-REVISION=	3
-PLATFORM=	freebsd4
+VERSION=	06.1
 BIN_FILES=	p4
 SBIN_FILES=	p4d p4ftpd p4p p4web
-REL_NOTES=	http://www.perforce.com/perforce/doc.052/user/relnotes.txt
-MD5_FILE=	${MASTERDIR}/distinfo.i386
+REL_NOTES=	http://www.perforce.com/perforce/doc.061/user/relnotes.txt
 .elif ${ARCH} == alpha
-DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 VERSION=	99.1
 REVISION=	1
 PLATFORM=	freebsdaxp
 BIN_FILES=	p4
 SBIN_FILES=	p4d
 REL_NOTES=	http://www.perforce.com/perforce/doc.991/user/relnotes.txt
-MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 .else
 VERSION=	0
-IGNORE=		"Unsupported platform, sorry."
+IGNORE=		unsupported platform, sorry
 .endif
 
 # End of kludge
@@ -60,6 +58,28 @@ PLIST_FILES=	${BIN_FILES:S+^+bin/+g} \
 
 .include <bsd.port.pre.mk>
 
+# Figure out what to install
+.if (${ARCH} == i386) || (${ARCH} == amd64)
+.if ${OSVERSION} > 504000
+.if ${ARCH} == amd64
+PLATFORM=	freebsd54x86_64
+.else
+PLATFORM=	freebsd54x86
+.endif
+.elif ${OSVERSION} > 400000
+PLATFORM=	freebsd4
+.else
+INGORE=		only supported on FreeBSD 4.x and greater
+.endif
+.endif
+
+# Add compatability dependencies.
+.if ${OSVERSION} > 600000
+LIB_DEPENDS+=	c_r.5:${PORTSDIR}/misc/compat5x
+.elif (${OSVERSION} < 540000) && (${OSVERSION} > 500000)
+LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
+.endif
+
 # These variables are all configurable.
 PERFORCE_USER?=		p4admin
 PERFORCE_UID?=		94
diff --git a/devel/p4/distinfo.freebsd4 b/devel/p4/distinfo.freebsd4
new file mode 100644
index 000000000000..59d41afabb1c
--- /dev/null
+++ b/devel/p4/distinfo.freebsd4
@@ -0,0 +1,15 @@
+MD5 (perforce/06.1/i386/p4) = 15f3d61541eb6d7792d90f046d372909
+SHA256 (perforce/06.1/i386/p4) = a95a23827d39537d289f7b3683ea72b97e3a7af77386b0887e0d4752955c897d
+SIZE (perforce/06.1/i386/p4) = 733072
+MD5 (perforce/06.1/i386/p4d) = 26fa46e07d9e9ee30cac6384661b9960
+SHA256 (perforce/06.1/i386/p4d) = 8a19cfa9cb2b893e8fb5e02232d3884b21e1977bf83540367188c55e9e5134ae
+SIZE (perforce/06.1/i386/p4d) = 1513300
+MD5 (perforce/06.1/i386/p4ftpd) = 01c0a6ab9a6590780f513a17f4aeffaf
+SHA256 (perforce/06.1/i386/p4ftpd) = d733ef1031adb8e556ae3402191aa45bcc92bc5d2566c786cf32e2135c8b2845
+SIZE (perforce/06.1/i386/p4ftpd) = 828224
+MD5 (perforce/06.1/i386/p4p) = 6f86444c928a015ca2d469805673db83
+SHA256 (perforce/06.1/i386/p4p) = 157c3b5fe562f52a9e1b2f2607f1c769780f7fd739dadd91739caca4fd882fb8
+SIZE (perforce/06.1/i386/p4p) = 613276
+MD5 (perforce/06.1/i386/p4web) = 8ec471a1c38b3e0f5dd50629537f4f38
+SHA256 (perforce/06.1/i386/p4web) = ce543e1ebc4662755c8169c9992ee10c651832caaf55262144406f3bb359a477
+SIZE (perforce/06.1/i386/p4web) = 1603728
diff --git a/devel/p4/distinfo.freebsd54x86 b/devel/p4/distinfo.freebsd54x86
new file mode 100644
index 000000000000..14865376b403
--- /dev/null
+++ b/devel/p4/distinfo.freebsd54x86
@@ -0,0 +1,15 @@
+MD5 (perforce/06.1/i386/p4) = e1e052d741125efeab929a9578f0c01f
+SHA256 (perforce/06.1/i386/p4) = 0c8b3a5b837c1ad14d2ee2ffb1ad28201611d573a4c7632c117781e5557f7411
+SIZE (perforce/06.1/i386/p4) = 502388
+MD5 (perforce/06.1/i386/p4d) = ed783c4619c832382e89041db4f458c4
+SHA256 (perforce/06.1/i386/p4d) = 7a6254a36ecf97f2a4dea868a263764ceebd64de2c12a7fd5da27ad6b09d74dd
+SIZE (perforce/06.1/i386/p4d) = 1332056
+MD5 (perforce/06.1/i386/p4ftpd) = 6cd62d30a5956793944ecb3fdd29c679
+SHA256 (perforce/06.1/i386/p4ftpd) = c35fc3da9b79379400fc091563a66716dc5a2b8d7090550887f54963beff87cc
+SIZE (perforce/06.1/i386/p4ftpd) = 597624
+MD5 (perforce/06.1/i386/p4p) = 45968587d4661e433cc8d91b5e3c30fb
+SHA256 (perforce/06.1/i386/p4p) = 8ecce897c9e78af8b5090619c323fcf21ff1be8a58f6bc852b92ef41ea33abfd
+SIZE (perforce/06.1/i386/p4p) = 433448
+MD5 (perforce/06.1/i386/p4web) = a92ee3b18dd0e457dd03d086f5317731
+SHA256 (perforce/06.1/i386/p4web) = fedb2fd1f818c9c9c625f2753a72cc747e00196b66d919dcf9397ae75bd32265
+SIZE (perforce/06.1/i386/p4web) = 1665483
diff --git a/devel/p4/distinfo.freebsd54x86_64 b/devel/p4/distinfo.freebsd54x86_64
new file mode 100644
index 000000000000..f4efacd8091f
--- /dev/null
+++ b/devel/p4/distinfo.freebsd54x86_64
@@ -0,0 +1,15 @@
+MD5 (perforce/06.1/amd64/p4) = e1e052d741125efeab929a9578f0c01f
+SHA256 (perforce/06.1/amd64/p4) = 0c8b3a5b837c1ad14d2ee2ffb1ad28201611d573a4c7632c117781e5557f7411
+SIZE (perforce/06.1/amd64/p4) = 502388
+MD5 (perforce/06.1/amd64/p4d) = ed783c4619c832382e89041db4f458c4
+SHA256 (perforce/06.1/amd64/p4d) = 7a6254a36ecf97f2a4dea868a263764ceebd64de2c12a7fd5da27ad6b09d74dd
+SIZE (perforce/06.1/amd64/p4d) = 1332056
+MD5 (perforce/06.1/amd64/p4ftpd) = 6cd62d30a5956793944ecb3fdd29c679
+SHA256 (perforce/06.1/amd64/p4ftpd) = c35fc3da9b79379400fc091563a66716dc5a2b8d7090550887f54963beff87cc
+SIZE (perforce/06.1/amd64/p4ftpd) = 597624
+MD5 (perforce/06.1/amd64/p4p) = 45968587d4661e433cc8d91b5e3c30fb
+SHA256 (perforce/06.1/amd64/p4p) = 8ecce897c9e78af8b5090619c323fcf21ff1be8a58f6bc852b92ef41ea33abfd
+SIZE (perforce/06.1/amd64/p4p) = 433448
+MD5 (perforce/06.1/amd64/p4web) = a92ee3b18dd0e457dd03d086f5317731
+SHA256 (perforce/06.1/amd64/p4web) = fedb2fd1f818c9c9c625f2753a72cc747e00196b66d919dcf9397ae75bd32265
+SIZE (perforce/06.1/amd64/p4web) = 1665483
diff --git a/devel/p4/distinfo.alpha b/devel/p4/distinfo.freebsdaxp
index 0c6b5f2e7179..0c6b5f2e7179 100644
--- a/devel/p4/distinfo.alpha
+++ b/devel/p4/distinfo.freebsdaxp
diff --git a/devel/p4/distinfo.i386 b/devel/p4/distinfo.i386
deleted file mode 100644
index 1462495029b9..000000000000
--- a/devel/p4/distinfo.i386
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 (perforce/05.2/i386/p4) = f096ecd881b6975dbd2149d9f12a3f90
-SHA256 (perforce/05.2/i386/p4) = fe99e70f8f790545c103219e0cb1ab2a4ac5df56bdf0cc50703669187e0f264b
-SIZE (perforce/05.2/i386/p4) = 717180
-MD5 (perforce/05.2/i386/p4d) = 4b823273027d36e31071b93c61ef5690
-SHA256 (perforce/05.2/i386/p4d) = ec78a0b5ca7cd695b5090e394e8fb822369a84157b31d2f9730b0c13749ed132
-SIZE (perforce/05.2/i386/p4d) = 1509976
-MD5 (perforce/05.2/i386/p4ftpd) = 0f8bf95dd1f0a6ea738a7fae5f3e06ab
-SHA256 (perforce/05.2/i386/p4ftpd) = 2be1ef92341ae023558e8d53bdad4adfa915ddd0c70bd44b42b65658c52c12cc
-SIZE (perforce/05.2/i386/p4ftpd) = 832500
-MD5 (perforce/05.2/i386/p4p) = f180f17fbc926423d8ae83e6f5d9c862
-SHA256 (perforce/05.2/i386/p4p) = 27527dd4cab4f06f2c46990dafddfcaa24e98ca1f61b05c2070049ced5a1d710
-SIZE (perforce/05.2/i386/p4p) = 593760
-MD5 (perforce/05.2/i386/p4web) = 95f56027c78f829f554882e9cac697ca
-SHA256 (perforce/05.2/i386/p4web) = b8febd81d193e264d9e348ec23024e45440ea2daef54f16d4d4c68fdcfa79f26
-SIZE (perforce/05.2/i386/p4web) = 1732661