From 2d69c6f6347a7be61f450c4718c12df1c8e4c2d7 Mon Sep 17 00:00:00 2001
From: Kris Kennaway <kris@FreeBSD.org>
Date: Thu, 18 Jan 2001 09:34:11 +0000
Subject: [PATCH] Fix whisker operation.

Submitted by:	Roman Shterenzon <roman@xpert.com>
PR:		23850
---
 security/whisker/Makefile       | 11 +++++------
 security/whisker/files/patch-aa | 11 +++++++++++
 security/whisker/pkg-plist      | 10 +++++-----
 3 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 security/whisker/files/patch-aa

diff --git a/security/whisker/Makefile b/security/whisker/Makefile
index fb5d0fcb7263..0c548a1043d8 100644
--- a/security/whisker/Makefile
+++ b/security/whisker/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	whisker
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.wiretrip.net/rfp/bins/whisker/
 DISTNAME=	${PORTNAME}
@@ -14,14 +15,12 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	kris@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/v${PORTVERSION}
-
-do-build:
-		(cd ${WRKSRC}; ${SED} "s%y0y0y0%${PREFIX}%g" whisker.pl > whisker)
+NO_BUILD=	yes
 
 do-install:
-		${INSTALL_SCRIPT} ${WRKSRC}/whisker ${PREFIX}/bin
-		${MKDIR} ${PREFIX}/lib/whisker
-		${INSTALL_DATA} ${WRKSRC}/*.db ${PREFIX}/lib/whisker
+		${INSTALL_SCRIPT} ${WRKSRC}/whisker.pl ${PREFIX}/bin/whisker
+		${MKDIR} ${PREFIX}/share/whisker
+		${INSTALL_DATA} ${WRKSRC}/*.db ${PREFIX}/share/whisker
 		${MKDIR} ${PREFIX}/share/doc/whisker
 		${INSTALL_DATA} ${WRKSRC}/whisker.txt ${PREFIX}/share/doc/whisker
 
diff --git a/security/whisker/files/patch-aa b/security/whisker/files/patch-aa
new file mode 100644
index 000000000000..6bfa3cfb2e8b
--- /dev/null
+++ b/security/whisker/files/patch-aa
@@ -0,0 +1,11 @@
+--- whisker.pl.orig	Tue Dec 26 11:26:37 2000
++++ whisker.pl	Tue Dec 26 11:39:54 2000
+@@ -3,7 +3,7 @@
+ 
+ $whisker_version="1.4.0";
+ $WHEREIS_WHISKER=$0;
+-$WHEREIS_WHISKER=~s/[^\/\\]+$//; 
++$WHEREIS_WHISKER=~s|\w+/[^\/\\]+$|share/whisker/|;
+ $GLOBAL_HTMLOUTPUT=0;
+ 
+ use Socket; use Getopt::Std;
diff --git a/security/whisker/pkg-plist b/security/whisker/pkg-plist
index 696dd099ae11..6e8947755ea0 100644
--- a/security/whisker/pkg-plist
+++ b/security/whisker/pkg-plist
@@ -1,8 +1,8 @@
 bin/whisker
-lib/whisker/brute.db
-lib/whisker/dumb.db
-lib/whisker/scan.db
-lib/whisker/server.db
-@dirrm lib/whisker
+share/whisker/brute.db
+share/whisker/dumb.db
+share/whisker/scan.db
+share/whisker/server.db
+@dirrm share/whisker
 share/doc/whisker/whisker.txt
 @dirrm share/doc/whisker