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	9 Mar 2012 13:13:23 -0000
@@ -5,8 +5,6 @@ COMMENT = 	network traffic monitor
 DISTNAME = 	vnstat-1.10
 CATEGORIES = 	net sysutils
 
-REVISION = 	6
-
 HOMEPAGE = 	http://humdi.net/vnstat/
 
 MASTER_SITES = ${HOMEPAGE}
@@ -19,7 +17,7 @@ PERMIT_PACKAGE_FTP = 	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP = 	Yes
 
-WANTLIB = 	c m gd
+WANTLIB = 	c gd m
 
 LIB_DEPENDS = 	graphics/gd
 
@@ -29,8 +27,7 @@ NO_REGRESS = 	Yes
 
 INSTALL_TARGET = bsdinstall
 
-LDFLAGS += 	-L${LOCALBASE}/lib -L/usr/X11R6/lib
 MAKE_FLAGS = 	CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS}"
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 .include <bsd.port.mk>
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	9 Mar 2012 13:13:23 -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	Fri Mar  9 09:53:36 2012
++++ Makefile	Fri Mar  9 09:59:52 2012
 @@ -4,20 +4,20 @@ SBIN = $(DESTDIR)/usr/sbin
  MAN = $(DESTDIR)/usr/share/man
  
@@ -16,11 +16,11 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2010/
  
  vnstat:
 -	+make -C src
-+	+$(MAKE) -C src
++	$(MAKE) -C src
  
  all:
 -	+make -C src all
-+	+$(MAKE) -C src all
++	$(MAKE) -C src all
  
  clean:
 -	make -C src clean
@@ -28,15 +28,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2010/
  
  install:
  	@echo "Installing vnStat..."
-@@ -126,7 +126,6 @@ bsdinstall:
- 	fi
- 
- # install binaries
--	install -dm 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,24 +137,18 @@ bsdinstall:
  
  # install default config if such doesn't exist
  	@if [ ! -f $(DESTDIR)/etc/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	9 Mar 2012 13:13:23 -0000
@@ -2,9 +2,8 @@ $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
-
+--- src/ifinfo.c.orig	Fri Mar  9 10:00:36 2012
++++ src/ifinfo.c	Fri Mar  9 10:08:57 2012
 @@ -418,9 +418,9 @@ int readifaddrs(const char *iface)
  			break;
  		}