From 0d8701d9d1688098f462d72ec5019346c04b1b02 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Mon, 30 Aug 2004 16:00:49 +0000
Subject: Fix paths to tclsh and wish, which were being found in the buildlink
 directory.  Bump PKGREVISION to 4.  From Ryo HAYASAKA in PR pkg/26808.

---
 security/tkpasman/Makefile         |  6 ++++--
 security/tkpasman/distinfo         |  4 ++--
 security/tkpasman/patches/patch-aa | 11 +++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'security')

diff --git a/security/tkpasman/Makefile b/security/tkpasman/Makefile
index 42c0014c1d2..29b63097aa2 100644
--- a/security/tkpasman/Makefile
+++ b/security/tkpasman/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/05/08 20:21:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/08/30 16:00:49 jmmv Exp $
 #
 
 DISTNAME=	TkPasMan-2.2a
 PKGNAME=	${DISTNAME:S/TkPasMan/tkpasman/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://www.xs4all.nl/~wbsoft/linux/projects/
 
@@ -16,6 +16,8 @@ USE_BUILDLINK3=		YES
 CONFIG_SUBST=		PREFIX="${PREFIX}"
 CONFIG_SUBST+=		SHELL="${SH}"
 CONFIG_SUBST+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIG_SUBST+=		TCLSH="${BUILDLINK_PREFIX.tcl}/bin/tclsh"
+CONFIG_SUBST+=		WISH="${BUILDLINK_PREFIX.tk}/bin/wish"
 CONFIG_SUBST_SED=	${CONFIG_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/security/tkpasman/distinfo b/security/tkpasman/distinfo
index 523091d7835..48267f44236 100644
--- a/security/tkpasman/distinfo
+++ b/security/tkpasman/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/06/09 22:12:35 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/08/30 16:00:49 jmmv Exp $
 
 SHA1 (TkPasMan-2.2a.tar.gz) = 670e4a05e4cad221261189c8819e851760907921
 Size (TkPasMan-2.2a.tar.gz) = 31330 bytes
-SHA1 (patch-aa) = e7256ce74b1688d2c8b4df160bd77afc50623a79
+SHA1 (patch-aa) = aea9e44b92a66455ce104cdbd3fe45a28c264eac
diff --git a/security/tkpasman/patches/patch-aa b/security/tkpasman/patches/patch-aa
index aadc77af6e9..4d0c47e05fa 100644
--- a/security/tkpasman/patches/patch-aa
+++ b/security/tkpasman/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/06/09 22:12:35 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2004/08/30 16:00:49 jmmv Exp $
 
 --- config.in.orig	2003-06-09 13:00:02.000000000 +0200
 +++ config.in
-@@ -4,11 +4,13 @@
+@@ -4,16 +4,18 @@
  # paths below.
  
  # In which directory do you want tkpasman to be installed?
@@ -18,6 +18,13 @@ $NetBSD: patch-aa,v 1.2 2003/06/09 22:12:35 jmmv Exp $
  
  # The Makefile should find wish8.3 and tclsh8.3.  When it fails, enter here
  # the full path to your wish and tclsh shell.
+-WISH=
+-TCLSH= 
++WISH=@WISH@
++TCLSH=@TCLSH@
+ 
+ # Filename of the user config file of TkPasMan.  Be sure to quote file-
+ # names starting with a tilde!
 @@ -27,12 +29,12 @@ PWDFILE='~/.tkpasman'
  
  # Build in openssl support (true or false, optional).
-- 
cgit v1.2.3