diff --git a/devel/jdk/1.5/Makefile b/devel/jdk/1.5/Makefile
index c30b86fb1f6..3206bdbed85 100644
--- a/devel/jdk/1.5/Makefile
+++ b/devel/jdk/1.5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2009/03/01 20:43:09 naddy Exp $
+# $OpenBSD: Makefile,v 1.56 2009/03/15 09:25:04 espie Exp $
 
 SHARED_ONLY=		Yes
 ONLY_FOR_ARCHS= 	amd64 i386
@@ -10,7 +10,7 @@ PKGNAME=		jdk-${V}
 PKGNAME-main=		jdk-${V}p3
 PKGNAME-jre=		jre-${V}p3
 
-CATEGORIES=		devel/jdk java
+CATEGORIES=		devel devel/jdk java
 
 MULTI_PACKAGES= 	-main -jre
 
diff --git a/devel/jdk/1.6/Makefile b/devel/jdk/1.6/Makefile
index 1f2f8bf961c..b85e21ce6d4 100644
--- a/devel/jdk/1.6/Makefile
+++ b/devel/jdk/1.6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2009/03/01 20:43:09 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2009/03/15 09:25:04 espie Exp $
 
 SHARED_ONLY=		Yes
 ONLY_FOR_ARCHS= 	amd64 i386
@@ -92,10 +92,10 @@ MAKE_ENV+=		DONT_ENABLE_IPV6=YES
 EXTRACT_CASES+=		*.jar) true ;;
 
 .if ${FLAVOR:L:Mnative_bootstrap}
-BUILD_DEPENDS+=		:jdk-1.6*:devel/jdk/1.6
+BUILD_DEPENDS+=		:jdk->=1.6,<1.7:devel/jdk/1.6
 MAKE_ENV+=		ALT_BOOTDIR="${LOCALBASE}/${JDKHOME}"
 .else
-BUILD_DEPENDS+=		:jdk-1.5*:devel/jdk/1.5
+BUILD_DEPENDS+=		:jdk->=1.5,<1.6:devel/jdk/1.5
 MAKE_ENV+=		ALT_BOOTDIR="${LOCALBASE}/jdk-1.5.0"
 .endif
 
diff --git a/devel/jdk/1.7/Makefile b/devel/jdk/1.7/Makefile
index 7ce15caf164..f54ca603e0e 100644
--- a/devel/jdk/1.7/Makefile
+++ b/devel/jdk/1.7/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2009/03/01 20:43:09 naddy Exp $
+# $OpenBSD: Makefile,v 1.28 2009/03/15 09:25:04 espie Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	i386 amd64
@@ -37,10 +37,10 @@ PERMIT_DISTFILES_FTP=	Yes
 NO_REGRESS=	Yes
 
 .if ${FLAVOR:L:Mnative_bootstrap}
-BUILD_DEPENDS+=	:jdk-1.7.0.*:devel/jdk/1.7
+BUILD_DEPENDS+=	:jdk->=1.7,<1.8:devel/jdk/1.7
 ALT_BOOTDIR=	${LOCALBASE}/jdk-1.7.0
 .else
-BUILD_DEPENDS+=	:jdk-1.6.0.*:devel/jdk/1.6
+BUILD_DEPENDS+=	:jdk->=1.6,<1.7:devel/jdk/1.6
 ALT_BOOTDIR=	${LOCALBASE}/jdk-1.6.0
 .endif
 
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile
index 0d46ab35a2a..b05f17c9f3e 100644
--- a/devel/libuta/Makefile
+++ b/devel/libuta/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2008/11/19 17:26:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2009/03/15 09:25:04 espie Exp $
 
 COMMENT=	graphical user interface library for C++
 
 DISTNAME=	libuta-0.4.4
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 SHARED_LIBS=		uta 42.0
 MODGNU_SHARED_LIBS=	uta ''
 
@@ -26,7 +26,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libuta/}
 LIB_DEPENDS=	smpeg.>=1.3::devel/smpeg \
 		SDL_mixer::devel/sdl-mixer \
 		png.>=2::graphics/png \
-		sigc:libsigc++-1.*:devel/libsigc++ \
+		sigc:libsigc++->=1,<2:devel/libsigc++ \
 		ttf.>=1.3::print/freetype
 
 USE_LIBTOOL=	Yes
diff --git a/math/graphviz/Makefile b/math/graphviz/Makefile
index d9a200a1c69..fcb10d47df2 100644
--- a/math/graphviz/Makefile
+++ b/math/graphviz/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2009/01/20 23:15:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2009/03/15 09:25:04 espie Exp $
 
 COMMENT-main=	graph drawing software
 
 DISTNAME=	graphviz-2.12
-PKGNAME-main=	${DISTNAME}p5
+PKGNAME-main=	${DISTNAME}p6
 CATEGORIES=	math devel graphics
 MULTI_PACKAGES=	-main
 
@@ -66,7 +66,7 @@ MODULES=	devel/gettext
 LIB_DEPENDS=	jpeg.>=62::graphics/jpeg \
 		png.>=2::graphics/png \
 		ltdl::devel/libtool,-ltdl \
-		tk84::x11/tk/8.4 \
+		tk84:tk->=8.4,<8.5:x11/tk/8.4 \
 		gd.>=20.34:gd->=2.0.34:graphics/gd
 
 # cairo stuff
@@ -83,8 +83,8 @@ WANTLIB+=	atk-1.0 crypto gthread-2.0 ssl gio-2.0 \
 		bonobo-activation bonoboui-2 gconf-2 gnome-2 \
 		gnome-keyring gnomecanvas-2 gnomevfs-2 popt xml2 gailutil
 
-RUN_DEPENDS=	:tk-8.4.*:x11/tk/8.4 \
-		:tcl->=8.4.7p5:lang/tcl/8.4 \
+RUN_DEPENDS=	:tk->=8.4,<8.5:x11/tk/8.4 \
+		:tcl->=8.4.7p5,<8.5:lang/tcl/8.4 \
 		::lang/guile
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		::devel/swig