ports/125336: [patch] Port: net-mgmt/nagiosgraph

[olli hauer]

>Number:         125336
>Category:       ports
>Synopsis:       [patch] Port: net-mgmt/nagiosgraph
>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:   Sun Jul 06 16:00:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     olli hauer
>Release:        
>Organization:
>Environment:
>Description:
The path to nagiosgraph.conf is inconsistent in the sources, so {REPLACE_CMD} should be adjusted for show.cgi

path before this patch

# grep -R "/nagiosgraph.conf" * | grep -v bak
insert.pl:my $configfile = '/usr/local/etc/nagios/nagiosgraph/nagiosgraph.conf';
show.cgi:my $configfile = '/usr/local/etc/nagiosgraph/nagios/nagiosgraph/nagiosgraph.conf';


now after Makefile adjustment

# grep -R "/nagiosgraph.conf" * | grep -v bak
insert.pl:my $configfile = '/usr/local/etc/nagios/nagiosgraph/nagiosgraph.conf';
show.cgi:my $configfile = '/usr/local/etc/nagios/nagiosgraph/nagiosgraph.conf';

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig       2008-06-24 14:34:53.000000000 +0200
+++ Makefile    2008-07-06 17:31:39.000000000 +0200
@@ -7,7 +7,7 @@

 PORTNAME=      nagiosgraph
 PORTVERSION=   0.9.0
-PORTREVISION=  2
+PORTREVISION=  3
 CATEGORIES=    net-mgmt
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=    ${PORTNAME}
@@ -29,10 +29,17 @@
 NAGIOSWWWDIR?= www/nagios

 post-patch:
-.for i in insert.pl show.cgi testcolor.cgi testentry.pl
-       ${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' -e 's!nagiosgraph\.conf!nagios/nagiosgraph/nagiosgraph.conf!g' ${WRKSRC}/$i
+.for i in insert.pl testcolor.cgi testentry.pl
+       ${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
+               -e 's!nagiosgraph\.conf!nagios/nagiosgraph/nagiosgraph.conf!g' ${WRKSRC}/$i
 .endfor

+.for i in show.cgi
+       ${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
+               -e 's!nagiosgraph/nagiosgraph\.conf!nagios/nagiosgraph/nagiosgraph.conf!g' ${WRKSRC}/$i
+.endfor
+
+
 do-install:
        ${MKDIR} ${PREFIX}/etc/nagios/nagiosgraph
 .for i in map nagiosgraph.conf


>Release-Note:
>Audit-Trail:
>Unformatted: