ports/129624: [PATCH] upgrade devel/cvsps-devel to 2.2b1

[Yarema]

>Number:         129624
>Category:       ports
>Synopsis:       [PATCH] upgrade devel/cvsps-devel to 2.2b1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 14 05:00:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Yarema
>Release:        FreeBSD 6.4-STABLE amd64
>Organization:
NYCBUG.org
>Environment:
System:	FreeBSD 6.4-STABLE amd64
	FreeBSD 7.1-PRERELEASE amd64

>Description:
Upgrade devel/cvsps-devel to 2.2b1
Bring the Makefile in sync with the stable devel/cvsps port.
Fix CONFLICTS=
>How-To-Repeat:
	cd devel/cvsps-devel && make install
>Fix:
diff -u -r -N cvsps-devel~/Makefile cvsps-devel/Makefile
--- cvsps-devel~/Makefile	2005-07-31 07:56:56.000000000 -0400
+++ cvsps-devel/Makefile	2008-12-13 23:03:57.375491016 -0500
@@ -7,23 +7,33 @@
 #
 
 PORTNAME=	cvsps
-DISTVERSION=	2.1
+DISTVERSION=	2.2b1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cobite.com/cvsps/
 PKGNAMESUFFIX?=	-devel
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	CVS patchsets
-
-CONFLICTS=	cvsps-1.*
+COMMENT=	Create patchset information from CVS
 
 USE_GMAKE=	yes
+ALL_TARGET=	cvsps
+
+CONFLICTS=	cvsps-[12].[01]*
 
 MAN1=		cvsps.1
 PLIST_FILES=	bin/cvsps
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvsps ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cvsps.1 ${MANPREFIX}/man/man1
 
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff -u -r -N cvsps-devel~/distinfo cvsps-devel/distinfo
--- cvsps-devel~/distinfo	2005-11-25 03:13:10.000000000 -0500
+++ cvsps-devel/distinfo	2008-12-13 23:04:47.587097142 -0500
@@ -1,3 +1,3 @@
-MD5 (cvsps-2.1.tar.gz) = bde2110ed9f5d14de8f8cb04e9d596fe
-SHA256 (cvsps-2.1.tar.gz) = 91d3198b33463861a581686d5fcf99a5c484e7c4d819384c04fda9cafec1075a
-SIZE (cvsps-2.1.tar.gz) = 61634
+MD5 (cvsps-2.2b1.tar.gz) = 997580e8e283034995b9209076858c68
+SHA256 (cvsps-2.2b1.tar.gz) = 6906acb3636cdb4a4a9d608111aec22a85530037cb08a62ed5eb74ca0b218f81
+SIZE (cvsps-2.2b1.tar.gz) = 62763
diff -u -r -N cvsps-devel~/files/patch-cvsps.c cvsps-devel/files/patch-cvsps.c
--- cvsps-devel~/files/patch-cvsps.c	2005-07-31 00:28:51.000000000 -0400
+++ cvsps-devel/files/patch-cvsps.c	2008-04-01 21:18:44.000000000 -0400
@@ -1,13 +1,12 @@
---- cvsps.c.orig	Sun Jul 31 13:23:28 2005
-+++ cvsps.c	Sun Jul 31 13:23:36 2005
-@@ -2550,9 +2550,9 @@
- 
+--- cvsps.c.orig	2008-04-01 21:18:44.000000000 -0400
++++ cvsps.c	2008-04-01 21:18:44.000000000 -0400
+@@ -2575,8 +2575,8 @@
      for (next = ps->members.next; next != &ps->members; next = next->next) 
      {
-+	int d1, d2;
  	PatchSetMember * psm = list_entry(next, PatchSetMember, link);
- 	rev = psm->pre_rev;
--	int d1, d2;
+-	rev = psm->pre_rev;
+ 	int d1, d2;
++	rev = psm->pre_rev;
  
  	/* the reason this is at all complicated has to do with a 
  	 * branch off of a branch.  it is possible (and indeed 
>Release-Note:
>Audit-Trail:
>Unformatted: