diff options
Diffstat (limited to 'devel/cscope')
-rw-r--r-- | devel/cscope/Makefile | 32 | ||||
-rw-r--r-- | devel/cscope/files/md5 | 4 | ||||
-rw-r--r-- | devel/cscope/files/patch-sum | 15 | ||||
-rw-r--r-- | devel/cscope/patches/patch-aa | 30 | ||||
-rw-r--r-- | devel/cscope/patches/patch-ab | 14 | ||||
-rw-r--r-- | devel/cscope/patches/patch-ac | 22 | ||||
-rw-r--r-- | devel/cscope/patches/patch-ad | 20 | ||||
-rw-r--r-- | devel/cscope/patches/patch-ae | 13 | ||||
-rw-r--r-- | devel/cscope/patches/patch-af | 10 | ||||
-rw-r--r-- | devel/cscope/patches/patch-ag | 19 | ||||
-rw-r--r-- | devel/cscope/patches/patch-ah | 14 | ||||
-rw-r--r-- | devel/cscope/patches/patch-ai | 32 | ||||
-rw-r--r-- | devel/cscope/pkg/PLIST | 4 |
13 files changed, 35 insertions, 194 deletions
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile index 3b4f5d2c5f2..0e12dec9c1c 100644 --- a/devel/cscope/Makefile +++ b/devel/cscope/Makefile @@ -1,16 +1,36 @@ -# $NetBSD: Makefile,v 1.2 2000/04/21 03:50:24 hubertf Exp $ +# $NetBSD: Makefile,v 1.3 2000/05/19 11:03:32 wiz Exp $ -DISTNAME= cscope-13.0-2 -PKGNAME= cscope-13.0.2 +DISTNAME= cscope-15.0bl2 +PKGNAME= cscope-15.0.2 CATEGORIES= devel MASTER_SITES= http://download.sourceforge.net/cscope/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://cscope.sourceforge.net/ -WRKSRC= ${WRKDIR}/cscope-13.0 +GNU_CONFIGURE= YES -post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/cscope.1 ${PREFIX}/man/cat1 +OSVER!= uname -r +GOOD_CURSES= 1.4[A-Z] 1.[5-9]* + +.for PATTERN in ${GOOD_CURSES} +.if ${OSVER:M${PATTERN}} != "" +CURSES_GOOD?= +.endif +.endfor + +.if !defined(CURSES_GOOD) +DEPEND+= ncurses>=5.0:../../devel/ncurses + +CONFIGURE_ARGS+=--with-ncurses=${LOCALBASE} + +post-extract: +.for FILE in command.c display.c edit.c exec.c find.c help.c input.c main.c + @cd ${WRKSRC}/src; \ + ${MV} ${FILE} ${FILE}.orig; \ + ${SED} "s/^#include <curses.h>/#include <ncurses.h>/" \ + < ${FILE}.orig > ${FILE} +.endfor +.endif .include <../../mk/bsd.pkg.mk> diff --git a/devel/cscope/files/md5 b/devel/cscope/files/md5 index dac1871deeb..f5c08f18425 100644 --- a/devel/cscope/files/md5 +++ b/devel/cscope/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/04/20 07:03:54 itojun Exp $ +$NetBSD: md5,v 1.2 2000/05/19 11:03:33 wiz Exp $ -MD5 (cscope-13.0-2.tar.gz) = c727eff70fddfee73754537b6be39597 +MD5 (cscope-15.0bl2.tar.gz) = dff40f905bb8709fb6a2ec4365b0bbcc diff --git a/devel/cscope/files/patch-sum b/devel/cscope/files/patch-sum index 281caf55654..42030716f10 100644 --- a/devel/cscope/files/patch-sum +++ b/devel/cscope/files/patch-sum @@ -1,11 +1,6 @@ -$NetBSD: patch-sum,v 1.6 2000/05/14 00:18:55 hubertf Exp $ +$NetBSD: patch-sum,v 1.7 2000/05/19 11:03:33 wiz Exp $ -MD5 (patch-aa) = a3f15eb905a452d56a6b2a5b0497f0ca -MD5 (patch-ab) = 17d194d42f78eefbc9eac7112ecc349f -MD5 (patch-ac) = b394402845ddc120b8cb9e75e057c32e -MD5 (patch-ad) = a28e9d509e3c5355d7dfbe82df530321 -MD5 (patch-ae) = 449e1af676d0be2a7c4355e861faedc3 -MD5 (patch-af) = 46df217b173afddc9b3552b3c43bf0d0 -MD5 (patch-ag) = a7a6697f49b38c3edb3047da334cfbd4 -MD5 (patch-ah) = 22590011e777ce58f05e7ddc85183bb3 -MD5 (patch-ai) = b7903852c8c30264b7d1fc1bee4cc995 +This placeholder file is generated by the ``makepatchsum'' target +whenever the patches directory is empty or missing. Its purpose +is to ensure that the presence of any obsolete patches will cause +the proper error to be emitted at build time. diff --git a/devel/cscope/patches/patch-aa b/devel/cscope/patches/patch-aa deleted file mode 100644 index 50c1fc4eead..00000000000 --- a/devel/cscope/patches/patch-aa +++ /dev/null @@ -1,30 +0,0 @@ -$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 -+#ifndef __NetBSD__ - #define KEY_BREAK 0400 /* easier to define than to add #if around the use */ - #define KEY_ENTER 0401 - #define KEY_BACKSPACE 0402 -- -+#endif -+#ifndef __NetBSD__ - #if !sun - #define cbreak() crmode() /* name change */ - #endif -+#endif - -+#ifndef __NetBSD__ - #if UNIXPC - #define erasechar() (_tty.c_cc[VERASE]) /* equivalent */ - #define killchar() (_tty.c_cc[VKILL]) /* equivalent */ - #else - #define erasechar() (_tty.sg_erase) /* equivalent */ - #define killchar() (_tty.sg_kill) /* equivalent */ -+#endif - #endif - #endif diff --git a/devel/cscope/patches/patch-ab b/devel/cscope/patches/patch-ab deleted file mode 100644 index 9f3e7fd9bcf..00000000000 --- a/devel/cscope/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2000/05/14 00:18:55 hubertf Exp $ - ---- 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 - -@@ -517,3 +520,2 @@ - char msg[MSGLEN + 1]; -- long time(); - diff --git a/devel/cscope/patches/patch-ac b/devel/cscope/patches/patch-ac deleted file mode 100644 index f1522abba35..00000000000 --- a/devel/cscope/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2000/05/14 00:18:56 hubertf Exp $ - ---- 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__ -+#include <sys/wait.h> -+#else - #include <wait.h> -+#endif - #include <curses.h> - -@@ -47,5 +51,7 @@ - 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 deleted file mode 100644 index b1ba1dd7600..00000000000 --- a/devel/cscope/patches/patch-ad +++ /dev/null @@ -1,20 +0,0 @@ -$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 deleted file mode 100644 index a7500be4cad..00000000000 --- a/devel/cscope/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 12475efa55e..00000000000 --- a/devel/cscope/patches/patch-af +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-af,v 1.2 2000/05/14 00:18:56 hubertf Exp $ - ---- 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 - diff --git a/devel/cscope/patches/patch-ag b/devel/cscope/patches/patch-ag deleted file mode 100644 index a136aa70f4a..00000000000 --- a/devel/cscope/patches/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ -$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 deleted file mode 100644 index d76cde459b8..00000000000 --- a/devel/cscope/patches/patch-ah +++ /dev/null @@ -1,14 +0,0 @@ -$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 deleted file mode 100644 index f580cfc499b..00000000000 --- a/devel/cscope/patches/patch-ai +++ /dev/null @@ -1,32 +0,0 @@ -$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 - diff --git a/devel/cscope/pkg/PLIST b/devel/cscope/pkg/PLIST index a56be05651a..c24748305bd 100644 --- a/devel/cscope/pkg/PLIST +++ b/devel/cscope/pkg/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 2000/04/21 03:50:25 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.3 2000/05/19 11:03:44 wiz Exp $ bin/cscope -man/cat1/cscope.1 +man/man1/cscope.1 |