- update to version 1.4.3

* new configuration options (see nagiosgraph.conf for details): stack
* added graph zooming. zooming happens in-place (no separate window).
  drag to zoom. right-click to revert the graph.
* added mouseovers that display time under the cursor.
* optionally specify heartbeat, step, and resolution per host/service.
* clean up insert.pl in preparation for additional processing modes and
  performance data sources.
* fix to javascript to display hosts and services when specified via CGI
  even if they do not appear in the host and service menus.
* fixed bug in handling of backslashes in service and database names.
* added support for rrdtool STACK. stack can be specified using the 'stack'
  directive and/or using the 'lineformat' directive. see nagiosgraph.conf
  for details and examples.

PR:		149358
Submitted by:	Ildar Hizbulin <hizel _at_ vyborg.ru> (maintainer)
Approved by:	glarkin (mentor)

3 files changed, 18 insertions, 14 deletions

diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile
index aeb614423199..54d87a3913bd 100644
--- a/net-mgmt/nagiosgraph/Makefile
+++ b/net-mgmt/nagiosgraph/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nagiosgraph
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
@@ -24,21 +24,23 @@ NAGIOSWWWDIR?=	www/nagios
 CGIFILES=	show.cgi showgraph.cgi showhost.cgi showservice.cgi testcolor.cgi showgroup.cgi
 LIBFILES=	insert.pl
 CFGFILES=	nagiosgraph.conf nagiosgraph_de.conf nagiosgraph_es.conf nagiosgraph_fr.conf \
-                servdb.conf groupdb.conf hostdb.conf datasetdb.conf map access.conf labels.conf \
+		servdb.conf groupdb.conf hostdb.conf datasetdb.conf map access.conf labels.conf \
 		rrdopts.conf
 
 PLIST_SUB=	NAGIOSWWWDIR=${NAGIOSWWWDIR} PORTNAME=${PORTNAME}
 
 post-patch:
-	${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/etc/nagiosgraph.conf
+	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/etc/nagiosgraph.conf
 .for i in ${CGIFILES}
-	${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
-		-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' ${WRKSRC}/cgi/$i
+	@${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
+		-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' \
+			${WRKSRC}/cgi/$i
 .endfor
 
 .for i in ${LIBFILES}
-	${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
-		-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' ${WRKSRC}/lib/$i
+	@${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!g' -e 's!/usr/local!${PREFIX}!g' \
+		-e 's!/opt/nagiosgraph/etc!${PREFIX}/etc/nagios/nagiosgraph!g' \
+			${WRKSRC}/lib/$i
 .endfor
 
 do-install:
@@ -47,7 +49,8 @@ do-install:
 
 .for i in ${CFGFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/$i ${PREFIX}/etc/nagios/${PORTNAME}/${i}.sample
-	[ -f ${PREFIX}/etc/nagios/${PORTNAME}/${i} ] || ${CP} -p ${PREFIX}/etc/nagios/${PORTNAME}/${i}.sample ${PREFIX}/etc/nagios/${PORTNAME}/${i}
+	[ -f ${PREFIX}/etc/nagios/${PORTNAME}/${i} ] || ${CP} -p ${PREFIX}/etc/nagios/${PORTNAME}/${i}.sample \
+		${PREFIX}/etc/nagios/${PORTNAME}/${i}
 .endfor
 
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
diff --git a/net-mgmt/nagiosgraph/distinfo b/net-mgmt/nagiosgraph/distinfo
index 8cc076d0c218..6aeb61ec716a 100644
--- a/net-mgmt/nagiosgraph/distinfo
+++ b/net-mgmt/nagiosgraph/distinfo
@@ -1,3 +1,3 @@
-MD5 (nagiosgraph-1.4.2.tar.gz) = 085c01c1f2534d050b21815af1986282
-SHA256 (nagiosgraph-1.4.2.tar.gz) = 798509946bbfc0d4f63fbf0d988dde4a40dcea9c5f935ee9c1ebd27158dff210
-SIZE (nagiosgraph-1.4.2.tar.gz) = 108561
+MD5 (nagiosgraph-1.4.3.tar.gz) = e00ac92d9d51a7605e08617d19b64080
+SHA256 (nagiosgraph-1.4.3.tar.gz) = f5c75abc782020d150c99417316dc838b640480be6b481cdd791b528954cd74f
+SIZE (nagiosgraph-1.4.3.tar.gz) = 113534
diff --git a/net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in b/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in
index e570386bdac3..80adfcb85f0f 100644
--- a/net-mgmt/nagiosgraph/files/patch-etc-nagiosgraph.conf.in
+++ b/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in
@@ -1,5 +1,5 @@
---- etc/nagiosgraph.conf.orig	2010-04-27 08:14:25.000000000 +0000
-+++ etc/nagiosgraph.conf	2010-04-27 08:18:16.000000000 +0000
+--- ./etc/nagiosgraph.conf.orig	2010-06-07 18:30:21.000000000 +0200
++++ ./etc/nagiosgraph.conf	2010-08-17 21:50:26.000000000 +0200
 @@ -8,19 +8,19 @@
  # Author:  (c) 2010 Matthew Wall
  
@@ -15,7 +15,8 @@
 +perflog = /var/spool/nagios/perfdata.log
  
  # Directory to store rrd database files
- rrddir = /var/nagiosgraph/rrd
+-rrddir = /var/nagiosgraph/rrd
++rrddir = /var/spool/nagios/nagiosgraph/rrd
  
  # File containing regular expressions to identify service and perf data
 -mapfile = /etc/nagiosgraph/map