From 9dda2994b8deaa2602062e23b0dba61323a99b33 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Thu, 3 Nov 2005 21:51:57 +0000
Subject: Fixed wrong use of WRKSRC.

---
 lang/bwbasic/Makefile         | 15 +++++++++------
 lang/bwbasic/distinfo         |  6 +++---
 lang/bwbasic/patches/patch-aa |  6 +++---
 lang/bwbasic/patches/patch-ac |  6 +++---
 4 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'lang/bwbasic')

diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index fbf24cd68a7..61b29e4fb36 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/28 17:00:36 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/03 22:19:01 rillig Exp $
 
 PKGNAME=	${DISTNAME:=pl2}
 DISTNAME=	bwbasic-2.20
@@ -9,21 +9,24 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	jspath@bcpl.net
 COMMENT=	The Bywater Basic interpreter
 
-WRKSRC=		${WRKDIR}/bwbasic-2.20p2/bwbasic-2.20
+WRKSRC=		${WRKDIR}/bwbasic-2.20p2
+BWBASIC_WRKSRC=	${WRKSRC}/bwbasic-2.20
 DIST_SUBDIR=	${PKGNAME_NOREV}
 GNU_CONFIGURE=	yes
+CONFIGURE_DIRS=	${BWBASIC_WRKSRC}
+BUILD_DIRS=	${CONFIGURE_DIRS}
 
 SHARE_DIR=	${PREFIX}/share/bwbasic
 
 pre-patch:
-	${CP} ${WRKSRC}/../bwb-2.20-patch01/* ${WRKSRC}
-	${CP} ${WRKSRC}/../bwb-2.20-patch02/* ${WRKSRC}
+	${CP} ${WRKSRC}/bwb-2.20-patch01/* ${BWBASIC_WRKSRC}
+	${CP} ${WRKSRC}/bwb-2.20-patch02/* ${BWBASIC_WRKSRC}
 
 post-install:
 	${INSTALL_DATA_DIR} ${SHARE_DIR}
-	${CP} -r ${WRKSRC}/bwbtest ${SHARE_DIR}
+	${CP} -r ${BWBASIC_WRKSRC}/bwbtest ${SHARE_DIR}
 	${FIND} ${SHARE_DIR} -type d -print | ${XARGS} ${CHMOD} ${BINMODE}
 	${FIND} ${SHARE_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${INSTALL_MAN} ${WRKSRC}/bwbasic.doc ${PREFIX}/man/man1/bwbasic.1
+	${INSTALL_MAN} ${BWBASIC_WRKSRC}/bwbasic.doc ${PREFIX}/man/man1/bwbasic.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/bwbasic/distinfo b/lang/bwbasic/distinfo
index 52c3b157922..67e812e1898 100644
--- a/lang/bwbasic/distinfo
+++ b/lang/bwbasic/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:05 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/11/03 22:19:01 rillig Exp $
 
 SHA1 (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = b96ff440c573b9aac17dfd90830e3defa46a5592
 RMD160 (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = a6ae5cdde2aa18228258314a34b776d3681cb0e8
 Size (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = 485971 bytes
-SHA1 (patch-aa) = e397e2e5b88ccccb44750702bff6d65054d96641
-SHA1 (patch-ac) = e316d334098ba1919239959333804973619dbc81
+SHA1 (patch-aa) = 45a1ff2c8e76a8f8c7d1c1f4876acb8e0bb55add
+SHA1 (patch-ac) = 286c3f91c90b33d1bab2de1581900129661ca74a
diff --git a/lang/bwbasic/patches/patch-aa b/lang/bwbasic/patches/patch-aa
index 5161bdd6606..61328b8c402 100644
--- a/lang/bwbasic/patches/patch-aa
+++ b/lang/bwbasic/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/02/15 19:43:22 pooka Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/03 22:19:01 rillig Exp $
 
---- Makefile.in.orig	Sat Nov 25 14:32:18 1995
-+++ Makefile.in	Sun Feb  6 16:12:49 2000
+--- bwbasic-2.20/Makefile.in.orig	Sat Nov 25 14:32:18 1995
++++ bwbasic-2.20/Makefile.in	Sun Feb  6 16:12:49 2000
 @@ -16,9 +16,10 @@
  
  DEFS = @DEFS@
diff --git a/lang/bwbasic/patches/patch-ac b/lang/bwbasic/patches/patch-ac
index 803687bef6c..e2235228eaf 100644
--- a/lang/bwbasic/patches/patch-ac
+++ b/lang/bwbasic/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/02/15 19:43:22 pooka Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $
 
---- bwbasic.doc	Tue Oct 12 19:30:12 1993
-+++ bwbasic.1	Fri Feb 11 22:42:36 2000
+--- bwbasic-2.20/bwbasic.doc	Tue Oct 12 19:30:12 1993
++++ bwbasic-2.20/bwbasic.1	Fri Feb 11 22:42:36 2000
 @@ -1,33 +1,10 @@
 -
 -
-- 
cgit v1.2.3