From nobody@FreeBSD.org  Wed May 11 12:21:59 2005
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 917E216A4D1
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 11 May 2005 12:21:59 +0000 (GMT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7FB5A43D1D
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 11 May 2005 12:21:59 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j4BCLx8u053708
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 11 May 2005 12:21:59 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id j4BCLxVe053707;
	Wed, 11 May 2005 12:21:59 GMT
	(envelope-from nobody)
Message-Id: <200505111221.j4BCLxVe053707@www.freebsd.org>
Date: Wed, 11 May 2005 12:21:59 GMT
From: Kay Abendroth <kay.abendroth@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: cvs2svn update to 1.2.1
X-Send-Pr-Version: www-2.3

>Number:         80891
>Category:       ports
>Synopsis:       cvs2svn update to 1.2.1
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 11 12:30:22 GMT 2005
>Closed-Date:    Fri Jun 10 19:48:17 GMT 2005
>Last-Modified:  Fri Jun 10 19:48:17 GMT 2005
>Originator:     Kay Abendroth
>Release:        5.4-Stable
>Organization:
>Environment:
FreeBSD susi.redhill.net 5.4-STABLE FreeBSD 5.4-STABLE #0: Wed Apr 20 12:24:59 UTC 2005     root@susi.redhill.net:/usr/obj/usr/src/sys/SUSI  i386
>Description:
Fix cvs2svn's dumpfile output to work after Subversion's r12645 (means Subversion release 1.1.3+).
>How-To-Repeat:

>Fix:
--- /usr/ports/devel/cvs2svn/Makefile   Sat Feb  5 02:56:46 2005
+++ cvs2svn/Makefile    Wed May 11 12:08:19 2005
@@ -5,9 +5,9 @@
 # $FreeBSD: ports/devel/cvs2svn/Makefile,v 1.5 2005/02/02 16:40:59 clsung Exp $

 PORTNAME=      cvs2svn
-PORTVERSION=   1.2.0
+PORTVERSION=   1.2.1
 CATEGORIES=    devel
-MASTER_SITES=  http://cvs2svn.tigris.org/files/documents/1462/19743/
+MASTER_SITES=  http://cvs2svn.tigris.org/files/documents/1462/20727/

 MAINTAINER=    jihuang@gate.sinica.edu.tw
 COMMENT=       CVS to Subversion Repository Converter
diff -u /usr/ports/devel/cvs2svn/distinfo cvs2svn/distinfo
--- /usr/ports/devel/cvs2svn/distinfo   Sat Feb  5 02:56:46 2005
+++ cvs2svn/distinfo    Wed May 11 12:16:07 2005
@@ -1,2 +1,2 @@
-MD5 (cvs2svn-1.2.0.tar.gz) = 82f7ecff709eec624214accba64847e3
-SIZE (cvs2svn-1.2.0.tar.gz) = 205317
+MD5 (cvs2svn-1.2.1.tar.gz) = 6769d039bea9c6c468402d1e6cbc38e0
+SIZE (cvs2svn-1.2.1.tar.gz) = 205214
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: thierry 
State-Changed-When: Wed May 11 20:20:41 GMT 2005 
State-Changed-Why:  

Asking for maintainer's approval. 

Note: the submitted patch does not apply cleanly, because tabs 
have been replaced by spaces; please consider the following one. 

--- cvs2svn.diff begins here --- 
diff -urN devel/cvs2svn.orig/Makefile devel/cvs2svn/Makefile 
--- devel/cvs2svn.orig/Makefile	Sat Feb  5 16:00:50 2005 
+++ devel/cvs2svn/Makefile	Wed May 11 22:13:47 2005 
@@ -5,9 +5,9 @@ 
# $FreeBSD: ports/devel/cvs2svn/Makefile,v 1.5 2005/02/02 16:40:59 clsung Exp $ 

PORTNAME=	cvs2svn 
-PORTVERSION=	1.2.0 
+PORTVERSION=	1.2.1 
CATEGORIES=	devel 
-MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/19743/ 
+MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/20727/ 

MAINTAINER=	jihuang@gate.sinica.edu.tw 
COMMENT=	CVS to Subversion Repository Converter 
diff -urN devel/cvs2svn.orig/distinfo devel/cvs2svn/distinfo 
--- devel/cvs2svn.orig/distinfo	Sat Feb  5 16:00:50 2005 
+++ devel/cvs2svn/distinfo	Wed May 11 22:12:23 2005 
@@ -1,2 +1,2 @@ 
-MD5 (cvs2svn-1.2.0.tar.gz) = 82f7ecff709eec624214accba64847e3 
-SIZE (cvs2svn-1.2.0.tar.gz) = 205317 
+MD5 (cvs2svn-1.2.1.tar.gz) = 6769d039bea9c6c468402d1e6cbc38e0 
+SIZE (cvs2svn-1.2.1.tar.gz) = 205214 
--- cvs2svn.diff ends here --- 



Responsible-Changed-From-To: freebsd-ports-bugs->thierry 
Responsible-Changed-By: thierry 
Responsible-Changed-When: Wed May 11 20:20:41 GMT 2005 
Responsible-Changed-Why:  

Take it. 


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

From: Kay Abendroth <kay.abendroth@gmail.com>
To: bug-followup@FreeBSD.org, kay.abendroth@gmail.com
Cc:  
Subject: Re: ports/80891: cvs2svn update to 1.2.1
Date: Thu, 12 May 2005 11:43:35 +0200

 The second patch doesn't work for me. Assuming patch-file is in
 /usr/ports, the command 'patch < cvs2svn.diff' produces this output:
 
 Hmm...  Looks like a unified diff to me...
 The text leading up to this was:
 --------------------------
 |diff -urN devel/cvs2svn.orig/Makefile devel/cvs2svn/Makefile
 |--- devel/cvs2svn.orig/Makefile        Sat Feb  5 16:00:50 2005
 |+++ devel/cvs2svn/Makefile     Wed May 11 22:13:47 2005
 --------------------------
 Patching file devel/cvs2svn/Makefile using Plan A...
 patch: **** malformed patch at line 5: # $FreeBSD:
 ports/devel/cvs2svn/Makefile,v 1.5 2005/02/02 16:40:59 clsung Exp $

From: Thierry Thomas <thierry@FreeBSD.org>
To: Kay Abendroth <kay.abendroth@gmail.com>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/80891: cvs2svn update to 1.2.1
Date: Thu, 12 May 2005 18:45:13 +0200

 Le Jeu 12 mai 05  11:50:06 +0200, Kay Abendroth <kay.abendroth@gmail.com>
  crivait:
 > The following reply was made to PR ports/80891; it has been noted by GNATS.
 > 
 > From: Kay Abendroth <kay.abendroth@gmail.com>
 > To: bug-followup@FreeBSD.org, kay.abendroth@gmail.com
 > Cc:  
 > Subject: Re: ports/80891: cvs2svn update to 1.2.1
 > Date: Thu, 12 May 2005 11:43:35 +0200
 > 
 >  The second patch doesn't work for me. Assuming patch-file is in
 >  /usr/ports, the command 'patch < cvs2svn.diff' produces this output:
 >  
 >  Hmm...  Looks like a unified diff to me...
 >  The text leading up to this was:
 >  --------------------------
 >  |diff -urN devel/cvs2svn.orig/Makefile devel/cvs2svn/Makefile
 >  |--- devel/cvs2svn.orig/Makefile        Sat Feb  5 16:00:50 2005
 >  |+++ devel/cvs2svn/Makefile     Wed May 11 22:13:47 2005
 >  --------------------------
 >  Patching file devel/cvs2svn/Makefile using Plan A...
 >  patch: **** malformed patch at line 5: # $FreeBSD:
 >  ports/devel/cvs2svn/Makefile,v 1.5 2005/02/02 16:40:59 clsung Exp $
 
 If it is located in /usr/ports, you have to enter
 `patch -p0 < cvs2svn.diff'
 
 Regards,
 -- 
 Th. Thomas.

From: Kay Abendroth <kay.abendroth@gmail.com>
To: bug-followup@freebsd.org, kay.abendroth@gmail.com
Cc:  
Subject: Re: ports/80891: cvs2svn update to 1.2.1
Date: Tue, 17 May 2005 15:36:13 +0200

 For me only the following works (assuming I'm in /usr/ports executing
 'patch < file'). There was no difference between 'patch -p0 ...' and
 'patch ...'. I think the problem with Thierrys patch are the missing
 spaces before (for example) 'PORTNAME=3D ...' and so on.
 
 
 diff -urN devel/cvs2svn.orig/Makefile devel/cvs2svn/Makefile
 --- devel/cvs2svn.orig/Makefile Thu May 12 09:08:39 2005
 +++ devel/cvs2svn/Makefile      Tue May 17 12:58:18 2005
 @@ -5,9 +5,9 @@
  # $FreeBSD: ports/devel/cvs2svn/Makefile,v 1.5 2005/02/02 16:40:59 clsung =
 Exp $
 
  PORTNAME=3D      cvs2svn
 -PORTVERSION=3D   1.2.0
 +PORTVERSION=3D   1.2.1
  CATEGORIES=3D    devel
 -MASTER_SITES=3D  http://cvs2svn.tigris.org/files/documents/1462/19743/
 +MASTER_SITES=3D  http://cvs2svn.tigris.org/files/documents/1462/20727/
 
  MAINTAINER=3D    jihuang@gate.sinica.edu.tw
  COMMENT=3D       CVS to Subversion Repository Converter
 diff -urN devel/cvs2svn.orig/distinfo devel/cvs2svn/distinfo
 --- devel/cvs2svn.orig/distinfo Thu May 12 09:08:39 2005
 +++ devel/cvs2svn/distinfo      Tue May 17 12:57:19 2005
 @@ -1,2 +1,2 @@
 -MD5 (cvs2svn-1.2.0.tar.gz) =3D 82f7ecff709eec624214accba64847e3
 -SIZE (cvs2svn-1.2.0.tar.gz) =3D 205317
 +MD5 (cvs2svn-1.2.1.tar.gz) =3D 6769d039bea9c6c468402d1e6cbc38e0
 +SIZE (cvs2svn-1.2.1.tar.gz) =3D 205214

From: Kay Abendroth <kay.abendroth@gmail.com>
To: bug-followup@FreeBSD.org, kay.abendroth@gmail.com
Cc:  
Subject: Re: ports/80891: cvs2svn update to 1.2.1
Date: Tue, 17 May 2005 16:07:21 +0200

 My last patch is bogus because of the bad formatting (gmail-webfrontend).

From: Kay Abendroth <kay.abendroth@gmail.com>
To: bug-followup@FreeBSD.org, kay.abendroth@gmail.com
Cc:  
Subject: Re: ports/80891: cvs2svn update to 1.2.1
Date: Wed, 18 May 2005 16:49:28 +0200

 This one is really clean and works fine:
 http://www.wsc.biz/patches/cvs2svn.patch
 
 
 Kay
State-Changed-From-To: feedback->closed 
State-Changed-By: thierry 
State-Changed-When: Fri Jun 10 19:47:56 GMT 2005 
State-Changed-Why:  

Committed, thanks! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=80891 
>Unformatted:
