Fixed wrong use of WRKSRC.

16 files changed, 54 insertions, 61 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
diff --git a/net/IglooFTP/Makefile b/net/IglooFTP/Makefile
index e198237f1f7..6a6b809c019 100644
--- a/net/IglooFTP/Makefile
+++ b/net/IglooFTP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:07 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/03 22:39:38 rillig Exp $
 
 DISTNAME=	IglooFTP-0.6.1
 PKGREVISION=	4
@@ -11,10 +11,10 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://www.littleigloo.org/iglooftp.php3
 COMMENT=	Easy to use FTP client for X Window System
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+BUILD_DIRS=	src
 
 post-extract:
-	${RM} ${WRKSRC}/../share/docs/LICENSE~
+	${RM} ${WRKSRC}/share/docs/LICENSE~
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/IglooFTP/distinfo b/net/IglooFTP/distinfo
index 908c1839ab5..532d06f2b5b 100644
--- a/net/IglooFTP/distinfo
+++ b/net/IglooFTP/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:41 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/11/03 22:39:38 rillig Exp $
 
 SHA1 (IglooFTP-0.6.1.src.tar.gz) = ab56bc6c15dc81525b8e987ae5fc15e562f92eed
 RMD160 (IglooFTP-0.6.1.src.tar.gz) = 7f0971ec857542d96a09dffc9db8a3544df38fae
 Size (IglooFTP-0.6.1.src.tar.gz) = 300553 bytes
-SHA1 (patch-aa) = 8016e43c95b53c38a39acaeeac3c72876fc9004a
-SHA1 (patch-ab) = 7f3b7c383099e4889618f6dafcc76e320278aec9
+SHA1 (patch-aa) = 62f8e163e4b4fa3842732c11beb712bbd3a7448a
+SHA1 (patch-ab) = 95acf4685cf1da0ce04afc86f92ce201b24324e5
diff --git a/net/IglooFTP/patches/patch-aa b/net/IglooFTP/patches/patch-aa
index 9fb929c8660..08f7a3130eb 100644
--- a/net/IglooFTP/patches/patch-aa
+++ b/net/IglooFTP/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2002/10/13 11:50:11 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 22:39:38 rillig Exp $
 
---- Makefile.orig	Fri Apr 16 00:05:15 1999
-+++ Makefile
+--- src/Makefile.orig	Fri Apr 16 00:05:15 1999
++++ src/Makefile
 @@ -1,14 +1,13 @@
  SHELL=/bin/sh
 -CC = gcc
diff --git a/net/IglooFTP/patches/patch-ab b/net/IglooFTP/patches/patch-ab
index 95815966ee8..e4299024f99 100644
--- a/net/IglooFTP/patches/patch-ab
+++ b/net/IglooFTP/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/11 21:40:41 agc Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 22:39:38 rillig Exp $
 
---- FTP.c.orig	Thu Apr 15 20:05:13 1999
-+++ FTP.c	Mon May  3 12:59:56 1999
+--- src/FTP.c.orig	Thu Apr 15 20:05:13 1999
++++ src/FTP.c	Mon May  3 12:59:56 1999
 @@ -15,12 +15,12 @@
   */
  
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index b119423ec8a..0705b829be6 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/03 22:37:28 rillig Exp $
 
 DISTNAME=	dgd-1.2p4
 PKGNAME=	dgd-1.2.0.4
@@ -13,20 +13,20 @@ LICENSE=	fee-based-commercial-use
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=		${WRKDIR}/dgd/src
-
-USE_TOOLS+=	gtar
+USE_TOOLS+=		gtar
+WRKSRC=			${WRKDIR}/dgd
+BUILD_DIRS=		src
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	"Fixing hardcoded paths and command names."
 SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	../mud.dgd
+SUBST_FILES.paths=	mud.dgd
 SUBST_SED.paths=	-e 's,/home/dworkin/,${PREFIX}/libdata/,g'
 
 INSTALLATION_DIRS=	libexec
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/a.out ${PREFIX}/libexec/dgd
+	${INSTALL_PROGRAM} ${WRKSRC}/src/a.out ${PREFIX}/libexec/dgd
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dgd
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dgd
 	${INSTALL_DATA_DIR} ${PREFIX}/libdata/dgd/tmp
@@ -37,6 +37,6 @@ do-install:
 	${GTAR} cCf ${WRKDIR}/dgd - mud | ${GTAR} xCf ${PREFIX}/libdata/dgd -
 	${CHOWN} -R ${BINOWN}:${BINGRP}  ${PREFIX}/libdata/dgd \
 		${PREFIX}/share/doc/dgd
-	${INSTALL_DATA} ${WRKSRC}/../mud.dgd ${PREFIX}/share/examples/dgd
+	${INSTALL_DATA} ${WRKSRC}/mud.dgd ${PREFIX}/share/examples/dgd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dgd/distinfo b/net/dgd/distinfo
index 6412c85ee54..9eca943d47d 100644
--- a/net/dgd/distinfo
+++ b/net/dgd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:45 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/11/03 22:37:28 rillig Exp $
 
 SHA1 (dgd-1.2p4.tar.gz) = 7a42cf6534ad114ab2eca6638414d5dd5595342a
 RMD160 (dgd-1.2p4.tar.gz) = 1c6f5e8e6783ba29d8933bef2c365031e32be77f
 Size (dgd-1.2p4.tar.gz) = 472205 bytes
-SHA1 (patch-aa) = 9926a03ca84c0d9473b0f3ee7bd19167b11c3579
+SHA1 (patch-aa) = 9253e211eb82fb06ea7771e2dbd37d9c53ea1435
diff --git a/net/dgd/patches/patch-aa b/net/dgd/patches/patch-aa
index bd454f02f78..438e34fabe6 100644
--- a/net/dgd/patches/patch-aa
+++ b/net/dgd/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/03/08 01:56:53 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 22:37:28 rillig Exp $
 
---- Makefile.orig	2002-08-26 08:21:20.000000000 -0500
-+++ Makefile
+--- src/Makefile.orig	2002-08-26 08:21:20.000000000 -0500
++++ src/Makefile
 @@ -5,11 +5,11 @@ HOST=	NETBSD
  DEFINES=-D$(HOST) #-DDUMP_FUNCS
  DEBUG=	-O2
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 4d1eca02079..7c0a2f585be 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/21 13:40:24 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/11/03 22:40:58 rillig Exp $
 
 DISTNAME=	mDNSResponder-107.1
 PKGREVISION=	1
@@ -10,8 +10,8 @@ HOMEPAGE=	http://developer.apple.com/darwin/projects/bonjour/
 COMMENT=	Apple's mDNS responder
 
 USE_TOOLS=	gmake
-WRKSRC=		${WRKDIR}/${DISTNAME}/mDNSPosix
-BUILDDIR=	${WRKSRC}/build/prod
+BUILD_DIRS=	mDNSPosix
+BUILDDIR=	${WRKSRC}/mDNSPosix/build/prod
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -53,7 +53,7 @@ do-install:
 	for i in ${SBINARY}; do \
 		${INSTALL_PROGRAM} ${BUILDDIR}/$$i ${PREFIX}/sbin; \
 	done
-	${INSTALL_DATA} ${WRKSRC}/../mDNSShared/dns_sd.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/mDNSShared/dns_sd.h ${PREFIX}/include
 	${INSTALL_LIB} ${BUILDDIR}/libdns_sd.${SO_SUFFIX} ${PREFIX}/lib
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index 17c05a31d45..3432810af8e 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/08/19 21:56:59 reed Exp $
+$NetBSD: distinfo,v 1.6 2005/11/03 22:40:58 rillig Exp $
 
 SHA1 (mDNSResponder-107.1.tar.gz) = 272c97dce83cea643a75ddd46a6e7d4c4e05d1ef
 RMD160 (mDNSResponder-107.1.tar.gz) = 3415d6e17aa44ce1f25b15d5f57af67d48280d08
 Size (mDNSResponder-107.1.tar.gz) = 1325181 bytes
-SHA1 (patch-aa) = 44b6130e6ac23bca2529c52b59c11bb8da3cbcf8
+SHA1 (patch-aa) = 628da397c9ee54c72224c08dc2dcffac3d831538
diff --git a/net/mDNSResponder/patches/patch-aa b/net/mDNSResponder/patches/patch-aa
index 34673f9ee11..0c0297321d1 100644
--- a/net/mDNSResponder/patches/patch-aa
+++ b/net/mDNSResponder/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2005/08/19 21:56:59 reed Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 22:40:58 rillig Exp $
 
---- Makefile.orig	Sat Jun 11 22:44:40 2005
-+++ Makefile
+--- mDNSPosix/Makefile.orig	Sat Jun 11 22:44:40 2005
++++ mDNSPosix/Makefile
 @@ -233,7 +233,7 @@ RM = rm
  LN = ln -s -f
  CFLAGS_COMMON = -I. -I$(COREDIR) -I$(SHAREDDIR) -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\"