Index: vnstat/Makefile
===================================================================
--- vnstat/Makefile
+++ vnstat/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	vnstat
-PORTVERSION=	1.15
+PORTVERSION=	1.17
 PORTREVISION=	0
 CATEGORIES=	net
-MASTER_SITES=	http://humdi.net/vnstat/ \
-		http://mirror.mcx2.org/
+MASTER_SITES=	http://humdi.net/vnstat/
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Console-based network traffic monitor
@@ -37,21 +36,26 @@
 
 .include <bsd.port.options.mk>
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|\/var\/lib\/vnstat|\/var\/db\/vnstat|g' ${PATCH_WRKSRC}/cfg/vnstat.conf
+	@${REINPLACE_CMD} -e 's|\/var\/log\/vnstat\/|\/var\/log\/|g' ${PATCH_WRKSRC}/cfg/vnstat.conf
+	@${REINPLACE_CMD} -e 's|\/var\/run\/vnstat\/|\/var\/run\/|g' ${PATCH_WRKSRC}/cfg/vnstat.conf
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vnstat ${STAGEDIR}/${PREFIX}/bin/vnstat
-	${INSTALL_PROGRAM} ${WRKSRC}/vnstatd ${STAGEDIR}/${PREFIX}/sbin/vnstatd
-	${INSTALL_DATA} ${WRKSRC}/cfg/vnstat.conf ${STAGEDIR}/${PREFIX}/etc/vnstat.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/man/vnstat.1 ${STAGEDIR}/${MANPREFIX}/man/man1/vnstat.1
-	${INSTALL_MAN} ${WRKSRC}/man/vnstatd.1 ${STAGEDIR}/${MANPREFIX}/man/man1/vnstatd.1
-	${INSTALL_MAN} ${WRKSRC}/man/vnstat.conf.5 ${STAGEDIR}/${MANPREFIX}/man/man5/vnstat.conf.5
+	${INSTALL_PROGRAM} ${WRKSRC}/vnstat ${STAGEDIR}${PREFIX}/bin/vnstat
+	${INSTALL_PROGRAM} ${WRKSRC}/vnstatd ${STAGEDIR}${PREFIX}/sbin/vnstatd
+	${INSTALL_DATA} ${WRKSRC}/cfg/vnstat.conf ${STAGEDIR}${PREFIX}/etc/vnstat.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/man/vnstat.1 ${STAGEDIR}${MANPREFIX}/man/man1/vnstat.1
+	${INSTALL_MAN} ${WRKSRC}/man/vnstatd.1 ${STAGEDIR}${MANPREFIX}/man/man1/vnstatd.1
+	${INSTALL_MAN} ${WRKSRC}/man/vnstat.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5/vnstat.conf.5
 .if ${PORT_OPTIONS:MGUI}
-	${INSTALL_PROGRAM} ${WRKSRC}/vnstati ${STAGEDIR}/${PREFIX}/bin/vnstati
-	${INSTALL_MAN} ${WRKSRC}/man/vnstati.1 ${STAGEDIR}/${MANPREFIX}/man/man1/vnstati.1
+	${INSTALL_PROGRAM} ${WRKSRC}/vnstati ${STAGEDIR}${PREFIX}/bin/vnstati
+	${INSTALL_MAN} ${WRKSRC}/man/vnstati.1 ${STAGEDIR}${MANPREFIX}/man/man1/vnstati.1
 .endif
 
 post-install-DOCS-on:
 	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
-	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}/${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: vnstat/distinfo
===================================================================
--- vnstat/distinfo
+++ vnstat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477754840
-SHA256 (vnstat-1.15.tar.gz) = c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39
-SIZE (vnstat-1.15.tar.gz) = 207712
+TIMESTAMP = 1518302872
+SHA256 (vnstat-1.17.tar.gz) = 18e4c53576ca9e1ef2f0e063a6d83b0c44e3b1cf008560d658745df5c9aa7971
+SIZE (vnstat-1.17.tar.gz) = 238397
Index: vnstat/files/vnstat.in
===================================================================
--- vnstat/files/vnstat.in
+++ vnstat/files/vnstat.in
@@ -18,14 +18,14 @@
 load_rc_config $name
 
 : ${vnstat_enable:=NO}
-: ${vnstat_pidfile=/var/run/vnstat/vnstat.pid}
+: ${vnstat_pidfile=/var/run/vnstat.pid}
 : ${vnstat_config=%%PREFIX%%/etc/vnstat.conf}
 : ${vnstat_flags="-d --noadd"}
 : ${vnstat_user:=%%USERS%%}
 : ${vnstat_group:=%%GROUPS%%}
 
 command="%%PREFIX%%/sbin/vnstatd"
-command_args="-p ${vnstat_pidfile} --config ${vnstat_config}"
+command_args="--config ${vnstat_config}"
 pidfile="${vnstat_pidfile}"
 user_cmd="%%PREFIX%%/bin/vnstat"
 
@@ -44,10 +44,6 @@
 {
 	local dbdir iface
 
-	if [ ! -e ${pidfile%/*} ]; then
-		install -d -o ${vnstat_user} -g ${vnstat_group} ${pidfile%/*};
-	fi
-
 	dbdir=$(grep "^DatabaseDir" ${vnstat_config} | awk 'BEGIN{FS="\042"}{print $2}')
 	if [ ! -d ${dbdir} ]; then
 		install -d -o ${vnstat_user} -g ${vnstat_group} ${dbdir};
@@ -65,8 +61,8 @@
 		done
 	fi
 
-	if [ ! -d "/var/run/vnstat" ]; then
-		install -d -o ${vnstat_user} -g ${vnstat_group} /var/run/vnstat;
+	if [ ! -e ${vnstat_pidfile} ]; then
+		install -o ${vnstat_user} -g ${vnstat_group} /dev/null ${vnstat_pidfile};
 	fi
 }