diff options
author | itojun <itojun> | 2000-08-11 23:47:48 +0000 |
---|---|---|
committer | itojun <itojun> | 2000-08-11 23:47:48 +0000 |
commit | 80c7d7fa7f93fc8f46e90f80af8dfefed3f7c953 (patch) | |
tree | b27477e42298aa4c3674b7afc78c4468a69ae9fd /sysutils | |
parent | f99736ae02a5b56b4cddbfbdbc269a684887964e (diff) | |
download | pkgsrc-80c7d7fa7f93fc8f46e90f80af8dfefed3f7c953.tar.gz |
support non-ncurses build. use {REPLACE,USE}_CURSES for ncurses detection.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/whowatch/Makefile | 7 | ||||
-rw-r--r-- | sysutils/whowatch/files/patch-sum | 4 | ||||
-rw-r--r-- | sysutils/whowatch/patches/patch-ab | 12 | ||||
-rw-r--r-- | sysutils/whowatch/patches/patch-ac | 26 |
4 files changed, 46 insertions, 3 deletions
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile index 7a4a2641fa6..3adbd039cfe 100644 --- a/sysutils/whowatch/Makefile +++ b/sysutils/whowatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/06/12 16:20:53 rh Exp $ +# $NetBSD: Makefile,v 1.2 2000/08/11 23:47:48 itojun Exp $ # DISTNAME= whowatch-1.4 @@ -9,9 +9,10 @@ MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/ \ MAINTAINER= rh@netbsd.org HOMEPAGE= http://wizard.ae.krakow.pl/~mike/\#whowatch -DEPENDS+= ncurses-*:../../devel/ncurses - GNU_CONFIGURE= YES CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${PREFIX}/include" +USE_CURSES= YES +REPLACE_NCURSES+=whowatch.h configure.in configure + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/whowatch/files/patch-sum b/sysutils/whowatch/files/patch-sum new file mode 100644 index 00000000000..6254a22ef77 --- /dev/null +++ b/sysutils/whowatch/files/patch-sum @@ -0,0 +1,4 @@ +$NetBSD: patch-sum,v 1.1 2000/08/11 23:47:51 itojun Exp $ + +MD5 (patch-ab) = 25fd35fb9de953b7d1268f5e452e0314 +MD5 (patch-ac) = bdb96f44d469dc9b1b626b9b3870f33c diff --git a/sysutils/whowatch/patches/patch-ab b/sysutils/whowatch/patches/patch-ab new file mode 100644 index 00000000000..a9ff1147ea1 --- /dev/null +++ b/sysutils/whowatch/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1 2000/08/11 23:47:51 itojun Exp $ +BSD curses: use strlen(s) on waddnstr(w, s, 0) +ncurses: pirnt nothing on waddnstr(w, s, 0) +the code assumes ncurses behavior. be explicit about the requirement. +--- screen.c- Fri Aug 11 22:05:43 2000 ++++ screen.c Fri Aug 11 22:06:00 2000 +@@ -118,3 +118,4 @@ + i--; +- waddnstr(w->wd, q, p - q); ++ if (p - q != 0) ++ waddnstr(w->wd, q, p - q); + wattrset(w->wd, COLOR_PAIR(*p)); diff --git a/sysutils/whowatch/patches/patch-ac b/sysutils/whowatch/patches/patch-ac new file mode 100644 index 00000000000..acab72222ce --- /dev/null +++ b/sysutils/whowatch/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.1 2000/08/11 23:47:52 itojun Exp $ +UP/DOWN conflicts with some curses.h +--- whowatch.c- Fri Aug 11 22:06:36 2000 ++++ whowatch.c Fri Aug 11 22:07:02 2000 +@@ -22,3 +22,3 @@ + +-enum key { ENTER=0x100, UP, DOWN, LEFT, RIGHT, DELETE, ESC, CTRL_K, CTRL_I, ++enum key { ENTER=0x100, K_UP, K_DOWN, LEFT, RIGHT, DELETE, ESC, CTRL_K, CTRL_I, + PG_DOWN, PG_UP, HOME, END }; +@@ -346,4 +346,4 @@ + switch(c) { +- case 0x41: return UP; +- case 0x42: return DOWN; ++ case 0x41: return K_UP; ++ case 0x42: return K_DOWN; + case 0x34: +@@ -476,3 +476,3 @@ + break; +- case UP: ++ case K_UP: + cursor_up(windows[state]); +@@ -480,3 +480,3 @@ + break; +- case DOWN: ++ case K_DOWN: + cursor_down(windows[state]); |