Fixed wrong use of WRKSRC.

4 files changed, 17 insertions, 18 deletions

diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
index ebeb0d853ab..079068bd6a4 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/03 21:40:13 rillig Exp $
 #
 
 DISTNAME=		arnsrc27012002
@@ -15,8 +15,10 @@ COMMENT=		Amstrad CPC, Amstrad CPC+ and KC Compact emulator
 # we want case sensitive file names.
 EXTRACT_CMD_OPTS.zip=	-aqo
 
-WRKSRC=			${WRKDIR}/arnold/src
+WRKSRC=			${WRKDIR}/arnold
 GNU_CONFIGURE=		yes
+CONFIGURE_DIRS=		src
+BUILD_DIRS=		${CONFIGURE_DIRS}
 BUILD_TARGET=		arnold
 
 SHAREDIR=		${PREFIX}/share/arnold
@@ -24,24 +26,21 @@ DOCDIR=			${PREFIX}/share/doc/arnold
 MAKE_ENV+=		SHAREDIR=${SHAREDIR}
 INSTALLATION_DIRS=	bin
 
-post-extract:
-	${CHMOD} +x ${WRKSRC}/configure
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../arnold ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/arnold ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${SHAREDIR}
 	${INSTALL_DATA_DIR} ${SHAREDIR}/roms
 	for dir in amsdose cpc464e cpc6128e cpc664e cpcplus kcc; \
 	do \
 		${INSTALL_DATA_DIR} ${SHAREDIR}/roms/$$dir; \
-		for f in ${WRKSRC}/../roms/$$dir/*; \
+		for f in ${WRKSRC}/roms/$$dir/*; \
 		do \
 			${INSTALL_DATA} $$f ${SHAREDIR}/roms/$$dir; \
 		done \
 	done
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/../readme.txt ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/../readme.linux ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.linux ${DOCDIR}
 
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/emulators/arnold/distinfo b/emulators/arnold/distinfo
index a03641cdd8a..98fd03f7dcc 100644
--- a/emulators/arnold/distinfo
+++ b/emulators/arnold/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:17 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/11/03 21:40:13 rillig Exp $
 
 SHA1 (arnsrc27012002.zip) = de3102b954d79176dce259375dc1824189027f8e
 RMD160 (arnsrc27012002.zip) = 7b43c157cbc4f6171ee9ef14cc282cc1692188c6
 Size (arnsrc27012002.zip) = 916680 bytes
-SHA1 (patch-aa) = 83ba9c44664d7d6fb938db0d250b4fc24702c09f
-SHA1 (patch-ab) = 3a733e50ee6f12dc2c37c378409e765a8b4d0c8d
+SHA1 (patch-aa) = aff649f6c37cf7a321c182442d9faac44594b413
+SHA1 (patch-ab) = fde2730f3cf53d539543489a6d691ad7a6bc9d68
diff --git a/emulators/arnold/patches/patch-aa b/emulators/arnold/patches/patch-aa
index 5f183f4ec47..5b2ad7b844e 100644
--- a/emulators/arnold/patches/patch-aa
+++ b/emulators/arnold/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/09/24 10:53:27 dillo Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/03 21:40:13 rillig Exp $
 
---- Makefile.in.orig	Sat Jan 19 15:49:14 2002
-+++ Makefile.in
+--- src/Makefile.in.orig	Sat Jan 19 15:49:14 2002
++++ src/Makefile.in
 @@ -25,7 +25,7 @@ SDLINC = @SDL_CFLAGS@
  SDLLIB = @SDL_LIBS@
  
diff --git a/emulators/arnold/patches/patch-ab b/emulators/arnold/patches/patch-ab
index fe6def80ced..72d72af94e5 100644
--- a/emulators/arnold/patches/patch-ab
+++ b/emulators/arnold/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/09/24 10:53:27 dillo Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 21:40:13 rillig Exp $
 
---- unix/main.c.orig	Sun Nov  4 21:15:22 2001
-+++ unix/main.c
+--- src/unix/main.c.orig	Sun Nov  4 21:15:22 2001
++++ src/unix/main.c
 @@ -63,7 +63,7 @@ int main(int argc, char *argv[])
  		char LocalDirectory[1024];
  		char ProgramDirectory[1024]="";