From nobody@www.freebsd.org  Thu Jun  6 09:17:14 2002
Return-Path: <nobody@www.freebsd.org>
Received: from nwww.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by hub.freebsd.org (Postfix) with ESMTP id 8DEB637B401
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  6 Jun 2002 09:17:13 -0700 (PDT)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by nwww.freebsd.org (8.12.2/8.12.2) with ESMTP id g56GHDhG089434
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 6 Jun 2002 09:17:13 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.2/8.12.2/Submit) id g56GHDrx089433;
	Thu, 6 Jun 2002 09:17:13 -0700 (PDT)
Message-Id: <200206061617.g56GHDrx089433@www.freebsd.org>
Date: Thu, 6 Jun 2002 09:17:13 -0700 (PDT)
From: David Marshall <marshall@chezmarshall.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: perforce Makefile doesn't do PORTREVISION correctly plus p4d update
X-Send-Pr-Version: www-1.0

>Number:         38950
>Category:       ports
>Synopsis:       perforce Makefile doesn't do PORTREVISION correctly plus p4d update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 06 09:20:01 PDT 2002
>Closed-Date:    Fri Sep 20 23:25:02 PDT 2002
>Last-Modified:  Fri Sep 20 23:25:02 PDT 2002
>Originator:     David Marshall
>Release:        4.5-RELEASE-p4
>Organization:
>Environment:
FreeBSD server1.chezmarshall.com 4.5-RELEASE-p4 FreeBSD 4.5-RELEASE-p4 #0: Tue Apr 23 12:45:43 EDT 2002     marshall@server1.chezmarshall.com:/disk3/obj/disk2/src/sys/CHEZMARSHALL  i386     
>Description:
A mechanism to separate PORTVERSION and PORTREVISION for i386 and alpha was implemented some time ago, but it doesn't work properly when forming the package name. Regardless of what VERSION is in the i386 block, the package name will always be perforce-02.1,1 rather than (for instance) perforce-02.1_3,1.  Probably has something to do with package name being formed from macro _SUF1 rather than directly from PORTREVISION.  I suck at make.
>How-To-Repeat:
Fiddle with VERSION and see that the package name doesn't change.     
>Fix:
This is such an embarrassing kludge, but I don't have enough familiarity with the ports makefiles to come up with anything better.  Just set _SUF to what we want it to be...  Patch to current ports/devel/perforce can be grabbed from http://www.chezmarshall.com/perforce.diff.txt.
     
>Release-Note:
>Audit-Trail:

From: David Marshall <marshall@chezmarshall.com>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/38950: perforce Makefile doesn't do PORTREVISION
  correctly plus p4d update
Date: Thu, 06 Jun 2002 14:06:25 -0400

 Wow, I am sometimes very ignorant.  Never mind about PORTREVISION 
 anymore.  Trevor very patiently explained to me that because this can't be 
 a package anyway, it's not such a big deal.  I was fiddling with it so that 
 portupgrade would do it just the way I like.  That's something for another day.
 
 Anyhow, I have verified from Perforce's website that these are the correct 
 executables -- the changelist serial numbers at 
 http://www.perforce.com/perforce/downloads/freebsd4.html match the 
 changelist numbers reported by these executables, so the removal of 
 FORBIDDEN should be considered.
 
 The current version/changelist for the executables are:
 
 p4     2002.1/32489
 p4d    2002.1/33994
 p4ftpd 2002.1/32489
 p4web  2002.1/33822
 
 Here's the REAL patch, heh, also at 
 http://www.chezmarshall.com/perforce.diff.txt.
 
 Index: devel/perforce/Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/devel/perforce/Makefile,v
 retrieving revision 1.12
 diff -u -p -r1.12 Makefile
 --- devel/perforce/Makefile     2002/06/06 16:09:03     1.12
 +++ devel/perforce/Makefile     2002/06/06 17:46:09
 @@ -19,8 +19,6 @@ EXTRACT_ONLY= # none
 
   MAINTAINER=    marshall@chezmarshall.com
 
 -FORBIDDEN=     "doubt about changed checksum of p4"
 -
   NO_PACKAGE=    Restricted distribution
   NO_CDROM=      Restricted distribution
   MAN1=          p4.1 p4d.1
 @@ -41,7 +39,7 @@ PERFORCE_PORT?=               1666
 
   .if ${ARCH} == i386
   VERSION=       02.1
 -REVISION=      2
 +REVISION=      3
   PLATFORM=      freebsd4
   BIN_FILES=     p4 p4web
   SBIN_FILES=    p4d p4ftpd
 Index: devel/perforce/distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/devel/perforce/distinfo,v
 retrieving revision 1.9
 diff -u -p -r1.9 distinfo
 --- devel/perforce/distinfo     2002/06/05 21:53:01     1.9
 +++ devel/perforce/distinfo     2002/06/06 17:46:09
 @@ -1,5 +1,5 @@
   MD5 (perforce/02.1/i386/p4) = 74e7d85461e5ec5c32b43ab6ce2751c1
 -MD5 (perforce/02.1/i386/p4d) = 895f9f8864d9f95feda2306c26b953cd
 +MD5 (perforce/02.1/i386/p4d) = da9a44c23d841699d74c1b3b4ea34f7e
   MD5 (perforce/02.1/i386/p4ftpd) = afe586e372af2371da484761b9dd8294
   MD5 (perforce/02.1/i386/p4web) = 14a3d7cd263c6cb5be5fe2c92494c80f
   MD5 (perforce/02.1/i386/p4.1) = f5ab07d3fe1d8387f7685fca03053461
 
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Fri Sep 20 23:24:29 PDT 2002 
State-Changed-Why:  
alfred made the md5 change 2months ago 

http://www.freebsd.org/cgi/query-pr.cgi?pr=38950 
>Unformatted:
