update to new perforce binaries

	Perforce has released new binaries.
	Also, with the popularity of portupgrade rising, I made some
	(somewhat bogus) changes to the makefile to help pkg_version and
	portupgrade figure out when the port has been upgraded.

I have moved the kludge on the PR to below the maintainer section.

PR:		ports/56497
Submitted by:	david marshall <marshall@chezmarshall.com>

12 files changed, 186 insertions, 108 deletions

diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 18dae81b6ab0..884b68b41375 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -20,6 +20,31 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
+#
+# 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
+#
+ARCH!= /usr/bin/uname -p
+ARCH?= i386
+
+.if ${ARCH} == i386
+VERSION=	03.1
+REVISION=	2
+PLATFORM=	freebsd4
+BIN_FILES=	p4 p4web
+SBIN_FILES=	p4d p4ftpd p4p
+.elif ${ARCH} == alpha
+VERSION=	99.1
+REVISION=	1
+PLATFORM=	freebsdaxp
+BIN_FILES=	p4
+SBIN_FILES=	p4d
+.else
+IGNORE=		"Unsupported platform, sorry."
+.endif
+
+# End of kludge
+
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
@@ -40,21 +65,9 @@ PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
-.if ${ARCH} == i386
-VERSION=	03.1
-REVISION=	1
-PLATFORM=	freebsd4
-BIN_FILES=	p4 p4web
-SBIN_FILES=	p4d p4ftpd p4p
-.elif ${ARCH} == alpha
-VERSION=	99.1
-REVISION=	1
-PLATFORM=	freebsdaxp
-BIN_FILES=	p4
-SBIN_FILES=	p4d
-.else
-IGNORE=		"Unsupported platform, sorry."
-.endif
+pre-everything::
+	@${ECHO} "If the checksums fail, try doing 'make distclean'"
+	@${ECHO} "to force getting the latest binaries from Perforce."
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
diff --git a/devel/p4/distinfo b/devel/p4/distinfo
index 17fa1c4863ed..d11fa48a0064 100644
--- a/devel/p4/distinfo
+++ b/devel/p4/distinfo
@@ -1,7 +1,7 @@
-MD5 (perforce/03.1/i386/p4) = 405400a707f42481a2b6a989061e6679
-MD5 (perforce/03.1/i386/p4web) = 12edede38a158f60a38afb3ddd018223
+MD5 (perforce/03.1/i386/p4) = 94db000b34a6e8297821efecacb96361
+MD5 (perforce/03.1/i386/p4web) = c14dcd83f95d963ce7b13fd216f2109f
 MD5 (perforce/03.1/i386/p4d) = ac79f109ca681283870d5fe9e2f8d6bc
-MD5 (perforce/03.1/i386/p4ftpd) = 69189a36b2011ed1c6a1877e8cba210f
+MD5 (perforce/03.1/i386/p4ftpd) = ec427c159b2a04afc24ff1883f849cbd
 MD5 (perforce/03.1/i386/p4p) = 8c68d9a0c580c17aab50db1753eb642e
 MD5 (perforce/03.1/i386/p4.1) = 58208eb02ba3786eed2d8e91d851cecd
 MD5 (perforce/03.1/i386/p4d.1) = 381a27c69d707aa3498602a1c216a8d3
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 18dae81b6ab0..884b68b41375 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -20,6 +20,31 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
+#
+# 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
+#
+ARCH!= /usr/bin/uname -p
+ARCH?= i386
+
+.if ${ARCH} == i386
+VERSION=	03.1
+REVISION=	2
+PLATFORM=	freebsd4
+BIN_FILES=	p4 p4web
+SBIN_FILES=	p4d p4ftpd p4p
+.elif ${ARCH} == alpha
+VERSION=	99.1
+REVISION=	1
+PLATFORM=	freebsdaxp
+BIN_FILES=	p4
+SBIN_FILES=	p4d
+.else
+IGNORE=		"Unsupported platform, sorry."
+.endif
+
+# End of kludge
+
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
@@ -40,21 +65,9 @@ PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
-.if ${ARCH} == i386
-VERSION=	03.1
-REVISION=	1
-PLATFORM=	freebsd4
-BIN_FILES=	p4 p4web
-SBIN_FILES=	p4d p4ftpd p4p
-.elif ${ARCH} == alpha
-VERSION=	99.1
-REVISION=	1
-PLATFORM=	freebsdaxp
-BIN_FILES=	p4
-SBIN_FILES=	p4d
-.else
-IGNORE=		"Unsupported platform, sorry."
-.endif
+pre-everything::
+	@${ECHO} "If the checksums fail, try doing 'make distclean'"
+	@${ECHO} "to force getting the latest binaries from Perforce."
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
diff --git a/devel/p4d/distinfo b/devel/p4d/distinfo
index 17fa1c4863ed..d11fa48a0064 100644
--- a/devel/p4d/distinfo
+++ b/devel/p4d/distinfo
@@ -1,7 +1,7 @@
-MD5 (perforce/03.1/i386/p4) = 405400a707f42481a2b6a989061e6679
-MD5 (perforce/03.1/i386/p4web) = 12edede38a158f60a38afb3ddd018223
+MD5 (perforce/03.1/i386/p4) = 94db000b34a6e8297821efecacb96361
+MD5 (perforce/03.1/i386/p4web) = c14dcd83f95d963ce7b13fd216f2109f
 MD5 (perforce/03.1/i386/p4d) = ac79f109ca681283870d5fe9e2f8d6bc
-MD5 (perforce/03.1/i386/p4ftpd) = 69189a36b2011ed1c6a1877e8cba210f
+MD5 (perforce/03.1/i386/p4ftpd) = ec427c159b2a04afc24ff1883f849cbd
 MD5 (perforce/03.1/i386/p4p) = 8c68d9a0c580c17aab50db1753eb642e
 MD5 (perforce/03.1/i386/p4.1) = 58208eb02ba3786eed2d8e91d851cecd
 MD5 (perforce/03.1/i386/p4d.1) = 381a27c69d707aa3498602a1c216a8d3
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index 18dae81b6ab0..884b68b41375 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -20,6 +20,31 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
+#
+# 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
+#
+ARCH!= /usr/bin/uname -p
+ARCH?= i386
+
+.if ${ARCH} == i386
+VERSION=	03.1
+REVISION=	2
+PLATFORM=	freebsd4
+BIN_FILES=	p4 p4web
+SBIN_FILES=	p4d p4ftpd p4p
+.elif ${ARCH} == alpha
+VERSION=	99.1
+REVISION=	1
+PLATFORM=	freebsdaxp
+BIN_FILES=	p4
+SBIN_FILES=	p4d
+.else
+IGNORE=		"Unsupported platform, sorry."
+.endif
+
+# End of kludge
+
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
@@ -40,21 +65,9 @@ PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
-.if ${ARCH} == i386
-VERSION=	03.1
-REVISION=	1
-PLATFORM=	freebsd4
-BIN_FILES=	p4 p4web
-SBIN_FILES=	p4d p4ftpd p4p
-.elif ${ARCH} == alpha
-VERSION=	99.1
-REVISION=	1
-PLATFORM=	freebsdaxp
-BIN_FILES=	p4
-SBIN_FILES=	p4d
-.else
-IGNORE=		"Unsupported platform, sorry."
-.endif
+pre-everything::
+	@${ECHO} "If the checksums fail, try doing 'make distclean'"
+	@${ECHO} "to force getting the latest binaries from Perforce."
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
diff --git a/devel/p4ftpd/distinfo b/devel/p4ftpd/distinfo
index 17fa1c4863ed..d11fa48a0064 100644
--- a/devel/p4ftpd/distinfo
+++ b/devel/p4ftpd/distinfo
@@ -1,7 +1,7 @@
-MD5 (perforce/03.1/i386/p4) = 405400a707f42481a2b6a989061e6679
-MD5 (perforce/03.1/i386/p4web) = 12edede38a158f60a38afb3ddd018223
+MD5 (perforce/03.1/i386/p4) = 94db000b34a6e8297821efecacb96361
+MD5 (perforce/03.1/i386/p4web) = c14dcd83f95d963ce7b13fd216f2109f
 MD5 (perforce/03.1/i386/p4d) = ac79f109ca681283870d5fe9e2f8d6bc
-MD5 (perforce/03.1/i386/p4ftpd) = 69189a36b2011ed1c6a1877e8cba210f
+MD5 (perforce/03.1/i386/p4ftpd) = ec427c159b2a04afc24ff1883f849cbd
 MD5 (perforce/03.1/i386/p4p) = 8c68d9a0c580c17aab50db1753eb642e
 MD5 (perforce/03.1/i386/p4.1) = 58208eb02ba3786eed2d8e91d851cecd
 MD5 (perforce/03.1/i386/p4d.1) = 381a27c69d707aa3498602a1c216a8d3
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index 18dae81b6ab0..884b68b41375 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -20,6 +20,31 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
+#
+# 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
+#
+ARCH!= /usr/bin/uname -p
+ARCH?= i386
+
+.if ${ARCH} == i386
+VERSION=	03.1
+REVISION=	2
+PLATFORM=	freebsd4
+BIN_FILES=	p4 p4web
+SBIN_FILES=	p4d p4ftpd p4p
+.elif ${ARCH} == alpha
+VERSION=	99.1
+REVISION=	1
+PLATFORM=	freebsdaxp
+BIN_FILES=	p4
+SBIN_FILES=	p4d
+.else
+IGNORE=		"Unsupported platform, sorry."
+.endif
+
+# End of kludge
+
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
@@ -40,21 +65,9 @@ PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
-.if ${ARCH} == i386
-VERSION=	03.1
-REVISION=	1
-PLATFORM=	freebsd4
-BIN_FILES=	p4 p4web
-SBIN_FILES=	p4d p4ftpd p4p
-.elif ${ARCH} == alpha
-VERSION=	99.1
-REVISION=	1
-PLATFORM=	freebsdaxp
-BIN_FILES=	p4
-SBIN_FILES=	p4d
-.else
-IGNORE=		"Unsupported platform, sorry."
-.endif
+pre-everything::
+	@${ECHO} "If the checksums fail, try doing 'make distclean'"
+	@${ECHO} "to force getting the latest binaries from Perforce."
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
diff --git a/devel/p4p/distinfo b/devel/p4p/distinfo
index 17fa1c4863ed..d11fa48a0064 100644
--- a/devel/p4p/distinfo
+++ b/devel/p4p/distinfo
@@ -1,7 +1,7 @@
-MD5 (perforce/03.1/i386/p4) = 405400a707f42481a2b6a989061e6679
-MD5 (perforce/03.1/i386/p4web) = 12edede38a158f60a38afb3ddd018223
+MD5 (perforce/03.1/i386/p4) = 94db000b34a6e8297821efecacb96361
+MD5 (perforce/03.1/i386/p4web) = c14dcd83f95d963ce7b13fd216f2109f
 MD5 (perforce/03.1/i386/p4d) = ac79f109ca681283870d5fe9e2f8d6bc
-MD5 (perforce/03.1/i386/p4ftpd) = 69189a36b2011ed1c6a1877e8cba210f
+MD5 (perforce/03.1/i386/p4ftpd) = ec427c159b2a04afc24ff1883f849cbd
 MD5 (perforce/03.1/i386/p4p) = 8c68d9a0c580c17aab50db1753eb642e
 MD5 (perforce/03.1/i386/p4.1) = 58208eb02ba3786eed2d8e91d851cecd
 MD5 (perforce/03.1/i386/p4d.1) = 381a27c69d707aa3498602a1c216a8d3
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index 18dae81b6ab0..884b68b41375 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -20,6 +20,31 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
+#
+# 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
+#
+ARCH!= /usr/bin/uname -p
+ARCH?= i386
+
+.if ${ARCH} == i386
+VERSION=	03.1
+REVISION=	2
+PLATFORM=	freebsd4
+BIN_FILES=	p4 p4web
+SBIN_FILES=	p4d p4ftpd p4p
+.elif ${ARCH} == alpha
+VERSION=	99.1
+REVISION=	1
+PLATFORM=	freebsdaxp
+BIN_FILES=	p4
+SBIN_FILES=	p4d
+.else
+IGNORE=		"Unsupported platform, sorry."
+.endif
+
+# End of kludge
+
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
@@ -40,21 +65,9 @@ PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
-.if ${ARCH} == i386
-VERSION=	03.1
-REVISION=	1
-PLATFORM=	freebsd4
-BIN_FILES=	p4 p4web
-SBIN_FILES=	p4d p4ftpd p4p
-.elif ${ARCH} == alpha
-VERSION=	99.1
-REVISION=	1
-PLATFORM=	freebsdaxp
-BIN_FILES=	p4
-SBIN_FILES=	p4d
-.else
-IGNORE=		"Unsupported platform, sorry."
-.endif
+pre-everything::
+	@${ECHO} "If the checksums fail, try doing 'make distclean'"
+	@${ECHO} "to force getting the latest binaries from Perforce."
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
diff --git a/devel/p4web/distinfo b/devel/p4web/distinfo
index 17fa1c4863ed..d11fa48a0064 100644
--- a/devel/p4web/distinfo
+++ b/devel/p4web/distinfo
@@ -1,7 +1,7 @@
-MD5 (perforce/03.1/i386/p4) = 405400a707f42481a2b6a989061e6679
-MD5 (perforce/03.1/i386/p4web) = 12edede38a158f60a38afb3ddd018223
+MD5 (perforce/03.1/i386/p4) = 94db000b34a6e8297821efecacb96361
+MD5 (perforce/03.1/i386/p4web) = c14dcd83f95d963ce7b13fd216f2109f
 MD5 (perforce/03.1/i386/p4d) = ac79f109ca681283870d5fe9e2f8d6bc
-MD5 (perforce/03.1/i386/p4ftpd) = 69189a36b2011ed1c6a1877e8cba210f
+MD5 (perforce/03.1/i386/p4ftpd) = ec427c159b2a04afc24ff1883f849cbd
 MD5 (perforce/03.1/i386/p4p) = 8c68d9a0c580c17aab50db1753eb642e
 MD5 (perforce/03.1/i386/p4.1) = 58208eb02ba3786eed2d8e91d851cecd
 MD5 (perforce/03.1/i386/p4d.1) = 381a27c69d707aa3498602a1c216a8d3
diff --git a/devel/perforce/Makefile b/devel/perforce/Makefile
index 18dae81b6ab0..884b68b41375 100644
--- a/devel/perforce/Makefile
+++ b/devel/perforce/Makefile
@@ -20,6 +20,31 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	marshall@chezmarshall.com
 COMMENT=	Perforce client and server
 
+#
+# 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
+#
+ARCH!= /usr/bin/uname -p
+ARCH?= i386
+
+.if ${ARCH} == i386
+VERSION=	03.1
+REVISION=	2
+PLATFORM=	freebsd4
+BIN_FILES=	p4 p4web
+SBIN_FILES=	p4d p4ftpd p4p
+.elif ${ARCH} == alpha
+VERSION=	99.1
+REVISION=	1
+PLATFORM=	freebsdaxp
+BIN_FILES=	p4
+SBIN_FILES=	p4d
+.else
+IGNORE=		"Unsupported platform, sorry."
+.endif
+
+# End of kludge
+
 NO_PACKAGE=	Restricted distribution
 NO_CDROM=	Restricted distribution
 MAN1=		p4.1 p4d.1
@@ -40,21 +65,9 @@ PERFORCE_PORT?=		1666
 PERFORCE_CACHE?=      ${PERFORCE_HOME}/cache
 PERFORCE_TARGET?=     perforce:1666
 
-.if ${ARCH} == i386
-VERSION=	03.1
-REVISION=	1
-PLATFORM=	freebsd4
-BIN_FILES=	p4 p4web
-SBIN_FILES=	p4d p4ftpd p4p
-.elif ${ARCH} == alpha
-VERSION=	99.1
-REVISION=	1
-PLATFORM=	freebsdaxp
-BIN_FILES=	p4
-SBIN_FILES=	p4d
-.else
-IGNORE=		"Unsupported platform, sorry."
-.endif
+pre-everything::
+	@${ECHO} "If the checksums fail, try doing 'make distclean'"
+	@${ECHO} "to force getting the latest binaries from Perforce."
 
 do-build:
 	${SED}	-e "s,@PERFORCE_ROOT@,${PERFORCE_ROOT},g" \
diff --git a/devel/perforce/distinfo b/devel/perforce/distinfo
index 17fa1c4863ed..d11fa48a0064 100644
--- a/devel/perforce/distinfo
+++ b/devel/perforce/distinfo
@@ -1,7 +1,7 @@
-MD5 (perforce/03.1/i386/p4) = 405400a707f42481a2b6a989061e6679
-MD5 (perforce/03.1/i386/p4web) = 12edede38a158f60a38afb3ddd018223
+MD5 (perforce/03.1/i386/p4) = 94db000b34a6e8297821efecacb96361
+MD5 (perforce/03.1/i386/p4web) = c14dcd83f95d963ce7b13fd216f2109f
 MD5 (perforce/03.1/i386/p4d) = ac79f109ca681283870d5fe9e2f8d6bc
-MD5 (perforce/03.1/i386/p4ftpd) = 69189a36b2011ed1c6a1877e8cba210f
+MD5 (perforce/03.1/i386/p4ftpd) = ec427c159b2a04afc24ff1883f849cbd
 MD5 (perforce/03.1/i386/p4p) = 8c68d9a0c580c17aab50db1753eb642e
 MD5 (perforce/03.1/i386/p4.1) = 58208eb02ba3786eed2d8e91d851cecd
 MD5 (perforce/03.1/i386/p4d.1) = 381a27c69d707aa3498602a1c216a8d3