net-mgmt/nagiosgraph: 1.4.4 -> 1.5.2

Changes:
- Added ART20 LICENSE
- ensure that insert.pl works with nagios embedded perl
- use embedded images for show/hide toggle buttons (thanks to matt perry)
- ensure graph controls float above other elements
- zoom when zoom rectangle drags to right or left
- added hourly interval
- generate text and html readme files from README.pod (thanks to matt perrry)
- fix map rule for PROCS (thanks to matt perry)
- increase variety of colors (thanks to matt perry)
- improved controls layout (thanks to matt perry)
- block right-click menu on graphs (thanks to matt perry)
- fixed escaping of urls
- isolate date/time formatting for graph mouseovers
- include pid when logging to help isolate multi-core/multi-thread issues.
- fixed debian6 packaging problems.
- change authentication behavior when nagios default_user_name is defined.
  behavior is now aligned to that defined in nagios.
- use more precise values for graph zoom bounds.
- specify explicitly the default graph height.
- strip leading and trailing whitespace from tuples (heartbeats, stepsizes,
  resolutions, steps, xffs, plotasLINE1, plotasLINE2, etc).
- added fixedscale as a per host/service/database/source parameter.  for
  backward compatibility it still works when specified as a cgi argument.
  note that it affects the vertical axis and the values in the legend.
- handle # in database and data source names
- ensure the directory containing perfdata log is writeable by nagios user.
- added export.cgi to dump rrd data in csv or xml format.
- automatically determine groups from the Nagios servicegroup definitions.
- fixed heartbeats/stepsizes/resolutions bug.  this time for real.  really.
- retain a copy of any modifications made to nagios.cfg and commands.cfg when
  removing rpm or deb packages.
- fixed install.pl to work with icinga.
- renamed upgrade.pl to flat2hier.pl
- fixed install option typo for --check-prerequisites in install instructions.
- encourage standalone installations rather than overlays unless installing
  from rpm or deb package.
- encourage nagios pre-flight checks before restarting nagios.

PR:		208483
Approved by:	hizel@vyborg.ru (maintainer)

4 files changed, 19 insertions, 16 deletions

diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile
index 34c4c7728e8..897da0f29d0 100644
--- a/net-mgmt/nagiosgraph/Makefile
+++ b/net-mgmt/nagiosgraph/Makefile
@@ -2,14 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	nagiosgraph
-PORTVERSION=	1.4.4
-PORTREVISION=	2
+PORTVERSION=	1.5.2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
 MAINTAINER=	hizel@vyborg.ru
 COMMENT=	Generate rrdtool graphs using performance data from nagios plugins
 
+LICENSE=	ART20
+
 RUN_DEPENDS=	rrdtool>=0:databases/rrdtool
 
 OPTIONS_DEFINE=		DOCS
@@ -91,9 +92,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/images/action-nagiosgraph.gif
 
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for i in utils/testentry.pl utils/upgrade.pl
-	${INSTALL_SCRIPT} ${WRKSRC}/$i ${STAGEDIR}${EXAMPLESDIR}/
-.endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/testentry.pl ${STAGEDIR}${EXAMPLESDIR}/
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
diff --git a/net-mgmt/nagiosgraph/distinfo b/net-mgmt/nagiosgraph/distinfo
index 9dac7c821ff..a5f0d9a6ad1 100644
--- a/net-mgmt/nagiosgraph/distinfo
+++ b/net-mgmt/nagiosgraph/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nagiosgraph-1.4.4.tar.gz) = e6c7091fbbf7dc44a5a3e8584d3f85dfbf20171dcb253c744ac15300cc9804a1
-SIZE (nagiosgraph-1.4.4.tar.gz) = 157955
+SHA256 (nagiosgraph-1.5.2.tar.gz) = c466193233a4affbd32f882d8cb475ef2d1e9bf091a21fbf3fccd1f825d7450e
+SIZE (nagiosgraph-1.5.2.tar.gz) = 329978
diff --git a/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in b/net-mgmt/nagiosgraph/files/patch-etc_nagiosgraph.conf
index dd119670266..704eb08f7a0 100644
--- a/net-mgmt/nagiosgraph/files/patch-etc__nagiosgraph.conf.in
+++ b/net-mgmt/nagiosgraph/files/patch-etc_nagiosgraph.conf
@@ -1,5 +1,5 @@
---- ./etc/nagiosgraph.conf.orig	2011-01-15 09:27:44.000000000 +0300
-+++ ./etc/nagiosgraph.conf	2011-02-03 16:08:34.000000000 +0300
+--- etc/nagiosgraph.conf.orig	2013-06-11 22:09:56 UTC
++++ etc/nagiosgraph.conf
 @@ -8,19 +8,19 @@
  # Author:  (c) 2010 Matthew Wall
  
@@ -24,7 +24,7 @@
  
  # Nagiosgraph CGI URL.
  nagiosgraphcgiurl = /nagiosgraph/cgi-bin
-@@ -33,22 +33,22 @@
+@@ -33,27 +33,27 @@ nagiosgraphcgiurl = /nagiosgraph/cgi-bin
  javascript = /nagiosgraph/nagiosgraph.js
  
  # Stylesheet: URL to the nagiosgraph stylesheet.
@@ -43,17 +43,22 @@
 -#servdb = /etc/nagiosgraph/servdb.conf
 +#servdb = %%PREFIX%%/etc/nagios/nagiosgraph/servdb.conf
  
- # Location of showgroup control file (required for showgroup.cgi)
--groupdb = /etc/nagiosgraph/groupdb.conf
-+groupdb = %%PREFIX%%/etc/nagios/nagiosgraph/groupdb.conf
+ # Groups can be enumerated explicitly in the groupdb file, gathered
+ # automatically from the service group definitions in the Nagios
+ # configuration, or a combination of both.
+ # Location of showgroup control file (optional)
+-#groupdb = /etc/nagiosgraph/groupdb.conf
++#groupdb = %%PREFIX%%/etc/nagios/nagiosgraph/groupdb.conf
+ # Location of the Nagios configuration file (optional)
+ #groupcfgfile = /etc/nagios/nagios.cfg
  
- # File containing data sets that should be selected in queries (optional)
+ # File containing sets of data sources to select in queries (optional)
 -#datasetdb = /etc/nagiosgraph/datasetdb.conf
 +#datasetdb = %%PREFIX%%/etc/nagios/nagiosgraph/datasetdb.conf
  
  # Access control configuration (optional)
  # The authorization method can be one of nagios3 or nagiosgraph.  If no
-@@ -61,12 +61,12 @@
+@@ -66,12 +66,12 @@ stylesheet = /nagiosgraph/nagiosgraph.cs
  # authorized_for_all_hosts, authorized_for_all_services, and default_user_name
  # variables to determine permissions.
  #authzmethod = nagios3
diff --git a/net-mgmt/nagiosgraph/pkg-plist b/net-mgmt/nagiosgraph/pkg-plist
index ffbf1ec0dfb..01879c92e9e 100644
--- a/net-mgmt/nagiosgraph/pkg-plist
+++ b/net-mgmt/nagiosgraph/pkg-plist
@@ -18,7 +18,6 @@ libexec/%%PORTNAME%%/insert.pl
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testentry.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade.pl
 %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/show.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showconfig.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showgraph.cgi