Index: head/net/vnstat/Makefile
===================================================================
--- head/net/vnstat/Makefile	(revision 485598)
+++ head/net/vnstat/Makefile	(revision 485599)
@@ -1,59 +1,59 @@
 # Created by: Dennis Herrmann <adox@mcx2.org>
 # $FreeBSD$
 
 PORTNAME=	vnstat
 PORTVERSION=	2.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://humdi.net/vnstat/ \
 		https://source.ipfire.org/source-2.x/
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Console-based network traffic monitor
 
 LICENSE=	GPLv2
 
 USE_RC_SUBR=	vnstat
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 
 USES=	gmake
 USERS=	vnstat
 GROUPS=	vnstat
 
 PORTDOCS=	README INSTALL_BSD UPGRADE
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS=${USERS} \
 		GROUPS=${GROUPS}
 
 OPTIONS_DEFINE=	GUI DOCS
 OPTIONS_DEFAULT=	GUI
 OPTIONS_SUB=	yes
 GUI_DESC=	Build with graphics/gd dependency
 
 GUI_LIB_DEPENDS+=	libgd.so:graphics/gd
 
 .include <bsd.port.options.mk>
 
 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
 .if ${PORT_OPTIONS:MGUI}
 	${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}
 
 .include <bsd.port.mk>
Index: head/net/vnstat/files/vnstat.in
===================================================================
--- head/net/vnstat/files/vnstat.in	(revision 485598)
+++ head/net/vnstat/files/vnstat.in	(revision 485599)
@@ -1,73 +1,49 @@
 #!/bin/sh
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 
 # PROVIDE: vnstat
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable vnstat:
 #
 # vnstat_enable="YES"
-# vnstat_additional_ifaces="em1"
 
 . /etc/rc.subr
 
 name=vnstat
 rcvar=vnstat_enable
 load_rc_config $name
 
 : ${vnstat_enable:=NO}
 : ${vnstat_pidfile=/var/run/vnstat/vnstat.pid}
 : ${vnstat_config=%%PREFIX%%/etc/vnstat.conf}
-: ${vnstat_flags="-d --noadd"}
+: ${vnstat_flags="-d"}
 : ${vnstat_user:=%%USERS%%}
 : ${vnstat_group:=%%GROUPS%%}
 
 command="%%PREFIX%%/sbin/vnstatd"
 command_args="-p ${vnstat_pidfile} --config ${vnstat_config}"
 pidfile="${vnstat_pidfile}"
 user_cmd="%%PREFIX%%/bin/vnstat"
 
 start_precmd=vnstat_startprecmd
 
-create_iface_database()
-{
-	local iface="$1"
-	local descr="$2"
-	su -m ${vnstat_user} -c "${user_cmd} --add --iface $iface" >/dev/null 2>&1 ||
-	  ! echo "$name: Failed to add database for the $descr interface $iface" || return 1
-	echo "$name: Created the database for the $descr interface $iface"
-}
-
 vnstat_startprecmd()
 {
-	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};
-	fi
-
-	iface=$(grep "^Interface" ${vnstat_config} | head -1 | awk 'BEGIN{FS="\042"}{print $2}')
-	if [ -n "${iface}" -a ! -f ${dbdir}/${iface} ]; then
-		create_iface_database $iface "default" || return 1
-	fi
-	if [ -n "${vnstat_additional_ifaces}" ]; then
-		for iface in ${vnstat_additional_ifaces}; do 
-			if [ ! -f ${dbdir}/${iface} ]; then
-				create_iface_database $iface "additional" || return 1
-			fi
-		done
 	fi
 
 	if [ ! -d "/var/run/vnstat" ]; then
 		install -d -o ${vnstat_user} -g ${vnstat_group} /var/run/vnstat;
 	fi
 }
 
 run_rc_command "$1"