- Fix shebangs

- Modernize plist
- Cosmetic fixes

2 files changed, 42 insertions, 41 deletions

diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index 5348a1323ba5..e5fb2daf65b7 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cricket
 PORTVERSION=	1.0.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
@@ -15,20 +15,19 @@ RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
 		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
 		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	util/metaQuery.pl
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 PLIST_SUB+=	VERSION=${PORTVERSION}
 SUB_FILES=	pkg-message
 
 # UID and username comes from ports/UIDs.
-USERS=	cricket
-GROUPS=	www
+USERS=		cricket
+GROUPS=		www
 
 CRICKETBASE=	${STAGEDIR}${PREFIX}/cricket
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e 's,/home/cricket,${PREFIX},g' \
 		${WRKSRC}/cricket-conf.pl.sample
@@ -49,4 +48,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cricket-conf.pl.sample \
 		${STAGEDIR}${PREFIX}/etc/cricket-conf.pl.dist
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/cricket/pkg-plist b/net-mgmt/cricket/pkg-plist
index d588066a74cc..8de0221fb3e9 100644
--- a/net-mgmt/cricket/pkg-plist
+++ b/net-mgmt/cricket/pkg-plist
@@ -133,37 +133,39 @@ cricket/cricket-%%VERSION%%/util/test-url
 cricket/cricket-%%VERSION%%/util/testwbem.pl
 cricket/cricket-%%VERSION%%/util/usrModemUsage
 etc/cricket-conf.pl.dist
-@dirrm cricket/cricket-%%VERSION%%/util/LeanODBC
-@dirrm cricket/cricket-%%VERSION%%/util
-@dirrm cricket/cricket-%%VERSION%%/sample-config/wbem
-@dirrm cricket/cricket-%%VERSION%%/sample-config/usr
-@dirrm cricket/cricket-%%VERSION%%/sample-config/systemperf
-@dirrm cricket/cricket-%%VERSION%%/sample-config/switches
-@dirrm cricket/cricket-%%VERSION%%/sample-config/switch-ports
-@dirrm cricket/cricket-%%VERSION%%/sample-config/subtree-times
-@dirrm cricket/cricket-%%VERSION%%/sample-config/squid-proxy
-@dirrm cricket/cricket-%%VERSION%%/sample-config/routing
-@dirrm cricket/cricket-%%VERSION%%/sample-config/routers
-@dirrm cricket/cricket-%%VERSION%%/sample-config/router-interfaces
-@dirrm cricket/cricket-%%VERSION%%/sample-config/portmasters
-@dirrm cricket/cricket-%%VERSION%%/sample-config/perfmon
-@dirrm cricket/cricket-%%VERSION%%/sample-config/news-server
-@dirrm cricket/cricket-%%VERSION%%/sample-config/http-performance
-@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-trunks
-@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-rtr-uni
-@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-intb-pvc
-@dirrm cricket/cricket-%%VERSION%%/sample-config/atm-interfaces
-@dirrm cricket/cricket-%%VERSION%%/sample-config
-@dirrm cricket/cricket-%%VERSION%%/lib/alternate/net-snmp
-@dirrm cricket/cricket-%%VERSION%%/lib/alternate/RRD
-@dirrm cricket/cricket-%%VERSION%%/lib/alternate
-@dirrm cricket/cricket-%%VERSION%%/lib/RRD
-@dirrm cricket/cricket-%%VERSION%%/lib/ConfigTree
-@dirrm cricket/cricket-%%VERSION%%/lib/Common
-@dirrm cricket/cricket-%%VERSION%%/lib/Bundle
-@dirrm cricket/cricket-%%VERSION%%/lib
-@dirrm cricket/cricket-%%VERSION%%/images
-@dirrm cricket/cricket-%%VERSION%%/doc/neta-paper
-@dirrm cricket/cricket-%%VERSION%%/doc
-@dirrm cricket/cricket-%%VERSION%%
-@dirrmtry cricket/
+@dir cricket/cricket-%%VERSION%%/util/LeanODBC
+@dir cricket/cricket-%%VERSION%%/util
+@dir cricket/cricket-%%VERSION%%/sample-config/wbem
+@dir cricket/cricket-%%VERSION%%/sample-config/usr
+@dir cricket/cricket-%%VERSION%%/sample-config/systemperf
+@dir cricket/cricket-%%VERSION%%/sample-config/switches
+@dir cricket/cricket-%%VERSION%%/sample-config/switch-ports
+@dir cricket/cricket-%%VERSION%%/sample-config/subtree-times
+@dir cricket/cricket-%%VERSION%%/sample-config/squid-proxy
+@dir cricket/cricket-%%VERSION%%/sample-config/routing
+@dir cricket/cricket-%%VERSION%%/sample-config/routers
+@dir cricket/cricket-%%VERSION%%/sample-config/router-interfaces
+@dir cricket/cricket-%%VERSION%%/sample-config/portmasters
+@dir cricket/cricket-%%VERSION%%/sample-config/perfmon
+@dir cricket/cricket-%%VERSION%%/sample-config/news-server
+@dir cricket/cricket-%%VERSION%%/sample-config/http-performance
+@dir cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-trunks
+@dir cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-rtr-uni
+@dir cricket/cricket-%%VERSION%%/sample-config/atm-interfaces/atm-intb-pvc
+@dir cricket/cricket-%%VERSION%%/sample-config/atm-interfaces
+@dir cricket/cricket-%%VERSION%%/sample-config
+@dir cricket/cricket-%%VERSION%%/lib/alternate/net-snmp
+@dir cricket/cricket-%%VERSION%%/lib/alternate/RRD
+@dir cricket/cricket-%%VERSION%%/lib/alternate
+@dir cricket/cricket-%%VERSION%%/lib/RRD
+@dir cricket/cricket-%%VERSION%%/lib/ConfigTree
+@dir cricket/cricket-%%VERSION%%/lib/Common
+@dir cricket/cricket-%%VERSION%%/lib/Bundle
+@dir cricket/cricket-%%VERSION%%/lib
+@dir cricket/cricket-%%VERSION%%/images
+@dir cricket/cricket-%%VERSION%%/doc/neta-paper
+@dir cricket/cricket-%%VERSION%%/doc
+@dir cricket/cricket-%%VERSION%%
+@dir cricket
+@owner
+@group