From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 7 07:20:06 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8FC7916A422 for ; Tue, 7 Feb 2006 07:20:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AD4943D46 for ; Tue, 7 Feb 2006 07:20:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k177K5t9066315 for ; Tue, 7 Feb 2006 07:20:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k177K50P066314; Tue, 7 Feb 2006 07:20:05 GMT (envelope-from gnats) Resent-Date: Tue, 7 Feb 2006 07:20:05 GMT Resent-Message-Id: <200602070720.k177K50P066314@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, Takayuki Nakao Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1253E16A422 for ; Tue, 7 Feb 2006 07:14:15 +0000 (GMT) (envelope-from t@nakao.org) Received: from jodo.ipboot.net (jodo.ipboot.net [202.178.100.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id A032243D46 for ; Tue, 7 Feb 2006 07:14:14 +0000 (GMT) (envelope-from t@nakao.org) Received: from localhost (localhost [127.0.0.1]) by jodo.ipboot.net (Postfix) with ESMTP id B86D239986 for ; Tue, 7 Feb 2006 16:14:12 +0900 (JST) Received: from jodo.ipboot.net ([127.0.0.1]) by localhost (jodo.ipboot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 07660-06 for ; Tue, 7 Feb 2006 16:14:10 +0900 (JST) Received: from localhost (localhost [IPv6:::1]) by jodo.ipboot.net (Postfix) with ESMTP id 2F1D539971 for ; Tue, 7 Feb 2006 16:14:10 +0900 (JST) Message-Id: <20060207.161410.00366242.nakao@nict.go.jp> Date: Tue, 07 Feb 2006 16:14:10 +0900 (JST) From: Takayuki Nakao To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/92944: Update ports: net-mgmt/nagiostat X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2006 07:20:06 -0000 >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 >Release: >Organization: >Environment: >Description: As of Jan 28th 2006, this port was marked as BROKEN. I requested a fix to original maintainer 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 +.include + +.if ${PERL_LEVEL} < 500800 +RUN_DEPENDS+= ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm +.endif + +.include 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: