diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index 4618eb2c4e..8f186766ec 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/10/25 22:34:49 wilfried Exp $
+# $OpenBSD: Makefile,v 1.10 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'wm-dockapp; space weather monitor'
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/ \
 			ftp://ftp.sra.co.jp/pub/os/FreeBSD/distfiles/
 
-RUN_DEPENDS=		::net/wget
+RUN_DEPENDS=		:wget-*:net/wget
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 925a3f39de..735451a715 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/10/25 22:34:49 wilfried Exp $
+# $OpenBSD: Makefile,v 1.7 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'wm-dockapp; front end for mpg123'
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${HOMEPAGE} \
 			ftp://ftp.sra.co.jp/pub/os/FreeBSD/distfiles/
 
-RUN_DEPENDS=		::audio/mpg123
+RUN_DEPENDS=		:mpg123-*:audio/mpg123
 
 SEPARATE_BUILD=		concurrent
 USE_X11=		Yes
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 233746efb3..4d854459a4 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2001/10/25 22:34:49 wilfried Exp $
+# $OpenBSD: Makefile,v 1.14 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'preferences program for wsoundserver'
 
@@ -20,7 +20,7 @@ MASTER_SITES=		ftp://shadowmere.student.utwente.nl/pub/WindowMaker/ \
 			ftp://ftp.sra.co.jp/pub/os/FreeBSD/distfiles/
 
 MODULES=		gettext
-RUN_DEPENDS=		::audio/wsoundserver
+RUN_DEPENDS=		:wsoundserver-*:audio/wsoundserver
 LIB_DEPENDS=		PropList.2::devel/libproplist \
 			wsound::audio/wsoundserver \
 			audiofile::devel/libaudiofile \
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 8797e3e4a2..b0b5d4b2ae 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2001/10/31 11:59:50 wilfried Exp $
+# $OpenBSD: Makefile,v 1.16 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'sound server for Window Maker'
 
@@ -23,7 +23,7 @@ PATCH_LIST=		${PORTSDIR}/infrastructure/patches/patch-lt1.3.0-ltconfig \
 			${PORTSDIR}/infrastructure/patches/patch-lt1.3.0-ltmain_sh \
 			patch-*
 
-RUN_DEPENDS=		::x11/windowmaker
+RUN_DEPENDS=		:windowmaker-*:x11/windowmaker
 LIB_DEPENDS=		wraster.4::x11/windowmaker \
 			PropList.2::devel/libproplist \
 			audiofile::devel/libaudiofile \
diff --git a/databases/mysqlgui/Makefile b/databases/mysqlgui/Makefile
index 4b60685fe7..11c775a702 100644
--- a/databases/mysqlgui/Makefile
+++ b/databases/mysqlgui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/11/10 12:29:40 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		"graphical sql client for MySQL"
 
@@ -24,7 +24,7 @@ DIST_SUBDIR=		mysqlgui
 PATCHFILES=		single.cc:0
 
 MODULES=		gettext
-BUILD_DEPENDS=		::x11/flvw
+BUILD_DEPENDS=		:flvw->=1.0:x11/flvw
 LIB_DEPENDS=		jpeg.62::graphics/jpeg \
 			fltk::x11/fltk \
 			fleditor::x11/fleditor \
diff --git a/databases/p5-DBD-Msql-Mysql/Makefile b/databases/p5-DBD-Msql-Mysql/Makefile
index 8e5d1badf9..d4306ca68b 100644
--- a/databases/p5-DBD-Msql-Mysql/Makefile
+++ b/databases/p5-DBD-Msql-Mysql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/11/10 12:29:40 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'mysql drivers for the perl DBI'
 
@@ -17,8 +17,8 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
 
-BUILD_DEPENDS=		::databases/p5-DBI
-RUN_DEPENDS=		::databases/p5-DBI
+BUILD_DEPENDS=		:p5-DBI->=1.08:databases/p5-DBI
+RUN_DEPENDS=		:p5-DBI->=1.08:databases/p5-DBI
 
 LIB_DEPENDS=		lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
 REGRESS_DEPENDS=	:mysql-server-3.23.*:databases/mysql,-server
@@ -35,9 +35,9 @@ FLAVORS=		dbimon
 FLAVOR?=
 
 .if ${FLAVOR:L:Mdbimon}
-RUN_DEPENDS+=		::devel/p5-Data-ShowTable \
-			::devel/p5-Term-ReadKey \
-			::devel/p5-Term-ReadLine-Gnu
+RUN_DEPENDS+=		:p5-Data-ShowTable->=3.3:devel/p5-Data-ShowTable \
+			:p5-Term-ReadKey-*:devel/p5-Term-ReadKey \
+			:p5-Term-ReadLine-Gnu-*:devel/p5-Term-ReadLine-Gnu
 .endif
 
 pre-regress:
diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index 7b770e839b..14df543616 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/10/25 22:34:49 wilfried Exp $
+# $OpenBSD: Makefile,v 1.7 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'wm-dockapp; chess game'
 
@@ -20,7 +20,7 @@ MASTER_SITES=		${HOMEPAGE} \
 			ftp://ftp.funet.fi/pub/FreeBSD/distfiles/ \
 			ftp://ftp.sra.co.jp/pub/os/FreeBSD/distfiles/
 
-RUN_DEPENDS=		::games/gnuchess
+RUN_DEPENDS=		:gnuchess-*:games/gnuchess
 
 USE_X11=		Yes
 NO_REGRESS=		Tes
diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile
index df7c424a0c..b94dd78e8b 100644
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/10/25 22:34:49 wilfried Exp $
+# $OpenBSD: Makefile,v 1.10 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'wm-dockapp; WWW image monitor'
 
@@ -19,9 +19,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/
 
-RUN_DEPENDS=		::graphics/ImageMagick \
-			::graphics/xv \
-			::net/wget
+RUN_DEPENDS=		:ImageMagick-*:graphics/ImageMagick \
+			:xv-*:graphics/xv \
+			:wget-*:net/wget
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index 90b2cf869f..48f0e63d9c 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/10/25 22:34:49 wilfried Exp $
+# $OpenBSD: Makefile,v 1.7 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'icons mainly for use in Window Maker'
 
@@ -20,7 +20,7 @@ DISTFILES=		DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
 
 DIST_SUBDIR=		wmicons
 
-RUN_DEPENDS=		::x11/windowmaker
+RUN_DEPENDS=		:windowmaker-*:x11/windowmaker
 
 NO_REGRESS=		Yes
 
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index 637a457810..af936c7f9f 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/10/25 22:34:49 wilfried Exp $
+# $OpenBSD: Makefile,v 1.7 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'wm-dockapp; shows photos and execute commands on that photo'
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}
 
-RUN_DEPENDS=		::graphics/ImageMagick
+RUN_DEPENDS=		:ImageMagick-*:graphics/ImageMagick
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 80dfb71bd1..ccc0a73275 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2001/10/25 22:34:49 wilfried Exp $
+# $OpenBSD: Makefile,v 1.3 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'wm-dockapp; mail notifier'
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://www.eecg.utoronto.ca/~chanb/WMMail.app/
 
-RUN_DEPENDS=		::x11/windowmaker
+RUN_DEPENDS=		:windowmaker-*:x11/windowmaker
 LIB_DEPENDS=		PropList.2::devel/libproplist
 
 SEPARATE_BUILD=		concurrent
diff --git a/misc/wmmand/Makefile b/misc/wmmand/Makefile
index d692bb9639..d6d701d88e 100644
--- a/misc/wmmand/Makefile
+++ b/misc/wmmand/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2001/10/25 22:34:49 wilfried Exp $
+# $OpenBSD: Makefile,v 1.3 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'wm-dockapp; mandelbrot explorer'
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/
 
-RUN_DEPENDS=		::graphics/xv
+RUN_DEPENDS=		:xv-*:graphics/xv
 
 NO_REGRESS=		Yes
 
diff --git a/misc/wmnetscapekiller/Makefile b/misc/wmnetscapekiller/Makefile
index 42efe09fb6..e73eb72e94 100644
--- a/misc/wmnetscapekiller/Makefile
+++ b/misc/wmnetscapekiller/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2001/10/25 22:34:50 wilfried Exp $
+# $OpenBSD: Makefile,v 1.9 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'wm-dockapp; for killing Netscape when it freezes'
 
@@ -20,7 +20,7 @@ MASTER_SITES=		${HOMEPAGE}wmNetscapeKiller-0.3/ \
 			ftp://ftp.darenet.dk/mirrors/mirror.linuxberg.com/files/x11/dock/ \
 			ftp://ftp.proxad.net/mirrors/ftp.linuxberg.com/files/x11/dock/
 
-RUN_DEPENDS=		::sysutils/skill
+RUN_DEPENDS=		:skill-*:sysutils/skill
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 258aca3421..2e5d157d33 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2001/11/01 12:53:44 wilfried Exp $
+# $OpenBSD: Makefile,v 1.9 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		"C++ interface for gtk+"
 COMMENT-docs=		"C++ interface for gtk+ documentation"
@@ -26,7 +26,7 @@ MULTI_PACKAGES=		-docs
 SUBPACKAGE?=
 
 .if ${SUBPACKAGE} != "-docs"
-BUILD_DEPENDS=		::devel/m4
+BUILD_DEPENDS=		:m4->=1.4:devel/m4
 LIB_DEPENDS=		sigc.0::devel/libsigc++ \
 			gdk.1,gtk.1::x11/gtk+
 .endif
diff --git a/x11/windowmaker-extra/Makefile b/x11/windowmaker-extra/Makefile
index ef054845ca..1d4d9f7a56 100644
--- a/x11/windowmaker-extra/Makefile
+++ b/x11/windowmaker-extra/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/10/25 22:34:50 wilfried Exp $
+# $OpenBSD: Makefile,v 1.7 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'themes and icons for Window Maker'
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	source/release
 
-RUN_DEPENDS=		::x11/windowmaker
+RUN_DEPENDS=		:windowmaker-*:x11/windowmaker
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/x11/wmthemeinstall/Makefile b/x11/wmthemeinstall/Makefile
index 1c03117e34..61cc9a64ba 100644
--- a/x11/wmthemeinstall/Makefile
+++ b/x11/wmthemeinstall/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2001/10/31 20:03:44 wilfried Exp $
+# $OpenBSD: Makefile,v 1.11 2001/11/14 13:58:34 wilfried Exp $
 # $FreeBSD: ports/x11-wm/wmthemeinstall/Makefile,v 1.5 2000/10/05 06:42:57 reg Exp $
 
 COMMENT=		'neat theme manager for Window Maker'
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/will/ \
 			ftp://ftp.sra.co.jp/pub/os/FreeBSD/distfiles/
 
-RUN_DEPENDS=		::x11/windowmaker
+RUN_DEPENDS=		:windowmaker-*:x11/windowmaker
 LIB_DEPENDS=		gtk.1,gdk.1::x11/gtk+
 
 SEPARATE_BUILD=		concurrent
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index b8a14357b1..6dd60e891c 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2001/10/25 22:34:50 wilfried Exp $
+# $OpenBSD: Makefile,v 1.10 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'wm-dockapp; weather monitor'
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/ \
 			ftp://ftp.sra.co.jp/pub/os/FreeBSD/distfiles/
 
-RUN_DEPENDS=		::net/wget
+RUN_DEPENDS=		:wget-*:net/wget
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 91ff2bc71a..108c3f4ab9 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2001/10/25 22:34:50 wilfried Exp $
+# $OpenBSD: Makefile,v 1.20 2001/11/14 13:58:34 wilfried Exp $
 
 COMMENT=		'color vt102 terminal emulator with transparency support'
 
@@ -16,8 +16,8 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		ftp://ftp.kddlabs.co.jp/X11/acontrib/wterm/ \
 			ftp://ftp.riken.go.jp/pub/X11/acontrib/wterm/
 
-BUILD_DEPENDS=		::x11/windowmaker
-RUN_DEPENDS=		::x11/windowmaker
+BUILD_DEPENDS=		:windowmaker->=0.50.0:x11/windowmaker
+RUN_DEPENDS=		${BUILD_DEPENDS}
 
 USE_X11=		Yes
 NO_REGRESS=		Yes