Fix some of the patches - some RCS IDs did sneak in!

Need a smarter pkgdiff...!

 - Hubert

4 files changed, 18 insertions, 37 deletions

diff --git a/devel/cscope/files/patch-sum b/devel/cscope/files/patch-sum
index 549dea68493..281caf55654 100644
--- a/devel/cscope/files/patch-sum
+++ b/devel/cscope/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.5 2000/05/04 01:33:06 hubertf Exp $
+$NetBSD: patch-sum,v 1.6 2000/05/14 00:18:55 hubertf Exp $
 
 MD5 (patch-aa) = a3f15eb905a452d56a6b2a5b0497f0ca
-MD5 (patch-ab) = 7b7b70e3659e9849c7fd9a650d1651cc
-MD5 (patch-ac) = 512edfdb86a54e83c2353ef95d80678f
+MD5 (patch-ab) = 17d194d42f78eefbc9eac7112ecc349f
+MD5 (patch-ac) = b394402845ddc120b8cb9e75e057c32e
 MD5 (patch-ad) = a28e9d509e3c5355d7dfbe82df530321
 MD5 (patch-ae) = 449e1af676d0be2a7c4355e861faedc3
-MD5 (patch-af) = f7b03c2e3da1847634fa70a32533b380
+MD5 (patch-af) = 46df217b173afddc9b3552b3c43bf0d0
 MD5 (patch-ag) = a7a6697f49b38c3edb3047da334cfbd4
 MD5 (patch-ah) = 22590011e777ce58f05e7ddc85183bb3
 MD5 (patch-ai) = b7903852c8c30264b7d1fc1bee4cc995
diff --git a/devel/cscope/patches/patch-ab b/devel/cscope/patches/patch-ab
index 10438ca3731..9f3e7fd9bcf 100644
--- a/devel/cscope/patches/patch-ab
+++ b/devel/cscope/patches/patch-ab
@@ -1,23 +1,14 @@
-$NetBSD: patch-ab,v 1.2 2000/05/04 01:33:06 hubertf Exp $
+$NetBSD: patch-ab,v 1.3 2000/05/14 00:18:55 hubertf Exp $
 
-diff -x *.orig -urN ./common/display.c /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/display.c
---- ./common/display.c	Tue Apr 18 03:39:04 2000
-+++ /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/display.c	Thu May  4 03:24:28 2000
-@@ -43,6 +43,9 @@
- #endif
- #include <curses.h>	/* LINES, COLS */
+--- common/display.c.orig	Tue Apr 18 03:39:04 2000
++++ common/display.c	Sun May 14 01:05:37 2000
+@@ -45,2 +45,5 @@
  #include <setjmp.h>	/* jmp_buf */
 +#ifdef __NetBSD__
 +#include <errno.h>
 +#endif
  
- static char const rcsid[] = "$Id: patch-ab,v 1.2 2000/05/04 01:33:06 hubertf Exp $";
- 
-@@ -515,7 +518,6 @@
- 	static	long	start;
- 	long	now;
+@@ -517,3 +520,2 @@
  	char	msg[MSGLEN + 1];
 -	long	time();
  
- 	/* save the start time */
- 	if (searchcount == 0) {
diff --git a/devel/cscope/patches/patch-ac b/devel/cscope/patches/patch-ac
index d5becc114c6..f1522abba35 100644
--- a/devel/cscope/patches/patch-ac
+++ b/devel/cscope/patches/patch-ac
@@ -1,10 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2000/05/04 01:33:07 hubertf Exp $
+$NetBSD: patch-ac,v 1.3 2000/05/14 00:18:56 hubertf Exp $
 
-diff -x *.orig -urN ./common/exec.c /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/exec.c
---- ./common/exec.c	Tue Apr 18 03:39:45 2000
-+++ /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/exec.c	Thu May  4 03:24:27 2000
-@@ -37,7 +37,11 @@
- 
+--- common/exec.c.orig	Tue Apr 18 03:39:45 2000
++++ common/exec.c	Sun May 14 01:08:16 2000
+@@ -38,5 +38,9 @@
  #include "global.h"
  #include <stdarg.h>
 +#ifdef __NetBSD__
@@ -14,9 +12,7 @@ diff -x *.orig -urN ./common/exec.c /disk1/cvs/pkgsrc/devel/cscope/work.i386.unp
 +#endif
  #include <curses.h>
  
- static char const rcsid[] = "$Id: patch-ac,v 1.2 2000/05/04 01:33:07 hubertf Exp $";
-@@ -46,7 +50,9 @@
- static	SIGTYPE	(*oldsighup)();		/* old value of hangup signal */
+@@ -47,5 +51,7 @@
  static	SIGTYPE	(*oldsigstp)();
  
 +#ifndef __NetBSD__
@@ -24,4 +20,3 @@ diff -x *.orig -urN ./common/exec.c /disk1/cvs/pkgsrc/devel/cscope/work.i386.unp
 +#endif
  static	int	join(), myexecvp();
  static	pid_t	myfork();
- 
diff --git a/devel/cscope/patches/patch-af b/devel/cscope/patches/patch-af
index cf505c62828..12475efa55e 100644
--- a/devel/cscope/patches/patch-af
+++ b/devel/cscope/patches/patch-af
@@ -1,15 +1,10 @@
-$NetBSD: patch-af,v 1.1 2000/05/04 01:33:07 hubertf Exp $
+$NetBSD: patch-af,v 1.2 2000/05/14 00:18:56 hubertf Exp $
 
-diff -x *.orig -urN ./common/input.c /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/input.c
---- ./common/input.c	Tue Apr 18 03:40:44 2000
-+++ /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/input.c	Thu May  4 03:24:27 2000
-@@ -38,6 +38,9 @@
- #include "global.h"
- #include <curses.h>
+--- common/input.c.orig	Tue Apr 18 03:40:44 2000
++++ common/input.c	Sun May 14 01:09:36 2000
+@@ -40,2 +40,5 @@
  #include <setjmp.h>	/* jmp_buf */
 +#ifdef __NetBSD__
 +#include <termios.h>
 +#endif
  
- static char const rcsid[] = "$Id: patch-af,v 1.1 2000/05/04 01:33:07 hubertf Exp $";
-