diff options
| -rw-r--r-- | net/nocol/Makefile | 7 | ||||
| -rw-r--r-- | net/nocol/files/md5 | 4 | ||||
| -rw-r--r-- | net/nocol/files/patch-sum | 9 | ||||
| -rw-r--r-- | net/nocol/patches/patch-aa | 40 | ||||
| -rw-r--r-- | net/nocol/patches/patch-ab | 34 | ||||
| -rw-r--r-- | net/nocol/patches/patch-ac | 21 | ||||
| -rw-r--r-- | net/nocol/patches/patch-ad | 13 | ||||
| -rw-r--r-- | net/nocol/pkg/PLIST | 5 |
8 files changed, 70 insertions, 63 deletions
diff --git a/net/nocol/Makefile b/net/nocol/Makefile index 60500aadd3e..0fb51f53226 100644 --- a/net/nocol/Makefile +++ b/net/nocol/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2000/01/10 00:57:16 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/13 11:09:16 abs Exp $ # -DISTNAME= nocol-4.2.2beta4 -PKGNAME= nocol-4.2.2b4 +DISTNAME= nocol-4.3.1 CATEGORIES= net -MASTER_SITES= ftp://ftp.navya.com/pub/vikas/ +MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.netplex-tech.com/software/nocol/ diff --git a/net/nocol/files/md5 b/net/nocol/files/md5 index 8c21f1ca96f..b3702958009 100644 --- a/net/nocol/files/md5 +++ b/net/nocol/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1999/12/06 21:09:12 abs Exp $ +$NetBSD: md5,v 1.4 2000/07/13 11:09:17 abs Exp $ -MD5 (nocol-4.2.2beta4.tar.gz) = 5cacd363cb313a96c8c31bd4c6353a05 +MD5 (nocol-4.3.1.tar.gz) = e054261e64f7683b5661f42ad37db15e diff --git a/net/nocol/files/patch-sum b/net/nocol/files/patch-sum index b3e6ee19a9a..a84a78a2c7e 100644 --- a/net/nocol/files/patch-sum +++ b/net/nocol/files/patch-sum @@ -1,5 +1,6 @@ -$NetBSD: patch-sum,v 1.2 1999/12/06 21:09:12 abs Exp $ +$NetBSD: patch-sum,v 1.3 2000/07/13 11:09:17 abs Exp $ -MD5 (patch-aa) = 5d550b170a60e06e279293168727f3cb -MD5 (patch-ab) = 76ecbdbaf5ffb054006333227398d992 -MD5 (patch-ac) = 2c8818dc2d4dd1835e7607627f49b713 +MD5 (patch-aa) = a8be5ffe066d39833ce92464615250b1 +MD5 (patch-ab) = 03afd4c3309bd3c138dce2dc85fc03a2 +MD5 (patch-ac) = b849c9ba9dd69eec016911366801701a +MD5 (patch-ad) = 3494652584a368850da02761541b4f81 diff --git a/net/nocol/patches/patch-aa b/net/nocol/patches/patch-aa index 6803256545c..842326efb3c 100644 --- a/net/nocol/patches/patch-aa +++ b/net/nocol/patches/patch-aa @@ -1,20 +1,24 @@ -$NetBSD: patch-aa,v 1.3 1999/12/06 21:09:12 abs Exp $ +$NetBSD: patch-aa,v 1.4 2000/07/13 11:09:18 abs Exp $ ---- Makefile.head.orig Tue Nov 23 23:16:41 1999 -+++ Makefile.head Tue Nov 23 23:18:40 1999 -@@ -37,6 +37,7 @@ - # DATADIR where datafiles for monitoring programs are created - # MSGSDIR for message files that the nocol display shows in - # in the 'messages' sub-window -+# EXAMPLESDIR directory in which to store example files - # HELPDIR where helpfiles for webnocol are kept. - BINDIR= $(ROOTDIR)/bin - ETCDIR= $(ROOTDIR)/etc -@@ -44,6 +45,7 @@ - DATADIR= $(ROOTDIR)/data - MSGSDIR= $(ROOTDIR)/msgs - HELPDIR= $(ROOTDIR)/help -+EXAMPLESDIR= ${ROOTDIR}/share/examples/nocol +--- netconsole/build_display.c.orig Thu Jul 13 11:13:37 2000 ++++ netconsole/build_display.c Thu Jul 13 11:15:26 2000 +@@ -59,7 +59,7 @@ + #include "netconsole.h" - ## - # NOCOL specific definitions: + +-#define WFULL(w) (w->_cury == (w->_maxy - 1)) ? 1:0 ++#define WFULL(w) (getcury(w) == (getmaxy(w) - 1)) ? 1:0 + + build_display () + { +@@ -238,8 +238,8 @@ + * Am calling touchwin() since its foolproof (see discussion above) + */ + touchwin (aw.wmain); +- y = aw.wprompt->_cury + aw.wprompt->_begy ; /* force cursor loc.. */ +- x = aw.wprompt->_curx + aw.wprompt->_begx ; /* ..to prompt window */ ++ y = getcury(aw.wprompt) + getbegy(aw.wprompt); /* force cursor loc.. */ ++ x = getcurx(aw.wprompt) + getbegx(aw.wprompt); /* ..to prompt window */ + wmove(aw.wmain, y, x); + wrefresh (aw.wmain); /* Onto screen */ + return (0) ; diff --git a/net/nocol/patches/patch-ab b/net/nocol/patches/patch-ab index 6935163601e..0dac310dbfe 100644 --- a/net/nocol/patches/patch-ab +++ b/net/nocol/patches/patch-ab @@ -1,25 +1,13 @@ -$NetBSD: patch-ab,v 1.3 1999/12/06 21:09:12 abs Exp $ +$NetBSD: patch-ab,v 1.4 2000/07/13 11:09:18 abs Exp $ ---- Makefile.mid.orig Tue Nov 9 05:38:58 1999 -+++ Makefile.mid Tue Nov 23 23:20:21 1999 -@@ -68,7 +68,7 @@ - -[ -d $(DATADIR) ] || mkdir $(DATADIR) - -[ -d $(ETCDIR) ] || mkdir $(ETCDIR) - -[ -d $(PIDDIR) ] || mkdir $(PIDDIR) -- -[ -d $(ETCDIR)/samples ] || mkdir $(ETCDIR)/samples -+ -[ -d $(EXAMPLESDIR) ] || mkdir -p $(EXAMPLESDIR) - -[ -d $(BINDIR) ] || mkdir $(BINDIR) - -[ -d $(MSGSDIR) ] || mkdir $(MSGSDIR) - -[ -d $(HELPDIR) ] || mkdir $(HELPDIR) -@@ -85,9 +85,9 @@ - ( echo "" ; echo "MAKING IN $$i" ; echo "----------" ; cd $$i ; \ - make $(MFLAGS) install ; ) ;\ - done -- @echo "Installing sample config files under $(ETCDIR)/samples/..." -+ @echo "Installing sample config files under $(EXAMPLESDIR)/..." - @-for i in */*-confg; do \ -- $(INSTALL) -m 444 -c $$i $(ETCDIR)/samples/ ;\ -+ $(INSTALL) -m 444 -c $$i $(EXAMPLESDIR)/ ;\ - done - @echo "" ; echo " NOW su AND DO A make root " +--- netconsole/fill_window.c.orig Thu Jul 13 11:15:34 2000 ++++ netconsole/fill_window.c Thu Jul 13 11:15:51 2000 +@@ -38,7 +38,7 @@ + #include "netconsole.h" + +-#define WFULL(w) (w->_cury == (w->_maxy - 1)) ? 1:0 ++#define WFULL(w) (getcury(w) == (getmaxy(w) - 1)) ? 1:0 + + fill_window(win, dirp, dir, pcurfd, dpy_func) + WINDOW *win; /* Window to be filled */ diff --git a/net/nocol/patches/patch-ac b/net/nocol/patches/patch-ac index 0da97016a19..66ea987a456 100644 --- a/net/nocol/patches/patch-ac +++ b/net/nocol/patches/patch-ac @@ -1,12 +1,13 @@ -$NetBSD: patch-ac,v 1.3 1999/12/06 21:09:12 abs Exp $ +$NetBSD: patch-ac,v 1.4 2000/07/13 11:09:18 abs Exp $ ---- Makefile.tail.orig Fri Jul 31 19:01:10 1998 -+++ Makefile.tail Tue Nov 23 23:20:28 1999 -@@ -14,6 +14,7 @@ - @[ -d $(BINDIR) ] || mkdir $(BINDIR) - @[ -d $(DATADIR) ] || mkdir $(DATADIR) - @[ -d $(MSGSDIR) ] || mkdir $(MSGSDIR) -+ @[ -d $(EXAMPLESDIR) ] || mkdir -p $(EXAMPLESDIR) +--- netconsole/help_page.c.orig Thu Jul 13 11:16:00 2000 ++++ netconsole/help_page.c Thu Jul 13 11:16:32 2000 +@@ -38,7 +38,7 @@ + # define HELPFILE "helpfile" + #endif - depend: - mkdep $(CFLAGS) `echo $(OBJS) | sed 's/\.o[ $]+/\.c/g'` +-#define WFULL(w) (w->_cury == (w->_maxy - 2)) ? 1:0 ++#define WFULL(w) (getcury(w) == (getmaxy(w) - 2)) ? 1:0 + + help_page() + { diff --git a/net/nocol/patches/patch-ad b/net/nocol/patches/patch-ad new file mode 100644 index 00000000000..136dbe122ee --- /dev/null +++ b/net/nocol/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2000/07/13 11:09:18 abs Exp $ + +--- Makefile.head.orig Wed Jan 19 04:08:32 2000 ++++ Makefile.head Thu Jul 13 11:07:09 2000 +@@ -45,7 +45,7 @@ + DATADIR= $(ROOTDIR)/data + MSGSDIR= $(ROOTDIR)/msgs + HELPDIR= $(ROOTDIR)/help +-EXAMPLESDIR= $(ETCDIR)/samples ++EXAMPLESDIR= ${ROOTDIR}/share/examples/nocol + + ## + # NOCOL specific definitions: diff --git a/net/nocol/pkg/PLIST b/net/nocol/pkg/PLIST index 8a227e1bce7..1ce6227a341 100644 --- a/net/nocol/pkg/PLIST +++ b/net/nocol/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1999/12/06 21:09:13 abs Exp $ +@comment $NetBSD: PLIST,v 1.3 2000/07/13 11:09:19 abs Exp $ bin/apcmon bin/armon bin/bgpmon @@ -55,6 +55,7 @@ bin/snmpget bin/snmpmon bin/snmpmon-client bin/snmpwalk +bin/sqlmon bin/syslogmon bin/testlog bin/tkNocol @@ -103,10 +104,10 @@ share/examples/nocol/smbmon-confg share/examples/nocol/snmpgeneric-confg share/examples/nocol/snmpmon-client-confg share/examples/nocol/snmpmon-confg +share/examples/nocol/sqlmon-confg share/examples/nocol/syslogmon-confg share/examples/nocol/tpmon-confg @dirrm bin/hostmon-osclients -@dirrm data @dirrm share/examples/nocol @dirrm run @dirrm msgs |