From owner-svn-ports-head@FreeBSD.ORG Tue Jan 7 08:04:10 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99004D10; Tue, 7 Jan 2014 08:04:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 84FC81CC1; Tue, 7 Jan 2014 08:04:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0784AkJ096520; Tue, 7 Jan 2014 08:04:10 GMT (envelope-from martymac@svn.freebsd.org) Received: (from martymac@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0784A3t096518; Tue, 7 Jan 2014 08:04:10 GMT (envelope-from martymac@svn.freebsd.org) Message-Id: <201401070804.s0784A3t096518@svn.freebsd.org> From: Ganael LAPLANCHE Date: Tue, 7 Jan 2014 08:04:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338980 - in head/sysutils/ganglia-monitor-core: . 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.17 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: Tue, 07 Jan 2014 08:04:10 -0000 Author: martymac Date: Tue Jan 7 08:04:09 2014 New Revision: 338980 URL: http://svnweb.freebsd.org/changeset/ports/338980 Log: Fix gmond startup at boot time PR: ports/184747 Submitted by: martymac Approved by: skreuzer (maintainer) Modified: head/sysutils/ganglia-monitor-core/Makefile (contents, props changed) head/sysutils/ganglia-monitor-core/files/gmond.in (contents, props changed) Modified: head/sysutils/ganglia-monitor-core/Makefile ============================================================================== --- head/sysutils/ganglia-monitor-core/Makefile Tue Jan 7 07:35:09 2014 (r338979) +++ head/sysutils/ganglia-monitor-core/Makefile Tue Jan 7 08:04:09 2014 (r338980) @@ -2,7 +2,7 @@ PORTNAME= monitor-core PORTVERSION= 3.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils net parallel MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION} PKGNAMEPREFIX= ganglia- Modified: head/sysutils/ganglia-monitor-core/files/gmond.in ============================================================================== --- head/sysutils/ganglia-monitor-core/files/gmond.in Tue Jan 7 07:35:09 2014 (r338979) +++ head/sysutils/ganglia-monitor-core/files/gmond.in Tue Jan 7 08:04:09 2014 (r338980) @@ -1,14 +1,23 @@ #!/bin/sh -# $FreeBSD: head/sysutils/ganglia-monitor-core/files/gmond.in 302141 2012-08-05 23:19:36Z dougb $ +# $FreeBSD$ # PROVIDE: gmond # REQUIRE: DAEMON # KEYWORD: shutdown -bname=`basename $0` - . /etc/rc.subr +case "$0" in +/etc/rc*) + # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown), + # so get the name of the script from $_file + bname=`basename $_file` + ;; +*) + bname=`basename $0` + ;; +esac + name=`echo "${bname}" | tr ".-" "__"` rcvar=${name}_enable