From owner-svn-ports-head@FreeBSD.ORG Mon May 12 18:15:09 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 7F71890F; Mon, 12 May 2014 18:15:09 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 610EB20C6; Mon, 12 May 2014 18:15:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CIF923079587; Mon, 12 May 2014 18:15:09 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CIF8Tg079584; Mon, 12 May 2014 18:15:08 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201405121815.s4CIF8Tg079584@svn.freebsd.org> From: Mark Felder Date: Mon, 12 May 2014 18:15:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353886 - in head/net-mgmt/devmon: . 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.18 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, 12 May 2014 18:15:09 -0000 Author: feld Date: Mon May 12 18:15:08 2014 New Revision: 353886 URL: http://svnweb.freebsd.org/changeset/ports/353886 QAT: https://qat.redports.org/buildarchive/r353886/ Log: Support STAGE Move pid dir creation to rc script Clean up rc script a bit, add some consistency change command_interpreter to /usr/local/bin/perl to avoid warnings Sponsored by: SupraNet Communications, Inc Modified: head/net-mgmt/devmon/Makefile head/net-mgmt/devmon/files/devmon.in head/net-mgmt/devmon/pkg-plist Modified: head/net-mgmt/devmon/Makefile ============================================================================== --- head/net-mgmt/devmon/Makefile Mon May 12 18:03:46 2014 (r353885) +++ head/net-mgmt/devmon/Makefile Mon May 12 18:15:08 2014 (r353886) @@ -3,7 +3,7 @@ PORTNAME= devmon DISTVERSION= 0.3.1-beta1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} @@ -29,7 +29,6 @@ OPTIONS_DEFINE= MYSQL REINPLACE_ARGS= -i '' -NO_STAGE= yes .include .if ${PORT_OPTIONS:MMYSQL} @@ -43,23 +42,22 @@ pre-install: (cd ${WRKSRC} && ${MV} devmon.cfg devmon.cfg.dist) do-install: - ${INSTALL} -d ${PREFIX}/devmon - ${INSTALL} -d ${PREFIX}/devmon/modules - ${INSTALL_SCRIPT} ${WRKSRC}/devmon ${PREFIX}/devmon/ - ${INSTALL_DATA} ${WRKSRC}/devmon.cfg.dist ${PREFIX}/devmon/ - (cd ${WRKSRC}/modules && ${COPYTREE_SHARE} \* ${PREFIX}/devmon/modules/) + ${INSTALL} -d ${STAGEDIR}/${PREFIX}/devmon + ${INSTALL} -d ${STAGEDIR}/${PREFIX}/devmon/modules + ${INSTALL_SCRIPT} ${WRKSRC}/devmon ${STAGEDIR}/${PREFIX}/devmon/ + ${INSTALL_DATA} ${WRKSRC}/devmon.cfg.dist ${STAGEDIR}/${PREFIX}/devmon/ + (cd ${WRKSRC}/modules && ${COPYTREE_SHARE} \* ${STAGEDIR}/${PREFIX}/devmon/modules/) post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ - ${INSTALL} -d ${DOCSDIR}/docs - ${INSTALL} -d ${DOCSDIR}/extras - ${INSTALL} -d -o ${USERS} -g ${GROUPS} /var/run/devmon - (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR}/docs/) - (cd ${WRKSRC}/extras && ${COPYTREE_SHARE} \* ${DOCSDIR}/extras/) + ${MKDIR} ${STAGEDIR}/${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}/${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}/${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}/${DOCSDIR}/ + ${INSTALL} -d ${STAGEDIR}/${DOCSDIR}/docs + ${INSTALL} -d ${STAGEDIR}/${DOCSDIR}/extras + (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DOCSDIR}/docs/) + (cd ${WRKSRC}/extras && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DOCSDIR}/extras/) .endif .include Modified: head/net-mgmt/devmon/files/devmon.in ============================================================================== --- head/net-mgmt/devmon/files/devmon.in Mon May 12 18:03:46 2014 (r353885) +++ head/net-mgmt/devmon/files/devmon.in Mon May 12 18:15:08 2014 (r353886) @@ -13,13 +13,13 @@ load_rc_config ${name} : ${devmon_enable:=NO} : ${devmon_config="%%PREFIX%%/devmon/devmon.cfg"} : ${devmon_db="%%PREFIX%%/devmon/hosts.db"} -: ${devmon_pid="/var/run/devmon/devmon.pid"} +: ${devmon_pid=/var/run/devmon/devmon.pid} : ${devmon_user="%%USERS%%"} : ${devmon_group="%%GROUPS%%"} command="%%PREFIX%%/devmon/devmon" command_args="-c ${devmon_config} -d ${devmon_db}" -command_interpreter=/usr/bin/perl +command_interpreter=/usr/local/bin/perl pidfile=${devmon_pid} start_precmd=devmon_startprecmd @@ -35,8 +35,7 @@ devmon_startprecmd() fi TEMPLATESDIR=%%PREFIX%%/devmon/templates - if [ ! -e ${TEMPLATESDIR} ] - then + if [ ! -e ${TEMPLATESDIR} ]; then echo "" echo " ERROR: no templates exist. Please install device templates" echo " to: ${TEMPLATESDIR}" @@ -45,43 +44,43 @@ devmon_startprecmd() echo "" echo " # svn co svn://svn.code.sf.net/p/devmon/code/trunk/templates ${TEMPLATESDIR}" echo "" - exit 1; + exit 1; fi DEVMONLOG=$(grep "^LOGFILE=" ${devmon_config} | awk -F '=' '{print $2}') - if [ ! -e ${DEVMONLOG} ]; - then + if [ ! -e ${DEVMONLOG} ]; then install -o devmon -g devmon /dev/null ${DEVMONLOG} fi + + if [ ! -d /var/run/devmon ]; then + install -o devmon -g devmon /dev/null /var/run/devmon + fi } devmon_statuscmd() { - if [ ! -e ${pidfile} ]; - then + if [ ! -e ${pidfile} ]; then echo "pidfile does not exist. ${name} is not running?"; - exit 1; + exit 1; fi - if pgrep -F ${pidfile} >/dev/null; - then + if pgrep -F ${pidfile} >/dev/null; then echo "${name} is running."; else echo "${name} is not running."; - exit 1; + exit 1; fi } devmon_stopcmd() { - if pgrep -F ${pidfile} >/dev/null; - then + if pgrep -F ${pidfile} >/dev/null; then mypid=`cat ${pidfile}`; kill ${sig_stop} ${mypid}; wait_for_pids ${mypid}; else echo "${name} is not running."; - exit 1; + exit 1; fi } Modified: head/net-mgmt/devmon/pkg-plist ============================================================================== --- head/net-mgmt/devmon/pkg-plist Mon May 12 18:03:46 2014 (r353885) +++ head/net-mgmt/devmon/pkg-plist Mon May 12 18:15:08 2014 (r353886) @@ -25,7 +25,6 @@ devmon/devmon %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG @dirrm devmon/modules @dirrmtry devmon -@unexec rmdir /var/run/devmon %%PORTDOCS%%@dirrm %%DOCSDIR%%/extras %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs %%PORTDOCS%%@dirrm %%DOCSDIR%%