diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index d13b5fa1ef1..f9796d216d6 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2006/10/28 11:19:20 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2006/11/20 18:32:38 bernd Exp $
 
 COMMENT=	"Embedded SQL implementation"
 DISTNAME=	sqlite-2.8.17
@@ -33,7 +33,7 @@ NO_REGRESS=	Yes
 CONFIGURE_ARGS+=--disable-tcl
 .else
 REGRESS_TARGET=	test
-BUILD_DEPENDS+=	tcl84::lang/tcl/8.4
+BUILD_DEPENDS+=	::lang/tcl/8.4
 CONFIGURE_ENV+=	config_TARGET_TCL_LIBS="-L${LOCALBASE}/lib -ltcl84 -lm"
 CONFIGURE_ENV+=	config_TARGET_TCL_INC="-I${LOCALBASE}/include/tcl8.4"
 .endif
diff --git a/devel/libbio/Makefile b/devel/libbio/Makefile
index c627daf2486..85219d9e812 100644
--- a/devel/libbio/Makefile
+++ b/devel/libbio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/03/03 00:51:37 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.3 2006/11/20 18:33:48 bernd Exp $
 
 COMMENT=	"Simple buffered I/O library from Plan 9"
 
@@ -10,8 +10,8 @@ HOMEPAGE=	http://pdos.lcs.mit.edu/~rsc/software/
 MAINTAINER=	Markus Friedl <markus@openbsd.org>
 EXTRACT_SUFX=	.tgz
 
-BUILD_DEPENDS=	utf::devel/libutf \
-		fmt::devel/libfmt
+BUILD_DEPENDS=	::devel/libutf \
+		::devel/libfmt
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/devel/libregexp9/Makefile b/devel/libregexp9/Makefile
index 0c4bf2f6d1d..7181fc2fdc1 100644
--- a/devel/libregexp9/Makefile
+++ b/devel/libregexp9/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/03/03 00:51:37 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.3 2006/11/20 18:33:48 bernd Exp $
 
 COMMENT=	"Simple regular expression library from Plan 9"
 
@@ -10,8 +10,8 @@ HOMEPAGE=	http://pdos.lcs.mit.edu/~rsc/software/
 MAINTAINER=	Markus Friedl <markus@openbsd.org>
 EXTRACT_SUFX=	.tgz
 
-BUILD_DEPENDS=	utf::devel/libutf \
-		fmt::devel/libfmt
+BUILD_DEPENDS=	::devel/libutf \
+		::devel/libfmt
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/devel/mk/Makefile b/devel/mk/Makefile
index 19a52f3bc06..84da0c466bb 100644
--- a/devel/mk/Makefile
+++ b/devel/mk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2004/11/24 00:11:03 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2006/11/20 18:33:48 bernd Exp $
 
 COMMENT=	"Streamlined replacement for make"
 
@@ -10,10 +10,10 @@ HOMEPAGE=	http://pdos.lcs.mit.edu/~rsc/software/
 MAINTAINER=	Markus Friedl <markus@openbsd.org>
 EXTRACT_SUFX=	.tgz
 
-BUILD_DEPENDS=	fmt::devel/libfmt \
-		bio::devel/libbio \
-		regexp9::devel/libregexp9 \
-		utf::devel/libutf
+BUILD_DEPENDS=	::devel/libfmt \
+		::devel/libbio \
+		::devel/libregexp9 \
+		::devel/libutf
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index 8e537839c3c..b71dbad84bc 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2004/05/07 15:28:31 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2006/11/20 18:33:48 bernd Exp $
 
 COMMENT=		"useful routines for Tcl"
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tcllib/}
 SUBST_VARS+=		TCLLIB
 
-BUILD_DEPENDS=		tcl84::lang/tcl/8.4
+BUILD_DEPENDS=		::lang/tcl/8.4
 
 CONFIGURE_STYLE= 	gnu dest