Garbage-collect expired ports:

2010-12-30 databases/p5-sqlrelay: broken and upstream disapeared
2010-12-30 devel/php-dbg2: No upstream support
2010-12-30 dns/fourcdns: upstream has disapeared
2010-12-31 emulators/win4bsd: Development has ceased and distfile is no longer available
2010-12-31 french/mozilla-flp: www/seamonkey port is deprecated. Consider using the www/firefox-i18n.
2010-12-31 french/xtel: Minitel services will be discontinued at the end of 2010.
2010-12-30 ftp/ftpq: upstream has disapeared
2010-12-30 graphics/paintlib: does not compile with new tiff and no more maintained upstream
2010-12-30 graphics/g3dviewer: does not build with gcc 4.2, upstream disapeared
2010-12-30 lang/scriba: Does not compile with gcc 4.2+, looks like abandonware
2010-12-30 math/rascal: Broken on every arch since 2008, looks like an abandonware
2010-12-31 net-mgmt/nrg: Project has vanished. Use cacti instead.
2010-12-31 security/hostsentry: Project is dead.
2010-12-31 sysutils/kcube: Project has vanished
2010-12-31 www/cybercalendar: has been unmaintained since 2001 and is unusable with dates after 2010 (see ports/150974)
2010-12-31 www/flock: Flock 3 moves from Firefox to Chromium
2010-12-31 www/linux-flock: Flock 3 moves from Firefox to Chromium
2010-12-30 x11-clocks/xtu: Looks like abandonware

Leave java/tya in for now, as it has outstanding PRs.

15 files changed, 0 insertions, 589 deletions

diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index f1f3c35e904..57172b8261e 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -169,7 +169,6 @@
     SUBDIR += nitpicker
     SUBDIR += noc
     SUBDIR += nocol
-    SUBDIR += nrg
     SUBDIR += nrpe2
     SUBDIR += nrpep
     SUBDIR += nsca
diff --git a/net-mgmt/nrg/Makefile b/net-mgmt/nrg/Makefile
deleted file mode 100644
index 49e60199125..00000000000
--- a/net-mgmt/nrg/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# New ports collection makefile for:   nrg
-# Date created:        18 January 2004
-# Whom:                Michael Ranner
-#
-# $FreeBSD$
-#
-
-PORTNAME=	nrg
-PORTVERSION=	0.99.25
-PORTREVISION=	3
-CATEGORIES=	net-mgmt sysutils
-MASTER_SITES=	ftp://nrg.hep.wisc.edu/pub/src/nrg/ \
-		http://www.ranner.jawa.at/stuff/
-
-MAINTAINER=	michael@ranner.eu
-COMMENT=	Tool for visualizing network and resource utilization data
-
-BUILD_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
-		${LOCALBASE}/bin/snmpget:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \
-		${LOCALBASE}/bin/snmpget:${PORTSDIR}/net-mgmt/net-snmp \
-		${SITE_PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-
-DEPRECATED=	Project has vanished. Use cacti instead.
-EXPIRATION_DATE=	2010-12-31
-
-NRG_WEB_PREFIX?=	${PREFIX}/www/data
-NRG_WEB_DIR?=		nrg
-NRG_WEB_TITLE?=		FreeBSD NRG Homepage
-
-NRG_DIR?=		nrg
-NRGDIR=			${NRG_DIR}
-DOCSDIR=		${NRGDIR}/html
-EXAMPLESDIR=	${NRGDIR}/examples
-
-SITE_PERL_ARCH=	${SITE_PERL}/${PERL_ARCH}
-
-PKGMESSAGE=		${WRKDIR}/pkg-message
-USE_PERL5=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}/${NRGDIR}
-ALL_TARGET=		pingd
-PLIST_SUB=		NRGDIR=${NRG_DIR}
-
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "    -DWITH_APCNISCLIENT to build collector for nrg-apcupsdstat"
-	@${ECHO} ""
-
-.if defined(WITH_APCNISCLIENT)
-EXTRA_PATCHES+=	${PATCHDIR}/nrg-apcupsdstat.patch
-PLIST_FILES+=	nrg/bin/nrg-apcupsdstat
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,= @WEB_PREFIX@,= ${NRG_WEB_PREFIX},g" \
-		-e "s,= @NRG_WEB_DIR@,= ${NRG_WEB_DIR},g" \
-		-e "s,= @NRG_WEB_TITLE@,= \"${NRG_WEB_TITLE}\",g" \
-		${WRKSRC}/examples/Makefile.ops.in
-	@${REINPLACE_CMD} -e "s,<malloc.h>,<stdlib.h>,g" \
-		${WRKSRC}/roverpingd/send.c ${WRKSRC}/roverpingd/pingd.c \
-		${WRKSRC}/roverpingd/read_list.c
-	@${REINPLACE_CMD} -e "s,<values.h>,<limits.h>,g" \
-		-e "s, MAXINT, INT_MAX,g" \
-		${WRKSRC}/roverpingd/write_stats.c
-	@${REINPLACE_CMD} -e "s,-D__FreeBSD__,,g" \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e "s,@bindir@/rrdtool,${PREFIX}/bin/rrdtool,g" \
-		${WRKSRC}/etc/run-star-head.pl.in
-	@${REINPLACE_CMD} -e "s,@prefix@,${PREFIX},g" \
-		-e "s,NOW \"%a %b %d %H:%M %Z %Y\",NOW '%a %b %d %H:%M %Z %Y',g" \
-		${WRKSRC}/templates/*.in
-	@${CP} ${TEMPLATES}/config.guess ${WRKSRC}/config/
-	@${CP} ${TEMPLATES}/config.sub ${WRKSRC}/config/
-
-pre-install:
-	@${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}
-
-.include <bsd.port.mk>
diff --git a/net-mgmt/nrg/distinfo b/net-mgmt/nrg/distinfo
deleted file mode 100644
index 4d21be36e51..00000000000
--- a/net-mgmt/nrg/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (nrg-0.99.25.tar.gz) = d11c831882bbc8f3acc39c69b5b74ca9d1fd81094fde3877801d3c7e57134805
-SIZE (nrg-0.99.25.tar.gz) = 208433
diff --git a/net-mgmt/nrg/files/nrg-apcupsdstat.patch b/net-mgmt/nrg/files/nrg-apcupsdstat.patch
deleted file mode 100644
index c4b340a18f9..00000000000
--- a/net-mgmt/nrg/files/nrg-apcupsdstat.patch
+++ /dev/null
@@ -1,187 +0,0 @@
---- collectors/nrg-apcupsdstat.in.orig	Fri Mar  5 18:13:13 2004
-+++ collectors/nrg-apcupsdstat.in	Fri Mar  5 18:13:13 2004
-@@ -0,0 +1,146 @@
-+#!@PERL@
-+#
-+# nrg-apcupsdstat - a nrg collector for reporting apcupsd statistics
-+#
-+# options: temp and battery
-+#
-+# michael ranner <mranner@inode.at>
-+#
-+# $Id$
-+#
-+
-+$mode = 'battery';
-+$server = 'localhost';
-+$port = '3551';
-+$stamp = '0';
-+$stat = '0';
-+$apcnisclient = "/usr/local/bin/apcnisclient";
-+
-+#------------------------------------------------------------------
-+# parse argv...
-+
-+while ( $ARGV[0] =~ /^-/ ) {
-+  $arg = $ARGV[0];
-+  if ( $arg =~ /^-d/ ) {
-+    $debug = 1;
-+    shift @ARGV;
-+  } elsif ( $arg =~ /^-p/ ) {
-+    $port = $ARGV[1];
-+    shift @ARGV; shift @ARGV;
-+  } elsif ( $arg =~ /^-m/ ) {
-+    $mode = $ARGV[1];
-+    shift @ARGV; shift @ARGV;
-+  } else {
-+    print "unknown option: \"$arg\"\n";
-+    &usage;
-+    exit 1;
-+  }
-+  $i++;
-+}
-+
-+if ( $#ARGV != 0 ) { 
-+  print "usage: nrg-apcupsdstat [args] apc_server\n";
-+  exit;
-+}
-+$server = $ARGV[0];
-+
-+if ( $debug ) {
-+  $date = `date`; chop $date;
-+  print "nrg-apcupsdstat: started in debug mode at $date\n";
-+  print "nrg-apcupsdstat: contacting $server at $port\n";
-+}
-+
-+if ( $mode ne 'load' && $mode ne 'temp' && $mode ne 'battery'
-+  && $mode ne 'inv' && $mode ne 'outv' && $mode ne 'battv' ) {
-+  print "unknown mode: \"$mode\"\n";
-+  &usage;
-+  exit 1;
-+}
-+
-+#------------------------------------------------------------------
-+# get the stats from apc nis client...
-+
-+if ( $port !~ /^\d+$/ ) {
-+  $port = getservbyname($port,'tcp') || &abend;
-+}
-+
-+open(CLIENT, "$apcnisclient $server:$port status|");
-+
-+while(<CLIENT>) {
-+  push(@details, $_);
-+}
-+close(CLIENT);
-+
-+if ( ! @details ) { &abend; }
-+
-+#------------------------------------------------------------------
-+# parse the stats...
-+
-+foreach $_ (@details) {
-+  ($n, $stamp) = split(": ") if /^DATE/;
-+
-+  if ($mode eq "battery") {
-+    next if !/^BCHARGE/;
-+    ($k, $n, $stat) = split;
-+    last;
-+  } elsif ($mode eq "battv") {
-+    next if !/^BATTV/;
-+    ($k, $n, $stat) = split;
-+    last;
-+  } elsif ($mode eq "inv") {
-+    next if !/^LINEV/;
-+    ($k, $n, $stat) = split;
-+    last;
-+  } elsif ($mode eq "load") {
-+    next if !/^LOADPCT/;
-+    ($k, $n, $stat) = split;
-+    last;
-+  } elsif ($mode eq "temp") {
-+    next if !/^ITEMP/;
-+    ($k, $n, $stat) = split;
-+    last;
-+  } elsif ($mode eq "outv") {
-+    next if !/^OUTPUTV/;
-+    ($k, $n, $stat) = split;
-+    last;
-+  }
-+
-+}
-+
-+$stamp = time;
-+
-+#------------------------------------------------------------------
-+# print out nrg collector format output...
-+
-+if ( ! $stamp || ! $stat ) {
-+  #print "nrg-apcupsdstat: could not get stats from $server!\n";
-+  $stamp = time;
-+  $details = "no stats from $server";
-+} else {
-+  $details = "$stat $mode GAUGE";
-+}
-+
-+$localtime = scalar localtime($stamp);
-+print "$stamp $localtime\n";
-+print "INF uptime\n"; # FIXME
-+print "$details\n";
-+
-+exit;
-+
-+#==================================================================
-+
-+sub usage {
-+  print "usage: nrg-apcupsdstat [-d] [-p port] [-m mode] apc_server\n";
-+}
-+
-+#------------------------------------------------------------------
-+
-+sub abend {
-+  if ( $debug) {"nrg-sendmail: connection to $server:$port failed\n";}
-+  $stamp = time;
-+  $localtime = scalar localtime($stamp);
-+  print "$stamp $localtime\n";
-+  print "INF uptime\n";
-+  print "connection to $server port $port failed\n";
-+  exit;
-+}
---- Makefile.in.orig	Fri Jul 23 21:42:58 2004
-+++ Makefile.in	Fri Jul 23 21:43:11 2004
-@@ -19,7 +19,7 @@
- CONTRIB_DIR = ${prefix}/contrib
- 
- BIN_FILES = \
--  dsreport mrtg2nrg nrg-apachestat nrg-autoconf \
-+  dsreport mrtg2nrg nrg-apachestat nrg-apcupsdstat nrg-autoconf \
-   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 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-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/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 discoverers/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/table-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 \
-+  collectors/nrg-apcupsdstat \
-   collectors/nrg-bindresponse \
-   collectors/nrg-bindstat \
-   collectors/nrg-bindstatd \
diff --git a/net-mgmt/nrg/files/patch-Makefile.in b/net-mgmt/nrg/files/patch-Makefile.in
deleted file mode 100644
index 95ca0d101fa..00000000000
--- a/net-mgmt/nrg/files/patch-Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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 --git a/net-mgmt/nrg/files/patch-examples b/net-mgmt/nrg/files/patch-examples
deleted file mode 100644
index af595dc813c..00000000000
--- a/net-mgmt/nrg/files/patch-examples
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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
-+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
- 
- 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$][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"
diff --git a/net-mgmt/nrg/files/patch-nrg-apachestat b/net-mgmt/nrg/files/patch-nrg-apachestat
deleted file mode 100644
index e74401d8ff3..00000000000
--- a/net-mgmt/nrg/files/patch-nrg-apachestat
+++ /dev/null
@@ -1,50 +0,0 @@
---- ./collectors/nrg-apachestat.in.orig	Sun Jul 20 20:51:09 2003
-+++ ./collectors/nrg-apachestat.in	Fri Mar  5 18:08:03 2004
-@@ -11,7 +11,7 @@
- $mode = "requests";
- $server = "localhost";
- $port = "80";
--$url = "server-status";
-+$url = "server-status?auto";
- $stamp = 0;
- $stat = 0;
- 
-@@ -88,15 +88,24 @@
-   # parse the stats...
- 
-   while(<SOCK>) {
-+  if ( $_ =~ /Uptime: (\d+)/ ) {
-+	$uptime = $1;
-+	last;
-+  }
-   if ( $_ =~ /Server uptime:/ ) {
-     if ( $_ =~ /(\d+) hour/ ) { $uptime += $1*60*60; }
-     if ( $_ =~ /(\d+) minute/ ) { $uptime += $1*60; }
-     if ( $_ =~ /(\d+) second/ ) { $uptime += $1; }
-   }
--  if ( $mode eq 'requests' && $_ =~ /Total accesses: (\d+)/ ) {
-+  if ( $mode eq 'requests' && $_ =~ /Total accesses: (\d+)/i ) {
-     $stat = $1;
-     &debug("$stat accesses\n");
--    last;
-+	last if $url !~ /auto$/;
-+  }
-+  if ( $mode eq 'bytes' && $_ =~ /Total kBytes: (\d+)/ ) {
-+    $stat = $1*1024;
-+    &debug("$stat bytes\n");
-+	last if $url !~ /auto$/;
-   }
-   if ( $mode eq 'bytes' && $_ =~ /Total Traffic: (\d+) kB/ ) {
-     $stat = $1*1024;
-@@ -105,6 +114,11 @@
-   }
-   if ( $mode eq 'bytes' && $_ =~ /Total Traffic: (\d+)\.(\d) MB/ ) {
-     $stat = ($1*1024*1024) + (($2/10)*1024*1024);
-+    &debug("$stat bytes\n");
-+    last;
-+  }
-+  if ( $mode eq 'bytes' && $_ =~ /Total Traffic: (\d+)\.(\d) GB/ ) {
-+    $stat = ($1*1024*1024*1024) + (($2/10)*1024*1024*1024);
-     &debug("$stat bytes\n");
-     last;
-   }
diff --git a/net-mgmt/nrg/files/patch-nrg-bindstat b/net-mgmt/nrg/files/patch-nrg-bindstat
deleted file mode 100644
index e54f61e7629..00000000000
--- a/net-mgmt/nrg/files/patch-nrg-bindstat
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./collectors/nrg-bindstat.in.orig	Sun Jul 20 20:51:09 2003
-+++ ./collectors/nrg-bindstat.in	Fri Mar  5 18:08:03 2004
-@@ -24,7 +24,7 @@
- $version = "4.9.6";
- $mode = "queries";
- $server = "localhost";
--$port = "88888";
-+$port = "28888";
- $stamp = 0;
- $stat = 0;
- 
diff --git a/net-mgmt/nrg/files/patch-nrg-rrdkeeper b/net-mgmt/nrg/files/patch-nrg-rrdkeeper
deleted file mode 100644
index 4a0cdff9dfc..00000000000
--- a/net-mgmt/nrg/files/patch-nrg-rrdkeeper
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/nrg-rrdkeeper.in.orig	Fri Mar  5 18:04:41 2004
-+++ src/nrg-rrdkeeper.in	Fri Mar  5 18:05:19 2004
-@@ -631,6 +631,12 @@
- 
-   }
- 
-+  $dir = $path;
-+  $dir =~ s/[^\/]+.rrd//;
-+  if (! -d $dir) {
-+    system("mkdir -p $dir");
-+  }
-+
-   #print "RRDs::create @create_options \n";
-   RRDs::create @create_options;
- 
diff --git a/net-mgmt/nrg/files/patch-nrg-sendmailstat b/net-mgmt/nrg/files/patch-nrg-sendmailstat
deleted file mode 100644
index a2a14d06fac..00000000000
--- a/net-mgmt/nrg/files/patch-nrg-sendmailstat
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./collectors/nrg-sendmailstat.in.orig	Sun Jul 20 20:51:09 2003
-+++ ./collectors/nrg-sendmailstat.in	Fri Mar  5 18:08:03 2004
-@@ -13,7 +13,7 @@
- 
- $mode = 'msgs';
- $server = 'localhost';
--$port = '88889';
-+$port = '28889';
- $stamp = '0';
- $stat = '0';
- 
diff --git a/net-mgmt/nrg/files/patch-roverpingd-Makefile.in b/net-mgmt/nrg/files/patch-roverpingd-Makefile.in
deleted file mode 100644
index abacdc1eca2..00000000000
--- a/net-mgmt/nrg/files/patch-roverpingd-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- roverpingd/Makefile.in.orig	Sun Aug  1 20:51:19 2004
-+++ roverpingd/Makefile.in	Sun Aug  1 20:51:29 2004
-@@ -6,8 +6,8 @@
- SRCS = pingd.c read_list.c send.c receive.c sock.c packet.c write_stats.c
- OBJS = pingd.o read_list.o send.o receive.o sock.o packet.o write_stats.o
- 
--CC = @CC@
--CFLAGS = @CFLAGS@
-+CC ?= @CC@
-+CFLAGS ?= @CFLAGS@
- LDFLAGS = @LDFLAGS@
- #DEFINES = -D__DEBUG_DATA_POINTS__
- DEFINES = 
diff --git a/net-mgmt/nrg/files/run-nrg.sh b/net-mgmt/nrg/files/run-nrg.sh
deleted file mode 100644
index 4beca07ecb2..00000000000
--- a/net-mgmt/nrg/files/run-nrg.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-LOG=/var/log/run-nrg.log
-
-#renice 5 -p $$ >/dev/null 2>&1
-/usr/local/nrg/run-nrg >$LOG
-#/usr/local/nrg/run-nrg.local >>$LOG
diff --git a/net-mgmt/nrg/pkg-descr b/net-mgmt/nrg/pkg-descr
deleted file mode 100644
index 7c9bbb5bb1d..00000000000
--- a/net-mgmt/nrg/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-NRG is a system for maintaining and visualizing network data and
-other resource utilization data. It automates the maintenance of
-RRDtool databases and graph web pages (that look like MRTG web
-pages.) NRG is primarily configured using very terse meta-
-configuration strings. These strings tell NRG to autodiscover
-network devices and verify that their current NRG configuration
-is correct.
-
-WWW: http://nrg.hep.wisc.edu/
diff --git a/net-mgmt/nrg/pkg-message b/net-mgmt/nrg/pkg-message
deleted file mode 100644
index 7be9ccfb364..00000000000
--- a/net-mgmt/nrg/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-
-************************************************************
-
-For configuration and upgrade, please read file located at:
-%%PREFIX%%/nrg/html/index.html
-
-Afer configuration add the next line to crontab:
-*/5 * * * * %%PREFIX%%/nrg/run-nrg.sh
-
-************************************************************
-
diff --git a/net-mgmt/nrg/pkg-plist b/net-mgmt/nrg/pkg-plist
deleted file mode 100644
index ae0c6ddc4cd..00000000000
--- a/net-mgmt/nrg/pkg-plist
+++ /dev/null
@@ -1,115 +0,0 @@
-%%NRGDIR%%/autoconfs/Default.conf
-%%NRGDIR%%/bin/dsreport
-%%NRGDIR%%/bin/mrtg2nrg
-%%NRGDIR%%/bin/nrg-apachestat
-%%NRGDIR%%/bin/nrg-autoconf
-%%NRGDIR%%/bin/nrg-bindresponse
-%%NRGDIR%%/bin/nrg-bindstat
-%%NRGDIR%%/bin/nrg-bindstatd
-%%NRGDIR%%/bin/nrg-cgikeeper
-%%NRGDIR%%/bin/nrg-discover-apache
-%%NRGDIR%%/bin/nrg-discover-bind
-%%NRGDIR%%/bin/nrg-discover-errors
-%%NRGDIR%%/bin/nrg-discover-ifaces
-%%NRGDIR%%/bin/nrg-discover-netdev
-%%NRGDIR%%/bin/nrg-discover-pingd
-%%NRGDIR%%/bin/nrg-discover-pvcs
-%%NRGDIR%%/bin/nrg-discover-sendmail
-%%NRGDIR%%/bin/nrg-discover-snmpd
-%%NRGDIR%%/bin/rrdmerge
-%%NRGDIR%%/bin/nrg-discover-tables
-%%NRGDIR%%/bin/nrg-discover-tcp
-%%NRGDIR%%/bin/nrg-find-confs
-%%NRGDIR%%/bin/nrg-indexmaker
-%%NRGDIR%%/bin/nrg-rrdkeeper
-%%NRGDIR%%/bin/nrg-pingdstat
-%%NRGDIR%%/bin/nrg-runmaker
-%%NRGDIR%%/bin/nrg-sendmailstat
-%%NRGDIR%%/bin/nrg-sendmailstatd
-%%NRGDIR%%/bin/nrg-spiketrimmer
-%%NRGDIR%%/bin/nrg-tablemaker
-%%NRGDIR%%/bin/nrg-tcpresponse
-%%NRGDIR%%/bin/rrdtrim
-%%NRGDIR%%/etc/nrg-oid-names
-%%NRGDIR%%/etc/run-star-head.pl
-%%NRGDIR%%/etc/run-star-tail.pl
-%%NRGDIR%%/templates/database-mrtg.rrd.tm
-%%NRGDIR%%/templates/discover-bind.tm
-%%NRGDIR%%/templates/discover-apache.tm
-%%NRGDIR%%/templates/discover-errors.tm
-%%NRGDIR%%/templates/discover-ifaces.tm
-%%NRGDIR%%/templates/discover-netdev.tm
-%%NRGDIR%%/templates/discover-pingd.tm
-%%NRGDIR%%/templates/discover-pvcs.tm
-%%NRGDIR%%/templates/discover-sendmail.tm
-%%NRGDIR%%/templates/discover-snmpd.tm
-%%NRGDIR%%/templates/discover-tables.tm
-%%NRGDIR%%/templates/discover-tcp.tm
-%%NRGDIR%%/templates/graph-current.cgi.tm
-%%NRGDIR%%/templates/graph-longterm.cgi.tm
-%%NRGDIR%%/templates/graph-mrtg.cgi.tm
-%%NRGDIR%%/templates/table-df.cgi.tm
-%%NRGDIR%%/templates/table-errors.cgi.tm
-%%NRGDIR%%/templates/table-ifaces.cgi.tm
-%%NRGDIR%%/templates/table-load.cgi.tm
-%%NRGDIR%%/templates/table-mem.cgi.tm
-%%NRGDIR%%/templates/table-ping-latency.cgi.tm
-%%NRGDIR%%/templates/table-ping-loss.cgi.tm
-%%NRGDIR%%/templates/table-swap.cgi.tm
-%%NRGDIR%%/templates/table-tcp.cgi.tm
-%%EXAMPLESDIR%%/Default.conf
-%%EXAMPLESDIR%%/NRG.mconf
-%%EXAMPLESDIR%%/Site.mconf
-%%EXAMPLESDIR%%/apache.mconf
-%%EXAMPLESDIR%%/bind.mconf
-%%EXAMPLESDIR%%/cisco.mconf
-%%EXAMPLESDIR%%/ftp.mconf
-%%EXAMPLESDIR%%/http.mconf
-%%EXAMPLESDIR%%/iface-errors.mconf
-%%EXAMPLESDIR%%/ifaces.mconf
-%%EXAMPLESDIR%%/imap.mconf
-%%EXAMPLESDIR%%/ping.mconf
-%%EXAMPLESDIR%%/pop.mconf
-%%EXAMPLESDIR%%/procurve.mconf
-%%EXAMPLESDIR%%/sendmail.mconf
-%%EXAMPLESDIR%%/smtp.mconf
-%%EXAMPLESDIR%%/ssh.mconf
-%%EXAMPLESDIR%%/trunk.mconf
-%%EXAMPLESDIR%%/unix.mconf
-%%DOCSDIR%%/apachestat.html
-%%DOCSDIR%%/bindstat.html
-%%DOCSDIR%%/changes
-%%DOCSDIR%%/collectors.html
-%%DOCSDIR%%/conf-string-list.html
-%%DOCSDIR%%/conf-strings.html
-%%DOCSDIR%%/configuration.html
-%%DOCSDIR%%/contrib.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/install.html
-%%DOCSDIR%%/log2rrd.html
-%%DOCSDIR%%/nrg+rrd.gif
-%%DOCSDIR%%/metaconf-strings.html
-%%DOCSDIR%%/metaconf.html
-%%DOCSDIR%%/mrtg-vs-nrg.html
-%%DOCSDIR%%/mrtg2nrg.html
-%%DOCSDIR%%/operation.html
-%%DOCSDIR%%/readme.html
-%%DOCSDIR%%/templates.html
-%%DOCSDIR%%/sample-conf.html
-%%DOCSDIR%%/sendmailstat.html
-%%DOCSDIR%%/upgrade.html
-%%DOCSDIR%%/whats-new
-%%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
-@dirrm %%NRGDIR%%/autoconfs
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
-@dirrm %%NRGDIR%%