On Thu, Mar 08, 2012 at 05:09:18PM +0000, Stuart Henderson wrote: > On 2012/03/08 17:37, Pierre-Emmanuel André wrote: > > -+ $(MAKE) -C src clean > > ++ +$(MAKE) -C src clean > > hmm, why the + here?
typo :) -- Pierre-Emmanuel André <pea at raveland.org> GPG key: 0x7AE329DC
Index: Makefile =================================================================== RCS file: /cvs/ports/net/vnstat/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile 17 Dec 2011 22:01:13 -0000 1.9 +++ Makefile 8 Mar 2012 17:17:35 -0000 @@ -2,10 +2,8 @@ COMMENT = network traffic monitor -DISTNAME = vnstat-1.10 +DISTNAME = vnstat-1.11 CATEGORIES = net sysutils - -REVISION = 6 HOMEPAGE = http://humdi.net/vnstat/ Index: distinfo =================================================================== RCS file: /cvs/ports/net/vnstat/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 25 Oct 2010 10:14:53 -0000 1.1.1.1 +++ distinfo 8 Mar 2012 17:17:35 -0000 @@ -1,5 +1,5 @@ -MD5 (vnstat-1.10.tar.gz) = lUIdloaJEwWQNIzrgP90qA== -RMD160 (vnstat-1.10.tar.gz) = H93ENDyzIGzOQlFvf/YQJMZe7T8= -SHA1 (vnstat-1.10.tar.gz) = gTF3+1Upber1BZuxEYhWFvTYqG8= -SHA256 (vnstat-1.10.tar.gz) = FQiD+ab1/iQwcHuqJr0UjzeBQj8J0ny1KFCWrZQ8vqI= -SIZE (vnstat-1.10.tar.gz) = 77685 +MD5 (vnstat-1.11.tar.gz) = paET+Rds1h+5VPK6KX9f2w== +RMD160 (vnstat-1.11.tar.gz) = x6hgLG7YbGdLFLK4cI6X9ZmfsOU= +SHA1 (vnstat-1.11.tar.gz) = kklPOKdS3PYAU68qbYl3c32n5hY= +SHA256 (vnstat-1.11.tar.gz) = txh22Be7tqFtMbQjbiKi62w5Zmp/e/6lgfX/RByt4CY= +SIZE (vnstat-1.11.tar.gz) = 79075 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/net/vnstat/patches/patch-Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Makefile --- patches/patch-Makefile 25 Oct 2010 10:14:53 -0000 1.1.1.1 +++ patches/patch-Makefile 8 Mar 2012 17:17:35 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2010/10/25 10:14:53 pea Exp $ ---- Makefile.orig Sat Aug 1 21:23:43 2009 -+++ Makefile Fri Sep 24 16:45:07 2010 +--- Makefile.orig Sun May 29 22:41:34 2011 ++++ Makefile Thu Mar 8 18:17:10 2012 @@ -4,20 +4,20 @@ SBIN = $(DESTDIR)/usr/sbin MAN = $(DESTDIR)/usr/share/man @@ -32,16 +32,17 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2010/ fi # install binaries -- install -dm 755 $(DESTDIR)/var/db/vnstat +- install -d -m 755 $(DESTDIR)/var/db/vnstat install -s -m 755 src/vnstat $(BIN_BSD) install -s -m 755 src/vnstatd $(SBIN_BSD) -@@ -137,24 +136,18 @@ bsdinstall: +@@ -137,25 +136,18 @@ bsdinstall: # install default config if such doesn't exist @if [ ! -f $(DESTDIR)/etc/vnstat.conf ]; \ - then echo "Installing config to $(DESTDIR)/etc/vnstat.conf"; \ -- install -D -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \ +- install -d -m 755 $(DESTDIR)/etc; \ +- install -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \ - sed -e 's/lib/db/g' $(DESTDIR)/etc/vnstat.conf >$(DESTDIR)/etc/vnstat.conf.bsd; \ - mv -f $(DESTDIR)/etc/vnstat.conf.bsd $(DESTDIR)/etc/vnstat.conf; \ + then echo "Installing config to ${PREFIX}/share/exemples/vnstat/vnstat.conf"; \ Index: patches/patch-src_ifinfo_c =================================================================== RCS file: /cvs/ports/net/vnstat/patches/patch-src_ifinfo_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_ifinfo_c --- patches/patch-src_ifinfo_c 25 Oct 2010 10:14:53 -0000 1.1.1.1 +++ patches/patch-src_ifinfo_c 8 Mar 2012 17:17:35 -0000 @@ -2,21 +2,20 @@ $OpenBSD: patch-src_ifinfo_c,v 1.1.1.1 2 Fixes a segfault with malloc option F ---- src/ifinfo.c.orig Wed Oct 6 11:45:54 2010 -+++ src/ifinfo.c Wed Oct 6 11:46:14 2010 - -@@ -418,9 +418,9 @@ int readifaddrs(const char *iface) +--- src/ifinfo.c.orig Wed Jun 1 00:29:51 2011 ++++ src/ifinfo.c Thu Mar 8 17:30:31 2012 +@@ -420,9 +420,9 @@ int readifaddrs(const char *iface) break; } } - freeifaddrs(ifap); - + if (check == 0) { + freeifaddrs(ifap); if (debug) printf("Requested interface \"%s\" not found.\n", iface); return 0; -@@ -433,6 +433,7 @@ int readifaddrs(const char *iface) +@@ -435,6 +435,7 @@ int readifaddrs(const char *iface) ifinfo.filled = 1; }
