From owner-svn-ports-head@freebsd.org Mon Jan 11 19:36:34 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F2C2A6B139; Mon, 11 Jan 2016 19:36:34 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C5901EC6; Mon, 11 Jan 2016 19:36:34 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0BJaXfN070186; Mon, 11 Jan 2016 19:36:33 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0BJaWm0070182; Mon, 11 Jan 2016 19:36:32 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201601111936.u0BJaWm0070182@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 11 Jan 2016 19:36:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405804 - in head/net-mgmt/bandwidthd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2016 19:36:34 -0000 Author: ohauer Date: Mon Jan 11 19:36:32 2016 New Revision: 405804 URL: https://svnweb.freebsd.org/changeset/ports/405804 Log: - write new rc script [1] - install config with @sample macro - bump PORTREVISION MFH: 2016Q1 Added: head/net-mgmt/bandwidthd/files/bandwidthd.in - copied, changed from r405803, head/net-mgmt/bandwidthd/files/bandwidthd.sh head/net-mgmt/bandwidthd/files/patch-Makefile.in - copied, changed from r405803, head/net-mgmt/bandwidthd/files/patch-Makefile Deleted: head/net-mgmt/bandwidthd/files/bandwidthd.sh head/net-mgmt/bandwidthd/files/patch-Makefile Modified: head/net-mgmt/bandwidthd/Makefile head/net-mgmt/bandwidthd/pkg-plist Modified: head/net-mgmt/bandwidthd/Makefile ============================================================================== --- head/net-mgmt/bandwidthd/Makefile Mon Jan 11 19:28:07 2016 (r405803) +++ head/net-mgmt/bandwidthd/Makefile Mon Jan 11 19:36:32 2016 (r405804) @@ -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 Copied and modified: head/net-mgmt/bandwidthd/files/bandwidthd.in (from r405803, head/net-mgmt/bandwidthd/files/bandwidthd.sh) ============================================================================== --- head/net-mgmt/bandwidthd/files/bandwidthd.sh Mon Jan 11 19:28:07 2016 (r405803, copy source) +++ head/net-mgmt/bandwidthd/files/bandwidthd.in Mon Jan 11 19:36:32 2016 (r405804) @@ -1,22 +1,26 @@ #!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: bandwidthd +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown -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 +# 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 and modified: head/net-mgmt/bandwidthd/files/patch-Makefile.in (from r405803, head/net-mgmt/bandwidthd/files/patch-Makefile) ============================================================================== --- head/net-mgmt/bandwidthd/files/patch-Makefile Mon Jan 11 19:28:07 2016 (r405803, copy source) +++ head/net-mgmt/bandwidthd/files/patch-Makefile.in Mon Jan 11 19:36:32 2016 (r405804) @@ -1,11 +1,11 @@ ---- Makefile.in.orig Sun Jan 16 17:02:04 2005 -+++ Makefile.in Sun Jan 16 17:02:38 2005 -@@ -41,7 +41,7 @@ +--- 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-dist ++ @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: head/net-mgmt/bandwidthd/pkg-plist ============================================================================== --- head/net-mgmt/bandwidthd/pkg-plist Mon Jan 11 19:28:07 2016 (r405803) +++ head/net-mgmt/bandwidthd/pkg-plist Mon Jan 11 19:36:32 2016 (r405804) @@ -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