3 files changed, 79 insertions, 76 deletions

diff --git a/net/cricket/Makefile b/net/cricket/Makefile
index 8ac0b805f18b..4e4ab5ff5549 100644
--- a/net/cricket/Makefile
+++ b/net/cricket/Makefile
@@ -6,26 +6,23 @@
 #
 
 PORTNAME=	cricket
-PORTVERSION=	0.72
+PORTVERSION=	1.0.2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www.munitions.com/~jra/cricket/dists/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	torstenb@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/${PERL_ARCH}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/${PERL_ARCH}/RRDs.pm:${PORTSDIR}/net/rrdtool
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/${PERL_ARCH}/LWP.pm:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/${PERL_ARCH}/Time/Zone.pm:${PORTSDIR}/devel/p5-TimeDate
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session \
+		${SITE_PERL}/RRDs.pm:${PORTSDIR}/net/rrdtool \
+		${SITE_PERL}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/Time/Zone.pm:${PORTSDIR}/devel/p5-TimeDate \
+		${SITE_PERL}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 
+SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VERSION}/${PERL_ARCH}
 NO_PACKAGE=	"needs customization"
-
 USE_PERL5=	yes
-
-FETCH_BEFORE_ARGS=	-b
 SCRIPTS_ENV+=	PERL5=${PERL5}
 
 do-build:
@@ -39,7 +36,7 @@ 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://www.munitions.com/~jra/cricket/. The documentation can"
+	@${ECHO} "http://cricket.sourceforge.net/. The documentation can"
 	@${ECHO} "be found in ${PREFIX}/cricket/doc/ too."
 
 .include <bsd.port.mk>
diff --git a/net/cricket/distinfo b/net/cricket/distinfo
index ea857b76293a..bd65373e363a 100644
--- a/net/cricket/distinfo
+++ b/net/cricket/distinfo
@@ -1 +1 @@
-MD5 (cricket-0.72.tar.gz) = e8441c8795eb743cf8c0efc585fa3db9
+MD5 (cricket-1.0.2.tar.gz) = 7bba92c227358304a5da7757482c11a2
diff --git a/net/cricket/pkg-plist b/net/cricket/pkg-plist
index dda63d1cb96a..7b54fa6ade1d 100644
--- a/net/cricket/pkg-plist
+++ b/net/cricket/pkg-plist
@@ -1,23 +1,61 @@
-cricket/doc/neta-paper/paper.ps.gz
+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/fig1.gif
+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/beginner.txt
-cricket/doc/index.html
-cricket/doc/mrtg-users.html
+cricket/doc/new-devices.html
 cricket/doc/reference.html
-cricket/sample-config/usr/Defaults
-cricket/sample-config/usr/targets
+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/atm-interfaces/Defaults
 cricket/sample-config/http-performance/Defaults
 cricket/sample-config/http-performance/urls
 cricket/sample-config/news-server/Defaults
@@ -35,27 +73,10 @@ 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/Defaults
-cricket/lib/ConfigTree/Cache.pm
-cricket/lib/ConfigTree/Node.pm
-cricket/lib/RRD/File.pm
-cricket/lib/RRD/Format.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/exec.pm
-cricket/lib/file.pm
-cricket/lib/func.pm
-cricket/lib/snmp.pm
-cricket/lib/snmpUtils.pm
-cricket/lib/Monitor.pm
-cricket/lib/RPN.pm
-cricket/images/cricket-sm.gif
-cricket/images/failed.gif
-cricket/images/rrdtool.gif
+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
@@ -67,43 +88,28 @@ cricket/util/rrd-dump
 cricket/util/rrd-tune
 cricket/util/test-url
 cricket/util/usrModemUsage
-cricket/util/README
-cricket/mini-graph.cgi
-cricket/grapher.cgi
-cricket/configure
-cricket/compile
-cricket/collector
-cricket/collect-subtrees
-cricket/VERSION
-cricket/TODO
-cricket/THANKS
-cricket/README
-cricket/Makefile
-cricket/FAQ
-cricket/COPYING
-cricket/CHANGES
-cricket/subtree-sets
-@dirrm cricket/lib/ConfigTree
+@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
-@dirrm cricket/sample-config/usr
-@dirrm cricket/sample-config/atm-interfaces/atm-intb-pvc
-@dirrm cricket/sample-config/atm-interfaces/atm-rtr-uni
-@dirrm cricket/sample-config/atm-interfaces/atm-trunks
-@dirrm cricket/sample-config/atm-interfaces
-@dirrm cricket/sample-config/http-performance
-@dirrm cricket/sample-config/news-server
-@dirrm cricket/sample-config/portmasters
-@dirrm cricket/sample-config/router-interfaces
-@dirrm cricket/sample-config/routers
-@dirrm cricket/sample-config/routing
-@dirrm cricket/sample-config/squid-proxy
-@dirrm cricket/sample-config/switch-ports
-@dirrm cricket/sample-config/switches
-@dirrm cricket/sample-config
-@dirrm cricket/util
 @dirrm cricket