Bug 142994

Summary: Update port: net-mgmt/netgraph from 0.9.0_3 to 1.4.0
Product: Ports & Packages Reporter: hizel
Component: Individual Port(s)Assignee: Martin Wilke <miwi>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description hizel 2010-01-19 22:20:09 UTC
1.4.0 2010-01-14
* Most changes from Matthew Wall
* deal with undefined db in getlabels
* code formatting to make 80 col editing a bit easier (e.g. my netbook)
* strings in ctrans for i18n, specified in nagiosgraph.conf
* punt the hr at pagebottom
* distinguish between nagios cgi and nagiosgraph cgi in the config file
* fixed use of 'performance data for (host|service)' label
* deal with uninitialized time* settings
* do not overwrite settings from config file
* pass cgi object when printing footer in showservice.cgi
* sort datasets naturally (thanks to tye at perlmonks for the algorithm)
* added 'negate' option to negate specific datasets (e.g. network receive)
* added 'plotas*' options to specify line weights by dataset
* added 'lineformat' option to specify line weight and color by dataset
* fixed quoting of setresize for button 'onclick'
* use 'GET' rather than 'POST' in printheader (for consistency)
* use classes/ids for time period headers so we can stylize them
* be less finicky about whitespace surrounding = in servdb and hostdb
* fixed the showservice.cgi script
* unescape filenames when reading from disk in dbfilelist
* found bug in javascript?  will not accept first item in select menu
* graphlabels/nolabels logic was all messed up, so refactored it
* split readdb into readhostdb and readservdb to disambiguate it
* provide list of hosts at top of showservices.cgi page
* update documentation in each of the .cgi and .pm files
* added cgi option 'period' to show, showgraph, showservice
* put sizes into list rather than as 2 buttons

...

and more :)

Fix: Patch attached with submission follows:
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2010-01-20 05:38:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 2 hizel 2010-01-25 10:11:26 UTC
sorry, pkg-plist-out not need, PORTREVISION= not need and port name is
net-mgmt/nagiosgraph 

diff -ruN /home/se/nagiosgraph.old/Makefile net-mgmt/nagiosgraph/Makefile
--- /home/se/nagiosgraph.old/Makefile	2010-01-19 20:07:40.000000000 +0300
+++ net-mgmt/nagiosgraph/Makefile	2010-01-20 07:13:07.000000000 +0300
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	nagiosgraph
-PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTVERSION=	1.4.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dsh@wizard.volgograd.ru
 COMMENT=	Generate rrdtool\'s graphs by performance data from nagios plugins
@@ -21,41 +19,45 @@
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
-PORTDOCS=	CHANGELOG INSTALL README README.map
+PORTDOCS=	AUTHORS CHANGELOG INSTALL README README.map TODO
 
 PLIST_SUB=	NAGIOSWWWDIR=${NAGIOSWWWDIR}
 
 NAGIOSWWWDIR?=	www/nagios
 
 post-patch:
-.for i in insert.pl testcolor.cgi testentry.pl
+.for i in lib/insert.pl cgi/show.cgi cgi/showgraph.cgi cgi/showhost.cgi cgi/showservice.cgi cgi/testcolor.cgi
 	${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
+		-e 's!/etc/nagios/!/usr/local/etc/nagios/!g' ${WRKSRC}/$i
 .endfor
 
+
 do-install:
 	${MKDIR} ${PREFIX}/etc/nagios/nagiosgraph
-.for i in map nagiosgraph.conf
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/nagios/nagiosgraph/${i}.example
+
+	${INSTALL_DATA} ${WRKSRC}/etc/ngshared.pm ${PREFIX}/etc/nagios/nagiosgraph/ngshared.pm
+
+.for i in hostdb.conf map nagiosgraph.conf servdb.conf
+	${INSTALL_DATA} ${WRKSRC}/etc/$i ${PREFIX}/etc/nagios/nagiosgraph/${i}.example
 .endfor
 
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/insert.pl ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/insert.pl ${PREFIX}/libexec/${PORTNAME}
 
 	${MKDIR} ${PREFIX}/${NAGIOSWWWDIR}/cgi-bin/nagiosgraph
-.for i in show.cgi testcolor.cgi
+.for i in cgi/show.cgi cgi/showgraph.cgi cgi/showhost.cgi cgi/showservice.cgi cgi/testcolor.cgi
 	${INSTALL_SCRIPT} ${WRKSRC}/$i ${PREFIX}/${NAGIOSWWWDIR}/cgi-bin/nagiosgraph
 .endfor
 
 	${MKDIR} ${PREFIX}/${NAGIOSWWWDIR}/stylesheets
-	${INSTALL_DATA} ${WRKSRC}/nagiosgraph.css ${PREFIX}/${NAGIOSWWWDIR}/stylesheets
+.for i in share/action.gif share/nagiosgraph.css share/nagiosgraph.js 
+	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${NAGIOSWWWDIR}/stylesheets
+.endfor
 
 	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/testentry.pl ${EXAMPLESDIR}
+.for i in utils/authz.pl utils/testentry.pl utils/upgrade.pl
+	${INSTALL_SCRIPT} ${WRKSRC}/$i ${EXAMPLESDIR}
+.endfor
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff -ruN /home/se/nagiosgraph.old/distinfo net-mgmt/nagiosgraph/distinfo
--- /home/se/nagiosgraph.old/distinfo	2010-01-19 20:07:40.000000000 +0300
+++ net-mgmt/nagiosgraph/distinfo	2010-01-19 20:08:32.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (nagiosgraph-0.9.0.tgz) = 4450d5d3f28d4ba379fc225e8aee893e
-SHA256 (nagiosgraph-0.9.0.tgz) = d93957c6f1435f9a10191e07c3fb6b42203a68f9537d9d9509879b9e5fa8dfff
-SIZE (nagiosgraph-0.9.0.tgz) = 20149
+MD5 (nagiosgraph-1.4.0.tar.gz) = d7bece0637df1ab2e94463d2c575b3e3
+SHA256 (nagiosgraph-1.4.0.tar.gz) = 1cb8b77d269201f271d18e4739ea12d927d8e5bf63449ace71c17e07a23f5fb6
+SIZE (nagiosgraph-1.4.0.tar.gz) = 61820
diff -ruN /home/se/nagiosgraph.old/pkg-plist net-mgmt/nagiosgraph/pkg-plist
--- /home/se/nagiosgraph.old/pkg-plist	2010-01-19 20:07:40.000000000 +0300
+++ net-mgmt/nagiosgraph/pkg-plist	2010-01-19 21:01:03.000000000 +0300
@@ -1,15 +1,25 @@
+etc/nagios/nagiosgraph/hostdb.conf.example
 etc/nagios/nagiosgraph/map.example
 etc/nagios/nagiosgraph/nagiosgraph.conf.example
+etc/nagios/nagiosgraph/ngshared.pm
+etc/nagios/nagiosgraph/servdb.conf.example
 libexec/nagiosgraph/insert.pl
-%%EXAMPLESDIR%%/testentry.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/authz.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testentry.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upgrade.pl
 %%NAGIOSWWWDIR%%/cgi-bin/nagiosgraph/show.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/nagiosgraph/showgraph.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/nagiosgraph/showhost.cgi
+%%NAGIOSWWWDIR%%/cgi-bin/nagiosgraph/showservice.cgi
 %%NAGIOSWWWDIR%%/cgi-bin/nagiosgraph/testcolor.cgi
+%%NAGIOSWWWDIR%%/stylesheets/action.gif
 %%NAGIOSWWWDIR%%/stylesheets/nagiosgraph.css
-@dirrm etc/nagios/nagiosgraph
-@dirrmtry etc/nagios
-@dirrm libexec/nagiosgraph
-@dirrm %%EXAMPLESDIR%%
+%%NAGIOSWWWDIR%%/stylesheets/nagiosgraph.js
+@dirrmtry %%NAGIOSWWWDIR%%/stylesheets
 @dirrm %%NAGIOSWWWDIR%%/cgi-bin/nagiosgraph
 @dirrmtry %%NAGIOSWWWDIR%%/cgi-bin
-@dirrmtry %%NAGIOSWWWDIR%%/stylesheets
 @dirrmtry %%NAGIOSWWWDIR%%
+@dirrm libexec/nagiosgraph
+@dirrm etc/nagios/nagiosgraph
+@dirrmtry etc/nagios
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
Comment 3 Martin Wilke freebsd_committer freebsd_triage 2010-01-31 13:12:24 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2010-01-31 13:12:29 UTC
miwi        2010-01-31 13:12:15 UTC

  FreeBSD ports repository

  Modified files:
    net-mgmt/nagiosgraph Makefile distinfo pkg-plist 
  Log:
  - Update to 1.4.0
  
  PR:             142994
  Submitted by:   Hizel Ildar <hizel@vyborg.ru>
  Approved by:    maintainer timeout
  
  Revision  Changes    Path
  1.10      +19 -16    ports/net-mgmt/nagiosgraph/Makefile
  1.3       +3 -3      ports/net-mgmt/nagiosgraph/distinfo
  1.2       +16 -6     ports/net-mgmt/nagiosgraph/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"