From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 28 20:10:10 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F4461065676 for ; Mon, 28 Mar 2011 20:10:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 493EE8FC15 for ; Mon, 28 Mar 2011 20:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p2SKAA7v019145 for ; Mon, 28 Mar 2011 20:10:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p2SKAAt8019144; Mon, 28 Mar 2011 20:10:10 GMT (envelope-from gnats) Resent-Date: Mon, 28 Mar 2011 20:10:10 GMT Resent-Message-Id: <201103282010.p2SKAAt8019144@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BA7A1065676 for ; Mon, 28 Mar 2011 20:05:10 +0000 (UTC) (envelope-from crees@zeus.bayofrum.net) Received: from relay.pcl-ipout02.plus.net (relay.pcl-ipout02.plus.net [212.159.7.100]) by mx1.freebsd.org (Postfix) with ESMTP id 91E738FC08 for ; Mon, 28 Mar 2011 20:05:09 +0000 (UTC) Received: from outmx06.plus.net ([212.159.14.18]) by relay.pcl-ipout02.plus.net with ESMTP; 28 Mar 2011 21:05:07 +0100 Received: from [46.208.63.213] (helo=zeus.bayofrum.net) by outmx06.plus.net with esmtp (Exim) id 1Q4IgU-0003sk-4v for FreeBSD-gnats-submit@freebsd.org; Mon, 28 Mar 2011 21:05:07 +0100 Received: from zeus.bayofrum.net (crees@localhost [127.0.0.1]) by zeus.bayofrum.net (8.14.4/8.14.4) with ESMTP id p2SK4La5033435 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO) for ; Mon, 28 Mar 2011 20:04:22 GMT (envelope-from crees@zeus.bayofrum.net) Received: (from crees@localhost) by zeus.bayofrum.net (8.14.4/8.14.4/Submit) id p2SK4JGg033434; Mon, 28 Mar 2011 21:04:19 +0100 (BST) (envelope-from crees) Message-Id: <201103282004.p2SK4JGg033434@zeus.bayofrum.net> Date: Mon, 28 Mar 2011 21:04:19 +0100 (BST) From: Chris Rees To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/156008: [MAINTAINER] Fix port: sysutils/monitorix remove hardcoded prefix from rc script X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Chris Rees List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2011 20:10:10 -0000 >Number: 156008 >Category: ports >Synopsis: [MAINTAINER] Fix port: sysutils/monitorix remove hardcoded prefix from rc script >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Mar 28 20:10:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: FreeBSD 8.2-RELEASE i386 >Organization: >Environment: System: FreeBSD zeus.bayofrum.net 8.2-RELEASE FreeBSD 8.2-RELEASE #1: Sun Feb 27 22:19:51 UTC 2011 root@zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386 >Description: >How-To-Repeat: >Fix: [1] Remove hardcoded /usr/local from rc script [2] Add trailing slashes to config file defaults [3] Add missing PLIST_SUB expressions Submitted by: sahil [1], Rick Chisholm (rchisholm_at_cyphersystems.com) [2], Chris Rees (utisoft_at_gmail.com) [3] --- monitorix-procname-fix.diff begins here --- Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/sysutils/monitorix/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 28 Mar 2011 02:45:01 -0000 1.3 +++ Makefile 28 Mar 2011 19:58:14 -0000 @@ -7,6 +7,7 @@ PORTNAME= monitorix PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.monitorix.org/ \ http://www.bayofrum.net/dist/${PORTNAME}/ @@ -42,7 +43,9 @@ SUB_FILES= pkg-message SUB_LIST= PERL=${PERL} -PLIST_SUB+= CGIDIR=${CGIDIR:C,^${PREFIX}/,,} +PLIST_SUB+= CGIDIR=${CGIDIR:C,^${PREFIX}/,,} \ + WWW_OWNER=${WWW_OWNER} \ + WWW_GROUP=${WWW_GROUP} WWW_FILES= logo_top.png \ logo_bot.png \ @@ -79,9 +82,9 @@ .endfor # eth0 doesn't exist in FreeBSD! Also let's set our own paths. @${REINPLACE_CMD} \ - -e 's|\($$BASE_DIR = "\)[^"]*|\1${WWWDIR}|' \ - -e 's|\($$BASE_LIB = "\)[^"]*|\1${DATADIR}|' \ - -e 's|\($$BASE_CGI = "\)[^"]*|\1${CGIPATH}|' \ + -e 's|\($$BASE_DIR = "\)[^"]*|\1${WWWDIR}/|' \ + -e 's|\($$BASE_LIB = "\)[^"]*|\1${DATADIR}/|' \ + -e 's|\($$BASE_CGI = "\)[^"]*|\1${CGIPATH}/|' \ -e "s|/var/lib/milter-greylist/db/|/var/milter-greylist/|" \ -e "s|eth0|lo0|g" \ ${WRKSRC}/monitorix.conf Index: files/monitorix.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/sysutils/monitorix/files/monitorix.in,v retrieving revision 1.2 diff -u -r1.2 monitorix.in --- files/monitorix.in 28 Mar 2011 02:45:01 -0000 1.2 +++ files/monitorix.in 28 Mar 2011 19:58:14 -0000 @@ -20,7 +20,7 @@ pidfile="/var/run/${name}.pid" command_interpreter="." -procname="/usr/local/sbin/${name}" +procname="%%PREFIX%%/sbin/${name}" monitorix_start() { --- monitorix-procname-fix.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: