- Move plugins to libdata - suggestion from salo@ in private email

- Bump to nb2

4 files changed, 45 insertions, 41 deletions

diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index eb1e3650d44..892ce7012ee 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/09/03 11:01:35 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2005/09/06 21:11:57 adrianp Exp $
 
 DISTNAME=	nikto-1.35
-PKGREVISION=	1
+PKGREVISION=	2
 DIST_SUBDIR=    ${PKGNAME}
 CATEGORIES=	security www
 MASTER_SITES=	http://www.cirt.net/nikto/
@@ -18,6 +18,9 @@ REPLACE_PERL=	nikto.pl
 NO_BUILD=	YES
 USE_PKGINSTALL=	YES
 
+# NOTE: this package will not work with pkgviews due to a hardcoded
+# location for nmap.
+#
 SUBST_CLASSES=		conf
 SUBST_STAGE.conf=	post-patch
 SUBST_FILES.conf=	config.txt
@@ -32,18 +35,18 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nikto
 	${INSTALL_DATA_DIR} ${PREFIX}/share/nikto
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nikto/docs
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nikto/plugins
+	${INSTALL_DATA_DIR} ${PREFIX}/libdata/nikto/plugins
+	${INSTALL_DATA_DIR} ${PREFIX}/libdata/nikto/docs
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nikto
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/nikto
-	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.txt ${PREFIX}/share/nikto/docs
+	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.txt ${PREFIX}/libdata/nikto/docs
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${PREFIX}/share/doc/nikto
-	${INSTALL_DATA} ${WRKSRC}/config.txt \
-		${PREFIX}/share/examples/nikto
+	${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
-	${INSTALL_DATA} ${WRKSRC}/plugins/LW.pm ${PREFIX}/share/nikto/plugins
-	${INSTALL_DATA} ${WRKSRC}/plugins/*.db ${PREFIX}/share/nikto/plugins
-	${INSTALL_DATA} ${WRKSRC}/plugins/*.txt ${PREFIX}/share/nikto/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/*.plugin \
+		${PREFIX}/libdata/nikto/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/LW.pm ${PREFIX}/libdata/nikto/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/*.db ${PREFIX}/libdata/nikto/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/*.txt ${PREFIX}/libdata/nikto/plugins
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nikto/PLIST b/security/nikto/PLIST
index 1d889cd9993..cf9b37e9a8f 100644
--- a/security/nikto/PLIST
+++ b/security/nikto/PLIST
@@ -1,32 +1,33 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/16 11:55:27 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/09/06 21:11:57 adrianp Exp $
 bin/nikto
 share/doc/nikto/CHANGES.txt
-share/nikto/docs/CHANGES.txt
 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
-share/nikto/plugins/LW.pm
-share/nikto/plugins/nikto_apacheusers.plugin
-share/nikto/plugins/nikto_core.plugin
-share/nikto/plugins/nikto_headers.plugin
-share/nikto/plugins/nikto_httpoptions.plugin
-share/nikto/plugins/nikto_msgs.plugin
-share/nikto/plugins/nikto_mutate.plugin
-share/nikto/plugins/nikto_outdated.plugin
-share/nikto/plugins/nikto_passfiles.plugin
-share/nikto/plugins/nikto_plugin_order.txt
-share/nikto/plugins/nikto_realms.plugin
-share/nikto/plugins/nikto_robots.plugin
-share/nikto/plugins/nikto_user_enum_apache.plugin
-share/nikto/plugins/nikto_user_enum_cgiwrap.plugin
-share/nikto/plugins/outdated.db
-share/nikto/plugins/realms.db
-share/nikto/plugins/scan_database.db
-share/nikto/plugins/server_msgs.db
-share/nikto/plugins/servers.db
-@dirrm share/nikto/docs
-@dirrm share/nikto/plugins
+libdata/nikto/docs/CHANGES.txt
+libdata/nikto/plugins/LW.pm
+libdata/nikto/plugins/nikto_apacheusers.plugin
+libdata/nikto/plugins/nikto_core.plugin
+libdata/nikto/plugins/nikto_headers.plugin
+libdata/nikto/plugins/nikto_httpoptions.plugin
+libdata/nikto/plugins/nikto_msgs.plugin
+libdata/nikto/plugins/nikto_mutate.plugin
+libdata/nikto/plugins/nikto_outdated.plugin
+libdata/nikto/plugins/nikto_passfiles.plugin
+libdata/nikto/plugins/nikto_plugin_order.txt
+libdata/nikto/plugins/nikto_realms.plugin
+libdata/nikto/plugins/nikto_robots.plugin
+libdata/nikto/plugins/nikto_user_enum_apache.plugin
+libdata/nikto/plugins/nikto_user_enum_cgiwrap.plugin
+libdata/nikto/plugins/outdated.db
+libdata/nikto/plugins/realms.db
+libdata/nikto/plugins/scan_database.db
+libdata/nikto/plugins/server_msgs.db
+libdata/nikto/plugins/servers.db
+@unexec ${RMDIR} %D/libdata/nikto/plugins 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/libdata/nikto/docs 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/libdata/nikto 2>/dev/null || ${TRUE}
 @dirrm share/nikto
 @dirrm share/doc/nikto
diff --git a/security/nikto/distinfo b/security/nikto/distinfo
index b715cab1081..14ba0c7704a 100644
--- a/security/nikto/distinfo
+++ b/security/nikto/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/09/03 11:01:35 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2005/09/06 21:11:57 adrianp Exp $
 
-SHA1 (nikto-1.35nb1/nikto-1.35.tar.gz) = b77154ee5974149d6e7777aa912036fb53e7cdbe
-RMD160 (nikto-1.35nb1/nikto-1.35.tar.gz) = d15079d704cde511adf6ac0f944c19dea9f3edd1
-Size (nikto-1.35nb1/nikto-1.35.tar.gz) = 192642 bytes
-SHA1 (patch-ab) = 06b45968587994a9faad881859c78f77f34ffcc1
+SHA1 (nikto-1.35nb2/nikto-1.35.tar.gz) = b77154ee5974149d6e7777aa912036fb53e7cdbe
+RMD160 (nikto-1.35nb2/nikto-1.35.tar.gz) = d15079d704cde511adf6ac0f944c19dea9f3edd1
+Size (nikto-1.35nb2/nikto-1.35.tar.gz) = 192642 bytes
+SHA1 (patch-ab) = 5e6b5d3533dbe7076d555efd2f56da6bf8881bae
diff --git a/security/nikto/patches/patch-ab b/security/nikto/patches/patch-ab
index 353be043e5e..61591696d90 100644
--- a/security/nikto/patches/patch-ab
+++ b/security/nikto/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2005/07/02 11:30:01 adrianp Exp $
+$NetBSD: patch-ab,v 1.4 2005/09/06 21:11:57 adrianp Exp $
 
 --- config.txt.orig	2005-07-02 11:42:30.000000000 +0100
 +++ config.txt
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.3 2005/07/02 11:30:01 adrianp Exp $
  
  # if Nikto is having difficulty finding 'plugins', set the full path here
 -# PLUGINDIR=/usr/local/nikto/plugins
-+PLUGINDIR=@PREFIX@/share/nikto/plugins
++PLUGINDIR=@PREFIX@/libdata/nikto/plugins
  
  # the default HTTP version to try... can/will be changed as necessary
  DEFAULTHTTPVER=1.1