- Update to 3.1.

- Pass maintainer to submitter.

PR:		ports/135987
Submitted by:	Sylvio Cesar <scjamorim@bsd.com.br>

4 files changed, 19 insertions, 42 deletions

diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index 3b9435b0fc5..4ba301f468f 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	cvs2p4
-PORTVERSION=	2.5.5
+PORTVERSION=	3.1
 CATEGORIES+=	devel
-MASTER_SITES=	ftp://public.perforce.com/public/perforce/utils/cvs2p4/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	erwin
+MASTER_SITES=	ftp://public.perforce.com/public/perforce/utils/cvs2p4/
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	scjamorim@bsd.com.br
 COMMENT=	CVS to Perforce Converter
 
 REINPLACE_ARGS=	-i ""
@@ -27,7 +25,7 @@ post-patch:
 	@${REINPLACE_CMD} \
 		-e 's,!!PREFIX!!,${PREFIX},g;' \
 		-e 's,!!PERFORCE_PORT!!,${PERFORCE_PORT},g;' \
-		${WRKSRC}/test/config
+		${WRKSRC}/test/config.test
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
diff --git a/devel/cvs2p4/distinfo b/devel/cvs2p4/distinfo
index d2a03547b2c..91337b997de 100644
--- a/devel/cvs2p4/distinfo
+++ b/devel/cvs2p4/distinfo
@@ -1,3 +1,3 @@
-MD5 (cvs2p4-2.5.5.tar) = 91e58b2f36f09bd5d05e8bb4228e7add
-SHA256 (cvs2p4-2.5.5.tar) = 0aa89aaefe45d75a2f69359963061dbd77dba2e54c5d0d8541385cd264b478c0
-SIZE (cvs2p4-2.5.5.tar) = 204800
+MD5 (cvs2p4-3.1.tar) = b6c9e0edde16ba8d623ebb7cac91e83e
+SHA256 (cvs2p4-3.1.tar) = 0e6131c645246bbcdbb01fe95b9606fd1e6ec5320265aca1be3bee63da14f0d0
+SIZE (cvs2p4-3.1.tar) = 276480
diff --git a/devel/cvs2p4/files/patch-config b/devel/cvs2p4/files/patch-config
deleted file mode 100644
index 8f50a8d7fc1..00000000000
--- a/devel/cvs2p4/files/patch-config
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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")
- #
--$P4		= "/usr/local/bin/p4";
-+$P4		= "!!PREFIX!!/bin/p4";
- 
- # p4 command location (If other than "/usr/local/bin/p4d")
- #
-@@ -14,7 +14,7 @@
- 
- # Perforce server we're using.
- #
--$P4PORT = "localhost:1680";
-+$P4PORT = "!!PERFORCE_PORT!!";
- 
- # 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 were
diff --git a/devel/cvs2p4/pkg-plist b/devel/cvs2p4/pkg-plist
index 512096b59a5..00a090d023a 100644
--- a/devel/cvs2p4/pkg-plist
+++ b/devel/cvs2p4/pkg-plist
@@ -1,7 +1,8 @@
-cvs2p4/Artistic
 cvs2p4/MANIFEST
 cvs2p4/NEWS
 cvs2p4/README
+cvs2p4/config.tmpl
+cvs2p4/bin/cvs2p4
 cvs2p4/bin/dochanges
 cvs2p4/bin/dolabels
 cvs2p4/bin/genchanges
@@ -11,10 +12,13 @@ cvs2p4/bin/srcdiff
 cvs2p4/lib/util.pl
 cvs2p4/test/Attic/datefile,v
 cvs2p4/test/at@file,v
+cvs2p4/test/brmap.pl
 cvs2p4/test/changes.good
-cvs2p4/test/config
+cvs2p4/test/config.test
 cvs2p4/test/datefile_readd,v
 cvs2p4/test/dollar$file,v
+cvs2p4/test/exclude_branches
+cvs2p4/test/exclude_tags
 cvs2p4/test/file,v
 cvs2p4/test/lines.good
 cvs2p4/test/metadata.good
@@ -30,8 +34,12 @@ cvs2p4/test/pound#file,v
 cvs2p4/test/runtest
 cvs2p4/test/space file,v
 cvs2p4/test/star*file,v
+cvs2p4/src/rcs-5.7/src/rlog.c.patch
+@dirrm cvs2p4/bin
+@dirrm cvs2p4/lib
+@dirrm cvs2p4/src/rcs-5.7/src
+@dirrm cvs2p4/src/rcs-5.7
+@dirrm cvs2p4/src
 @dirrm cvs2p4/test/Attic
 @dirrm cvs2p4/test
-@dirrm cvs2p4/lib
-@dirrm cvs2p4/bin
 @dirrm cvs2p4