ports/135987: [PATCH] devel/cvs2p4: update to 3.1

[Sylvio Cesar]

>Number:         135987
>Category:       ports
>Synopsis:       [PATCH] devel/cvs2p4: update to 3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 24 02:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Sylvio Cesar
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD freecontrib.vida.br 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Fri May  1 08:49:13 UTC
>Description:
- Update to 3.1
- Take maintainership

Removed file(s):
- files/patch-config

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- cvs2p4-3.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/cvs2p4/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- Makefile	12 Aug 2006 08:34:40 -0000	1.13
+++ Makefile	24 Jun 2009 02:15:19 -0000
@@ -6,14 +6,14 @@
 #
 
 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
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	scjamorim at bsd.com.br
 COMMENT=	CVS to Perforce Converter
 
 REINPLACE_ARGS=	-i ""
@@ -27,7 +27,7 @@
 	@${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
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/cvs2p4/distinfo,v
retrieving revision 1.7
diff -u -u -r1.7 distinfo
--- distinfo	24 Jul 2006 12:54:37 -0000	1.7
+++ distinfo	24 Jun 2009 02:15:19 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/cvs2p4/pkg-plist,v
retrieving revision 1.4
diff -u -u -r1.4 pkg-plist
--- pkg-plist	24 Jul 2006 12:54:37 -0000	1.4
+++ pkg-plist	24 Jun 2009 02:15:19 -0000
@@ -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/lib/util.pl
 cvs2p4/test/Attic/datefile,v
 cvs2p4/test/at 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/runtest
 cvs2p4/test/space file,v
 cvs2p4/test/star*file,v
+cvs2p4/src/rcs-5.7/src/rlog.c.patch
+ at dirrm cvs2p4/bin
+ at dirrm cvs2p4/lib
+ at dirrm cvs2p4/src/rcs-5.7/src
+ at dirrm cvs2p4/src/rcs-5.7
+ at dirrm cvs2p4/src
 @dirrm cvs2p4/test/Attic
 @dirrm cvs2p4/test
- at dirrm cvs2p4/lib
- at dirrm cvs2p4/bin
 @dirrm cvs2p4
Index: files/patch-config
===================================================================
RCS file: files/patch-config
diff -N files/patch-config
--- files/patch-config	11 Oct 2004 22:38:14 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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
--- cvs2p4-3.1.patch ends here ---

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