Index: head/net/vnstat/Makefile =================================================================== --- head/net/vnstat/Makefile (revision 373706) +++ head/net/vnstat/Makefile (revision 373707) @@ -1,75 +1,72 @@ # Created by: Dennis Herrmann # $FreeBSD$ PORTNAME= vnstat -PORTVERSION= 1.11 -PORTREVISION= 6 +PORTVERSION= 1.12 CATEGORIES= net MASTER_SITES= http://humdi.net/vnstat/ \ http://mirror.mcx2.org/ MAINTAINER= feld@FreeBSD.org COMMENT= Console-based network traffic monitor +LICENSE= GPLv2 + MAKE_ARGS= CC="${CC}" CFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" INSTALL_TARGET= bsdinstall USE_RC_SUBR= vnstat +USES= gmake USERS= vnstat GROUPS= vnstat -PORTDOCS= README INSTALL_BSD UPGRADE vnstat-cron +PORTDOCS= README INSTALL_BSD UPGRADE SUB_FILES= pkg-message SUB_LIST= USERS=${USERS} \ GROUPS=${GROUPS} # will compile with image output OPTIONS_DEFINE= GUI DOCS OPTIONS_DEFAULT= GUI GUI_DESC= Build with graphics/gd dependency .include .if ${PORT_OPTIONS:MGUI} LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd PLIST_SUB+= GUI="" .else ALL_TARGET="vnstat" PLIST_SUB+= GUI="@comment " .endif - -post-extract: - @cd ${WRKSRC} && ${CP} examples/vnstat.cron vnstat-cron - @${REINPLACE_CMD} -e 's|/usr/bin|/usr/local/bin|g' \ - -e 's|ls /var/lib|ls -l /var/db|g' ${WRKSRC}/vnstat-cron post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ ${WRKSRC}/src/cfg.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstat ${STAGEDIR}/${PREFIX}/bin/vnstat ${INSTALL_PROGRAM} ${WRKSRC}/src/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}/src/vnstati ${STAGEDIR}/${PREFIX}/bin/vnstati ${INSTALL_MAN} ${WRKSRC}/man/vnstati.1 ${STAGEDIR}/${MANPREFIX}/man/man1/vnstati.1 .endif post-install: .if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "installing additional documentation to ${DOCSDIR}" @${MKDIR} ${STAGEDIR}/${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}/${DOCSDIR} .endif @${ECHO_MSG} "" @${CAT} ${PKGMESSAGE} @${ECHO_MSG} "" .include Index: head/net/vnstat/distinfo =================================================================== --- head/net/vnstat/distinfo (revision 373706) +++ head/net/vnstat/distinfo (revision 373707) @@ -1,2 +1,2 @@ -SHA256 (vnstat-1.11.tar.gz) = b71876d817bbb6a16d31b4236e22a2eb6c39666a7f7bfea581f5ff441cade026 -SIZE (vnstat-1.11.tar.gz) = 79075 +SHA256 (vnstat-1.12.tar.gz) = af1050d9c1b22d4b9742fe0d1818de9eb1037b8e7f9ba67b962e108d8527be69 +SIZE (vnstat-1.12.tar.gz) = 98435 Index: head/net/vnstat/files/pkg-message.in =================================================================== --- head/net/vnstat/files/pkg-message.in (revision 373706) +++ head/net/vnstat/files/pkg-message.in (revision 373707) @@ -1,10 +1,8 @@ ########################################################################### vnstat has been installed. -This port neeeds a cron entry. Please copy the contents of: -%%DOCSDIR%%/vnstat-cron to your crontab. A Sample -configuration file has be installed in %%PREFIX%%/etc/ +A Sample configuration file has be installed in %%PREFIX%%/etc/ For more information about vnStat use "man vnstat" or visit: http://humdi.net/vnstat/ ########################################################################### Index: head/net/vnstat/files/vnstat.in =================================================================== --- head/net/vnstat/files/vnstat.in (revision 373706) +++ head/net/vnstat/files/vnstat.in (revision 373707) @@ -1,48 +1,48 @@ #!/bin/sh # Created by: Mark Felder # $FreeBSD$ # PROVIDE: vnstat # REQUIRE: LOGIN # KEYWORD: shutdown # Add the following line to /etc/rc.conf to enable vnstat: # # vnstat_enable="YES" . /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_pidfile=/var/run/vnstat/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}" pidfile="${vnstat_pidfile}" start_precmd=vnstat_startprecmd vnstat_startprecmd() { 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 if [ ! -d "/var/run/vnstat" ]; then install -d -o ${vnstat_user} -g ${vnstat_group} /var/run/vnstat; fi } run_rc_command "$1"