ports/87632: [MAINTAINER] net-mgmt/nrg: update to 0.99.25
Michael Ranner
mranner at inode.at
Tue Oct 18 16:30:18 UTC 2005
>Number: 87632
>Category: ports
>Synopsis: [MAINTAINER] net-mgmt/nrg: update to 0.99.25
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 18 16:30:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Michael Ranner
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD dwarf.jawa.at 5.4-RELEASE FreeBSD 5.4-RELEASE #7: Fri May 13 07:58:48 CEST 2005
>Description:
- Update to 0.99.25
- Install config files as *-dist
Added file(s):
- files/patch-Makefile.in
Removed file(s):
- files/patch-roverpingd-receive.c
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- nrg-0.99.25.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nrg/Makefile /usr/ports/net-mgmt/nrg.update/Makefile
--- /usr/ports/net-mgmt/nrg/Makefile Thu Oct 13 20:08:18 2005
+++ /usr/ports/net-mgmt/nrg.update/Makefile Tue Oct 18 18:16:17 2005
@@ -6,10 +6,9 @@
#
PORTNAME= nrg
-PORTVERSION= 0.99.22
-PORTREVISION= 1
+PORTVERSION= 0.99.25
CATEGORIES= net-mgmt sysutils
-MASTER_SITES= ftp://nrg.hep.wisc.edu/pub/src/nrg/old-versions/ \
+MASTER_SITES= ftp://nrg.hep.wisc.edu/pub/src/nrg/ \
http://www.ranner.jawa.at/stuff/
MAINTAINER= mranner at inode.at
@@ -74,6 +73,10 @@
@${SED} 's|%%PREFIX%%|${PREFIX}|g' <${.CURDIR}/pkg-message >${PKGMESSAGE}
post-install:
+ ${INSTALL_DATA} ${WRKSRC}/examples/Makefile.ops ${PREFIX}/nrg/Makefile-dist
+ ${INSTALL_DATA} ${WRKSRC}/examples/Default.conf ${PREFIX}/nrg/Default.conf-dist
+ ${INSTALL_DATA} ${WRKSRC}/examples/NRG.mconf ${PREFIX}/nrg/NRG.mconf-dist
+ ${INSTALL_DATA} ${WRKSRC}/examples/Site.mconf ${PREFIX}/nrg/Site.mconf-dist
@${INSTALL_SCRIPT} ${FILESDIR}/run-nrg.sh ${PREFIX}/nrg/
@${CAT} ${PKGMESSAGE}
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nrg/distinfo /usr/ports/net-mgmt/nrg.update/distinfo
--- /usr/ports/net-mgmt/nrg/distinfo Mon Aug 2 10:33:10 2004
+++ /usr/ports/net-mgmt/nrg.update/distinfo Tue Oct 18 16:21:23 2005
@@ -1,2 +1,2 @@
-MD5 (nrg-0.99.22.tar.gz) = 439242d8567aab1a375873128a34fc5c
-SIZE (nrg-0.99.22.tar.gz) = 2889103
+MD5 (nrg-0.99.25.tar.gz) = 55edf3b93e9cd155fde5332d02c725ab
+SIZE (nrg-0.99.25.tar.gz) = 208433
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nrg/files/nrg-apcupsdstat.patch /usr/ports/net-mgmt/nrg.update/files/nrg-apcupsdstat.patch
--- /usr/ports/net-mgmt/nrg/files/nrg-apcupsdstat.patch Mon Aug 2 10:33:10 2004
+++ /usr/ports/net-mgmt/nrg.update/files/nrg-apcupsdstat.patch Tue Oct 18 18:20:02 2005
@@ -14,7 +14,7 @@
+
+$mode = 'battery';
+$server = 'localhost';
-+$port = '7000';
++$port = '3551';
+$stamp = '0';
+$stat = '0';
+$apcnisclient = "/usr/local/bin/apcnisclient";
@@ -158,25 +158,26 @@
nrg-bindresponse nrg-bindstat nrg-bindstatd \
nrg-cgikeeper nrg-discover-apache nrg-discover-bind \
nrg-discover-errors nrg-discover-ifaces nrg-discover-netdev \
---- configure.orig Fri Jul 23 21:44:13 2004
-+++ configure Fri Jul 23 21:38:18 2004
-@@ -2019,6 +2019,7 @@
- Makefile \
- collectors/nrg-apmstat \
- collectors/nrg-apachestat \
-+ collectors/nrg-apcupsdstat \
- collectors/nrg-bindresponse \
- collectors/nrg-bindstat \
- collectors/nrg-bindstatd \
-@@ -2189,6 +2190,7 @@
- Makefile \
- collectors/nrg-apmstat \
- collectors/nrg-apachestat \
-+ collectors/nrg-apcupsdstat \
- collectors/nrg-bindresponse \
- collectors/nrg-bindstat \
- collectors/nrg-bindstatd \
-@@ -2312,6 +2314,7 @@
+--- configure.orig Fri Aug 5 22:26:55 2005
++++ configure Tue Oct 18 17:18:23 2005
+@@ -3475,7 +3475,7 @@
+
+
+
+- ac_config_files="$ac_config_files Makefile collectors/nrg-apmstat collectors/nrg-apachestat collectors/nrg-bindresponse collectors/nrg-bindstat collectors/nrg-bindstatd collectors/nrg-pingdstat collectors/nrg-sendmailstat collectors/nrg-sendmailstatd collectors/nrg-tcpresponse contrib/dsreport contrib/rrdmerge contrib/rrdtrim contrib/rrdtuner discoverers/nrg-discover-apache discoverers/nrg-discover-bind discoverers/nrg-discover-error!
s discoverers/nrg-discover-ifaces discoverers/nrg-discover-netdev discoverers/nrg-discover-pingd discoverers/nrg-discover-pvcs discoverers/nrg-discover-sendmail discoverers/nrg-discover-skel discoverers/nrg-discover-snmpd discoverers/nrg-discover-tables discoverers/nrg-discover-tcp etc/run-star-head.pl etc/run-star-tail.pl examples/Default.conf examples/Makefile.ops examples/NRG.mconf roverpingd/Makefile roverpingd/pingd.h src/nrg-runmaker src/nrg-cgikeeper src/nrg-rrdkeeper src/nrg-tablemaker src/nrg-indexmaker src/nrg-autoconf src/mrtg2nrg src/nrg-find-confs src/nrg-spiketrimmer templates/database-mrtg.rrd.tm templates/graph-current.cgi.tm templates/graph-longterm.cgi.tm templates/graph-mrtg.cgi.tm templates/table-df.cgi.tm templates/table-errors.cgi.tm templates/table-ifaces.cgi.tm templates/table-load.cgi.tm templates/table-mem.cgi.tm templates/table-ping-latency.cgi.tm templates/table-ping-loss.cgi.tm templates/table-swap.cgi.tm templates/table-tcp.cgi.tm"
++ ac_config_files="$ac_config_files Makefile collectors/nrg-apmstat collectors/nrg-apachestat collectors/nrg-apcupsdstat collectors/nrg-bindresponse collectors/nrg-bindstat collectors/nrg-bindstatd collectors/nrg-pingdstat collectors/nrg-sendmailstat collectors/nrg-sendmailstatd collectors/nrg-tcpresponse contrib/dsreport contrib/rrdmerge contrib/rrdtrim contrib/rrdtuner discoverers/nrg-discover-apache discoverers/nrg-discover-bind dis!
coverers/nrg-discover-errors discoverers/nrg-discover-ifaces discoverers/nrg-discover-netdev discoverers/nrg-discover-pingd discoverers/nrg-discover-pvcs discoverers/nrg-discover-sendmail discoverers/nrg-discover-skel discoverers/nrg-discover-snmpd discoverers/nrg-discover-tables discoverers/nrg-discover-tcp etc/run-star-head.pl etc/run-star-tail.pl examples/Default.conf examples/Makefile.ops examples/NRG.mconf roverpingd/Makefile roverpingd/pingd.h src/nrg-runmaker src/nrg-cgikeeper src/nrg-rrdkeeper src/nrg-tablemaker src/nrg-indexmaker src/nrg-autoconf src/mrtg2nrg src/nrg-find-confs src/nrg-spiketrimmer templates/database-mrtg.rrd.tm templates/graph-current.cgi.tm templates/graph-longterm.cgi.tm templates/graph-mrtg.cgi.tm templates/table-df.cgi.tm templates/table-errors.cgi.tm templates/table-ifaces.cgi.tm templates/table-load.cgi.tm templates/table-mem.cgi.tm templates/table-ping-latency.cgi.tm templates/table-ping-loss.cgi.tm templates/table-swap.cgi.tm templates/tab!
le-tcp.cgi.tm"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -4028,6 +4028,7 @@
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "collectors/nrg-apmstat" ) CONFIG_FILES="$CONFIG_FILES collectors/nrg-apmstat" ;;
+ "collectors/nrg-apachestat" ) CONFIG_FILES="$CONFIG_FILES collectors/nrg-apachestat" ;;
++ "collectors/nrg-apcupsdstat" ) CONFIG_FILES="$CONFIG_FILES collectors/nrg-apcupsdstat" ;;
+ "collectors/nrg-bindresponse" ) CONFIG_FILES="$CONFIG_FILES collectors/nrg-bindresponse" ;;
+ "collectors/nrg-bindstat" ) CONFIG_FILES="$CONFIG_FILES collectors/nrg-bindstat" ;;
+ "collectors/nrg-bindstatd" ) CONFIG_FILES="$CONFIG_FILES collectors/nrg-bindstatd" ;;
+@@ -4441,6 +4442,7 @@
for f in \
collectors/nrg-apachestat \
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nrg/files/patch-Makefile.in /usr/ports/net-mgmt/nrg.update/files/patch-Makefile.in
--- /usr/ports/net-mgmt/nrg/files/patch-Makefile.in Thu Jan 1 01:00:00 1970
+++ /usr/ports/net-mgmt/nrg.update/files/patch-Makefile.in Tue Oct 18 18:11:13 2005
@@ -0,0 +1,41 @@
+--- Makefile.in.orig Tue Oct 18 18:10:05 2005
++++ Makefile.in Tue Oct 18 18:10:40 2005
+@@ -112,38 +112,6 @@
+ $(MKINSTALLDIRS) $(ARCHIVE_DIR); \
+ fi
+
+- @if [ ! -f $(prefix)/Makefile ]; then \
+- echo "installing Makefile in $(prefix)"; \
+- $(INSTALL) -c -m 644 examples/Makefile.ops $(prefix)/Makefile; \
+- else \
+- echo "installing Makefile.NEW in $(prefix)"; \
+- $(INSTALL) -c -m 644 examples/Makefile.ops $(prefix)/Makefile.NEW; \
+- fi
+-
+- @if [ ! -f $(prefix)/Default.conf ]; then \
+- echo "installing Default.conf in $(prefix)"; \
+- $(INSTALL) -c -m 644 examples/Default.conf $(prefix)/Default.conf; \
+- else \
+- echo "installing Default.conf.NEW in $(prefix)"; \
+- $(INSTALL) -c -m 644 examples/Default.conf $(prefix)/Default.conf.NEW; \
+- fi
+-
+- @if [ ! -f $(prefix)/NRG.mconf ]; then \
+- echo "installing NRG.mconf in $(prefix)"; \
+- $(INSTALL) -c -m 644 examples/NRG.mconf $(prefix)/NRG.mconf; \
+- else \
+- echo "installing NRG.mconf.NEW in $(prefix)"; \
+- $(INSTALL) -c -m 644 examples/NRG.mconf $(prefix)/NRG.mconf.NEW; \
+- fi
+-
+- @if [ ! -f $(prefix)/Site.mconf ]; then \
+- echo "installing Site.mconf in $(prefix)"; \
+- $(INSTALL) -c -m 644 examples/Site.mconf $(prefix)/Site.mconf; \
+- else \
+- echo "installing Site.mconf.NEW in $(prefix)"; \
+- $(INSTALL) -c -m 644 examples/Site.mconf $(prefix)/Site.mconf.NEW; \
+- fi
+-
+ @if [ ! -d $(prefix)/autoconfs ]; then \
+ $(MKINSTALLDIRS) $(prefix)/autoconfs; \
+ fi
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nrg/files/patch-examples /usr/ports/net-mgmt/nrg.update/files/patch-examples
--- /usr/ports/net-mgmt/nrg/files/patch-examples Fri Nov 5 15:20:40 2004
+++ /usr/ports/net-mgmt/nrg.update/files/patch-examples Tue Oct 18 16:38:32 2005
@@ -1,26 +1,27 @@
---- ./examples/Makefile.ops.in.orig Sun Jul 20 20:51:10 2003
-+++ ./examples/Makefile.ops.in Fri Mar 5 18:08:03 2004
-@@ -4,8 +4,8 @@
- # $Id: Makefile.ops.in,v 1.41 2003/07/20 15:16:04 rader Exp $
+--- examples/Makefile.ops.in.orig Tue Oct 18 16:24:17 2005
++++ examples/Makefile.ops.in Tue Oct 18 16:24:49 2005
+@@ -4,9 +4,9 @@
+ # $Id: Makefile.ops.in,v 1.44 2005/04/30 17:28:22 rader Exp $
#
-WEB_PREFIX = /usr/local/web/html
--NRG_WEB_TITLE = "Somesite's NRG Home Page"
+WEB_PREFIX = /usr/local/www/data
+ NRG_WEB_DIR = nrg
+-NRG_WEB_TITLE = "Somesite's NRG Home Page"
+NRG_WEB_TITLE = "FreeBSD NRG Homepage"
MCONF_FILES = NRG.mconf Site.mconf
- NRG_WEB_DIR = nrg
---- examples/Default.conf.in.orig Tue Sep 28 23:28:31 2004
-+++ examples/Default.conf.in Tue Sep 28 23:28:44 2004
+ prefix = @prefix@
+--- examples/Default.conf.in.orig Tue Oct 18 16:37:19 2005
++++ examples/Default.conf.in Tue Oct 18 16:37:39 2005
@@ -224,8 +224,8 @@
- Graph[.*-snmpd-mem$][total_mem_m]: black LINE2
- Graph[.*-snmpd-mem$][used_mem_m]: green AREA
--Graph[.*-snmpd-mem$][cache_mem_m]: d0ffff STACK
--Graph[.*-snmpd-mem$][buff_mem_m]: ffd0ff STACK
+ Graph[.*-snmpd-mem][total_mem_m]: black LINE2
+ Graph[.*-snmpd-mem][used_mem_m]: green AREA
+-Graph[.*-snmpd-mem][cache_mem_m]: d0ffff STACK
+-Graph[.*-snmpd-mem][buff_mem_m]: ffd0ff STACK
+Graph[.*-snmpd-mem$][cache_mem_m]: cyan STACK
+Graph[.*-snmpd-mem$][buff_mem_m]: blue STACK
- Label[.*-snmpd-swap$][used_swp_m]: "used swap "
- Label[.*-snmpd-swap$][total_swp_m]: "total swap"
+ Label[.*-snmpd-swap][used_swp_m]: "used swap "
+ Label[.*-snmpd-swap][total_swp_m]: "total swap"
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nrg/files/patch-roverpingd-receive.c /usr/ports/net-mgmt/nrg.update/files/patch-roverpingd-receive.c
--- /usr/ports/net-mgmt/nrg/files/patch-roverpingd-receive.c Mon Aug 2 10:33:10 2004
+++ /usr/ports/net-mgmt/nrg.update/files/patch-roverpingd-receive.c Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
---- roverpingd/receive.c.orig Sun Aug 1 15:55:04 2004
-+++ roverpingd/receive.c Sun Aug 1 15:55:43 2004
-@@ -170,9 +170,7 @@
- #ifdef __DEBUG_DATA_POINTS__
- /* assumes NUM_DATA_POINTS == 20... can't use loop here because */
- /* because it will get interrupted causing disjointed output... */
-- if ( debuggin) { fprintf(stderr,"node %d data...
-- %d %d %d %d %d %d %d %d %d %d
-- %d %d %d %d %d %d %d %d %d %d (next=%d)\n",
-+ if ( debuggin) { fprintf(stderr,"node %d data...\n %d %d %d %d %d %d %d %d %d %d\n %d %d %d %d %d %d %d %d %d %d (next=%d)\n",
- idx,
- ping_list[idx]->n_latency_data[0], ping_list[idx]->n_latency_data[1],
- ping_list[idx]->n_latency_data[2], ping_list[idx]->n_latency_data[3],
diff -ruN --exclude=CVS /usr/ports/net-mgmt/nrg/pkg-plist /usr/ports/net-mgmt/nrg.update/pkg-plist
--- /usr/ports/net-mgmt/nrg/pkg-plist Mon Aug 2 10:33:10 2004
+++ /usr/ports/net-mgmt/nrg.update/pkg-plist Tue Oct 18 18:09:25 2005
@@ -1,3 +1,4 @@
+%%NRGDIR%%/autoconfs/Default.conf
%%NRGDIR%%/bin/dsreport
%%NRGDIR%%/bin/mrtg2nrg
%%NRGDIR%%/bin/nrg-apachestat
@@ -25,7 +26,6 @@
%%NRGDIR%%/bin/nrg-runmaker
%%NRGDIR%%/bin/nrg-sendmailstat
%%NRGDIR%%/bin/nrg-sendmailstatd
-%%NRGDIR%%/bin/nrg-snmpwalk
%%NRGDIR%%/bin/nrg-spiketrimmer
%%NRGDIR%%/bin/nrg-tablemaker
%%NRGDIR%%/bin/nrg-tcpresponse
@@ -99,16 +99,17 @@
%%DOCSDIR%%/sendmailstat.html
%%DOCSDIR%%/upgrade.html
%%DOCSDIR%%/whats-new
-%%NRGDIR%%/Makefile
-%%NRGDIR%%/Default.conf
-%%NRGDIR%%/NRG.mconf
-%%NRGDIR%%/Site.mconf
+%%NRGDIR%%/Makefile-dist
+%%NRGDIR%%/Default.conf-dist
+%%NRGDIR%%/NRG.mconf-dist
+%%NRGDIR%%/Site.mconf-dist
%%NRGDIR%%/.VERSION
%%NRGDIR%%/run-nrg.sh
@dirrm %%NRGDIR%%/templates
@dirrm %%NRGDIR%%/etc
@dirrm %%NRGDIR%%/bin
@dirrm %%NRGDIR%%/archive
+ at dirrm %%NRGDIR%%/autoconfs
@dirrm %%EXAMPLESDIR%%
@dirrm %%DOCSDIR%%
@dirrm %%NRGDIR%%
--- nrg-0.99.25.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list