From cceabcb629ad5533b50bbc076a797ca16d59417d Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Thu, 3 Nov 2005 20:41:43 +0000
Subject: Fixed wrong usage of WRKSRC.

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

(limited to 'security')

diff --git a/security/john/Makefile b/security/john/Makefile
index 2bb57cf2fe0..811a33b9d5b 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:26 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/03 20:41:43 rillig Exp $
 #
 
 DISTNAME=	john-1.6
@@ -10,9 +10,8 @@ MAINTAINER=	DawS@irc.pl
 HOMEPAGE=	http://www.openwall.com/john/
 COMMENT=	Unix Password Cracker
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
 NO_CONFIGURE=	yes
+BUILD_DIRS=	src
 
 .include "../../mk/compiler.mk"
 .include "../../mk/bsd.prefs.mk"
@@ -36,14 +35,14 @@ BUILD_TARGET=	generic
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../run/john ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/run/john ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/../run/all.chr ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/../run/alpha.chr ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/../run/digits.chr ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/../run/john.ini ${PREFIX}/share/john
-	${INSTALL_DATA} ${WRKSRC}/../run/mailer ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/../run/password.lst ${PREFIX}/share/john
+	${INSTALL_DATA} ${WRKSRC}/run/all.chr ${PREFIX}/share/john
+	${INSTALL_DATA} ${WRKSRC}/run/alpha.chr ${PREFIX}/share/john
+	${INSTALL_DATA} ${WRKSRC}/run/digits.chr ${PREFIX}/share/john
+	${INSTALL_DATA} ${WRKSRC}/run/john.ini ${PREFIX}/share/john
+	${INSTALL_DATA} ${WRKSRC}/run/mailer ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/run/password.lst ${PREFIX}/share/john
 	${LN} -sf ${PREFIX}/bin/john ${PREFIX}/bin/unafs
 	${LN} -sf ${PREFIX}/bin/john ${PREFIX}/bin/unique
 	${LN} -sf ${PREFIX}/bin/john ${PREFIX}/bin/unshadow
diff --git a/security/john/distinfo b/security/john/distinfo
index 780e7793185..69d51b547de 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:10:07 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/11/03 20:41:43 rillig Exp $
 
 SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
 RMD160 (john-1.6.tar.gz) = 5a34e7f57b190313cc0773e996f6eed74f28d160
 Size (john-1.6.tar.gz) = 497341 bytes
-SHA1 (patch-aa) = 0c235ee26071e34a09ed894305707e4b5daf318f
+SHA1 (patch-aa) = 3a99923611742807ca7258bd880244b9a252b0ff
diff --git a/security/john/patches/patch-aa b/security/john/patches/patch-aa
index 1055543a596..f71ba97dbf5 100644
--- a/security/john/patches/patch-aa
+++ b/security/john/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/06/26 19:06:04 grant Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 20:41:43 rillig Exp $
 
---- Makefile.orig	1998-12-03 11:29:50.000000000 +1100
-+++ Makefile
+--- src/Makefile.orig	1998-12-03 11:29:50.000000000 +1100
++++ src/Makefile
 @@ -3,21 +3,21 @@
  # Copyright (c) 1996-98 by Solar Designer
  #
-- 
cgit v1.2.3