ports/156008: [MAINTAINER] Fix port: sysutils/monitorix remove hardcoded prefix from rc script

[Chris Rees]

>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 at 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: