- Update nikto to 1.34

- No CHANGELOG available

4 files changed, 20 insertions, 34 deletions

diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 71597c105c6..73819ca911a 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,23 +1,30 @@
-# $NetBSD: Makefile,v 1.2 2004/03/26 02:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/16 11:55:27 adrianp Exp $
 
-DISTNAME=	nikto-1.32
-PKGREVISION=	1
+DISTNAME=	nikto-1.34
 CATEGORIES=	security www
 MASTER_SITES=	http://www.cirt.net/nikto/
 
-MAINTAINER=	adrianp@stindustries.net
+MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE= 	http://www.cirt.net/code/nikto.shtml
 COMMENT=	URL scanner used to search for known vulnerable CGIs on websites
 
 DEPENDS+=	p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
 DEPENDS+=	nmap>=2.00:../../net/nmap
 
+NO_BUILDLINK=	YES
 USE_PERL5=      YES
 REPLACE_PERL=	nikto.pl
+NO_BUILD=	YES
+USE_PKGINSTALL=	YES
 
-do-build:
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/config.txt > \
-		${WRKSRC}/config.txt.sample
+SUBST_CLASSES=		conf
+SUBST_STAGE.conf=	post-patch
+SUBST_FILES.conf=	config.txt
+SUBST_SED.conf=		-e "s|\#NMAP=/usr|NMAP=${PREFIX}|g" 
+SUBST_MESSAGE.conf=	"Fixing configuration files."
+
+CONF_FILES=	${PREFIX}/share/examples/nikto/config.txt \
+			 ${PREFIX}/share/nikto/config.txt
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nikto
@@ -28,7 +35,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/nikto
 	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.txt ${PREFIX}/share/nikto/docs
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${PREFIX}/share/doc/nikto
-	${INSTALL_DATA} ${WRKSRC}/config.txt.sample \
+	${INSTALL_DATA} ${WRKSRC}/config.txt \
 		${PREFIX}/share/examples/nikto
 	${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${PREFIX}/bin/nikto
 	${INSTALL_DATA} ${WRKSRC}/plugins/*.plugin ${PREFIX}/share/nikto/plugins
diff --git a/security/nikto/PLIST b/security/nikto/PLIST
index fa72af14e1d..1d889cd9993 100644
--- a/security/nikto/PLIST
+++ b/security/nikto/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/05 17:45:24 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/10/16 11:55:27 adrianp Exp $
 bin/nikto
 share/doc/nikto/CHANGES.txt
 share/nikto/docs/CHANGES.txt
@@ -6,7 +6,7 @@ share/doc/nikto/LICENSE.txt
 share/doc/nikto/README_plugins.txt
 share/doc/nikto/nikto_usage.html
 share/doc/nikto/nikto_usage.txt
-share/examples/nikto/config.txt.sample
+share/examples/nikto/config.txt
 share/nikto/plugins/LW.pm
 share/nikto/plugins/nikto_apacheusers.plugin
 share/nikto/plugins/nikto_core.plugin
diff --git a/security/nikto/distinfo b/security/nikto/distinfo
index ad7342f52b5..c6b4572f2e6 100644
--- a/security/nikto/distinfo
+++ b/security/nikto/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/05 17:45:24 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/10/16 11:55:27 adrianp Exp $
 
-SHA1 (nikto-1.32.tar.gz) = 3d1909ccbd60e14f8a319d33c33830bdd8a6da61
-Size (nikto-1.32.tar.gz) = 345290 bytes
+SHA1 (nikto-1.34.tar.gz) = 7e932bef107f3162d30425f698df652f522f653a
+Size (nikto-1.34.tar.gz) = 184320 bytes
 SHA1 (patch-aa) = 2fe6b18a1e66b1ecc865aa50feb5fc166bc0e853
-SHA1 (patch-ab) = 1d5ad9f778dc9af6f37549a9882e7adc6e55a09c
diff --git a/security/nikto/patches/patch-ab b/security/nikto/patches/patch-ab
deleted file mode 100644
index f6aadb272e5..00000000000
--- a/security/nikto/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/05 17:45:24 xtraeme Exp $
-
---- config.txt.orig	Sat Oct  4 01:49:02 2003
-+++ config.txt	Sat Oct  4 01:49:49 2003
-@@ -5,13 +5,13 @@
- # CLIOPTS=-g -a
- 
- # location of nmap to use with port scanning (rather than Nikto internals)
--#NMAP=/usr/bin/nmap
-+NMAP=@PREFIX@/bin/nmap
- 
- # ports never to scan
- SKIPPORTS=21 111
- 
- # if Nikto is having difficulty finding 'plugins', set the full path here
--# PLUGINDIR=/usr/local/nikto/plugins
-+PLUGINDIR=@PREFIX@/share/nikto/plugins
- 
- # the default HTTP version to try... can/will be changed as necessary
- DEFAULTHTTPVER=1.1