Fixed wrong use of WRKSRC.

6 files changed, 21 insertions, 28 deletions

diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index a2269caa924..27d71a9bac3 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/09/28 20:52:23 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2005/11/03 22:35:53 rillig Exp $
 
 DISTNAME=	hugs98-Dec2001
 PKGNAME=	hugs98-200112
@@ -10,9 +10,10 @@ MAINTAINER=	nathanw@mit.edu
 HOMEPAGE=	http://www.haskell.org/hugs/
 COMMENT=	Nottingham and Yale Haskell interpreter and programming environment
 
-WRKSRC=			${WRKDIR}/hugs98-Dec2001/src/unix
 GNU_CONFIGURE=		yes
+CONFIGURE_DIRS=		src/unix
 CONFIGURE_ARGS+=	--with-readline
+BUILD_DIRS=		src
 BUILD_TARGET=		default
 
 .include "../../mk/bsd.prefs.mk"
@@ -25,16 +26,8 @@ CONFIGURE_ENV+=		ac_cv_header_nlist_h=no
 
 INSTALLATION_DIRS=	man/man1
 
-do-build:
-	@cd ${WRKSRC}/.. && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${BUILD_TARGET}
-
-do-install:
-	@cd ${WRKSRC}/.. && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}
-
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/../../docs/hugs.1 ${PREFIX}/man/man1/hugs.1
+	${INSTALL_MAN} ${WRKSRC}/docs/hugs.1 ${PREFIX}/man/man1/hugs.1
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/hugs/distinfo b/lang/hugs/distinfo
index e2650157cbb..508025a3e19 100644
--- a/lang/hugs/distinfo
+++ b/lang/hugs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2005/02/24 09:03:08 agc Exp $
+$NetBSD: distinfo,v 1.12 2005/11/03 22:35:53 rillig Exp $
 
 SHA1 (hugs98-Dec2001.tar.gz) = 0980e3bbd21a6f5bc8ab1658a90be2a4dec35007
 RMD160 (hugs98-Dec2001.tar.gz) = c10c5279ef4f06b753750dca7854791e5664b314
 Size (hugs98-Dec2001.tar.gz) = 821812 bytes
-SHA1 (patch-aa) = c7e05ca44740a4a39595ab95149e6064b9d99ca9
-SHA1 (patch-ab) = 81d75e31db129be9f3e38e330c6c7f3cca375784
-SHA1 (patch-ac) = 4fa190a3aaec5c3fc64c7cf693ace5cb6786c430
-SHA1 (patch-ad) = fc0ed4a99eecd8c89096ba9f30567564701e4070
+SHA1 (patch-aa) = 91c3ac30eb7b89e7866ed69711a067849bd2b279
+SHA1 (patch-ab) = 0c5f3f41048c4220726b3c95cc88e1a4a8be19c8
+SHA1 (patch-ac) = 4e4826187298b36c38397ba3578753ab5535ee27
+SHA1 (patch-ad) = c39e30d9b46605c69b17fdd4a5ac0846e821f463
diff --git a/lang/hugs/patches/patch-aa b/lang/hugs/patches/patch-aa
index e610f3a56eb..5225e01326c 100644
--- a/lang/hugs/patches/patch-aa
+++ b/lang/hugs/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2001/05/22 06:38:09 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2005/11/03 22:35:53 rillig Exp $
 
---- ../MkInstal.in.orig	Tue Feb 29 05:29:00 2000
-+++ ../MkInstal.in	Tue May 22 02:32:45 2001
+--- src/MkInstal.in.orig	Tue Feb 29 05:29:00 2000
++++ src/MkInstal.in	Tue May 22 02:32:45 2001
 @@ -10,8 +10,8 @@
  # multiple files at once.
  ################################################################
diff --git a/lang/hugs/patches/patch-ab b/lang/hugs/patches/patch-ab
index 2c7675155e6..d8a6452480f 100644
--- a/lang/hugs/patches/patch-ab
+++ b/lang/hugs/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2001/05/22 06:38:09 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2005/11/03 22:35:53 rillig Exp $
 
---- ../prelude.h.orig	Thu May 27 23:29:25 1999
-+++ ../prelude.h	Sat May 20 04:06:55 2000
+--- src/prelude.h.orig	Thu May 27 23:29:25 1999
++++ src/prelude.h	Sat May 20 04:06:55 2000
 @@ -566,10 +566,12 @@
   * eval, print loop
   */
diff --git a/lang/hugs/patches/patch-ac b/lang/hugs/patches/patch-ac
index 1ec6b7c96cf..f42de4d800b 100644
--- a/lang/hugs/patches/patch-ac
+++ b/lang/hugs/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2002/04/09 02:59:15 markd Exp $
+$NetBSD: patch-ac,v 1.4 2005/11/03 22:35:53 rillig Exp $
 
---- configure.orig	Sat Dec 15 16:20:04 2001
-+++ configure	Fri Mar 15 15:01:38 2002
+--- src/unix/configure.orig	Sat Dec 15 16:20:04 2001
++++ src/unix/configure	Fri Mar 15 15:01:38 2002
 @@ -4608,8 +4608,8 @@
    -Wno-parentheses \
    "
diff --git a/lang/hugs/patches/patch-ad b/lang/hugs/patches/patch-ad
index 096de8ee3c8..24669482c9a 100644
--- a/lang/hugs/patches/patch-ad
+++ b/lang/hugs/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2003/06/23 21:24:34 jtb Exp $
+$NetBSD: patch-ad,v 1.4 2005/11/03 22:35:53 rillig Exp $
 
---- ../input.c.orig
-+++ ../input.c
+--- src/input.c.orig
++++ src/input.c
 @@ -313,7 +313,7 @@
  static char *lineBuffer = NULL;   /* getline() does the initial allocation */
  #else