Fri Jun 29 14:59:24 2012 UTC ()
Make this work with our cvs which prints out an extra line in version
because of the cvsacl patch.


(christos)
diff -r1.23 -r1.24 pkgsrc/devel/cvsps/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/cvsps/distinfo
diff -r0 -r1.1 pkgsrc/devel/cvsps/patches/patch-ag
cvs diff -r1.23 -r1.24 pkgsrc/devel/cvsps/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cvsps/Makefile 2012/03/09 12:49:25 1.23
+++ pkgsrc/devel/cvsps/Makefile 2012/06/29 14:59:24 1.24
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.23 2012/03/09 12:49:25 fhajny Exp $ 1# $NetBSD: Makefile,v 1.24 2012/06/29 14:59:24 christos Exp $
2# 2#
3 3
4DISTNAME= cvsps-2.1 4DISTNAME= cvsps-2.1
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= devel scm 6CATEGORIES= devel scm
7MASTER_SITES= ${HOMEPAGE} 7MASTER_SITES= ${HOMEPAGE}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://www.cobite.com/cvsps/ 10HOMEPAGE= http://www.cobite.com/cvsps/
11COMMENT= Generates 'patchset' information from a CVS repository 11COMMENT= Generates 'patchset' information from a CVS repository
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18 18
cvs diff -r1.11 -r1.12 pkgsrc/devel/cvsps/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cvsps/distinfo 2012/03/09 12:49:25 1.11
+++ pkgsrc/devel/cvsps/distinfo 2012/06/29 14:59:24 1.12
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.11 2012/03/09 12:49:25 fhajny Exp $ 1$NetBSD: distinfo,v 1.12 2012/06/29 14:59:24 christos Exp $
2 2
3SHA1 (cvsps-2.1.tar.gz) = a53a62b121e7b86e07a393bcb8aa4f0492a747c4 3SHA1 (cvsps-2.1.tar.gz) = a53a62b121e7b86e07a393bcb8aa4f0492a747c4
4RMD160 (cvsps-2.1.tar.gz) = a3063f638fbf1136761549658432d5842e4a766f 4RMD160 (cvsps-2.1.tar.gz) = a3063f638fbf1136761549658432d5842e4a766f
5Size (cvsps-2.1.tar.gz) = 61634 bytes 5Size (cvsps-2.1.tar.gz) = 61634 bytes
6SHA1 (patch-aa) = fae6fe786c59ba7ea5ef5c8d14838558fd1a014f 6SHA1 (patch-aa) = fae6fe786c59ba7ea5ef5c8d14838558fd1a014f
7SHA1 (patch-ab) = c9357a01388a9631ba960661183981bb31cbf53b 7SHA1 (patch-ab) = c9357a01388a9631ba960661183981bb31cbf53b
8SHA1 (patch-ac) = 07f6d1955c0fde42784f8891b1136f12fa5dbfa4 8SHA1 (patch-ac) = 07f6d1955c0fde42784f8891b1136f12fa5dbfa4
9SHA1 (patch-ad) = 20d84dc236a5c259677fdf68268de5bb64e6d26f 9SHA1 (patch-ad) = 20d84dc236a5c259677fdf68268de5bb64e6d26f
10SHA1 (patch-ae) = 345036b4021f90a2f6629a5d32e85caa786d961f 10SHA1 (patch-ae) = 345036b4021f90a2f6629a5d32e85caa786d961f
11SHA1 (patch-af) = d32eb67ede1d81ee3abe55a7f94515fcf3ea93cf 11SHA1 (patch-af) = d32eb67ede1d81ee3abe55a7f94515fcf3ea93cf
 12SHA1 (patch-ag) = 38ea212acde5e07aee33413c79f893e311ebb85e
File Added: pkgsrc/devel/cvsps/patches/patch-ag
$NetBSD: patch-ag,v 1.1 2012/06/29 14:59:24 christos Exp $

--- cvs_direct.c.orig	2012-06-28 17:52:13.000000000 -0400
+++ cvs_direct.c	2012-06-28 17:52:51.000000000 -0400
@@ -916,7 +916,9 @@
     else
 	debug(DEBUG_APPERROR, "cvs_direct: didn't read version: %s", lbuff);
     
-    read_line(ctx, lbuff);
+    do
+	read_line(ctx, lbuff);
+    while(memcmp(lbuff, "M ", 2) == 0);
     if (strcmp(lbuff, "ok") != 0)
 	debug(DEBUG_APPERROR, "cvs_direct: protocol error reading version");