Index: branches/2016Q1/net-mgmt/bandwidthd/Makefile
===================================================================
--- branches/2016Q1/net-mgmt/bandwidthd/Makefile	(revision 405898)
+++ branches/2016Q1/net-mgmt/bandwidthd/Makefile	(revision 405899)
@@ -1,27 +1,31 @@
 # Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
 # $FreeBSD$
 
 PORTNAME=	bandwidthd
 PORTVERSION=	2.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tracks bandwidth usage by IP address
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
 
+SUB_FILES=	bandwidthd
+
 USE_CSTD=	gnu89
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	ac_cv_lib_iconv_libiconv_open=no
 USES=		gmake tar:tgz
 
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/bandwidthd.sh \
-	    ${STAGEDIR}${PREFIX}/etc/rc.d/bandwidthd.sh.sample
+	${INSTALL_SCRIPT} ${WRKDIR}/bandwidthd \
+	    ${STAGEDIR}${PREFIX}/etc/rc.d
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile
===================================================================
--- branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile	(revision 405898)
+++ branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile	(nonexistent)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Jan 16 17:02:04 2005
-+++ Makefile.in	Sun Jan 16 17:02:38 2005
-@@ -41,7 +41,7 @@
- 	@INSTALL@ -d $(DESTDIR)$(exec_prefix)/bandwidthd/etc
- 	@INSTALL@ -d $(DESTDIR)$(exec_prefix)/bandwidthd/htdocs
- 	@INSTALL@ -m755 -s bandwidthd $(DESTDIR)$(exec_prefix)/bandwidthd	
--	if [ ! -f $(DESTDIR)$(exec_prefix)/bandwidthd/etc/bandwidthd.conf ] ; then @INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)$(exec_prefix)/bandwidthd/etc/ ; fi
-+	@INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)$(exec_prefix)/bandwidthd/etc/bandwidthd.conf-dist
- 	@INSTALL@ -m644 htdocs/legend.gif $(DESTDIR)$(exec_prefix)/bandwidthd/htdocs
- 	@INSTALL@ -m644 htdocs/logo.gif $(DESTDIR)$(exec_prefix)/bandwidthd/htdocs
- 

Property changes on: branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.sh
===================================================================
--- branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.sh	(revision 405898)
+++ branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.sh	(nonexistent)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-        start)
-	        [ -x ${PREFIX}/bandwidthd ] && \
-        	[ -r ${PREFIX}/bandwidthd/etc/bandwidthd.conf ] && \
-        	cd ${PREFIX}/bandwidthd && ./bandwidthd &&\
-                        echo -n ' bandwidthd'
-
-	;;
-	stop)
-	killall bandwidthd && echo -n ' bandwidthd'
-	;;
-	*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac

Property changes on: branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.sh
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.in
===================================================================
--- branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.in	(nonexistent)
+++ branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.in	(revision 405899)
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: bandwidthd
+# REQUIRE: NETWORKING SERVERS
+# BEFORE:  DAEMON
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable bandwidthd:
+# bandwidthd_enable (bool):	Set it to "YES" to enable bandwidthd.
+#				Default is "NO".
+
+bandwidthd_enable=${bandwidthd_enable:="NO"}
+
+. /etc/rc.subr
+
+name="bandwidthd"
+rcvar="bandwidthd_enable"
+
+command="%%PREFIX%%/bandwidthd/bandwidthd"
+required_files="%%PREFIX%%/bandwidthd/etc/bandwidthd.conf"
+pidfile="/var/run/bandwidthd.pid"
+
+load_rc_config $name
+run_rc_command "$1"

Property changes on: branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile.in
===================================================================
--- branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile.in	(nonexistent)
+++ branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile.in	(revision 405899)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2005-01-11 21:15:49 UTC
++++ Makefile.in
+@@ -41,7 +41,7 @@ install: all
+ 	@INSTALL@ -d $(DESTDIR)$(exec_prefix)/bandwidthd/etc
+ 	@INSTALL@ -d $(DESTDIR)$(exec_prefix)/bandwidthd/htdocs
+ 	@INSTALL@ -m755 -s bandwidthd $(DESTDIR)$(exec_prefix)/bandwidthd	
+-	if [ ! -f $(DESTDIR)$(exec_prefix)/bandwidthd/etc/bandwidthd.conf ] ; then @INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)$(exec_prefix)/bandwidthd/etc/ ; fi
++	@INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)$(exec_prefix)/bandwidthd/etc/bandwidthd.conf.sample
+ 	@INSTALL@ -m644 htdocs/legend.gif $(DESTDIR)$(exec_prefix)/bandwidthd/htdocs
+ 	@INSTALL@ -m644 htdocs/logo.gif $(DESTDIR)$(exec_prefix)/bandwidthd/htdocs
+ 

Property changes on: branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2016Q1/net-mgmt/bandwidthd/pkg-plist
===================================================================
--- branches/2016Q1/net-mgmt/bandwidthd/pkg-plist	(revision 405898)
+++ branches/2016Q1/net-mgmt/bandwidthd/pkg-plist	(revision 405899)
@@ -1,5 +1,6 @@
-bandwidthd/etc/bandwidthd.conf-dist
 bandwidthd/bandwidthd
+@sample bandwidthd/etc/bandwidthd.conf.sample
 bandwidthd/htdocs/legend.gif
 bandwidthd/htdocs/logo.gif
-etc/rc.d/bandwidthd.sh.sample
+etc/rc.d/bandwidthd
+%%PORTDOCS%%%%DOCSDIR%%/README
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 405898)
+++ branches/2016Q1	(revision 405899)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r405804