Date: Wed, 20 Jan 2010 13:32:46 +0300 From: Hizel Ildar <hizel@vyborg.ru> To: freebsd-ports-bugs@freebsd.org Subject: Re: ports/142994: Update port: net-mgmt/netgraph from 0.9.0_3 to 1.4.0 Message-ID: <20100120133246.37f90608@hzwork.vyborg.ru> In-Reply-To: <201001200538.o0K5cPnb093396@freefall.freebsd.org> References: <201001200538.o0K5cPnb093396@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
sorry, pkg-plist-out not need, PORTREVISION= not need
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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100120133246.37f90608>