- Update to 2.4

PR:		ports/72242
Submitted by:	marck

4 files changed, 19 insertions, 15 deletions

diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index a59732fc9773..44a14eacd99c 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -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
diff --git a/devel/cvs2p4/distinfo b/devel/cvs2p4/distinfo
index 71b986611c1b..54c7c965606d 100644
--- a/devel/cvs2p4/distinfo
+++ b/devel/cvs2p4/distinfo
@@ -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
diff --git a/devel/cvs2p4/files/patch-config b/devel/cvs2p4/files/patch-config
index ef042b94d85b..8f50a8d7fc14 100644
--- a/devel/cvs2p4/files/patch-config
+++ b/devel/cvs2p4/files/patch-config
@@ -1,5 +1,5 @@
---- test/config.orig	Tue Aug 28 07:48:21 2001
-+++ test/config	Sun Sep  2 07:07:23 2001
+--- 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 +7,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
diff --git a/devel/cvs2p4/pkg-plist b/devel/cvs2p4/pkg-plist
index c29284b3bb93..a5b20ef6461a 100644
--- a/devel/cvs2p4/pkg-plist
+++ b/devel/cvs2p4/pkg-plist
@@ -8,20 +8,24 @@ cvs2p4/bin/genchanges
 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
+@dirrm cvs2p4/test/Attic
 @dirrm cvs2p4/test
 @dirrm cvs2p4/lib
 @dirrm cvs2p4/bin