5 files changed, 67 insertions, 70 deletions

diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 43264135a875..88677ddd08b6 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -19,7 +19,8 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perforce client and server
 
-ONLY_FOR_ARCHS=	i386 amd64 alpha
+ONLY_FOR_ARCHS=	alpha amd64 i386 sparc64
+
 DIST_SUBDIR=	perforce/${VERSION}/${ARCH}
 MD5_FILE=	${MASTERDIR}/distinfo.${PLATFORM}
 
@@ -30,16 +31,15 @@ MD5_FILE=	${MASTERDIR}/distinfo.${PLATFORM}
 ARCH!=	/usr/bin/uname -p
 ARCH?=	i386
 
-.if (${ARCH} == i386) || (${ARCH} == amd64)
-VERSION=	06.1
-REVISION=	6
+.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == sparc64
+VERSION=	06.2
+REVISION=	0
 BIN_FILES=	p4
 SBIN_FILES=	p4d p4ftpd p4p p4web
-REL_NOTES=	http://www.perforce.com/perforce/doc.061/user/relnotes.txt
+REL_NOTES=	http://www.perforce.com/perforce/doc.062/user/relnotes.txt
 .elif ${ARCH} == alpha
 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
@@ -59,30 +59,27 @@ PLIST_FILES=	${BIN_FILES:S+^+bin/+g} \
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 700017
+BROKEN=		requires compat6x, which has not yet been relased
+.endif
+
 # Figure out what to install
-.if (${ARCH} == i386) || (${ARCH} == amd64)
-.if ${OSVERSION} > 504000
-.if ${ARCH} == amd64
+.if ${ARCH} == alpha
+PLATFORM=	freebsdaxp
+.elif ${ARCH} == amd64
 PLATFORM=	freebsd54x86_64
-.else
+.if ${OSVERSION} >= 600000
+LIB_DEPENDS+=	c_r.5:${PORTSDIR}/misc/compat5x
+.endif
+.elif ${ARCH} == i386
 PLATFORM=	freebsd54x86
+.if ${OSVERSION} >= 600000
+LIB_DEPENDS+=	c_r.5:${PORTSDIR}/misc/compat5x
 .endif
-.elif ${OSVERSION} > 400000
-PLATFORM=	freebsd4
+.elif ${ARCH} == sparc64 && ${OSVERSION} >= 601000
+PLATFORM=	freebsd61sparc64
 .else
-IGNORE=		only supported on FreeBSD 4.x and greater
-.endif
-.endif
-
-.if (${ARCH} == amd64) && (${OSVERSION} < 504000)
-IGNORE=		amd64 is only supported on FreeBSD 5.4 and later
-.endif
-
-# Add compatability dependencies.
-.if ${OSVERSION} > 600000
-LIB_DEPENDS+=	c_r.5:${PORTSDIR}/misc/compat5x
-.elif (${OSVERSION} < 504000) && (${OSVERSION} > 500000)
-LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
+IGNORE=		unsupported OS release, sorry
 .endif
 
 # These variables are all configurable.
diff --git a/devel/p4/distinfo.freebsd4 b/devel/p4/distinfo.freebsd4
deleted file mode 100644
index 141847f92426..000000000000
--- a/devel/p4/distinfo.freebsd4
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 (perforce/06.1/i386/p4) = b2db1eb40020d495aeed0072b2bc538a
-SHA256 (perforce/06.1/i386/p4) = 74a4586c8d21e968a608a37966759d07844c6752ccd5ea097f54061d61e6da1c
-SIZE (perforce/06.1/i386/p4) = 734504
-MD5 (perforce/06.1/i386/p4d) = ff1cb62f2ae143bd216c07b19f50b3c9
-SHA256 (perforce/06.1/i386/p4d) = 1591726ca52ea6c8714e42bf95bb99f4840a66ec215120279521349c299f9b12
-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) = 9ac89d7b4970b33bfe4979c317362d09
-SHA256 (perforce/06.1/i386/p4p) = 150d2504f53ed8aab38bc09b4cd5bca6d9fdd37ba5268341842398c5dde756c4
-SIZE (perforce/06.1/i386/p4p) = 613296
-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
index aa6196b7d343..59386de7dab4 100644
--- a/devel/p4/distinfo.freebsd54x86
+++ b/devel/p4/distinfo.freebsd54x86
@@ -1,15 +1,15 @@
-MD5 (perforce/06.1/i386/p4) = 8899698abaab7f7e26bca94571b8c1e7
-SHA256 (perforce/06.1/i386/p4) = ac69427052d67eb961b12a7063a202f580e564c46097e58e4040bf0953e6a8b5
-SIZE (perforce/06.1/i386/p4) = 503748
-MD5 (perforce/06.1/i386/p4d) = a4f39ec2bc0a4c1f35a04a6705114b95
-SHA256 (perforce/06.1/i386/p4d) = e31735fde7de65d91fcf4fe8313adad98d7c10ca724b67db3cae21d21f4b84e7
-SIZE (perforce/06.1/i386/p4d) = 1333592
-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) = ba23b0d431c3674565179b7752024001
-SHA256 (perforce/06.1/i386/p4p) = 12059a570f2cf13c9766377e72ed1fa846280d5acf0e9bd74dfe97b5fc38466f
-SIZE (perforce/06.1/i386/p4p) = 433724
-MD5 (perforce/06.1/i386/p4web) = a92ee3b18dd0e457dd03d086f5317731
-SHA256 (perforce/06.1/i386/p4web) = fedb2fd1f818c9c9c625f2753a72cc747e00196b66d919dcf9397ae75bd32265
-SIZE (perforce/06.1/i386/p4web) = 1665483
+MD5 (perforce/06.2/i386/p4) = 95aa7364204817c3e33dcdbfceaf2452
+SHA256 (perforce/06.2/i386/p4) = 8da93b07f57f69a3e8392d88c5937b065e769cdd9c9413566e74bd0e557ffc64
+SIZE (perforce/06.2/i386/p4) = 506488
+MD5 (perforce/06.2/i386/p4d) = d7ad7f15577b994865d9b5a3318f73f5
+SHA256 (perforce/06.2/i386/p4d) = 2a454d6bf9fd187c9092da808ef17f667817407238c66c373434f7ced1b946ff
+SIZE (perforce/06.2/i386/p4d) = 1399160
+MD5 (perforce/06.2/i386/p4ftpd) = 72bedc6e05835eda0788da2eb0986c2f
+SHA256 (perforce/06.2/i386/p4ftpd) = c324ace80099ef70f897a7b78e0e4677e383b63f0be6d2f31b80e7519d88502f
+SIZE (perforce/06.2/i386/p4ftpd) = 602076
+MD5 (perforce/06.2/i386/p4p) = e7f32d9da739a12a804a46d647c496d4
+SHA256 (perforce/06.2/i386/p4p) = 82a7e7d3dd242650c6fa574de283c993567654038625b675990c4055236f7465
+SIZE (perforce/06.2/i386/p4p) = 444320
+MD5 (perforce/06.2/i386/p4web) = 16cf5ce929cd2bc068a47cbaf2f9f2e6
+SHA256 (perforce/06.2/i386/p4web) = 0322a7e50aa84c2aa20b218df4bf8fb86f3371d5496af99b56acd2b4a9e08581
+SIZE (perforce/06.2/i386/p4web) = 1695267
diff --git a/devel/p4/distinfo.freebsd54x86_64 b/devel/p4/distinfo.freebsd54x86_64
index 28228a419f80..e94250f0aeb9 100644
--- a/devel/p4/distinfo.freebsd54x86_64
+++ b/devel/p4/distinfo.freebsd54x86_64
@@ -1,15 +1,15 @@
-MD5 (perforce/06.1/amd64/p4) = 35a845c5583ca7ca4c0a25eefabcb554
-SHA256 (perforce/06.1/amd64/p4) = efe72bfa7d0ec7245b07a9c5f93824ef14eb101f24c603b012f24b6cea726253
-SIZE (perforce/06.1/amd64/p4) = 566752
-MD5 (perforce/06.1/amd64/p4d) = e19f5599984673d5135074707cbedbb2
-SHA256 (perforce/06.1/amd64/p4d) = 29ff45fcf7fb50770db3f21a966909f8713c9569ea7cff77522f7dab9f5b120e
-SIZE (perforce/06.1/amd64/p4d) = 1487288
-MD5 (perforce/06.1/amd64/p4ftpd) = bbf5bcc99d769bcc15f8962166425dd8
-SHA256 (perforce/06.1/amd64/p4ftpd) = 7e2025ecf4175562c07bc6b5c615b7ad3a0e666569fd4c4db9c35fa6f98daf91
-SIZE (perforce/06.1/amd64/p4ftpd) = 673464
-MD5 (perforce/06.1/amd64/p4p) = 3c03a8beb7e0f8e84370a1ae657bfdeb
-SHA256 (perforce/06.1/amd64/p4p) = 6e144ea29d952502e74802c7cf6ce9cf8eda9d39c74b4e26eedf17e9368bea22
-SIZE (perforce/06.1/amd64/p4p) = 518040
-MD5 (perforce/06.1/amd64/p4web) = ca65281377b851693295afac8f9f638c
-SHA256 (perforce/06.1/amd64/p4web) = 0ee99ed670b62baf0e7056b2ab4723d1b49e938cbea6930753d68d4a260de18f
-SIZE (perforce/06.1/amd64/p4web) = 1836816
+MD5 (perforce/06.2/amd64/p4) = d93725b13a81360bce862d2216469bbc
+SHA256 (perforce/06.2/amd64/p4) = e75bca064e60803a0628048fc4616ed4494326b53542622154969d71b75fbe3f
+SIZE (perforce/06.2/amd64/p4) = 568632
+MD5 (perforce/06.2/amd64/p4d) = 5b17dd684c9e6367cf3929e2584bedef
+SHA256 (perforce/06.2/amd64/p4d) = 53f105d6678b6aea2f5fe39a12c9d2c331f940b397a34e16bc006bbe1583d726
+SIZE (perforce/06.2/amd64/p4d) = 1553528
+MD5 (perforce/06.2/amd64/p4ftpd) = 0fda699385823285452a311951a7340d
+SHA256 (perforce/06.2/amd64/p4ftpd) = deb1f1e2d68396b967b405642a29a32ad8e81bb6ce183df2712be333cb1bdb35
+SIZE (perforce/06.2/amd64/p4ftpd) = 678680
+MD5 (perforce/06.2/amd64/p4p) = 462e16d903e9d99613270b8fadd48295
+SHA256 (perforce/06.2/amd64/p4p) = d8e09b6f6746adfe6f19de1bd3494417b7e2e48f02bc08c897464f0ac3897a52
+SIZE (perforce/06.2/amd64/p4p) = 529472
+MD5 (perforce/06.2/amd64/p4web) = 075a3947b42d67f201920c2bf6dad3df
+SHA256 (perforce/06.2/amd64/p4web) = 479c2c862ada10147971ddac1d67ed46f8b6950f8f60810aef5ac9a6ba209f08
+SIZE (perforce/06.2/amd64/p4web) = 1873416
diff --git a/devel/p4/distinfo.freebsd61sparc64 b/devel/p4/distinfo.freebsd61sparc64
new file mode 100644
index 000000000000..ea58514d5ecc
--- /dev/null
+++ b/devel/p4/distinfo.freebsd61sparc64
@@ -0,0 +1,15 @@
+MD5 (perforce/06.2/sparc64/p4) = 0dd88a52e2a00510bb9a9fe474bfffab
+SHA256 (perforce/06.2/sparc64/p4) = 7079c6a17c634e7d376987f35319d799b93966a80be6ea86988073a93ef9a5b8
+SIZE (perforce/06.2/sparc64/p4) = 586008
+MD5 (perforce/06.2/sparc64/p4d) = d7a0cecc6d73abf2e3e3b0e0e930bb92
+SHA256 (perforce/06.2/sparc64/p4d) = 69317a30a8107fc63c3b5ae0fdc60417218c02546002573203a5f5882d1b32ea
+SIZE (perforce/06.2/sparc64/p4d) = 1580024
+MD5 (perforce/06.2/sparc64/p4ftpd) = 9be748356e018db0a7dfa8ff4e95e2fb
+SHA256 (perforce/06.2/sparc64/p4ftpd) = 9c1969c87df06b077bdc589383346674c022e0274b5324522582a213b20a25a7
+SIZE (perforce/06.2/sparc64/p4ftpd) = 700320
+MD5 (perforce/06.2/sparc64/p4p) = 2ce90e0dbfac6d9449bb1c9cd55fdfad
+SHA256 (perforce/06.2/sparc64/p4p) = 1bad7dc3cf4814d99710e17f3b61b4991517be03c94d86cca0ce1d9fce369cea
+SIZE (perforce/06.2/sparc64/p4p) = 556832
+MD5 (perforce/06.2/sparc64/p4web) = d0ba00ff910b16cc626964ff72c88591
+SHA256 (perforce/06.2/sparc64/p4web) = 9d27eb494e4f11308fb57426b596fcfacb64dbe2a453df5a32ac91a90745110d
+SIZE (perforce/06.2/sparc64/p4web) = 1773992