Skip site navigation (1)Skip section navigation (2)
Date:      5 Sep 2003 16:51:52 -0000
From:      david marshall <marshall@chezmarshall.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/56497: update to new perforce binaries
Message-ID:  <20030905165152.34655.qmail@chezmarshall.com>
Resent-Message-ID: <200309051700.h85H0YDr014666@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         56497
>Category:       ports
>Synopsis:       update to new perforce binaries
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 05 10:00:34 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     david marshall
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
System: FreeBSD server1.chezmarshall.com 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Fri Apr 4 19:41:27 EST 2003 marshall@server1.chezmarshall.com:/disk3/obj/disk2/src/sys/CHEZMARSHALL i386


	
>Description:
	
	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.
>How-To-Repeat:
	
>Fix:

	
	Apply following patch:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/perforce/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile	24 Jul 2003 05:19:11 -0000	1.20
+++ Makefile	5 Sep 2003 16:44:48 -0000
@@ -5,6 +5,29 @@
 # $FreeBSD: ports/devel/perforce/Makefile,v 1.20 2003/07/24 05:19:11 daichi Exp $
 #
 
+#
+# 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
+
 PORTNAME=	perforce
 PORTVERSION=	${VERSION}
 PORTREVISION=	${REVISION}
@@ -40,21 +63,9 @@
 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" \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/perforce/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo	24 Jul 2003 05:19:11 -0000	1.15
+++ distinfo	5 Sep 2003 16:44:48 -0000
@@ -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


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030905165152.34655.qmail>