Move to relative paths in the pkgsrc tree.

47 files changed, 134 insertions, 136 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 9d7907ec801..732dd5e8a4b 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/22 14:22:40 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/24 09:20:33 agc Exp $
 #
 
 DISTNAME=		snd
@@ -10,7 +10,7 @@ MASTER_SITES=		ftp://ccrma-ftp.stanford.edu/pub/Lisp/
 MAINTAINER=		hubertf@netbsd.org
 
 DEPENDS+=		xpm-3.4j:../../graphics/xpm
-BUILD_DEPENDS+=		${X11BASE}/include/Xm:${PORTSDIR}/x11/lesstif
+BUILD_DEPENDS+=		${X11BASE}/include/Xm:../../x11/lesstif
 
 USE_X11=		YES
 REQUIRES_MOTIF=		YES
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 65a24a27928..918d65ade43 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/04/22 14:22:40 agc Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/24 09:20:33 agc Exp $
 #
 
 DISTNAME=       timidity-0.2i
@@ -10,8 +10,8 @@ DISTFILES=      ${TIINS} ${DISTNAME}.tar.gz
 
 MAINTAINER=     mycroft@NetBSD.ORG
 
-BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
+BUILD_DEPENDS=  unzip:../../archivers/unzip
+RUN_DEPENDS=	wish8.0:../../x11/tk80
 DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 DEPENDS+=	tk-8.0p2:../../x11/tk80
 
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index f41a766b45d..e62c72a6c65 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:40 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.18 1997/10/08 13:10:20 jmz Exp
 #
 
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
 
 MAINTAINER=	packages@netbsd.org
 
-RUN_DEPENDS=    wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS=    wish8.0:../../x11/tk80
 DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 WRKSRC=		${WRKDIR}/xcd
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index cf78fffc375..3c04ccb4e83 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:21 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
 #
 
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/software/
 
 MAINTAINER=     packages@netbsd.org
 
-RUN_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz \
-		lsz:${PORTSDIR}/comms/lrzsz \
-		kermit:${PORTSDIR}/comms/kermit
+RUN_DEPENDS=	lrz:../../comms/lrzsz \
+		lsz:../../comms/lrzsz \
+		kermit:../../comms/kermit
 
 WRKSRC=		${WRKDIR}/${PKGNAME}/src
 IS_INTERACTIVE=	yes
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 6d7f7ccf0d2..8ce0224c20a 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/04/22 11:05:02 agc Exp $
+# $NetBSD: Makefile,v 1.16 1998/04/24 09:20:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp
 #
 
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	packages@netbsd.org
 
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS=	gm4:../../devel/m4
 
 USE_PERL5=	yes
 
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index ff09df31fab..344ec0b98a4 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -12,7 +12,7 @@ OPSYS!=		uname -s
 .if (${OPSYS} == "FreeBSD")
 # agc - don't do this if we're on NetBSD
 # FreeBSD use emacs to byte-compile a .el file
-BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
+BUILD_DEPENDS=	emacs:../../editors/emacs
 .endif
 
 GNU_CONFIGURE=	yes
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 3a48780d5e6..25022aec4be 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/24 09:20:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/09/15 07:22:06 tg Exp
 #
 
@@ -10,8 +10,8 @@ ONLY_FOR_ARCHS=	i386
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	icont:${PORTSDIR}/lang/icon
-RUN_DEPENDS=	iconx:${PORTSDIR}/lang/icon
+BUILD_DEPENDS=	icont:../../lang/icon
+RUN_DEPENDS=	iconx:../../lang/icon
 
 WRKSRC=		${WRKDIR}/src
 MAN1=		cpif.1 nodefs.1 noroots.1 noweb.1 noindex.1 \
diff --git a/editors/ssam/Makefile b/editors/ssam/Makefile
index 19662bd9c84..1b5de5955d6 100644
--- a/editors/ssam/Makefile
+++ b/editors/ssam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:22 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/24 09:20:34 agc Exp $
 #
 
 DISTNAME=	ssam-1.9
@@ -7,8 +7,8 @@ MASTER_SITES=	http://www.westley.demon.co.uk/src/
 
 MAINTAINER=	agc@netbsd.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libutf.a:${PORTSDIR}/misc/libutf
-RUN_DEPENDS=	${PREFIX}/etc/langcoll.utf:${PORTSDIR}/misc/libutf
+BUILD_DEPENDS=	${PREFIX}/lib/libutf.a:../../misc/libutf
+RUN_DEPENDS=	${PREFIX}/etc/langcoll.utf:../../misc/libutf
 
 MAN1=		ssam.1
 GNU_CONFIGURE=	yes
diff --git a/emulators/compat11/Makefile b/emulators/compat11/Makefile
index e2db42df6a4..cae7cb54d68 100644
--- a/emulators/compat11/Makefile
+++ b/emulators/compat11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:23 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/24 09:20:34 agc Exp $
 #
 
 DISTNAME=	compat11
@@ -8,9 +8,9 @@ EXTRACT_SUFX=	_${ARCH}.tgz
 
 MAINTAINER=	tv@netbsd.org
 
-LIB_DEPENDS=	edit.0.:${PORTSDIR}/emulators/compat12 \
-		g++.3.:${PORTSDIR}/emulators/compat12 \
-		util.3.:${PORTSDIR}/emulators/compat12
+LIB_DEPENDS=	edit.0.:../../emulators/compat12 \
+		g++.3.:../../emulators/compat12 \
+		util.3.:../../emulators/compat12
 
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/emulators/linux_lib/pkg/PLIST b/emulators/linux_lib/pkg/PLIST
index ff9c901f142..27d24d36134 100644
--- a/emulators/linux_lib/pkg/PLIST
+++ b/emulators/linux_lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/04/23 09:36:41 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/04/24 09:20:34 agc Exp $
 bin/bash
 etc/host.conf
 etc/ld.so.conf
@@ -168,10 +168,8 @@ usr/X11R6/lib/libX11.so.6
 usr/X11R6/lib/libSM.so.6
 usr/X11R6/lib/libPEX5.so.6
 usr/X11R6/lib/libICE.so.6
-usr/X11R6/lib/X11
-@unexec rm -f %D/%F
-usr/lib/X11
-@unexec rm -f %D/%F
+@unexec rm -f %D/usr/X11R6/lib/X11
+@unexec rm -f %D/usr/lib/X11
 usr/lib/libf2c.so
 usr/lib/libc.so
 usr/lib/libm.so
@@ -212,9 +210,7 @@ usr/lib/libgdbm.so.2
 usr/lib/libstdc++.so.26
 usr/lib/libg++.so.26
 usr/X11
-@unexec rm -f %D/%F
 usr/X386
-@unexec rm -f %D/%F
 usr/i486-linuxaout/lib/libX11.so.3
 usr/i486-linuxaout/lib/libX11.so.6
 usr/i486-linuxaout/lib/libXIE.so.6
@@ -272,3 +268,5 @@ usr/openwin/lib/libolgx.so.3
 @dirrm var/X11R6/lib
 @dirrm var/X11R6
 @dirrm var
+dev/dsp
+@dirrm dev
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 80f609b147b..a585eec6a43 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:41 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:34 agc Exp $
 #
 
 DISTNAME=		xmame-0.30.1_src
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		mycroft@NetBSD.ORG
 
-RUN_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS=		unzip:../../archivers/unzip
 DEPENDS+=		xpm-3.4j:../../graphics/xpm
 
 WRKSRC=			${WRKDIR}/xmame-0.30.1
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index 9190f1fbc3b..ace333525b1 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/04/22 14:22:41 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/24 09:20:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
 #
 
@@ -12,12 +12,12 @@ EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:../../x11/qt
 DEPENDS+=	jpeg-6a:../../graphics/jpeg
 DEPENDS+=	qt-1.33:../../x11/qt
 DEPENDS+=	kdelibs-3.1b:../../x11/kdelibs
 DEPENDS+=	giflib-3.0:../../graphics/giflib
-RUN_DEPENDS=	kappfinder:${PORTSDIR}/x11/kdebase
+RUN_DEPENDS=	kappfinder:../../x11/kdebase
 
 USE_X11=	yes
 USE_GMAKE=	yes
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 90abdf103e8..e441e1d8e17 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:44 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/24 09:20:35 agc Exp $
 #
 
 DISTNAME=		xfig.3.2
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	applications/drawing_tools/xfig
 
 MAINTAINER=		root@garbled.futureone.com
 
-RUN_DEPENDS=		fig2dev:${PORTSDIR}/print/transfig
+RUN_DEPENDS=		fig2dev:../../print/transfig
 DEPENDS+=		xpm-3.4j:../../graphics/xpm
 DEPENDS+=		jpeg-6a:../../graphics/jpeg
 DEPENDS+=		Xaw3d-1.3:../../x11/Xaw3d
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 4944afb3d19..7202e5262e5 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/04/20 11:56:25 frueauf Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/24 09:20:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/20 10:33:35 jkh Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=		packages@netbsd.org
 WRKSRC=			${WRKDIR}/tcl8.0/unix
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ENV+=		PORTSDIR=${PORTSDIR}
+CONFIGURE_ENV+=		PORTSDIR=${.CURDIR}/../../../../..
 
 MAN1=	tclsh.1
 MAN3=	Alloc.3 AddErrInfo.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index 9332407bc83..6d231f3e75a 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:25 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/24 09:20:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/02/15 05:36:54 peter Exp
 #
 
@@ -26,12 +26,12 @@ PATCH_DIST_ARGS= -d ${WRKSRC}/lib --forward --quiet -E ${PATCH_DIST_STRIP}
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
+BUILD_DEPENDS=	tclsh8.0:../../lang/tcl80
+RUN_DEPENDS=	wish8.0:../../x11/tk80
 # exmh is pretty useless without this, but it's not needed to build it.
-RUN_DEPENDS+=   repl:${PORTSDIR}/mail/nmh
+RUN_DEPENDS+=   repl:../../mail/nmh
 # full mime support needs mmencode/mmdecode from metamail
-RUN_DEPENDS+=   mmencode:${PORTSDIR}/mail/metamail
+RUN_DEPENDS+=   mmencode:../../mail/metamail
 
 DIST_SUBDIR=	${PKGNAME}
 
diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index 8ceaf632a00..135d14790a2 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:32 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/24 09:20:35 agc Exp $
 
 DISTNAME=	NumPy-11
 PKGNAME=	py-Numeric-1.1
@@ -8,8 +8,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@endicor.com
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+BUILD_DEPENDS=	python:../../lang/python
+RUN_DEPENDS=	python:../../lang/python
 
 WRKSRC=		${WRKDIR}/LLNLDistribution/Numerical
 ALL_TARGET=	default
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 1cd7e6b2584..76423b25f88 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:45 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:35 agc Exp $
 #
 
 DISTNAME=	nt.1.5a23
@@ -8,10 +8,10 @@ MASTER_SITES=	ftp://cs.ucl.ac.uk/mice/nte/
 
 MAINTAINER=	mycroft@NetBSD.ORG
 
-TK_DIR=         ${PORTSDIR}/x11/tk80
+TK_DIR=         ../../x11/tk80
 TK_SRC=		${TK_DIR}/${WRKDIR:T}/tk8.0
 
-BUILD_DEPENDS=	${PORTSDIR}/x11/tk80/${WRKDIR:T}/tk8.0/generic/default.h:${TK_DIR}:configure
+BUILD_DEPENDS=	../../x11/tk80/${WRKDIR:T}/tk8.0/generic/default.h:${TK_DIR}:configure
 DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 RESTRICTED=	"Contains DES encryption"
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 6b1faaceda7..5a485db4d59 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:45 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp 
 #
 
@@ -9,7 +9,7 @@ DISTFILES=	vatsrc-4.0b2.tar.gz
 
 MAINTAINER=	mycroft@NetBSD.ORG
 
-GSM_DIR=	${PORTSDIR}/audio/gsm
+GSM_DIR=	../../audio/gsm
 GSM_WORK=	${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10
 
 # If configure is changed to look for libgsm.a in ${PREFIX}/lib, then
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index a73c8b4ecba..7af4fac0a6d 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:45 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/24 09:20:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.imada.ou.dk/pub/dotfile/
 MAINTAINER=	oly@world.std.com
 
 DEPENDS+=	tk-8.0p2:../../x11/tk80
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS=	wish8.0:../../x11/tk80
 
 GNU_CONFIGURE=	yes
 MAN1=		dotfile.1
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index bd90be24a10..1120af66784 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/04/22 14:22:46 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/24 09:20:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
 #
 
@@ -12,12 +12,12 @@ EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:../../x11/qt
 DEPENDS+=	jpeg-6a:../../graphics/jpeg
 DEPENDS+=	qt-1.33:../../x11/qt
 DEPENDS+=	kdelibs-3.1b:../../x11/kdelibs
 DEPENDS+=	giflib-3.0:../../graphics/giflib
-RUN_DEPENDS=	kappfinder:${PORTSDIR}/x11/kdebase
+RUN_DEPENDS=	kappfinder:../../x11/kdebase
 
 USE_X11=	yes
 HAS_CONFIGURE=	yes
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 7b39d893cbc..a8203913d34 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:27 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp
 #
 
@@ -8,7 +8,7 @@ MASTER_SITES=   ftp://stampede.cs.berkeley.edu/pub/kp/
 
 MAINTAINER=	packages@netbsd.org
 
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS=	wish8.0:../../x11/tk80
 
 MAN1=		kp.1
 
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 03310754ee8..f0a506ea7ba 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:37 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:36 agc Exp $
 #
 
 DISTNAME=	rpm-2.4.12
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.redhat.com/pub/redhat/code/rpm/ \
 
 MAINTAINER=	mycroft@NetBSD.ORG
 
-BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:../../databases/gdbm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=${MACHINE_ARCH}--netbsd
diff --git a/misc/xfinans/Makefile b/misc/xfinans/Makefile
index 49f90af5f8f..faf19f9148a 100644
--- a/misc/xfinans/Makefile
+++ b/misc/xfinans/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:57 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/24 09:20:39 agc Exp $
 #
 
 DISTNAME=		xfinans-5.9
@@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR=	apps/financial/accounting
 
 MAINTAINER=		root@garbled.futureone.com
 
-RUN_DEPENDS=		gnuplot:${PORTSDIR}/graphics/gnuplot
+RUN_DEPENDS=		gnuplot:../../graphics/gnuplot
 
 USE_IMAKE=		yes
 
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 7eb75e68435..8fad4037666 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:47 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -12,15 +12,15 @@ EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt \
-		${LOCALBASE}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS=	moc:../../x11/qt \
+		${LOCALBASE}/lib/libgdbm.a:../../databases/gdbm
 DEPENDS+=	jpeg-6a:../../graphics/jpeg
 DEPENDS+=	qt-1.33:../../x11/qt
 DEPENDS+=	uulib-0.5.13:../../converters/uulib
 DEPENDS+=	kdelibs-3.1b:../../x11/kdelibs
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 DEPENDS+=	kdesupport-3.1b:../../converters/kdesupport
-RUN_DEPENDS=	kappfinder:${PORTSDIR}/x11/kdebase
+RUN_DEPENDS=	kappfinder:../../x11/kdebase
 
 USE_X11=	yes
 HAS_CONFIGURE=	yes
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index d6f8227b3ba..01d3470d9ec 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:30 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	Net
 
 MAINTAINER=		packages@netbsd.org
 
-BUILD_DEPENDS= 		${PREFIX}/lib/perl5/site_perl/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper
+BUILD_DEPENDS= 		${PREFIX}/lib/perl5/site_perl/Data/Dumper.pm:../../devel/p5-Data-Dumper
 
 USE_PERL5=		YES
 
diff --git a/net/sirc/Makefile b/net/sirc/Makefile
index d3b79a5a6b5..10895f8dea7 100644
--- a/net/sirc/Makefile
+++ b/net/sirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:40 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:36 agc Exp $
 
 DISTNAME=	sirc-2.21
 CATEGORIES=	net
@@ -6,7 +6,7 @@ MASTER_SITES=	http://www.eleves.ens.fr:8080/home/espel/sirc/
 
 MAINTAINER=	hubertf@netbsd.org
 
-RUN_DEPENDS=    ${PREFIX}/bin/perl:${PORTSDIR}/lang/perl5
+RUN_DEPENDS=    ${PREFIX}/bin/perl:../../lang/perl5
 
 MAN1=		ssfe.1 sirc.1
 
diff --git a/net/tkirc/Makefile b/net/tkirc/Makefile
index 2ab528e080e..af366775147 100644
--- a/net/tkirc/Makefile
+++ b/net/tkirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:55 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/24 09:20:39 agc Exp $
 
 DISTNAME=	tkirc1.202
 PKGNAME=	tkirc-1.202
@@ -7,8 +7,8 @@ MASTER_SITES=	ftp://ftp.informatik.uni-oldenburg.de/pub/tkirc/
 
 MAINTAINER=	hubertf@netbsd.org
 
-RUN_DEPENDS=	irc:${PORTSDIR}/net/ircII \
-		wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS=	irc:../../net/ircII \
+		wish8.0:../../x11/tk80
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/plan9/9term/Makefile b/plan9/9term/Makefile
index 413571ceca5..2fe8f780b7a 100644
--- a/plan9/9term/Makefile
+++ b/plan9/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:31 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/24 09:20:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITES=   ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 MAINTAINER=	packages@netbsd.org
 
 # needs library and private header, but not during runtime
-BUILD_DEPENDS=	${PORTSDIR}/plan9/sam/${WRKDIR:T}/libframe/libframe.a:${PORTSDIR}/plan9/sam
+BUILD_DEPENDS=	../../plan9/sam/${WRKDIR:T}/libframe/libframe.a:../../plan9/sam
 
 OPSYS!= 	uname -s
 .if (${OPSYS} == "NetBSD")
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 50fd647e26e..fc8c5b241ce 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/04/15 10:38:45 agc Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/24 09:20:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/10/13 11:22:43 asami Exp
 #
 
@@ -12,11 +12,11 @@ DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 
 MAINTAINER=	explorer@netbsd.org
 
-BUILD_DEPENDS=	${PORTSDIR}/graphics/jpeg/${WRKDIR:T}/jpeg-6a:${PORTSDIR}/graphics/jpeg:extract \
-		${PORTSDIR}/graphics/png/${WRKDIR:T}/libpng-0.96:${PORTSDIR}/graphics/png:extract \
-		unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	../../graphics/jpeg/${WRKDIR:T}/jpeg-6a:../../graphics/jpeg:extract \
+		../../graphics/png/${WRKDIR:T}/libpng-0.96:../../graphics/png:extract \
+		unzip:../../archivers/unzip
 
-MAKE_ENV=	PORTSDIR=${PORTSDIR}
+MAKE_ENV=	PORTSDIR=${.CURDIR}/../..
 EXTRACT_ONLY=	${GS_SOURCES}
 WRKSRC=		${WRKDIR}/gs5.10
 MAKEFILE=	unix-gcc.mak
@@ -44,16 +44,16 @@ post-extract:
 	${TOUCH} ${WRKSRC}/adler32.o
 	${TOUCH} ${WRKSRC}/deflate.o
 	${TOUCH} ${WRKSRC}/trees.o
-	ln -s ${PORTSDIR}/graphics/jpeg/${WRKDIR:T}/jpeg-6a ${WRKSRC}/jpeg-6a
-	ln -s ${PORTSDIR}/graphics/png/${WRKDIR:T}/libpng-0.96 ${WRKSRC}/libpng
+	${LN} -s ../../../../graphics/jpeg/${WRKDIR:T}/jpeg-6a ${WRKSRC}/jpeg-6a
+	${LN} -s ../../../../graphics/png/${WRKDIR:T}/libpng-0.96 ${WRKSRC}/libpng
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
 
 do-configure:
 .if defined(BATCH)
-	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
+	@${SETENV} PORTSDIR=${.CURDIR}/../.. WRKSRC=${WRKSRC} \
 		${SH} ${SCRIPTDIR}/configure.batch
 .else
-	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
+	@${SETENV} PORTSDIR=${.CURDIR}/../.. WRKSRC=${WRKSRC} \
 		${SH} ${SCRIPTDIR}/configure
 .endif
 
@@ -82,7 +82,7 @@ post-install:
 	strip ${PREFIX}/bin/gs
 
 pre-clean:
-	@cd ${PORTSDIR}/graphics/jpeg && ${MAKE} clean
-	@cd ${PORTSDIR}/graphics/png && ${MAKE} clean
+	@cd ../../graphics/jpeg && ${MAKE} clean
+	@cd ../../graphics/png && ${MAKE} clean
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 77795207e3d..85cf02f2dff 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:47 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/
 MAINTAINER=	packages@netbsd.org
 
 DEPENDS+=	Xaw3d-1.3:../../x11/Xaw3d
-RUN_DEPENDS=	${LOCALBASE}/bin/gs:${PORTSDIR}/print/ghostscript5
+RUN_DEPENDS=	${LOCALBASE}/bin/gs:../../print/ghostscript5
 
 USE_IMAKE=	yes
 
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 06ba98f3214..d6cd8738c09 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:47 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/24 09:20:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
 #
 
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.via.ecp.fr/pub/lyx/stable/ \
 
 MAINTAINER=	frueauf@netbsd.org
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
-		ispell:${PORTSDIR}/textproc/ispell
+BUILD_DEPENDS=	latex:../../print/teTeX
+RUN_DEPENDS=	latex:../../print/teTeX \
+		ispell:../../textproc/ispell
 DEPENDS+=	xpm-3.4j:../../graphics/xpm
 DEPENDS+=	xforms-0.88:../../x11/xforms
 
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index eae27c1729c..0c7ebbcd868 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/04/19 12:55:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/24 09:20:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 23:55:31 asami Exp
 #
 
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/
 
 MAINTAINER=	hubertf@NetBSD.org
 
-RUN_DEPENDS=	mkisofs:${PORTSDIR}/sysutils/mkisofs
+RUN_DEPENDS=	mkisofs:../../sysutils/mkisofs
 
 MAN1=		cdrecord.1
 USE_GMAKE=	yes
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index d3da350307e..a3742df4ee9 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:51 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/24 09:20:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/27 00:11:48 asami Exp
 #
 
@@ -11,8 +11,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PATCH1} ${PATCH2}
 
 MAINTAINER=	packages@netbsd.org
 
-RUN_DEPENDS=	elk:${PORTSDIR}/lang/elk
-BUILD_DEPENDS=	elk:${PORTSDIR}/lang/elk
+RUN_DEPENDS=	elk:../../lang/elk
+BUILD_DEPENDS=	elk:../../lang/elk
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	unroff
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 8eb9c84d527..387dfd4a688 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:34 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/14 04:00:11 jfitz Exp
 #
 
@@ -10,9 +10,9 @@ MASTER_SITE_SUBDIR=	URI
 
 MAINTAINER=		packages@netbsd.org
 
-BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/MD5.pm:${PORTSDIR}/security/p5-MD5 \
-		${PREFIX}/lib/perl5/site_perl/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
-		${PREFIX}/lib/perl5/site_perl/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/MD5.pm:../../security/p5-MD5 \
+		${PREFIX}/lib/perl5/site_perl/Net/FTP.pm:../../net/p5-Net \
+		${PREFIX}/lib/perl5/site_perl/MIME/Base64.pm:../../converters/p5-MIME-Base64
 
 USE_PERL5=	YES
 
diff --git a/x11/fvwm1/Makefile b/x11/fvwm1/Makefile
index 43c095f93ad..74f08a8c02a 100644
--- a/x11/fvwm1/Makefile
+++ b/x11/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:49 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/24 09:20:37 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
 MAINTAINER=	cjs@netbsd.org
 
 DEPENDS+=	xpm-3.4j:../../graphics/xpm
-RUN_DEPENDS=	xpmroot:${PORTSDIR}/x11/xpmroot
+RUN_DEPENDS=	xpmroot:../../x11/xpmroot
 
 USE_IMAKE=	yes
 XMKMF=		xmkmf && make Makefiles	# drop -a because we have no `depends' target
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index e5705950461..4eb0490d5b0 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -14,7 +14,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
 MAINTAINER=	packages@netbsd.org
 
 DEPENDS+=	xpm-3.4j:../../graphics/xpm
-RUN_DEPENDS=	xpmroot:${PORTSDIR}/x11/xpmroot
+RUN_DEPENDS=	xpmroot:../../x11/xpmroot
 
 USE_IMAKE=	yes
 CAT1= 		FvwmAudio.0 FvwmAuto.0 FvwmBacker.0 FvwmBanner.0 \
diff --git a/x11/fvwm95/Makefile b/x11/fvwm95/Makefile
index 14da66fa3b2..fe03fc34163 100644
--- a/x11/fvwm95/Makefile
+++ b/x11/fvwm95/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:38 agc Exp $
 # FreeBSD: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp
 #
 
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	packages@netbsd.org
 
 DEPENDS+=	xpm-3.4j:../../graphics/xpm
-BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
-RUN_DEPENDS=	xpmroot:${PORTSDIR}/x11/xpmroot
+BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:../../audio/rplay
+RUN_DEPENDS=	xpmroot:../../x11/xpmroot
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/kde/Makefile b/x11/kde/Makefile
index 1eff7b073b0..98e76aa3d10 100644
--- a/x11/kde/Makefile
+++ b/x11/kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:49 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/24 09:20:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp
 #
 
@@ -10,10 +10,10 @@ DISTFILES=	# empty
 MAINTAINER=	packages@netbsd.org
 
 DEPENDS+=	kdelibs-3.1b:../../x11/kdelibs
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase \
-		kcalc:${PORTSDIR}/misc/kdeutils \
-		kmahjongg:${PORTSDIR}/games/kdegames \
-		kmail:${PORTSDIR}/net/kdenetwork
+RUN_DEPENDS=	kwm:../../x11/kdebase \
+		kcalc:../../misc/kdeutils \
+		kmahjongg:../../games/kdegames \
+		kmail:../../net/kdenetwork
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index a6f96e99ff3..3878c8eaf6c 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 #
 
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:../../x11/qt
 DEPENDS+=	jpeg-6a:../../graphics/jpeg
 DEPENDS+=	qt-1.33:../../x11/qt
 DEPENDS+=	kdelibs-3.1b:../../x11/kdelibs
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index aa59933c27c..466904414ec 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
+BUILD_DEPENDS=	moc:../../x11/qt
 DEPENDS+=	jpeg-6a:../../graphics/jpeg
 DEPENDS+=	qt-1.33:../../x11/qt
 DEPENDS+=	giflib-3.0:../../graphics/giflib
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 1191eb05f68..377c66b6ed0 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:49 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/24 09:20:38 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	Tk
 
 MAINTAINER=		packages@netbsd.org
 
-BUILD_DEPENDS= 		${PREFIX}/lib/perl5/site_perl/HTML/Parse.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= 		${PREFIX}/lib/perl5/site_perl/HTML/Parse.pm:../../www/p5-libwww
 DEPENDS+=		tk-8.0p2:../../x11/tk80
 
 USE_PERL5=		YES
diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
index 72179a54312..4c223fbf36f 100644
--- a/x11/tk80/Makefile
+++ b/x11/tk80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/04/22 14:22:50 agc Exp $
+# $NetBSD: Makefile,v 1.15 1998/04/24 09:20:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp
 #
 
@@ -14,7 +14,7 @@ DEPENDS+=	tcl-8.0p2:../../lang/tcl80
 WRKSRC=		${WRKDIR}/tk8.0/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ENV+=  PORTSDIR=${PORTSDIR}
+CONFIGURE_ENV+=  PORTSDIR=${.CURDIR}/../../../../..
 
 MAN1=		wish.1
 MAN3=		3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
diff --git a/x11/tkcron/Makefile b/x11/tkcron/Makefile
index ff5afdd75ad..8194c752b1c 100644
--- a/x11/tkcron/Makefile
+++ b/x11/tkcron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:55 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/24 09:20:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/22 20:10:39 jseger Exp
 #
 
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.tcl.gz
 
 MAINTAINER=	sander@haldjas.folklore.ee
 
-RUN_DEPENDS=	wish8\.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS=	wish8.0:../../x11/tk80
 
 EXTRACT_CMD=	${GZIP_CMD}
 EXTRACT_BEFORE_ARGS= -cd
diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile
index 9d573db10d1..2962b11ea0a 100644
--- a/x11/tkinfo/Makefile
+++ b/x11/tkinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:36 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/24 09:20:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/12/16 09:26:12 tg Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.math.ucsb.edu/~boldt/tkinfo/ \
 
 MAINTAINER=	packages@netbsd.org
 
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS=	wish8.0:../../x11/tk80
 
 NO_BUILD=	yes
 
diff --git a/x11/tkirc/Makefile b/x11/tkirc/Makefile
index 2ab528e080e..af366775147 100644
--- a/x11/tkirc/Makefile
+++ b/x11/tkirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:55 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/24 09:20:39 agc Exp $
 
 DISTNAME=	tkirc1.202
 PKGNAME=	tkirc-1.202
@@ -7,8 +7,8 @@ MASTER_SITES=	ftp://ftp.informatik.uni-oldenburg.de/pub/tkirc/
 
 MAINTAINER=	hubertf@netbsd.org
 
-RUN_DEPENDS=	irc:${PORTSDIR}/net/ircII \
-		wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS=	irc:../../net/ircII \
+		wish8.0:../../x11/tk80
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index 64c5084b9a5..cec078be878 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/04/22 14:22:50 agc Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/24 09:20:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
 #
 
@@ -10,8 +10,8 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		packages@netbsd.org
 
 DEPENDS+=		tk-8.0p2:../../x11/tk80
-RUN_DEPENDS=		rman:${PORTSDIR}/textproc/rman \
-			glimpse:${PORTSDIR}/textproc/glimpse
+RUN_DEPENDS=		rman:../../textproc/rman \
+			glimpse:../../textproc/glimpse
 
 NO_CDROM=		"Don't sell for profit"
 MIRROR_DISTFILE=	no
diff --git a/x11/xfinans/Makefile b/x11/xfinans/Makefile
index 49f90af5f8f..faf19f9148a 100644
--- a/x11/xfinans/Makefile
+++ b/x11/xfinans/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:57 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/24 09:20:39 agc Exp $
 #
 
 DISTNAME=		xfinans-5.9
@@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR=	apps/financial/accounting
 
 MAINTAINER=		root@garbled.futureone.com
 
-RUN_DEPENDS=		gnuplot:${PORTSDIR}/graphics/gnuplot
+RUN_DEPENDS=		gnuplot:../../graphics/gnuplot
 
 USE_IMAKE=		yes