On Tue, Jun 07, 2011 at 12:40:06PM -0700, Chris Kuethe wrote: > In time for IPv6 day, here's an update to darkstat - with ipv6 > support. I've been running release candidates for a while, works for > me.
The diff you sent out had the distinfo content munged. Working fine for me with my existing IPv4 only setup. I can't get it to bind to the v6 tunnel with my current setup but I'll take it up with the author. Here is an updated diff with some fixes for the port. better license marker, de-silence the build, tweak the man page addition to have the sentence start on a new line. Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/darkstat/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile 19 Nov 2010 22:31:32 -0000 1.15 +++ Makefile 7 Jun 2011 22:26:28 -0000 @@ -2,13 +2,13 @@ COMMENT= network statistics gatherer with graphs -DISTNAME= darkstat-3.0.713 +DISTNAME= darkstat-3.0.714 CATEGORIES= net www -HOMEPAGE= http://dmr.ath.cx/net/darkstat/ +HOMEPAGE= http://unix4lyfe.org/darkstat/ MAINTAINER= Chris Kuethe <[email protected]> -# BSD with some code GPL'ed +# GPLv2 and BSD PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -21,7 +21,6 @@ EXTRACT_SUFX= .tar.bz2 CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-privdrop-user=_darkstat -USE_GROFF = Yes NO_REGRESS= Yes .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/cvs/ports/net/darkstat/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo 10 Jun 2010 03:57:30 -0000 1.11 +++ distinfo 7 Jun 2011 22:18:40 -0000 @@ -1,5 +1,5 @@ -MD5 (darkstat-3.0.713.tar.bz2) = P9Kk3bEjrRG7mfEJSmIG2Q== -RMD160 (darkstat-3.0.713.tar.bz2) = Uu3yfq6eXxvq5s/6sgcUYM8ar2U= -SHA1 (darkstat-3.0.713.tar.bz2) = muDyl7BiU8oj5zbiJNDtcDMdqPE= -SHA256 (darkstat-3.0.713.tar.bz2) = fMTiDG5cxexjR/rUDPq9Dj7EiYPF7wbNY/sDMLc/Va4= -SIZE (darkstat-3.0.713.tar.bz2) = 99671 +MD5 (darkstat-3.0.714.tar.bz2) = 7vOF+tyNu2EdPUxNj6lIFw== +RMD160 (darkstat-3.0.714.tar.bz2) = 2OkQQAc2rzRHF3muoLxj0EC1cp8= +SHA1 (darkstat-3.0.714.tar.bz2) = jmqfkPWugU+QbyPeqnYUS2SWqms= +SHA256 (darkstat-3.0.714.tar.bz2) = aou97pYrpIQStGdiFMGWEXkg/Ht8pAVlLgWlj6eAemc= +SIZE (darkstat-3.0.714.tar.bz2) = 108844 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_in 7 Jun 2011 22:22:30 -0000 @@ -0,0 +1,28 @@ +$OpenBSD$ +--- Makefile.in.orig Tue Jun 7 06:54:05 2011 ++++ Makefile.in Tue Jun 7 18:22:22 2011 +@@ -50,12 +50,10 @@ OBJS = $(SRCS:%.c=%.o) + all: darkstat + + darkstat: $(OBJS) +- @echo "===> Linking $@" +- @$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ ++ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ + + .c.o: +- @echo "===> Compiling $@" +- @$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ + + clean: + rm -f darkstat $(OBJS) c-ify graphjs.h stylecss.h +@@ -80,8 +78,7 @@ stylecss.h: static/style.css c-ify + ./c-ify style_css <static/style.css >$@ + + c-ify: static/c-ify.c +- @echo "==> Compiling $@" +- @$(HOSTCC) $(HOSTCFLAGS) static/c-ify.c -o $@ ++ $(HOSTCC) $(HOSTCFLAGS) static/c-ify.c -o $@ + + install: darkstat + $(INSTALL) -d $(DESTDIR)$(sbindir) Index: patches/patch-darkstat_8_in =================================================================== RCS file: /home/cvs/ports/net/darkstat/patches/patch-darkstat_8_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-darkstat_8_in --- patches/patch-darkstat_8_in 10 Jun 2010 03:51:39 -0000 1.1 +++ patches/patch-darkstat_8_in 7 Jun 2011 22:21:41 -0000 @@ -1,11 +1,12 @@ $OpenBSD: patch-darkstat_8_in,v 1.1 2010/06/10 03:51:39 lum Exp $ ---- darkstat.8.in.orig Tue Jun 8 11:43:24 2010 -+++ darkstat.8.in Tue Jun 8 11:42:25 2010 -@@ -122,6 +122,7 @@ Errors, warnings, and verbose messages will go to \fBs - daemon, priority debug) instead of \fBstderr\fR. +--- darkstat.8.in.orig Tue Jun 7 06:54:05 2011 ++++ darkstat.8.in Tue Jun 7 18:21:17 2011 +@@ -123,6 +123,8 @@ daemon, priority debug) instead of \fBstderr\fR. On some systems, these messages end up in \fB/var/log/debug\fR -+by default. On OpenBSD, these messages end up in \fB/var/log/daemon\fR by default. ++On OpenBSD, these messages end up in \fB/var/log/daemon\fR ++by default. .\" .TP + .BI \-\-verbose Index: patches/patch-err_c =================================================================== RCS file: /home/cvs/ports/net/darkstat/patches/patch-err_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-err_c --- patches/patch-err_c 10 Jun 2010 03:51:39 -0000 1.1 +++ patches/patch-err_c 7 Jun 2011 22:20:04 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-err_c,v 1.1 2010/06/10 03:51:39 lum Exp $ ---- err.c.orig Fri Jun 4 04:46:38 2010 -+++ err.c Fri Jun 4 04:41:44 2010 -@@ -47,7 +47,7 @@ to_syslog(const char *type, const int want_err, +--- err.c.orig Tue Jun 7 06:54:05 2011 ++++ err.c Tue Jun 7 18:18:59 2011 +@@ -51,7 +51,7 @@ to_syslog(const char *type, const int want_err, strlcat(buf, ": ", sizeof(buf)); strlcat(buf, strerror(saved_errno), sizeof(buf)); } -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
