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

DEPENDS definition.

9 files changed, 22 insertions, 22 deletions

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