- update to 1.0.4.p1

- remove NO_PACKAGE; the customization isn't done at build/install time
- remove the old patches & configure script; use cricket's own scripts to
  tell it our version of perl.
- revamp the install so it matches the docs more closely:
  * things go in ${PREFIX}/cricket
  * scripts go in cricket/cricket-${PORTVERSION}, cricket/cricket symlink
    created for convenience
  * cricket/cricket-{config,data,logs} created
- create a "cricket" user to run the collectors
- use pkg-message instead of ${ECHO}'ing things in post-install

PR:		38932 (with a few modifications)
Submitted by:	Janos Mohacsi <janos.mohacsi@dante.org.uk>

23 files changed, 258 insertions, 571 deletions

diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index d72744e40933..7700a7e78e83 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	cricket
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.4.p1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://cricket.sourceforge.net/download/beta/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-pre/}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -23,22 +23,37 @@ RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session \
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 SITE_PERL_ARCH=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
 
-NO_PACKAGE=	"needs customization"
+HAS_CONFIGURE=	yes
 USE_PERL5=	yes
-SCRIPTS_ENV+=	PERL5=${PERL5}
-
-do-build:
+NO_BUILD=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB+=	VERSION=${PORTVERSION}
+CRICKET_USER=	cricket
+CRICKET_GROUP=	www
 
 do-install:
-	@${MKDIR} -m 755 ${PREFIX}/cricket
-	@${CP} -R ${WRKSRC}/* ${PREFIX}/cricket
-	@find ${PREFIX}/cricket -name \*.orig -or -name \*.bak | xargs ${RM} -f
+	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+	@${MKDIR} -m 755 ${PREFIX}/cricket/cricket-${PORTVERSION}
+	@${CP} -R ${WRKSRC}/* ${PREFIX}/cricket/cricket-${PORTVERSION}
+	@find ${PREFIX}/cricket/cricket-${PORTVERSION} -name \*.orig -or \
+		-name \*.bak | xargs ${RM} -f
+	${CHOWN} -R ${CRICKET_USER}:${CRICKET_GROUP} ${PREFIX}/cricket
+	@if [ -L ${PREFIX}/cricket/cricket ]; then \
+		${ECHO} "Updating ${PREFIX}/cricket/cricket symbolic link" ; \
+		${RM} ${PREFIX}/cricket/cricket ; \
+	fi
+	${LN} -s ${PREFIX}/cricket/cricket-${PORTVERSION} \
+		${PREFIX}/cricket/cricket
+	@if [ -f ${LOCALBASE}/cricket/compile ] ; then \
+		${ECHO} "You should migrate manually to use new cricket" ; \
+		${ECHO} "installation scheme." ; \
+	fi
 
 post-install:
-	@${ECHO} ""
-	@${ECHO} "Cricket has been installed in ${PREFIX}/cricket. You'll find"
-	@${ECHO} "executables and configfiles there. Please take a look at"
-	@${ECHO} "http://cricket.sourceforge.net/. The documentation can"
-	@${ECHO} "be found in ${PREFIX}/cricket/doc/ too."
+	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/cricket-conf.pl.sample \
+		>${PREFIX}/etc/cricket-conf.pl.dist 
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},' ${FILESDIR}/pkg-message.in > \
+		${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/cricket/distinfo b/net-mgmt/cricket/distinfo
index bd65373e363a..3df25b81e172 100644
--- a/net-mgmt/cricket/distinfo
+++ b/net-mgmt/cricket/distinfo
@@ -1 +1 @@
-MD5 (cricket-1.0.2.tar.gz) = 7bba92c227358304a5da7757482c11a2
+MD5 (cricket-1.0.4-pre1.tar.gz) = 658c7fd004743ac9e55cb3ad9ed6624c
diff --git a/net-mgmt/cricket/files/patch-aa b/net-mgmt/cricket/files/patch-aa
deleted file mode 100644
index 7bce91d18f91..000000000000
--- a/net-mgmt/cricket/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** sample-config/news-server/Defaults.orig	Sat Jan 22 12:39:37 2000
---- sample-config/news-server/Defaults	Sat Jan 22 12:40:10 2000
-***************
-*** 11,17 ****
-  	# you'll probably want to change this... unless you
-  	# have Cricket in ~/cricket and your config tree in ~/config
-  	util-dir	=	%auto-base%/../cricket/util
-! 	remexec		=	"/usr/local/net/bin/ssh -l %user% %server%"
-  	user		=	news
-  	server		=	nntp-host
-  	target-type	=	news-server
---- 11,17 ----
-  	# you'll probably want to change this... unless you
-  	# have Cricket in ~/cricket and your config tree in ~/config
-  	util-dir	=	%auto-base%/../cricket/util
-! 	remexec		=	"%%PREFIX%%/bin/ssh -l %user% %server%"
-  	user		=	news
-  	server		=	nntp-host
-  	target-type	=	news-server
diff --git a/net-mgmt/cricket/files/patch-ab b/net-mgmt/cricket/files/patch-ab
deleted file mode 100644
index 650ceb627c1f..000000000000
--- a/net-mgmt/cricket/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-*** util/dump-targets.orig	Sun Jan  9 09:25:52 2000
---- util/dump-targets	Sun Feb 13 20:46:15 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
-***************
-*** 20,26 ****
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! 	$Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-  }
-  
-  use lib "$Common::global::gInstallRoot/../lib";
---- 20,27 ----
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! #	$Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-! 	$Common::global::gInstallRoot = '%%PREFIX%%/cricket';
-  }
-  
-  use lib "$Common::global::gInstallRoot/../lib";
diff --git a/net-mgmt/cricket/files/patch-ac b/net-mgmt/cricket/files/patch-ac
deleted file mode 100644
index 2bdff6c439ff..000000000000
--- a/net-mgmt/cricket/files/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-*** util/generate-statics.orig	Sun Jan  9 09:29:20 2000
---- util/generate-statics	Sun Feb 13 20:47:27 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
-***************
-*** 20,30 ****
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! 	$gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-  
-  	# You need to update this to point to the URL
-  	# you use to access Cricket.
-! 	$gBaseURL = "http://localhost/~cricket/grapher.cgi";
-  }
-  
-  use lib "$gInstallRoot/../lib";
---- 20,32 ----
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! #	$gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-! 	$gInstallRoot = '%%PREFIX%%/cricket';
-  
-  	# You need to update this to point to the URL
-  	# you use to access Cricket.
-! #	$gBaseURL = "http://localhost/~cricket/grapher.cgi";
-! 	$gBaseURL = "http://localhost/cgi-bin/grapher.cgi";
-  }
-  
-  use lib "$gInstallRoot/../lib";
diff --git a/net-mgmt/cricket/files/patch-ad b/net-mgmt/cricket/files/patch-ad
deleted file mode 100644
index 886df19252f5..000000000000
--- a/net-mgmt/cricket/files/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-*** util/listInterfaces.orig	Mon Jul 19 19:55:45 1999
---- util/listInterfaces	Sun Feb 13 20:48:15 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
-***************
-*** 20,26 ****
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! 	$gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
-  }
-  
-  use lib "$gInstallRoot/lib";
---- 20,27 ----
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! #	$gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
-! 	$gInstallRoot = '%%PREFIX%%/cricket';
-  }
-  
-  use lib "$gInstallRoot/lib";
diff --git a/net-mgmt/cricket/files/patch-ae b/net-mgmt/cricket/files/patch-ae
deleted file mode 100644
index 11802a51fd23..000000000000
--- a/net-mgmt/cricket/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-*** util/newsstats.orig	Sat Jan 22 12:41:06 2000
---- util/newsstats	Sat Jan 22 12:41:12 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl
-  
-  ##
-  # Get simple stats from INND with cleanfeed
---- 1,4 ----
-! #!%%PATHPERLBIN%%
-  
-  ##
-  # Get simple stats from INND with cleanfeed
diff --git a/net-mgmt/cricket/files/patch-af b/net-mgmt/cricket/files/patch-af
deleted file mode 100644
index 18d6bcb1ef21..000000000000
--- a/net-mgmt/cricket/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-*** util/pmlines.pl.orig	Sat Jan 22 12:41:27 2000
---- util/pmlines.pl	Sat Jan 22 12:41:35 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl
-  
-  # pmlines.pl
-  #
---- 1,4 ----
-! #!%%PATHPERLBIN%%
-  
-  # pmlines.pl
-  #
diff --git a/net-mgmt/cricket/files/patch-ag b/net-mgmt/cricket/files/patch-ag
deleted file mode 100644
index 830972963a84..000000000000
--- a/net-mgmt/cricket/files/patch-ag
+++ /dev/null
@@ -1,28 +0,0 @@
-*** util/rrd-dump.orig	Wed Jun 16 04:28:02 1999
---- util/rrd-dump	Sun Feb 13 20:49:13 2000
-***************
-*** 1,11 ****
-! #!/usr/local/bin/perl -w 
-  # -*- perl -*-
-  
-  # this is a little script to exercise RRD::File -- useful
-  # when I was developing it, and possibly useful now too
-  
-  BEGIN {
-!     $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
-  }
-  
-  use lib "$gInstallRoot/lib";
---- 1,12 ----
-! #!%%PATHPERLBIN%% -w 
-  # -*- perl -*-
-  
-  # this is a little script to exercise RRD::File -- useful
-  # when I was developing it, and possibly useful now too
-  
-  BEGIN {
-! #    $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
-!     $gInstallRoot = '%%PREFIX%%/cricket';
-  }
-  
-  use lib "$gInstallRoot/lib";
diff --git a/net-mgmt/cricket/files/patch-ah b/net-mgmt/cricket/files/patch-ah
deleted file mode 100644
index 7f204c5d03b2..000000000000
--- a/net-mgmt/cricket/files/patch-ah
+++ /dev/null
@@ -1,31 +0,0 @@
-*** util/rrd-tune.orig	Mon Jan 10 06:38:41 2000
---- util/rrd-tune	Sun Feb 13 20:49:47 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
-***************
-*** 20,26 ****
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! 	$gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-  }
-  
-  use lib "$gInstallRoot/../lib";
---- 20,27 ----
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! #	$gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-! 	$gInstallRoot = '%%PREFIX%%/cricket';
-  }
-  
-  use lib "$gInstallRoot/../lib";
diff --git a/net-mgmt/cricket/files/patch-ai b/net-mgmt/cricket/files/patch-ai
deleted file mode 100644
index 76da6e08e799..000000000000
--- a/net-mgmt/cricket/files/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-*** util/test-url.orig	Sat Jan 22 12:43:07 2000
---- util/test-url	Sat Jan 22 12:43:15 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w
-  # -*- perl -*-
-  
-  #	 test-url: a simple script to see how fast a webserver is
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w
-  # -*- perl -*-
-  
-  #	 test-url: a simple script to see how fast a webserver is
diff --git a/net-mgmt/cricket/files/patch-aj b/net-mgmt/cricket/files/patch-aj
deleted file mode 100644
index ee86b8388f14..000000000000
--- a/net-mgmt/cricket/files/patch-aj
+++ /dev/null
@@ -1,31 +0,0 @@
-*** util/usrModemUsage.orig	Tue Jul 20 03:02:29 1999
---- util/usrModemUsage	Sun Feb 13 20:50:34 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w
-  # -*- perl -*-
-  
-  # usrModemUsage
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w
-  # -*- perl -*-
-  
-  # usrModemUsage
-***************
-*** 23,29 ****
-  # modem chassis.
-  
-  BEGIN {
-!     $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
-  }
-  
-  #
---- 23,30 ----
-  # modem chassis.
-  
-  BEGIN {
-! #    $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
-!     $gInstallRoot = '%%PREFIX%%/cricket';
-  }
-  
-  #
diff --git a/net-mgmt/cricket/files/patch-ak b/net-mgmt/cricket/files/patch-ak
deleted file mode 100644
index c856a71a5639..000000000000
--- a/net-mgmt/cricket/files/patch-ak
+++ /dev/null
@@ -1,31 +0,0 @@
-*** collect-subtrees.orig	Mon Jan 24 03:24:13 2000
---- collect-subtrees	Sun Feb 13 20:42:15 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
-***************
-*** 30,36 ****
-  # to tell collect-subtrees where to find it.
-  
-  BEGIN {
-!     $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-  }
-  
-  use Getopt::Long;
---- 30,37 ----
-  # to tell collect-subtrees where to find it.
-  
-  BEGIN {
-! #    $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-!     $gInstallRoot = '%%PREFIX%%/cricket';
-  }
-  
-  use Getopt::Long;
diff --git a/net-mgmt/cricket/files/patch-al b/net-mgmt/cricket/files/patch-al
deleted file mode 100644
index c391d5d62086..000000000000
--- a/net-mgmt/cricket/files/patch-al
+++ /dev/null
@@ -1,31 +0,0 @@
-*** collector.orig	Mon Jan 10 06:37:37 2000
---- collector	Sun Feb 13 20:42:06 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
-***************
-*** 20,26 ****
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! 	$Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-  }
-  
-  use lib "$Common::global::gInstallRoot/lib";
---- 20,27 ----
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! #	$Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-! 	$Common::global::gInstallRoot = '%%PREFIX%%/cricket';
-  }
-  
-  use lib "$Common::global::gInstallRoot/lib";
diff --git a/net-mgmt/cricket/files/patch-am b/net-mgmt/cricket/files/patch-am
deleted file mode 100644
index 5a5562994c42..000000000000
--- a/net-mgmt/cricket/files/patch-am
+++ /dev/null
@@ -1,44 +0,0 @@
-*** grapher.cgi.orig	Mon Jan 24 08:47:49 2000
---- grapher.cgi	Sun Feb 13 20:44:03 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w 
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w 
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
-***************
-*** 27,39 ****
-  	# be prepended. Special care is taken to set $HOME right,
-  	# even when running as user nobody (see fixHome for info).
-  
-! 	$Common::global::gConfigRoot = 'cricket-config'; 	# i.e. $HOME/config
-  
-  	# This magic attempts to guess the install directory based
-  	# on how the script was called. If it fails for you, just
-  	# hardcode it.
-  
-! 	$Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || './') . '.';
-  
-  	# cached images are stored here... there will be no more than
-  	# 5 minutes worth of images, so it won't take too much space.
---- 27,41 ----
-  	# be prepended. Special care is taken to set $HOME right,
-  	# even when running as user nobody (see fixHome for info).
-  
-! #	$Common::global::gConfigRoot = 'cricket-config'; 	# i.e. $HOME/config
-! 	$Common::global::gConfigRoot = '%%PREFIX%%/cricket/cricket-config';
-  
-  	# This magic attempts to guess the install directory based
-  	# on how the script was called. If it fails for you, just
-  	# hardcode it.
-  
-! #	$Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || './') . '.';
-! 	$Common::global::gInstallRoot = '%%PREFIX%%/cricket';
-  
-  	# cached images are stored here... there will be no more than
-  	# 5 minutes worth of images, so it won't take too much space.
diff --git a/net-mgmt/cricket/files/patch-an b/net-mgmt/cricket/files/patch-an
deleted file mode 100644
index b8d06434bef8..000000000000
--- a/net-mgmt/cricket/files/patch-an
+++ /dev/null
@@ -1,31 +0,0 @@
-*** mini-graph.cgi.orig	Sat Jul 10 05:17:41 1999
---- mini-graph.cgi	Sun Feb 13 20:44:34 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w 
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w 
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
-***************
-*** 24,30 ****
-  	# on how the script was called. If it fails for you, just
-  	# hardcode it.
-  
-! 	$gInstallRoot = (($0 =~ m:^(.*/):)[0] || './') . '.';
-  
-  	# cached images are stored here... there will be no more than
-  	# 5 minutes worth of images, so it won't take too much space.
---- 24,31 ----
-  	# on how the script was called. If it fails for you, just
-  	# hardcode it.
-  
-! #	$gInstallRoot = (($0 =~ m:^(.*/):)[0] || './') . '.';
-! 	$gInstallRoot = '%%PREFIX%%/cricket';
-  
-  	# cached images are stored here... there will be no more than
-  	# 5 minutes worth of images, so it won't take too much space.
diff --git a/net-mgmt/cricket/files/patch-ao b/net-mgmt/cricket/files/patch-ao
deleted file mode 100644
index f9834d9dfb96..000000000000
--- a/net-mgmt/cricket/files/patch-ao
+++ /dev/null
@@ -1,31 +0,0 @@
-*** compile.orig	Fri Jul 16 08:07:25 1999
---- compile	Sun Feb 13 20:42:54 2000
-***************
-*** 1,4 ****
-! #!/usr/local/bin/perl -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
---- 1,4 ----
-! #!%%PATHPERLBIN%% -w
-  # -*- perl -*-
-  
-  # Cricket: a configuration, polling and data display wrapper for RRD files
-***************
-*** 20,26 ****
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! 	$Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-  }
-  
-  use lib "$Common::global::gInstallRoot/lib";
---- 20,27 ----
-  #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-  BEGIN {
-! #	$Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-! 	$Common::global::gInstallRoot = '%%PREFIX%%/cricket';
-  }
-  
-  use lib "$Common::global::gInstallRoot/lib";
diff --git a/net-mgmt/cricket/files/patch-cricket-conf.pl.sample b/net-mgmt/cricket/files/patch-cricket-conf.pl.sample
new file mode 100644
index 000000000000..fbf2999a1eec
--- /dev/null
+++ b/net-mgmt/cricket/files/patch-cricket-conf.pl.sample
@@ -0,0 +1,19 @@
+*** cricket-conf.pl.sample.orig	Wed Apr 10 00:28:27 2002
+--- cricket-conf.pl.sample	Wed Jun  5 19:29:38 2002
+***************
+*** 13,19 ****
+  #	$Id: cricket-conf.pl.sample,v 1.5 2002/04/09 23:28:27 driehuis Exp $
+  package Common::global;
+  
+! $gCricketHome = "/home/cricket";
+  $gInstallRoot = "$gCricketHome/cricket";
+  #$gConfigRoot = "$gCricketHome/cricket-config";
+  
+--- 13,19 ----
+  #	$Id: cricket-conf.pl.sample,v 1.5 2002/04/09 23:28:27 driehuis Exp $
+  package Common::global;
+  
+! $gCricketHome = "%%PREFIX%%/cricket";
+  $gInstallRoot = "$gCricketHome/cricket";
+  #$gConfigRoot = "$gCricketHome/cricket-config";
+  
diff --git a/net-mgmt/cricket/files/patch-sample-config::news-server::Defaults b/net-mgmt/cricket/files/patch-sample-config::news-server::Defaults
new file mode 100644
index 000000000000..fa97de2b827e
--- /dev/null
+++ b/net-mgmt/cricket/files/patch-sample-config::news-server::Defaults
@@ -0,0 +1,19 @@
+*** sample-config/news-server/Defaults.orig	Thu Oct 25 00:27:29 2001
+--- sample-config/news-server/Defaults	Wed Jun  5 16:55:45 2002
+***************
+*** 11,17 ****
+      # you'll probably want to change this... unless you
+      # have Cricket in ~/cricket and your config tree in ~/config
+      util-dir    =   %auto-base%/../cricket/util
+!     remexec     =   "/usr/local/net/bin/ssh -l %user% %server%"
+      user        =   news
+      server      =   nntp-host
+      target-type =   news-server
+--- 11,17 ----
+      # you'll probably want to change this... unless you
+      # have Cricket in ~/cricket and your config tree in ~/config
+      util-dir    =   %auto-base%/../cricket/util
+!     remexec     =   "/usr/bin/ssh -l %user% %server%"
+      user        =   news
+      server      =   nntp-host
+      target-type =   news-server
diff --git a/net-mgmt/cricket/files/pkg-message.in b/net-mgmt/cricket/files/pkg-message.in
new file mode 100644
index 000000000000..a06d9e8828a8
--- /dev/null
+++ b/net-mgmt/cricket/files/pkg-message.in
@@ -0,0 +1,7 @@
+Sample config installed at:
+        %%PREFIX%%/etc/cricket-conf.pl.dist
+
+Cricket has been installed in %%PREFIX%%/cricket. You'll find
+executables and configfiles there. Please take a look at
+http://cricket.sourceforge.net/. The documentation can be
+found in %%PREFIX%%/cricket/cricket/doc/ too.
diff --git a/net-mgmt/cricket/pkg-install b/net-mgmt/cricket/pkg-install
new file mode 100644
index 000000000000..3543dceea194
--- /dev/null
+++ b/net-mgmt/cricket/pkg-install
@@ -0,0 +1,24 @@
+#!/bin/sh
+# $FreeBSD$
+#
+
+if [ "$2" != "PRE-INSTALL" ]; then
+	exit 0
+fi
+
+USER=cricket
+#group selected to be www since the webserver has to be able to serve it
+GROUP=www 
+
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+	if pw useradd ${USER} -g ${GROUP} -h - \
+		-s "/sbin/nologin" -d "${PREFIX}/cricket" \
+		-c "Cricket Monitoring Owner"; \
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+exit 0
diff --git a/net-mgmt/cricket/pkg-plist b/net-mgmt/cricket/pkg-plist
index 7b54fa6ade1d..0ce78f08d07a 100644
--- a/net-mgmt/cricket/pkg-plist
+++ b/net-mgmt/cricket/pkg-plist
@@ -1,115 +1,159 @@
-cricket/CHANGES
-cricket/COPYING
-cricket/README
-cricket/THANKS
-cricket/TODO
-cricket/VERSION
-cricket/collect-subtrees
-cricket/collector
-cricket/compile
-cricket/configure
-cricket/doc/beginner.html
-cricket/doc/gpl.html
-cricket/doc/history.html
-cricket/doc/index.html
-cricket/doc/inst-mapping.html
-cricket/doc/intro.html
-cricket/doc/modperl.html
-cricket/doc/neta-paper/fig1.gif
-cricket/doc/neta-paper/fig2.gif
-cricket/doc/neta-paper/paper.html
-cricket/doc/neta-paper/paper.ps.gz
-cricket/doc/neta-paper/peer1.gif
-cricket/doc/neta-paper/peer2.gif
-cricket/doc/neta-paper/ss.gif
-cricket/doc/new-devices.html
-cricket/doc/reference.html
-cricket/doc/tools.html
-cricket/grapher.cgi
-cricket/images/cricket-sm.gif
-cricket/images/failed.gif
-cricket/images/rrdtool.gif
-cricket/lib/Bundle/CricketPrereq.pm
-cricket/lib/Common/HandleTarget.pm
-cricket/lib/Common/Log.pm
-cricket/lib/Common/Map.pm
-cricket/lib/Common/Options.pm
-cricket/lib/Common/Util.pm
-cricket/lib/Common/Version.pm
-cricket/lib/ConfigTree/Cache.pm
-cricket/lib/ConfigTree/Node.pm
-cricket/lib/Monitor.pm
-cricket/lib/RPN.pm
-cricket/lib/RRD/File.pm
-cricket/lib/RRD/Format.pm
-cricket/lib/exec.pm
-cricket/lib/file.pm
-cricket/lib/func.pm
-cricket/lib/snmp.pm
-cricket/lib/snmpUtils.pm
-cricket/mini-graph.cgi
-cricket/sample-config/Defaults
-cricket/sample-config/atm-interfaces/Defaults
-cricket/sample-config/atm-interfaces/atm-intb-pvc/Defaults
-cricket/sample-config/atm-interfaces/atm-intb-pvc/interfaces
-cricket/sample-config/atm-interfaces/atm-rtr-uni/Defaults
-cricket/sample-config/atm-interfaces/atm-rtr-uni/interfaces
-cricket/sample-config/atm-interfaces/atm-trunks/Defaults
-cricket/sample-config/atm-interfaces/atm-trunks/interfaces
-cricket/sample-config/http-performance/Defaults
-cricket/sample-config/http-performance/urls
-cricket/sample-config/news-server/Defaults
-cricket/sample-config/news-server/targets
-cricket/sample-config/portmasters/Defaults
-cricket/sample-config/portmasters/portmasters
-cricket/sample-config/router-interfaces/Defaults
-cricket/sample-config/router-interfaces/interfaces
-cricket/sample-config/routers/Defaults
-cricket/sample-config/routers/Targets
-cricket/sample-config/routing/Defaults
-cricket/sample-config/routing/Targets
-cricket/sample-config/squid-proxy/Defaults
-cricket/sample-config/switch-ports/Defaults
-cricket/sample-config/switch-ports/switches
-cricket/sample-config/switches/Defaults
-cricket/sample-config/switches/switches
-cricket/sample-config/usr/Defaults
-cricket/sample-config/usr/targets
-cricket/subtree-sets
-cricket/util/README
-cricket/util/dump-targets
-cricket/util/generate-statics
-cricket/util/getFormat.c
-cricket/util/listInterfaces
-cricket/util/newsstats
-cricket/util/pmlines.pl
-cricket/util/relocate-perl
-cricket/util/rrd-dump
-cricket/util/rrd-tune
-cricket/util/test-url
-cricket/util/usrModemUsage
-@dirrm cricket/util
-@dirrm cricket/sample-config/usr
-@dirrm cricket/sample-config/switches
-@dirrm cricket/sample-config/switch-ports
-@dirrm cricket/sample-config/squid-proxy
-@dirrm cricket/sample-config/routing
-@dirrm cricket/sample-config/routers
-@dirrm cricket/sample-config/router-interfaces
-@dirrm cricket/sample-config/portmasters
-@dirrm cricket/sample-config/news-server
-@dirrm cricket/sample-config/http-performance
-@dirrm cricket/sample-config/atm-interfaces/atm-trunks
-@dirrm cricket/sample-config/atm-interfaces/atm-rtr-uni
-@dirrm cricket/sample-config/atm-interfaces/atm-intb-pvc
-@dirrm cricket/sample-config/atm-interfaces
-@dirrm cricket/sample-config
-@dirrm cricket/lib/RRD
-@dirrm cricket/lib/ConfigTree
-@dirrm cricket/lib/Common
-@dirrm cricket/lib/Bundle
-@dirrm cricket/lib
-@dirrm cricket/images
-@dirrm cricket/doc/neta-paper
-@dirrm cricket/doc
+cricket/cricket-%%VERSION%%/lib/Common/Options.pm
+cricket/cricket-%%VERSION%%/lib/Common/Log.pm
+cricket/cricket-%%VERSION%%/lib/Common/Map.pm
+cricket/cricket-%%VERSION%%/lib/Common/HandleTarget.pm
+cricket/cricket-%%VERSION%%/lib/Common/Util.pm
+cricket/cricket-%%VERSION%%/lib/Common/Version.pm
+cricket/cricket-%%VERSION%%/lib/Common/global.pm
+cricket/cricket-%%VERSION%%/lib/Bundle/CricketPrereq.pm
+cricket/cricket-%%VERSION%%/lib/RRD/File.pm
+cricket/cricket-%%VERSION%%/lib/RRD/Format.pm
+cricket/cricket-%%VERSION%%/lib/ConfigTree/Cache.pm
+cricket/cricket-%%VERSION%%/lib/ConfigTree/Node.pm
+cricket/cricket-%%VERSION%%/lib/alternate/net-snmp/snmpUtils.pm
+cricket/cricket-%%VERSION%%/lib/Monitor.pm
+cricket/cricket-%%VERSION%%/lib/func.pm
+cricket/cricket-%%VERSION%%/lib/perfmon.pm
+cricket/cricket-%%VERSION%%/lib/snmp.pm
+cricket/cricket-%%VERSION%%/lib/snmpUtils.pm
+cricket/cricket-%%VERSION%%/lib/sql.pm
+cricket/cricket-%%VERSION%%/lib/sqlUtils.pm
+cricket/cricket-%%VERSION%%/lib/wbem.pm
+cricket/cricket-%%VERSION%%/lib/field.pm
+cricket/cricket-%%VERSION%%/lib/exec.pm
+cricket/cricket-%%VERSION%%/lib/RPN.pm
+cricket/cricket-%%VERSION%%/lib/file.pm
+cricket/cricket-%%VERSION%%/images/cricket-sm.gif
+cricket/cricket-%%VERSION%%/images/failed.gif
+cricket/cricket-%%VERSION%%/images/rrdtool.gif
+cricket/cricket-%%VERSION%%/sample-config/routers/Defaults
+cricket/cricket-%%VERSION%%/sample-config/routers/Targets
+cricket/cricket-%%VERSION%%/sample-config/wbem/Defaults
+cricket/cricket-%%VERSION%%/sample-config/wbem/targets
+cricket/cricket-%%VERSION%%/sample-config/http-performance/Defaults
+cricket/cricket-%%VERSION%%/sample-config/http-performance/urls
+cricket/cricket-%%VERSION%%/sample-config/news-server/Defaults
+cricket/cricket-%%VERSION%%/sample-config/news-server/targets
+cricket/cricket-%%VERSION%%/sample-config/perfmon/Defaults
+cricket/cricket-%%VERSION%%/sample-config/perfmon/targets
+cricket/cricket-%%VERSION%%/sample-config/portmasters/Defaults
+cricket/cricket-%%VERSION%%/sample-config/portmasters/portmasters
+cricket/cricket-%%VERSION%%/sample-config/router-interfaces/Defaults
+cricket/cricket-%%VERSION%%/sample-config/router-interfaces/interfaces
+cricket/cricket-%%VERSION%%/sample-config/usr/Defaults
+cricket/cricket-%%VERSION%%/sample-config/usr/targets
+cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-intb-pvc/Defaults
+cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-intb-pvc/interfaces
+cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-rtr-uni/Defaults
+cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-rtr-uni/interfaces
+cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-trunks/Defaults
+cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-trunks/interfaces
+cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/Defaults
+cricket/cricket-%%VERSION%%/sample-config/squid-proxy/Defaults
+cricket/cricket-%%VERSION%%/sample-config/subtree-times/Defaults
+cricket/cricket-%%VERSION%%/sample-config/subtree-times/targets
+cricket/cricket-%%VERSION%%/sample-config/switch-ports/Defaults
+cricket/cricket-%%VERSION%%/sample-config/switch-ports/switches
+cricket/cricket-%%VERSION%%/sample-config/switches/Defaults
+cricket/cricket-%%VERSION%%/sample-config/switches/switches
+cricket/cricket-%%VERSION%%/sample-config/systemperf/Defaults
+cricket/cricket-%%VERSION%%/sample-config/routing/Defaults
+cricket/cricket-%%VERSION%%/sample-config/routing/Targets
+cricket/cricket-%%VERSION%%/sample-config/Defaults
+cricket/cricket-%%VERSION%%/doc/neta-paper/paper.ps.gz
+cricket/cricket-%%VERSION%%/doc/neta-paper/fig2.gif
+cricket/cricket-%%VERSION%%/doc/neta-paper/paper.html
+cricket/cricket-%%VERSION%%/doc/neta-paper/fig1.gif
+cricket/cricket-%%VERSION%%/doc/neta-paper/peer1.gif
+cricket/cricket-%%VERSION%%/doc/neta-paper/peer2.gif
+cricket/cricket-%%VERSION%%/doc/neta-paper/ss.gif
+cricket/cricket-%%VERSION%%/doc/beginner.html
+cricket/cricket-%%VERSION%%/doc/copytosql.html
+cricket/cricket-%%VERSION%%/doc/cricket.sql
+cricket/cricket-%%VERSION%%/doc/gpl.html
+cricket/cricket-%%VERSION%%/doc/history.html
+cricket/cricket-%%VERSION%%/doc/index.html
+cricket/cricket-%%VERSION%%/doc/inst-mapping.html
+cricket/cricket-%%VERSION%%/doc/intro.html
+cricket/cricket-%%VERSION%%/doc/modperl.html
+cricket/cricket-%%VERSION%%/doc/monitor-thresholds.html
+cricket/cricket-%%VERSION%%/doc/new-devices.html
+cricket/cricket-%%VERSION%%/doc/perfmon.html
+cricket/cricket-%%VERSION%%/doc/reference.html
+cricket/cricket-%%VERSION%%/doc/tools.html
+cricket/cricket-%%VERSION%%/doc/win2kw1.gif
+cricket/cricket-%%VERSION%%/doc/win2kwmi.html
+cricket/cricket-%%VERSION%%/util/LeanODBC/LeanODBC.pm
+cricket/cricket-%%VERSION%%/util/LeanODBC/LeanODBC.xs
+cricket/cricket-%%VERSION%%/util/LeanODBC/Makefile.PL
+cricket/cricket-%%VERSION%%/util/LeanODBC/README
+cricket/cricket-%%VERSION%%/util/LeanODBC/stripsql.h
+cricket/cricket-%%VERSION%%/util/LeanODBC/test.pl
+cricket/cricket-%%VERSION%%/util/README
+cricket/cricket-%%VERSION%%/util/README.listInterfaces
+cricket/cricket-%%VERSION%%/util/dump-targets
+cricket/cricket-%%VERSION%%/util/generate-statics
+cricket/cricket-%%VERSION%%/util/get-collector-stats
+cricket/cricket-%%VERSION%%/util/listInterfaces
+cricket/cricket-%%VERSION%%/util/newsstats
+cricket/cricket-%%VERSION%%/util/perfInfo.pl
+cricket/cricket-%%VERSION%%/util/pmlines.pl
+cricket/cricket-%%VERSION%%/util/relocate-perl
+cricket/cricket-%%VERSION%%/util/rrd-dump
+cricket/cricket-%%VERSION%%/util/rrd-tune
+cricket/cricket-%%VERSION%%/util/run-subtree
+cricket/cricket-%%VERSION%%/util/systemPerfConf.pl
+cricket/cricket-%%VERSION%%/util/test-url
+cricket/cricket-%%VERSION%%/util/testwbem.pl
+cricket/cricket-%%VERSION%%/util/getFormat.c
+cricket/cricket-%%VERSION%%/util/usrModemUsage
+cricket/cricket-%%VERSION%%/cricket-conf.pl.sample
+cricket/cricket-%%VERSION%%/configure
+cricket/cricket-%%VERSION%%/compile
+cricket/cricket-%%VERSION%%/collector
+cricket/cricket-%%VERSION%%/collect-subtrees
+cricket/cricket-%%VERSION%%/VERSION
+cricket/cricket-%%VERSION%%/TODO
+cricket/cricket-%%VERSION%%/THANKS
+cricket/cricket-%%VERSION%%/README
+cricket/cricket-%%VERSION%%/DEV-INFO
+cricket/cricket-%%VERSION%%/COPYING
+cricket/cricket-%%VERSION%%/CHANGES
+cricket/cricket-%%VERSION%%/subtree-sets
+cricket/cricket-%%VERSION%%/mini-graph.cgi
+cricket/cricket-%%VERSION%%/grapher.cgi
+cricket/cricket
+etc/cricket-conf.pl.dist
+@dirrm cricket/cricket-%%VERSION%%/lib/Common
+@dirrm cricket/cricket-%%VERSION%%/lib/Bundle
+@dirrm cricket/cricket-%%VERSION%%/lib/RRD
+@dirrm cricket/cricket-%%VERSION%%/lib/ConfigTree
+@dirrm cricket/cricket-%%VERSION%%/lib/alternate/net-snmp
+@dirrm cricket/cricket-%%VERSION%%/lib/alternate
+@dirrm cricket/cricket-%%VERSION%%/lib
+@dirrm cricket/cricket-%%VERSION%%/images
+@dirrm cricket/cricket-%%VERSION%%/sample-config/routers
+@dirrm cricket/cricket-%%VERSION%%/sample-config/wbem
+@dirrm cricket/cricket-%%VERSION%%/sample-config/http-performance
+@dirrm cricket/cricket-%%VERSION%%/sample-config/news-server
+@dirrm cricket/cricket-%%VERSION%%/sample-config/perfmon
+@dirrm cricket/cricket-%%VERSION%%/sample-config/portmasters
+@dirrm cricket/cricket-%%VERSION%%/sample-config/router-interfaces
+@dirrm cricket/cricket-%%VERSION%%/sample-config/usr
+@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-intb-pvc
+@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-rtr-uni
+@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-trunks
+@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces
+@dirrm cricket/cricket-%%VERSION%%/sample-config/squid-proxy
+@dirrm cricket/cricket-%%VERSION%%/sample-config/subtree-times
+@dirrm cricket/cricket-%%VERSION%%/sample-config/switch-ports
+@dirrm cricket/cricket-%%VERSION%%/sample-config/switches
+@dirrm cricket/cricket-%%VERSION%%/sample-config/systemperf
+@dirrm cricket/cricket-%%VERSION%%/sample-config/routing
+@dirrm cricket/cricket-%%VERSION%%/sample-config
+@dirrm cricket/cricket-%%VERSION%%/doc/neta-paper
+@dirrm cricket/cricket-%%VERSION%%/doc
+@dirrm cricket/cricket-%%VERSION%%/util/LeanODBC
+@dirrm cricket/cricket-%%VERSION%%/util
+@dirrm cricket/cricket-%%VERSION%%
 @dirrm cricket
diff --git a/net-mgmt/cricket/scripts/configure b/net-mgmt/cricket/scripts/configure
deleted file mode 100644
index bcf7568dd6b3..000000000000
--- a/net-mgmt/cricket/scripts/configure
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-echo var set to ${PERL5} >/tmp/debug1
-
-FILES_PERLPATH="util/dump-targets util/generate-statics util/listInterfaces \
-	compile util/newsstats util/pmlines.pl util/rrd-dump util/rrd-tune \
-	util/test-url util/usrModemUsage collect-subtrees collector \
-	grapher.cgi mini-graph.cgi"
-FILES_PREFIX="sample-config/news-server/Defaults collect-subtrees collector \
-	compile grapher.cgi mini-graph.cgi util/dump-targets \
-	util/generate-statics util/listInterfaces util/rrd-dump \
-	util/rrd-tune util/usrModemUsage"
-
-for f in $FILES_PERLPATH ; do
-	mv ${WRKSRC}/${f} ${WRKSRC}/$f.bak && sed <${WRKSRC}/${f}.bak \
-		s+%%PATHPERLBIN%%+${PERL5}+g >${WRKSRC}/${f}
-done
-
-for f in $FILES_PREFIX ; do
-	mv ${WRKSRC}/${f} ${WRKSRC}/$f.bak && sed <${WRKSRC}/${f}.bak \
-		s+%%PREFIX%%+${PREFIX}+g >${WRKSRC}/${f}
-done