Date: Tue, 07 Feb 2006 16:14:10 +0900 (JST) From: Takayuki Nakao <t@nakao.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92944: Update ports: net-mgmt/nagiostat Message-ID: <20060207.161410.00366242.nakao@nict.go.jp> Resent-Message-ID: <200602070720.k177K50P066314@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92944
>Category: ports
>Synopsis: Update ports: net-mgmt/nagiostat
>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: Tue Feb 07 07:20:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Takayuki Nakao <t@nakao.org>
>Release:
>Organization:
>Environment:
>Description:
As of Jan 28th 2006, this port was marked as BROKEN.
I requested a fix to original maintainer <janos.mohacsi@bsd.hu> with
the attached patch, but I did not receive any reply from him/her for a
week. Thus I submit this PR by myself!
Following bug fixes are included in this patch;
- Destination directory where nagiostat.cgi and graph.gif are
installed was not consistent with the default installation directory
of a port net-mgmt/nagios.
Now, the destination directory is configurable by NAGIOSWWWDIR variable.
- Unnecessary dependency to a port www/p5-CGI is deleted.
>How-To-Repeat:
>Fix:
The recursive diff is attached below;
diff -ruN nagiostat.orig/Makefile nagiostat/Makefile
--- nagiostat.orig/Makefile Tue Feb 7 15:52:29 2006
+++ nagiostat/Makefile Tue Feb 7 15:52:41 2006
@@ -16,10 +16,7 @@
COMMENT= Nagiostat parses performance-data from Nagios and generates graphs
RUN_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \
- nagios:${PORTSDIR}/net-mgmt/nagios \
- ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
-
-BROKEN= Does not install
+ nagios:${PORTSDIR}/net-mgmt/nagios
USE_PERL5= yes
NO_BUILD= yes
@@ -28,6 +25,9 @@
NAGIOSDIR?= /var/spool/nagios
DOC_FILES= README GPL.txt
+NAGIOSWWWDIR?= www/nagios
+PLIST_SUB+= NAGIOSWWWDIR=${NAGIOSWWWDIR}
+
post-patch:
@${REINPLACE_CMD} \
-e 's|%%NAGIOSTATCONFDIR%%|${PREFIX}/etc/|' \
@@ -39,9 +39,9 @@
@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
@${MKDIR} ${NAGIOSDIR}/${PORTNAME}rrd
@${INSTALL_SCRIPT} ${WRKSRC}/nagiostat ${PREFIX}/libexec/${PORTNAME}/
- @${LN} -fs ${PREFIX}/libexec/${PORTNAME}/nagiostat ${PREFIX}/share/nagios/cgi-bin/nagiostat.cgi
+ @${LN} -fs ${PREFIX}/libexec/${PORTNAME}/nagiostat ${PREFIX}/${NAGIOSWWWDIR}/cgi-bin/nagiostat.cgi
@${INSTALL_DATA} ${WRKSRC}/nagiostat.conf ${PREFIX}/etc/nagiostat.conf-sample
- @${INSTALL_DATA} ${WRKSRC}/graph.gif ${PREFIX}/share/nagios/images/logos
+ @${INSTALL_DATA} ${WRKSRC}/graph.gif ${PREFIX}/${NAGIOSWWWDIR}/images/logos
@${MKDIR} ${PREFIX}/libexec/${PORTNAME}/html-templates/
@${INSTALL_DATA} ${WRKSRC}/html-templates/default.html ${PREFIX}/libexec/${PORTNAME}/html-templates/
@${INSTALL_DATA} ${WRKSRC}/html-templates/graphindex.html ${PREFIX}/libexec/${PORTNAME}/html-templates/
@@ -54,4 +54,10 @@
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+RUN_DEPENDS+= ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
+.endif
+
+.include <bsd.port.post.mk>
diff -ruN nagiostat.orig/pkg-plist nagiostat/pkg-plist
--- nagiostat.orig/pkg-plist Tue Feb 7 15:52:29 2006
+++ nagiostat/pkg-plist Tue Feb 7 15:52:41 2006
@@ -3,11 +3,11 @@
@exec chown nagios:nagios /var/spool/nagios/nagiostatrrd
@unexec rmdir /var/spool/nagios/nagiostatrrd 2>/dev/null || true
etc/nagiostat.conf-sample
-share/nagios/cgi-bin/nagiostat.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/nagiostat.cgi
libexec/nagiostat/nagiostat
libexec/nagiostat/html-templates/default.html
libexec/nagiostat/html-templates/graphindex.html
-share/nagios/images/logos/graph.gif
+%%NAGIOSWWWDIR%%/images/logos/graph.gif
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/GPL.txt
@dirrm libexec/nagiostat/html-templates
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060207.161410.00366242.nakao>