Remove RUN_DEPENDS from package Makefiles, and replace it with an ordinary

DEPENDS definition.

27 files changed, 63 insertions, 73 deletions

diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 3c3e1c85e19..5392c2980e4 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/11/07 20:04:48 mycroft Exp $
+# $NetBSD: Makefile,v 1.18 1998/11/19 15:40:45 agc Exp $
 #
 
 DISTNAME=       timidity-0.2i
@@ -11,7 +11,6 @@ MAINTAINER=     mycroft@NetBSD.ORG
 HOMEPAGE=	http://www.cgs.fi/~tt/timidity/
 
 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/cad/pcb/Makefile b/cad/pcb/Makefile
index 5f2ce48301f..e89440ea39d 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/07 14:30:33 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1998/11/19 15:40:45 agc Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/10/31 18:05:31 jseger Exp
 #
 
@@ -10,9 +10,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	gm4:../../devel/m4 \
-		texindex:../../print/teTeX
-RUN_DEPENDS=	gm4:../../devel/m4
+BUILD_DEPENDS=	texindex:../../print/teTeX
+DEPENDS+=	m4-1.4:../../devel/m4
 
 USE_IMAKE=	yes
 
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index be2e19461f5..508ee524543 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/08/20 15:16:42 tsarna Exp $
+# $NetBSD: Makefile,v 1.10 1998/11/19 15:40:45 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
 #
 
@@ -10,9 +10,8 @@ MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/software/
 MAINTAINER=     tron@netbsd.org
 HOMEPAGE=	http://www.clinet.fi/~walker/minicom.html
 
-RUN_DEPENDS=	lrz:../../comms/lrzsz \
-		lsz:../../comms/lrzsz \
-		kermit:../../comms/kermit
+DEPENDS+=	lrzsz-0.12.18:../../comms/lrzsz
+DEPENDS+=	kermit-6.0.192:../../comms/kermit
 
 WRKSRC=		${WRKDIR}/${PKGNAME}/src
 IS_INTERACTIVE=	yes
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 7f5c611fad7..bc89cf23335 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/08/20 15:16:45 tsarna Exp $
+# $NetBSD: Makefile,v 1.18 1998/11/19 15:40:45 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/autoconf/autoconf.html
 
-RUN_DEPENDS=	gm4:../../devel/m4
+DEPENDS=	m4-1.4:../../devel/m4
 
 USE_PERL5=	yes
 
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 145743da055..2c2b3151c1a 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/10/15 19:51:07 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/11/19 15:40:45 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/06/24 18:43:28 jfitz Exp
 #
 
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 
-RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/Curses.pm:../../devel/p5-Curses
+DEPENDS+=	p5-Curses-1.02:../../devel/p5-Curses
 
 USE_PERL5=	YES
 
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index fe94da7fbe0..87bb5d61dc9 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1998/11/12 23:20:09 frueauf Exp $
+# $NetBSD: Makefile,v 1.25 1998/11/19 15:40:46 agc Exp $
 #
 
 DISTNAME=		xmame-0.34b5.2
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		mycroft@NetBSD.ORG
 HOMEPAGE=		http://drake.dit.upm.es/~mame/
 
-RUN_DEPENDS=		unzip:../../archivers/unzip
+DEPENDS=		unzip-5.32:../../archivers/unzip
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 CONFLICTS=		xmame-0.30.1 xmame-0.33b6.1 xmame-0.34b1.1 \
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index e4239a8840a..d02f5d254a8 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/11/12 23:20:10 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/11/19 15:40:46 agc Exp $
 #
 
 DISTNAME=		unix02b4
@@ -10,7 +10,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		mycroft@NetBSD.ORG
 HOMEPAGE=		http://internetter.com/titan/mess/
 
-RUN_DEPENDS=		unzip:../../archivers/unzip
+DEPENDS=		unzip-5.32:../../archivers/unzip
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 CONFLICTS=		xmess-0.1
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index 1ac563808af..89de067a740 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/08/20 15:17:09 tsarna Exp $
+# $NetBSD: Makefile,v 1.14 1998/11/19 15:40:46 agc Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/02/15 05:36:54 peter Exp
 #
 
@@ -26,12 +26,10 @@ PATCH_DIST_ARGS= -d ${WRKSRC}/lib --forward --quiet -E ${PATCH_DIST_STRIP}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.beedub.com/exmh/
 
-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:../../mail/nmh
-# full mime support needs mmencode/mmdecode from metamail
-RUN_DEPENDS+=   mmencode:../../mail/metamail
+DEPENDS+=	tcl-8.0p2:../../lang/tcl80
+DEPENDS+=	tk-8.0p2:../../x11/tk80
+DEPENDS+=	nmh-0.27:../../mail/nmh
+DEPENDS+=	mm-2.7:../../mail/metamail
 
 DIST_SUBDIR=	${PKGNAME}
 
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index 626e148b550..0c80bfd7c21 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/08/20 15:17:12 tsarna Exp $
+# $NetBSD: Makefile,v 1.13 1998/11/19 15:40:46 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp
 #
 
@@ -10,7 +10,6 @@ MAINTAINER=	oly@world.std.com
 HOMEPAGE=	http://www.imada.ou.dk/~blackie/dotfile/
 
 DEPENDS+=	tk-8.0p2:../../x11/tk80
-RUN_DEPENDS=	wish8.0:../../x11/tk80
 
 # this pkg opens some X connectin
 IS_INTERACTIVE= yes
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index c142000b829..e54037e5b82 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/06/22 12:52:32 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/11/19 15:40:46 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:../../x11/tk80
+DEPENDS=	tk-8.0p2:../../x11/tk80
 
 pre-configure:
 	for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
diff --git a/misc/xfinans/Makefile b/misc/xfinans/Makefile
index bb7b5f69253..b8ef24310c5 100644
--- a/misc/xfinans/Makefile
+++ b/misc/xfinans/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/08/27 13:46:00 garbled Exp $
+# $NetBSD: Makefile,v 1.6 1998/11/19 15:40:48 agc Exp $
 #
 
 DISTNAME=		xfinans-5.9
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	apps/financial/accounting
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.cs.auc.dk/~lupus/xfinans.html
 
-RUN_DEPENDS=		gnuplot:../../graphics/gnuplot
+DEPENDS=		gnuplot-3.5:../../graphics/gnuplot
 
 USE_IMAKE=		yes
 
diff --git a/net/tkirc/Makefile b/net/tkirc/Makefile
index f46f43fc1d0..7582fadd497 100644
--- a/net/tkirc/Makefile
+++ b/net/tkirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/08/20 15:17:38 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 1998/11/19 15:40:48 agc Exp $
 
 DISTNAME=	tkirc1.202
 PKGNAME=	tkirc-1.202
@@ -8,8 +8,8 @@ MASTER_SITES=	ftp://ftp.informatik.uni-oldenburg.de/pub/tkirc/
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.north.de/~atte/tkirc/
 
-RUN_DEPENDS=	irc:../../net/ircII \
-		wish8.0:../../x11/tk80
+DEPENDS+=	ircII-4.4:../../net/ircII
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 4db6ef637cd..f6d9009a7e5 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/08/20 15:17:24 tsarna Exp $
+# $NetBSD: Makefile,v 1.15 1998/11/19 15:40:46 agc Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
 #
 
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://wwwthep.physik.uni-mainz.de/~plass/gv/
 
 DEPENDS+=	Xaw3d-1.5:../../x11/Xaw3d
-RUN_DEPENDS=	${LOCALBASE}/bin/gs:../../print/ghostscript5
+DEPENDS+=	ghostscript-5.50:../../print/ghostscript5
 
 USE_IMAKE=	yes
 
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 7c1058ae70e..5c53a048b70 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/11/13 13:04:51 matthias Exp $
+# $NetBSD: Makefile,v 1.13 1998/11/19 15:40:46 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
 #
 
@@ -10,11 +10,10 @@ MASTER_SITES=	ftp://ftp.via.ecp.fr/pub/lyx/stable/ \
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://la1ad.uio.no/lyx/
 
-BUILD_DEPENDS=	latex:../../print/teTeX
-RUN_DEPENDS=	latex:../../print/teTeX \
-		ispell:../../textproc/ispell
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 DEPENDS+=	xforms-0.88:../../x11/xforms
+DEPENDS+=	teTeX-0.4p8:../../print/teTeX
+DEPENDS+=	ispell-3.1.20:../../textproc/ispell
 
 ONLY_FOR_ARCHS=	arm32 i386 m68k sparc ns32k
 
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 422bd136b85..6c24a60c1c3 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 1998/10/22 07:01:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.20 1998/11/19 15:40:46 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 23:55:31 asami Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.fokus.gmd.de/nthp/employees/schilling/cdrecord.html
 
-RUN_DEPENDS=	mkisofs:../../sysutils/mkisofs
+DEPENDS=	mkisofs-1.11.3:../../sysutils/mkisofs
 
 USE_GMAKE=	yes
 
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index 75f6dae386b..84a559d2a0c 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/11/13 01:50:21 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1998/11/19 15:40:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/27 00:11:48 asami Exp
 #
 
@@ -12,8 +12,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PATCH1} ${PATCH2}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www-rn.informatik.uni-bremen.de/software/unroff/
 
-RUN_DEPENDS=	elk:../../lang/elk
-BUILD_DEPENDS=	elk:../../lang/elk
+DEPENDS+=	elk-3.0.2:../../lang/elk
 
 NOT_FOR_ARCHS=	alpha	#needs elk
 
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 0ebbad31d69..50fa45f3f62 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/10/03 21:28:57 tv Exp $
+# $NetBSD: Makefile,v 1.7 1998/11/19 15:40:47 agc Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -13,8 +13,7 @@ EXTRACT_SUFX=	.gz
 
 MAINTAINER=	tv@netbsd.org
 
-BUILD_DEPENDS+=	${PREFIX}/sbin/apxs:../../www/apache
-RUN_DEPENDS+=	${PREFIX}/sbin/apxs:../../www/apache
+DEPENDS+=	apache-1.3.2:../../www/apache
 
 USE_PERL5=	yes	# for "apxs"
 EXTRACT_CMD=	${DO_NADA}
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index 9b69617e4cd..2f19954432f 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/10/05 14:27:19 tv Exp $
+# $NetBSD: Makefile,v 1.3 1998/11/19 15:40:47 agc Exp $
 #
 
 DISTNAME=	mod_fastcgi-2.0.17
@@ -9,8 +9,7 @@ MASTER_SITES=	http://www.fastcgi.com/
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.fastcgi.com/
 
-BUILD_DEPENDS+=	${PREFIX}/sbin/apxs:../../www/apache
-RUN_DEPENDS+=	${PREFIX}/sbin/apxs:../../www/apache
+DEPENDS+=	apache-1.3.2:../../www/apache
 
 USE_PERL5=	yes	# for "apxs"
 
diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index 4143255b0c5..bb23997d7bd 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/09/24 16:53:19 garbled Exp $
+# $NetBSD: Makefile,v 1.5 1998/11/19 15:40:47 agc Exp $
 
 DISTNAME=		AfterStep-1.4.5.0
 PKGNAME=		afterstep-1.450
@@ -11,7 +11,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.afterstep.org/
 
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
-RUN_DEPENDS+=		asclock:../../x11/asclock
+DEPENDS+=		asclock-11:../../x11/asclock
 
 WRKSRC=			${WRKDIR}/AfterStep
 USE_X11=		yes
diff --git a/x11/fvwm1/Makefile b/x11/fvwm1/Makefile
index 0844bbcabfe..d681e7a6d5c 100644
--- a/x11/fvwm1/Makefile
+++ b/x11/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/09/16 18:05:05 garbled Exp $
+# $NetBSD: Makefile,v 1.13 1998/11/19 15:40:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -10,7 +10,7 @@ MAINTAINER=	cjs@netbsd.org
 HOMEPAGE=	http://www.hpc.uh.edu/fvwm/
 
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
-RUN_DEPENDS=	xpmroot:../../x11/xpmroot
+DEPENDS=	xpmroot-1.01:../../x11/xpmroot
 
 USE_IMAKE=	yes
 # drop -a because we have no `depends' target
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index 5ec412910ef..7e8b8210bef 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/08/20 15:17:33 tsarna Exp $
+# $NetBSD: Makefile,v 1.15 1998/11/19 15:40:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -15,7 +15,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.hpc.uh.edu/fvwm/
 
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
-RUN_DEPENDS=	xpmroot:../../x11/xpmroot
+DEPENDS+=	xpmroot-1.01:../../x11/xpmroot
 
 USE_IMAKE=	yes
 
diff --git a/x11/fvwm95/Makefile b/x11/fvwm95/Makefile
index d6f0a356baf..c4c9c8cb331 100644
--- a/x11/fvwm95/Makefile
+++ b/x11/fvwm95/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/08/20 15:17:33 tsarna Exp $
+# $NetBSD: Makefile,v 1.14 1998/11/19 15:40:47 agc Exp $
 # FreeBSD: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp
 #
 
@@ -12,8 +12,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	ftp://mitac11.uia.ac.be/html-test/fvwm95.html
 
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
-BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:../../audio/rplay
-RUN_DEPENDS=	xpmroot:../../x11/xpmroot
+DEPENDS+=	xpmroot-1.01:../../x11/xpmroot
+DEPENDS+=	rplay-3.2.0b6:../../audio/rplay
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/tkcron/Makefile b/x11/tkcron/Makefile
index 1a661c104ac..46117436e23 100644
--- a/x11/tkcron/Makefile
+++ b/x11/tkcron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/10/15 19:51:08 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/11/19 15:40:47 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:../../x11/tk80
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 EXTRACT_CMD=	${GZIP_CMD}
 EXTRACT_BEFORE_ARGS= -cd
diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile
index d5f305a120a..6688d67cad8 100644
--- a/x11/tkinfo/Makefile
+++ b/x11/tkinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/10/15 19:51:08 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/11/19 15:40:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/12/16 09:26:12 tg Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.math.ucsb.edu/~boldt/tkinfo/ \
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://math-www.uni-paderborn.de/~axel/tkinfo/
 
-RUN_DEPENDS=	wish8.0:../../x11/tk80
+DEPENDS=	tk-8.0p2:../../x11/tk80
 
 NO_BUILD=	yes
 
@@ -18,7 +18,7 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/tkinfo ${PREFIX}/bin
 
 post-patch:
-	( cd ${WRKSRC} ; ${SED} 's|@PREFIX@|'${PREFIX}'|g' \
+	( cd ${WRKSRC} ; ${SED} 's|@PREFIX@|${PREFIX}|g' \
 		<tkinfo >tkinfo.BAK ; ${MV} tkinfo.BAK tkinfo )
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkirc/Makefile b/x11/tkirc/Makefile
index f46f43fc1d0..7582fadd497 100644
--- a/x11/tkirc/Makefile
+++ b/x11/tkirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/08/20 15:17:38 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 1998/11/19 15:40:48 agc Exp $
 
 DISTNAME=	tkirc1.202
 PKGNAME=	tkirc-1.202
@@ -8,8 +8,8 @@ MASTER_SITES=	ftp://ftp.informatik.uni-oldenburg.de/pub/tkirc/
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.north.de/~atte/tkirc/
 
-RUN_DEPENDS=	irc:../../net/ircII \
-		wish8.0:../../x11/tk80
+DEPENDS+=	ircII-4.4:../../net/ircII
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index 5da9b7d2390..02381925037 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/10/15 19:51:08 agc Exp $
+# $NetBSD: Makefile,v 1.16 1998/11/19 15:40:48 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:../../textproc/rman \
-			glimpse:../../textproc/glimpse
+DEPENDS+=		rman-3.0.6:../../textproc/rman
+DEPENDS+=		glimpse-4.0:../../textproc/glimpse
 
 NO_CDROM=		"Don't sell for profit"
 MIRROR_DISTFILE=	no
diff --git a/x11/xfinans/Makefile b/x11/xfinans/Makefile
index bb7b5f69253..b8ef24310c5 100644
--- a/x11/xfinans/Makefile
+++ b/x11/xfinans/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/08/27 13:46:00 garbled Exp $
+# $NetBSD: Makefile,v 1.6 1998/11/19 15:40:48 agc Exp $
 #
 
 DISTNAME=		xfinans-5.9
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	apps/financial/accounting
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.cs.auc.dk/~lupus/xfinans.html
 
-RUN_DEPENDS=		gnuplot:../../graphics/gnuplot
+DEPENDS=		gnuplot-3.5:../../graphics/gnuplot
 
 USE_IMAKE=		yes