svn commit: r405899 - in branches/2016Q1/net-mgmt/bandwidthd: . files

[Olli Hauer]

Author: ohauer
Date: Tue Jan 12 17:47:26 2016
New Revision: 405899
URL: https://svnweb.freebsd.org/changeset/ports/405899

Log:
  MFH: r405804
  
  - write new rc script [1]
  - install config with @sample macro
  - bump PORTREVISION
  
  Approved by: portmgr (feld@)

Added:
  branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.in
     - copied unchanged from r405804, head/net-mgmt/bandwidthd/files/bandwidthd.in
  branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile.in
     - copied unchanged from r405804, head/net-mgmt/bandwidthd/files/patch-Makefile.in
Deleted:
  branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.sh
  branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile
Modified:
  branches/2016Q1/net-mgmt/bandwidthd/Makefile
  branches/2016Q1/net-mgmt/bandwidthd/pkg-plist
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/net-mgmt/bandwidthd/Makefile
==============================================================================
--- branches/2016Q1/net-mgmt/bandwidthd/Makefile	Tue Jan 12 17:45:18 2016	(r405898)
+++ branches/2016Q1/net-mgmt/bandwidthd/Makefile	Tue Jan 12 17:47:26 2016	(r405899)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bandwidthd
 PORTVERSION=	2.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 
@@ -14,6 +14,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
 
+SUB_FILES=	bandwidthd
+
 USE_CSTD=	gnu89
 
 GNU_CONFIGURE=	YES
@@ -21,7 +23,9 @@ CONFIGURE_ARGS=	ac_cv_lib_iconv_libiconv
 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>

Copied: branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.in (from r405804, head/net-mgmt/bandwidthd/files/bandwidthd.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/net-mgmt/bandwidthd/files/bandwidthd.in	Tue Jan 12 17:47:26 2016	(r405899, copy of r405804, head/net-mgmt/bandwidthd/files/bandwidthd.in)
@@ -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"

Copied: branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile.in (from r405804, head/net-mgmt/bandwidthd/files/patch-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/net-mgmt/bandwidthd/files/patch-Makefile.in	Tue Jan 12 17:47:26 2016	(r405899, copy of r405804, head/net-mgmt/bandwidthd/files/patch-Makefile.in)
@@ -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
+ 

Modified: branches/2016Q1/net-mgmt/bandwidthd/pkg-plist
==============================================================================
--- branches/2016Q1/net-mgmt/bandwidthd/pkg-plist	Tue Jan 12 17:45:18 2016	(r405898)
+++ branches/2016Q1/net-mgmt/bandwidthd/pkg-plist	Tue Jan 12 17:47:26 2016	(r405899)
@@ -1,5 +1,6 @@
-bandwidthd/etc/bandwidthd.conf-dist
 bandwidthd/bandwidthd
+ at 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