diff options
| author | wiz <wiz@pkgsrc.org> | 2001-01-07 02:25:35 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2001-01-07 02:25:35 +0000 |
| commit | 6589777df7767f72bc04dd1e63c2dfe5c6392200 (patch) | |
| tree | 5cace4fe6c9c0b65da73324664cbc1398c1775d0 /net/ntop | |
| parent | 5c752750f76b259a2d0e010d3dd4cd892c1524d2 (diff) | |
| download | pkgsrc-6589777df7767f72bc04dd1e63c2dfe5c6392200.tar.gz | |
USE_CURSES instead of hardwired dependency on ncurses.
Patch by Charles Hannum.
Diffstat (limited to 'net/ntop')
| -rw-r--r-- | net/ntop/Makefile | 14 | ||||
| -rw-r--r-- | net/ntop/files/patch-sum | 3 | ||||
| -rw-r--r-- | net/ntop/patches/patch-ac | 28 |
3 files changed, 39 insertions, 6 deletions
diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 235a288fafa..8f0fb2f36f0 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2000/11/01 21:43:59 abs Exp $ +# $NetBSD: Makefile,v 1.16 2001/01/07 02:25:35 wiz Exp $ DISTNAME= ntop-1.1 PKGNAME= ntop-1.1nb1 @@ -9,15 +9,19 @@ EXTRACT_SUFX= -src.tar.gz MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.ntop.org/ -DEPENDS+= ncurses>=4.2:../../devel/ncurses - GNU_CONFIGURE= yes +USE_CURSES= yes +REPLACE_NCURSES= ${WRKSRC}/configure ${WRKSRC}/ntop.h CONFIGURE_ARGS+= --enable-threads=no +INSTALL_TARGET= install install-man + +.include "../../mk/bsd.prefs.mk" + +.if ${NEED_NCURSES} == "YES" CPPFLAGS+= -I${LOCALBASE}/include # for ncurses.h LDFLAGS+= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" - -INSTALL_TARGET= install install-man +.endif .include "../../mk/bsd.pkg.mk" diff --git a/net/ntop/files/patch-sum b/net/ntop/files/patch-sum index 38ba0da45d7..ac10f62b338 100644 --- a/net/ntop/files/patch-sum +++ b/net/ntop/files/patch-sum @@ -1,4 +1,5 @@ -$NetBSD: patch-sum,v 1.3 2000/10/20 11:03:00 abs Exp $ +$NetBSD: patch-sum,v 1.4 2001/01/07 02:25:35 wiz Exp $ MD5 (patch-aa) = bc35939bcacdbd55e8c5b6808b634cd3 MD5 (patch-ab) = 5f341d4a6d156c744269a62d433d1471 +MD5 (patch-ac) = 5d31221bbf026ae27f9b408889082b78 diff --git a/net/ntop/patches/patch-ac b/net/ntop/patches/patch-ac new file mode 100644 index 00000000000..fcc1d2b5d83 --- /dev/null +++ b/net/ntop/patches/patch-ac @@ -0,0 +1,28 @@ +$NetBSD: patch-ac,v 1.4 2001/01/07 02:25:35 wiz Exp $ + +--- pbuf.c.orig Mon May 3 17:43:09 1999 ++++ pbuf.c +@@ -843,20 +843,18 @@ + + int checkKeyPressed() { + int theChar = getch(); +- unsigned char in_char; + int rc = 1, numScreens; + +- if((theChar != EOF) +- && ((in_char = (unsigned char)theChar)) != 255) { ++ if((theChar != EOF) && (theChar != ERR)) { + + /* + char buf[32]; + +- sprintf(buf, ">%c-%d<", in_char, in_char); ++ sprintf(buf, ">%c-%d<", theChar, theChar); + mvprintw(0, 40, buf); refresh(); + sleep(2); + */ +- switch(in_char) { ++ switch(theChar) { + case 'q': + case 'Q': + cleanup(-1); |