ports/72242: [update] devel/cvs2p4 to contemporary 2.4

[Dmitry Morozovsky]

>Number:         72242
>Category:       ports
>Synopsis:       [update] devel/cvs2p4 to contemporary 2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 01 21:30:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Morozovsky
>Release:        FreeBSD 4-STABLE i386
>Organization:
Cronyx Plus LLC (RiNet ISP)
>Environment:
System: FreeBSD 4-STABLE 


>Description:
Here is update for CVS to Perforce conversion package written
by Richard Geiger and distributed by Perforce as unsupported
Perforce-related project.

>How-To-Repeat:

>Fix:


Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/cvs2p4/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	20 Feb 2003 17:06:41 -0000	1.8
+++ Makefile	1 Oct 2004 21:16:11 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvs2p4
-PORTVERSION=	1.3.3
+PORTVERSION=	2.4
 CATEGORIES+=	devel
 MASTER_SITES=	ftp://public.perforce.com/public/perforce/utils/cvs2p4/
 EXTRACT_SUFX=	.tar
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/cvs2p4/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	29 Jan 2004 07:22:58 -0000	1.3
+++ distinfo	1 Oct 2004 21:16:11 -0000
@@ -1,2 +1,2 @@
-MD5 (cvs2p4-1.3.3.tar) = a5b81372aec18ab8c4cbee7ab375d4f2
-SIZE (cvs2p4-1.3.3.tar) = 153600
+MD5 (cvs2p4-2.4.tar) = b90831dd257083c8316e2203262dbf1e
+SIZE (cvs2p4-2.4.tar) = 194560
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/cvs2p4/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	17 May 2002 21:47:37 -0000	1.2
+++ pkg-plist	1 Oct 2004 21:16:11 -0000
@@ -8,20 +8,24 @@
 cvs2p4/bin/genmetadata
 cvs2p4/bin/revmap
 cvs2p4/lib/util.pl
+cvs2p4/test/Attic/datefile,v
 cvs2p4/test/changes.good
 cvs2p4/test/config
+cvs2p4/test/datefile_readd,v
 cvs2p4/test/dollar$file,v
 cvs2p4/test/file,v
 cvs2p4/test/lines.good
 cvs2p4/test/metadata.good
 cvs2p4/test/norm
 cvs2p4/test/p4_changes_-l.good
+cvs2p4/test/p4_describe-new.good
 cvs2p4/test/p4_describe.good
-cvs2p4/test/p4_describe.good-r97.3
 cvs2p4/test/p4_filesat.good
 cvs2p4/test/p4_labels.good
+cvs2p4/test/phone.gif,v
 cvs2p4/test/runtest
 cvs2p4/test/space file,v
+ at dirrm cvs2p4/test/Attic
 @dirrm cvs2p4/test
 @dirrm cvs2p4/lib
 @dirrm cvs2p4/bin
Index: files/patch-config
===================================================================
RCS file: /home/ncvs/ports/devel/cvs2p4/files/patch-config,v
retrieving revision 1.1
diff -u -r1.1 patch-config
--- files/patch-config	1 Sep 2001 22:13:54 -0000	1.1
+++ files/patch-config	1 Oct 2004 21:16:11 -0000
@@ -1,5 +1,8 @@
---- test/config.orig	Tue Aug 28 07:48:21 2001
-+++ test/config	Sun Sep  2 07:07:23 2001
+
+$FreeBSD$
+
+--- test/config.orig	Wed Aug 27 23:35:53 2003
++++ test/config	Sat Oct  2 01:06:28 2004
 @@ -6,7 +6,7 @@
  
  # p4 command location (If other than "/usr/local/bin/p4")
@@ -7,23 +10,23 @@
 -$P4		= "/usr/local/bin/p4";
 +$P4		= "!!PREFIX!!/bin/p4";
  
- # path to the RCS "co" command
+ # p4 command location (If other than "/usr/local/bin/p4d")
  #
 @@ -14,7 +14,7 @@
  
  # Perforce server we're using.
  #
--$P4PORT = "localhost:1678";
-+$P4PORT = "localhost:!!PERFORCE_PORT!!";
+-$P4PORT = "localhost:1680";
++$P4PORT = "!!PERFORCE_PORT!!";
  
- # Perforce client name for the conversion client.
- # I can't imagine why you'd want to change this, but maybe you can!
-@@ -71,7 +71,7 @@
- 
- # Name of the "head" codeline
+ # Perforce server's P4ROOT
+ #
+@@ -99,7 +99,7 @@
+ # Perforce. But if that makes you nervous, you can set this to
+ # "trunk".
  #
 -$TRUNKLINE    	= "shemp";
 +$TRUNKLINE    	= "head";
  
  # Conventional branch tag name suffix to remove when importing to
- # Perforce. (This is a netapp specific thing; our branch tags are
+ # Perforce. (This is a netapp specific thing; our branch tags were
>Release-Note:
>Audit-Trail:
>Unformatted: