From 94d15e982868a6fa1c358a1582ee5138b45f1cd6 Mon Sep 17 00:00:00 2001
From: christos <christos@pkgsrc.org>
Date: Fri, 29 Jun 2012 14:59:24 +0000
Subject: Make this work with our cvs which prints out an extra line in version
 because of the cvsacl patch.

---
 devel/cvsps/Makefile         |  4 ++--
 devel/cvsps/distinfo         |  3 ++-
 devel/cvsps/patches/patch-ag | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 devel/cvsps/patches/patch-ag

diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index 684bbb81bab..2a6c94e2f9b 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2012/03/09 12:49:25 fhajny Exp $
+# $NetBSD: Makefile,v 1.24 2012/06/29 14:59:24 christos Exp $
 #
 
 DISTNAME=	cvsps-2.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel scm
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/devel/cvsps/distinfo b/devel/cvsps/distinfo
index 8a72df0bfe6..96182f64114 100644
--- a/devel/cvsps/distinfo
+++ b/devel/cvsps/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/03/09 12:49:25 fhajny Exp $
+$NetBSD: distinfo,v 1.12 2012/06/29 14:59:24 christos Exp $
 
 SHA1 (cvsps-2.1.tar.gz) = a53a62b121e7b86e07a393bcb8aa4f0492a747c4
 RMD160 (cvsps-2.1.tar.gz) = a3063f638fbf1136761549658432d5842e4a766f
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = 07f6d1955c0fde42784f8891b1136f12fa5dbfa4
 SHA1 (patch-ad) = 20d84dc236a5c259677fdf68268de5bb64e6d26f
 SHA1 (patch-ae) = 345036b4021f90a2f6629a5d32e85caa786d961f
 SHA1 (patch-af) = d32eb67ede1d81ee3abe55a7f94515fcf3ea93cf
+SHA1 (patch-ag) = 38ea212acde5e07aee33413c79f893e311ebb85e
diff --git a/devel/cvsps/patches/patch-ag b/devel/cvsps/patches/patch-ag
new file mode 100644
index 00000000000..abc5dcabf82
--- /dev/null
+++ b/devel/cvsps/patches/patch-ag
@@ -0,0 +1,15 @@
+$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");
+ 
-- 
cgit v1.2.3