From yds@dppl.com  Sun Dec 14 04:53:01 2008
Return-Path: <yds@dppl.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E15C41065670
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Dec 2008 04:53:01 +0000 (UTC)
	(envelope-from yds@dppl.com)
Received: from orion.dppl.com (orion.dppl.biz [216.182.10.231])
	by mx1.freebsd.org (Postfix) with ESMTP id C2FB98FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Dec 2008 04:53:01 +0000 (UTC)
	(envelope-from yds@dppl.com)
Received: by orion.dppl.com (Postfix, from userid 1001)
	id 7A2C56432C46; Sat, 13 Dec 2008 23:36:02 -0500 (EST)
Message-Id: <20081214043602.7A2C56432C46@orion.dppl.com>
Date: Sat, 13 Dec 2008 23:36:02 -0500 (EST)
From: Yarema <yds@CoolRat.org>
Reply-To: Yarema <yds@CoolRat.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] upgrade devel/cvsps-devel to 2.2b1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         129624
>Category:       ports
>Synopsis:       [PATCH] upgrade devel/cvsps-devel to 2.2b1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 14 05:00:01 UTC 2008
>Closed-Date:    Sun Dec 14 07:27:38 UTC 2008
>Last-Modified:  Sun Dec 14 07:30:02 UTC 2008
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Dec 14 05:00:16 UTC 2008 
Responsible-Changed-Why:  
beech@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=129624 
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Sun Dec 14 07:27:23 UTC 2008 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=129624 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/129624: commit references a PR
Date: Sun, 14 Dec 2008 07:26:08 +0000 (UTC)

 beech       2008-12-14 07:25:54 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/cvsps-devel    Makefile distinfo 
     devel/cvsps-devel/files patch-cvsps.c 
   Log:
   - Upgrade to 2.2b1
   - Bring the Makefile in sync with the stable devel/cvsps port.
   - Fix CONFLICTS=
   
   PR:             ports/129624
   Submitted by:   Yarema <yds@CoolRat.org>
   
   Revision  Changes    Path
   1.12      +14 -4     ports/devel/cvsps-devel/Makefile
   1.8       +3 -3      ports/devel/cvsps-devel/distinfo
   1.2       +6 -7      ports/devel/cvsps-devel/files/patch-cvsps.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
