* split

 * don't change the name of cbreak to crmode if sun is not defined

Hint by Brett Lymn <blymn@baesystems.com.au>, sent to me by Thomas
Klausner.

10 files changed, 180 insertions, 210 deletions

diff --git a/devel/cscope/files/patch-sum b/devel/cscope/files/patch-sum
index 0f765eeceae..549dea68493 100644
--- a/devel/cscope/files/patch-sum
+++ b/devel/cscope/files/patch-sum
@@ -1,5 +1,11 @@
-$NetBSD: patch-sum,v 1.4 2000/04/21 08:52:48 bouyer Exp $
+$NetBSD: patch-sum,v 1.5 2000/05/04 01:33:06 hubertf Exp $
 
-MD5 (patch-aa) = a31d0594546056807b99b3e3a6254ba2
-MD5 (patch-ab) = 0e72f5a165347ec7905048af27ec943b
-MD5 (patch-ac) = 852f5f59a5240936cefa79e94dde6fd3
+MD5 (patch-aa) = a3f15eb905a452d56a6b2a5b0497f0ca
+MD5 (patch-ab) = 7b7b70e3659e9849c7fd9a650d1651cc
+MD5 (patch-ac) = 512edfdb86a54e83c2353ef95d80678f
+MD5 (patch-ad) = a28e9d509e3c5355d7dfbe82df530321
+MD5 (patch-ae) = 449e1af676d0be2a7c4355e861faedc3
+MD5 (patch-af) = f7b03c2e3da1847634fa70a32533b380
+MD5 (patch-ag) = a7a6697f49b38c3edb3047da334cfbd4
+MD5 (patch-ah) = 22590011e777ce58f05e7ddc85183bb3
+MD5 (patch-ai) = b7903852c8c30264b7d1fc1bee4cc995
diff --git a/devel/cscope/patches/patch-aa b/devel/cscope/patches/patch-aa
index cad4a702647..50c1fc4eead 100644
--- a/devel/cscope/patches/patch-aa
+++ b/devel/cscope/patches/patch-aa
@@ -1,12 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2000/04/21 08:52:49 bouyer Exp $
-Index: common/constants.h
-===================================================================
-RCS file: /cvsroot/cscope/cscope/common/constants.h,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 constants.h
---- common/constants.h	2000/04/18 13:16:41	1.1.1.1
-+++ common/constants.h	2000/04/20 06:59:58
-@@ -127,19 +127,22 @@
+$NetBSD: patch-aa,v 1.4 2000/05/04 01:33:06 hubertf Exp $
+
+--- common/constants.h.orig	Tue Apr 18 03:38:29 2000
++++ common/constants.h	Thu May  4 03:25:23 2000
+@@ -127,19 +127,24 @@
  #endif
  
  #if !TERMINFO
@@ -16,9 +12,11 @@ diff -u -r1.1.1.1 constants.h
  #define	KEY_BACKSPACE	0402
 -
 +#endif
++#ifndef __NetBSD__
  #if !sun
  #define cbreak()	crmode()			/* name change */
  #endif
++#endif
  
 +#ifndef __NetBSD__
  #if UNIXPC
@@ -30,153 +28,3 @@ diff -u -r1.1.1.1 constants.h
 +#endif
  #endif
  #endif
-Index: common/display.c
-===================================================================
-RCS file: /cvsroot/cscope/cscope/common/display.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 display.c
---- common/display.c	2000/04/18 13:16:42	1.1.1.1
-+++ common/display.c	2000/04/20 06:59:58
-@@ -43,4 +43,7 @@
- #endif
- #include <curses.h>	/* LINES, COLS */
- #include <setjmp.h>	/* jmp_buf */
-+#ifdef __NetBSD__
-+#include <errno.h>
-+#endif
- 
-Index: common/exec.c
-===================================================================
-RCS file: /cvsroot/cscope/cscope/common/exec.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 exec.c
---- common/exec.c	2000/04/18 13:16:42	1.1.1.1
-+++ common/exec.c	2000/04/20 06:59:59
-@@ -37,6 +37,10 @@
- 
- #include "global.h"
- #include <stdarg.h>
-+#ifdef __NetBSD__
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- #include <curses.h>
- 
-@@ -46,7 +50,9 @@
- static	SIGTYPE	(*oldsighup)();		/* old value of hangup signal */
- static	SIGTYPE	(*oldsigstp)();
- 
-+#ifndef __NetBSD__
- typedef int	pid_t;
-+#endif
- static	int	join(), myexecvp();
- static	pid_t	myfork();
- 
-Index: common/global.h
-===================================================================
-RCS file: /cvsroot/cscope/cscope/common/global.h,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 global.h
---- common/global.h	2000/04/18 13:16:43	1.1.1.1
-+++ common/global.h	2000/04/20 06:59:59
-@@ -46,10 +46,14 @@
- #include "invlib.h"	/* inverted index library */
- #include "library.h"	/* library function return values */
- 
-+#ifdef __NetBSD__
-+#define SIGTYPE void
-+#else
- #if SVR2 || BSD && !sun
- #define SIGTYPE int
- #else
- #define SIGTYPE void
-+#endif
- #endif
- 
- typedef	enum	{		/* boolean data type */
-Index: common/help.c
-===================================================================
-RCS file: /cvsroot/cscope/cscope/common/help.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 help.c
---- common/help.c	2000/04/18 13:16:43	1.1.1.1
-+++ common/help.c	2000/04/20 06:59:59
-@@ -132,6 +132,7 @@
- 					++ln;
- 				}
- 			}
-+			move(ln, 0);
- 			(void) addstr(*tp++);
- 		}
- 		else {
-Index: common/input.c
-===================================================================
-RCS file: /cvsroot/cscope/cscope/common/input.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 input.c
---- common/input.c	2000/04/18 13:16:43	1.1.1.1
-+++ common/input.c	2000/04/20 06:59:59
-@@ -38,4 +38,7 @@
- #include "global.h"
- #include <curses.h>
- #include <setjmp.h>	/* jmp_buf */
-+#ifdef __NetBSD__
-+#include <termios.h>
-+#endif
- 
-Index: common/library.h
-===================================================================
-RCS file: /cvsroot/cscope/cscope/common/library.h,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 library.h
---- common/library.h	2000/04/18 13:16:43	1.1.1.1
-+++ common/library.h	2000/04/20 06:59:59
-@@ -53,7 +53,12 @@
- char	*ctime(), *getcwd(), *getenv(), *mktemp();
- char	*strcat(), *strcpy(), *strncpy(), *strpbrk(), *strchr(), *strrchr();
- char	*strtok();
--long	lseek(), time();
-+#if BSD
-+off_t	lseek();
-+time_t	time();
-+#else
-+long	lseek();
-+#endif
- unsigned sleep();
- void	exit(), free(), qsort();
- #if BSD
-Index: common/vpaccess.c
-===================================================================
-RCS file: /cvsroot/cscope/cscope/common/vpaccess.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 vpaccess.c
---- common/vpaccess.c	2000/04/18 13:16:44	1.1.1.1
-+++ common/vpaccess.c	2000/04/20 06:59:59
-@@ -37,7 +37,7 @@
- #include <stdio.h>
- #include <unistd.h>
- #include "vp.h"
--#ifdef CCS
-+#if defined(CCS) || defined(__NetBSD__)
- #include <sys/types.h>
- #else
- typedef int mode_t;
-Index: i386/Makefile
-===================================================================
-RCS file: /cvsroot/cscope/cscope/i386/Makefile,v
-retrieving revision 1.2
-diff -u -r1.2 Makefile
---- i386/Makefile	2000/04/19 16:44:45	1.2
-+++ i386/Makefile	2000/04/20 06:59:59
-@@ -37,8 +37,8 @@
- 
- COMCS= ../common
- INCLIST= -I$(COMCS)
--DEFLIST= -DLinux
--LIBS= -lncurses -lfl
-+DEFLIST= -DBSD
-+LIBS= -lcurses -lfl
- 
- INS= install
- INSDIR=/usr/local/bin
diff --git a/devel/cscope/patches/patch-ab b/devel/cscope/patches/patch-ab
index 46bbc7adebf..10438ca3731 100644
--- a/devel/cscope/patches/patch-ab
+++ b/devel/cscope/patches/patch-ab
@@ -1,37 +1,23 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/04/20 07:03:55 itojun Exp $
-*** i386/Makefile.orig	Tue Apr 18 10:43:47 2000
---- i386/Makefile	Thu Apr 20 15:52:18 2000
-***************
-*** 42,48 ****
-  
-  INS= install
-! INSDIR=/usr/local/bin
-! INSMANDIR=/usr/local/man/man1
-  MANPAGE=../doc/cscope.1
-  
-  OBJ = dir.o crossref.o scanner.o lookup.o command.o display.o find.o \
---- 42,48 ----
-  
-  INS= install
-! INSDIR=${PREFIX}/bin
-! INSMANDIR=${PREFIX}/man/man1
-  MANPAGE=../doc/cscope.1
-  
-  OBJ = dir.o crossref.o scanner.o lookup.o command.o display.o find.o \
-***************
-*** 163,169 ****
-  
-  install: all
-  	$(INS) -s -m 755 $(PROGRAM) $(INSDIR)
-! 	$(INS) -m 755 $(MANPAGE) $(INSMANDIR)
-  
-  clean:
-  	rm -f *.o *.out lex.yy.c y.tab.? scanner.c egrep.c
---- 163,169 ----
-  
-  install: all
-  	$(INS) -s -m 755 $(PROGRAM) $(INSDIR)
-! #	$(INS) -m 755 $(MANPAGE) $(INSMANDIR)
-  
-  clean:
-  	rm -f *.o *.out lex.yy.c y.tab.? scanner.c egrep.c
+$NetBSD: patch-ab,v 1.2 2000/05/04 01:33:06 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 */
+ #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;
+ 	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 fda15297780..d5becc114c6 100644
--- a/devel/cscope/patches/patch-ac
+++ b/devel/cscope/patches/patch-ac
@@ -1,10 +1,27 @@
---- common/display.c.orig	Thu Apr 20 13:05:36 2000
-+++ common/display.c	Thu Apr 20 13:06:32 2000
-@@ -515,7 +515,6 @@
- 	static	long	start;
- 	long	now;
- 	char	msg[MSGLEN + 1];
--	long	time();
- 
- 	/* save the start time */
- 	if (searchcount == 0) {
+$NetBSD: patch-ac,v 1.2 2000/05/04 01:33:07 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 @@
+ 
+ #include "global.h"
+ #include <stdarg.h>
++#ifdef __NetBSD__
++#include <sys/wait.h>
++#else
+ #include <wait.h>
++#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 */
+ static	SIGTYPE	(*oldsigstp)();
+ 
++#ifndef __NetBSD__
+ typedef int	pid_t;
++#endif
+ static	int	join(), myexecvp();
+ static	pid_t	myfork();
+ 
diff --git a/devel/cscope/patches/patch-ad b/devel/cscope/patches/patch-ad
new file mode 100644
index 00000000000..b1ba1dd7600
--- /dev/null
+++ b/devel/cscope/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2000/05/04 01:33:07 hubertf Exp $
+
+diff -x *.orig -urN ./common/global.h /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/global.h
+--- ./common/global.h	Tue Apr 18 03:40:03 2000
++++ /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/global.h	Thu May  4 03:24:27 2000
+@@ -46,10 +46,14 @@
+ #include "invlib.h"	/* inverted index library */
+ #include "library.h"	/* library function return values */
+ 
++#ifdef __NetBSD__
++#define SIGTYPE void
++#else
+ #if SVR2 || BSD && !sun
+ #define SIGTYPE int
+ #else
+ #define SIGTYPE void
++#endif
+ #endif
+ 
+ typedef	enum	{		/* boolean data type */
diff --git a/devel/cscope/patches/patch-ae b/devel/cscope/patches/patch-ae
new file mode 100644
index 00000000000..a7500be4cad
--- /dev/null
+++ b/devel/cscope/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2000/05/04 01:33:07 hubertf Exp $
+
+diff -x *.orig -urN ./common/help.c /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/help.c
+--- ./common/help.c	Tue Apr 18 03:40:29 2000
++++ /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/help.c	Thu May  4 03:24:27 2000
+@@ -132,6 +132,7 @@
+ 					++ln;
+ 				}
+ 			}
++			move(ln, 0);
+ 			(void) addstr(*tp++);
+ 		}
+ 		else {
diff --git a/devel/cscope/patches/patch-af b/devel/cscope/patches/patch-af
new file mode 100644
index 00000000000..cf505c62828
--- /dev/null
+++ b/devel/cscope/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2000/05/04 01:33:07 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>
+ #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 $";
+ 
diff --git a/devel/cscope/patches/patch-ag b/devel/cscope/patches/patch-ag
new file mode 100644
index 00000000000..a136aa70f4a
--- /dev/null
+++ b/devel/cscope/patches/patch-ag
@@ -0,0 +1,19 @@
+$NetBSD: patch-ag,v 1.1 2000/05/04 01:33:07 hubertf Exp $
+
+diff -x *.orig -urN ./common/library.h /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/library.h
+--- ./common/library.h	Tue Apr 18 03:41:11 2000
++++ /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/library.h	Thu May  4 03:24:27 2000
+@@ -53,7 +53,12 @@
+ char	*ctime(), *getcwd(), *getenv(), *mktemp();
+ char	*strcat(), *strcpy(), *strncpy(), *strpbrk(), *strchr(), *strrchr();
+ char	*strtok();
+-long	lseek(), time();
++#if BSD
++off_t	lseek();
++time_t	time();
++#else
++long	lseek();
++#endif
+ unsigned sleep();
+ void	exit(), free(), qsort();
+ #if BSD
diff --git a/devel/cscope/patches/patch-ah b/devel/cscope/patches/patch-ah
new file mode 100644
index 00000000000..d76cde459b8
--- /dev/null
+++ b/devel/cscope/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 2000/05/04 01:33:07 hubertf Exp $
+
+diff -x *.orig -urN ./common/vpaccess.c /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/vpaccess.c
+--- ./common/vpaccess.c	Tue Apr 18 03:42:45 2000
++++ /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/common/vpaccess.c	Thu May  4 03:24:27 2000
+@@ -37,7 +37,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include "vp.h"
+-#ifdef CCS
++#if defined(CCS) || defined(__NetBSD__)
+ #include <sys/types.h>
+ #else
+ typedef int mode_t;
diff --git a/devel/cscope/patches/patch-ai b/devel/cscope/patches/patch-ai
new file mode 100644
index 00000000000..f580cfc499b
--- /dev/null
+++ b/devel/cscope/patches/patch-ai
@@ -0,0 +1,32 @@
+$NetBSD: patch-ai,v 1.1 2000/05/04 01:33:07 hubertf Exp $
+
+diff -x *.orig -urN ./i386/Makefile /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/i386/Makefile
+--- ./i386/Makefile	Tue Apr 18 03:43:47 2000
++++ /disk1/cvs/pkgsrc/devel/cscope/work.i386.unpatched/cscope-13.0/i386/Makefile	Thu May  4 03:24:27 2000
+@@ -37,12 +37,12 @@
+ 
+ COMCS= ../common
+ INCLIST= -I$(COMCS)
+-DEFLIST= -DLinux
+-LIBS= -lncurses -lfl
++DEFLIST= -DBSD
++LIBS= -lcurses -lfl
+ 
+ INS= install
+-INSDIR=/usr/local/bin
+-INSMANDIR=/usr/local/man/man1
++INSDIR=${PREFIX}/bin
++INSMANDIR=${PREFIX}/man/man1
+ MANPAGE=../doc/cscope.1
+ 
+ OBJ = dir.o crossref.o scanner.o lookup.o command.o display.o find.o \
+@@ -163,7 +163,7 @@
+ 
+ install: all
+ 	$(INS) -s -m 755 $(PROGRAM) $(INSDIR)
+-	$(INS) -m 755 $(MANPAGE) $(INSMANDIR)
++#	$(INS) -m 755 $(MANPAGE) $(INSMANDIR)
+ 
+ clean:
+ 	rm -f *.o *.out lex.yy.c y.tab.? scanner.c egrep.c
+