diff --git a/devel/eclipse/sdk/Makefile b/devel/eclipse/sdk/Makefile
index 48fef9b0040..8ccea2f1e09 100644
--- a/devel/eclipse/sdk/Makefile
+++ b/devel/eclipse/sdk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2010/10/24 21:10:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.58 2010/11/08 09:57:39 espie Exp $
 
 SHARED_ONLY=		Yes
 ONLY_FOR_ARCHS=		amd64 i386
@@ -73,7 +73,7 @@ RUN_DEPENDS-main=	::java/javaPathHelper \
 			${MODJAVA_RUN_DEPENDS} \
 			:swt-browser-${ECLIPSE_VER}:devel/eclipse/sdk,-browser \
 			::devel/desktop-file-utils
-LIB_DEPENDS-main=	gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS-main=	::x11/gtk+2
 
 WANTLIB-main=		X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
 			Xcomposite Xdamage gdk_pixbuf-2.0 \
@@ -83,13 +83,14 @@ WANTLIB-main=		X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
 			pango-1.0 pangoft2-1.0 pangocairo-1.0 cairo \
 			pixman-1 gio-2.0 pthread-stubs xcb \
 			gthread-2.0 pthread xcb-render GL Xxf86vm drm xcb-shm
+			gdk-x11-2.0 gtk-x11-2.0
 
-LIB_DEPENDS-swt=	gtk-x11-2.0::x11/gtk+2
-WANTLIB-swt=		GL GLU Xtst m atk-1.0 cairo gthread-2.0
+LIB_DEPENDS-swt=	::x11/gtk+2
+WANTLIB-swt=		GL GLU Xtst m atk-1.0 cairo gthread-2.0 gtk-x11-2.0
 
 RUN_DEPENDS-gnome=	:swt-${ECLIPSE_VER}:devel/eclipse/sdk,-swt
-LIB_DEPENDS-gnome=	gnomeui-2::x11/gnome/libgnomeui
-WANTLIB-gnome=		gnome-2 gnomevfs-2
+LIB_DEPENDS-gnome=	::x11/gnome/libgnomeui
+WANTLIB-gnome=		gnome-2 gnomevfs-2 gnomeui-2
 
 RUN_DEPENDS-browser=	:swt-${ECLIPSE_VER}:devel/eclipse/sdk,-swt
 LIB_DEPENDS-browser=	:xulrunner->=1.9:devel/xulrunner/1.9
diff --git a/devel/ethos/Makefile b/devel/ethos/Makefile
index 0b039364736..b8a4078e37c 100644
--- a/devel/ethos/Makefile
+++ b/devel/ethos/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/24 15:53:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/08 09:57:39 espie Exp $
 
 COMMENT =	plugin framework library
 
@@ -40,13 +40,13 @@ BUILD_DEPENDS +=	${RUN_DEPENDS}
 RUN_DEPENDS +=	::x11/py-gtk2
 
 LIB_DEPENDS =	${MODPY_LIB_DEPENDS} \
-		gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2
+		::x11/gtk+2
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0
 WANTLIB += pcre pixman-1 png pthread-stubs xcb z ffi
-WANTLIB += ${MODPY_WANTLIB}
+WANTLIB += ${MODPY_WANTLIB} gtk-x11-2.0 gdk-x11-2.0
 
 .include <bsd.port.mk>
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index a9370e8a8b5..c284ba3e0c5 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/24 21:10:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/08 09:57:39 espie Exp $
 
 COMMENT=	generic game engine library
 
@@ -21,11 +21,12 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB += SDL X11 Xau Xdmcp Xext Xrandr Xrender jpeg m mikmod
 WANTLIB += ogg png pthread-stubs smpeg sndio tiff usbhid vorbis
 WANTLIB += vorbisfile xcb z
+WANTLIB += SDL_image.>=2 SDL_mixer.>=3
 
 MASTER_SITES=	http://sarrazip.com/dev/
 
-LIB_DEPENDS=	SDL_image.>=2::devel/sdl-image \
-		SDL_mixer.>=3::devel/sdl-mixer
+LIB_DEPENDS=	::devel/sdl-image \
+		::devel/sdl-mixer
 
 MODULES=	converters/libiconv
 USE_LIBTOOL=	Yes
diff --git a/devel/fox/Makefile b/devel/fox/Makefile
index 23d795e542e..d8c536cf7b8 100644
--- a/devel/fox/Makefile
+++ b/devel/fox/Makefile
@@ -1,44 +1,44 @@
-# $OpenBSD: Makefile,v 1.19 2010/10/24 21:10:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/08 09:57:39 espie Exp $
 
-COMMENT=	C++ toolkit for GUI
-CATEGORIES=	devel
+COMMENT =	C++ toolkit for GUI
+CATEGORIES =	devel
 
-DISTNAME=	fox-1.6.37
+DISTNAME =	fox-1.6.37
 
 SHARED_LIBS +=	FOX-1.6              2.0      # .0.37
 SHARED_LIBS +=	CHART-1.6            1.0      # .0.28
-MASTER_SITES=	${HOMEPAGE}/ftp/
-HOMEPAGE=	http://www.fox-toolkit.org/
-MAINTAINER=	Marc Espie <espie@openbsd.org>
+MASTER_SITES =	${HOMEPAGE}/ftp/
+HOMEPAGE =	http://www.fox-toolkit.org/
+MAINTAINER =	Marc Espie <espie@openbsd.org>
 
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE =	gnu
 
-LIB_DEPENDS=	bz2::archivers/bzip2 \
-		jpeg::graphics/jpeg \
-		png::graphics/png \
-		tiff::graphics/tiff
+LIB_DEPENDS =	::archivers/bzip2 \
+		::graphics/jpeg \
+		::graphics/png \
+		::graphics/tiff
 
-CONFIGURE_ENV+= \
+CONFIGURE_ENV += \
 	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 	LDFLAGS="-L${LOCALBASE}/lib" 
-CONFIGURE_ARGS+= \
+CONFIGURE_ARGS += \
 	--x-includes=${X11BASE}/include \
 	--x-libraries=${X11BASE}/lib \
 	--with-xft
 
 # LGPL or looser
-PERMIT_DISTFILES_FTP=Yes
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_PACKAGE_CDROM=Yes
-USE_LIBTOOL=	Yes
+PERMIT_DISTFILES_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_PACKAGE_CDROM = Yes
+USE_LIBTOOL =	Yes
 USE_GROFF =	Yes
 
-FOX=		fox-1.6
-SUBST_VARS=	FOX
+FOX =		fox-1.6
+SUBST_VARS =	FOX
 
-WANTLIB=	GL GLU X11 Xau Xcursor Xdmcp Xext Xfixes Xrender Xrandr c m \
+WANTLIB =	GL GLU X11 Xau Xcursor Xdmcp Xext Xfixes Xrender Xrandr c m \
 		stdc++ z pthread Xft expat fontconfig freetype \
-		pthread-stubs xcb
+		pthread-stubs xcb bz2 jpeg png tiff
 
 .include <bsd.port.mk>
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 1181a5e98b3..f7851aa61f8 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2010/10/18 13:28:51 jasper Exp $
+# $OpenBSD: Makefile,v 1.34 2010/11/08 09:57:39 espie Exp $
 
 COMMENT=		GNOME Application Libs
 
@@ -32,6 +32,7 @@ WANTLIB += gnomecanvas-2 gnomeprint-2-2 gnomevfs-2 gobject-2.0
 WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png popt ssl util xml2 z
 WANTLIB += pthread-stubs xcb
+WANTLIB += gnomeui-2 gnomeprintui-2-2
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gal/2.5/}
 EXTRACT_SUFX=		.tar.bz2
@@ -39,8 +40,8 @@ EXTRACT_SUFX=		.tar.bz2
 MODULES=		devel/gettext \
 			textproc/intltool
 
-LIB_DEPENDS=		gnomeui-2::x11/gnome/libgnomeui \
-			gnomeprintui-2-2::x11/gnome/libgnomeprintui
+LIB_DEPENDS=		::x11/gnome/libgnomeui \
+			::x11/gnome/libgnomeprintui
 
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 6b69ce935ea..dd82d9273ec 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/19 15:21:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/08 09:57:39 espie Exp $
 
 COMMENT=		C++ interface to GConf
 
@@ -23,10 +23,11 @@ WANTLIB=	dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
 MODULES=		devel/gettext \
 			x11/gnome
 
-LIB_DEPENDS=		ORBit-2::devel/ORBit2 \
-			gconf-2.>=5::devel/gconf2 \
-			sigc-2.0:libsigc++->=2,<3:devel/libsigc++-2 \
-			glibmm-2.4:glib2mm->=2.8:devel/glib2mm
+LIB_DEPENDS=		::devel/ORBit2 \
+			::devel/gconf2 \
+			:libsigc++->=2,<3:devel/libsigc++-2 \
+			:glib2mm->=2.8:devel/glib2mm
+WANTLIB +=		ORBit-2 gconf-2.>=5 sigc-2.0 glibmm-2.4
 
 
 CONFIGURE_STYLE=	gnu
diff --git a/devel/geotiff/Makefile b/devel/geotiff/Makefile
index 156cffbe2a0..9dd07cdbc46 100644
--- a/devel/geotiff/Makefile
+++ b/devel/geotiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/01/23 10:29:45 landry Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/08 09:57:39 espie Exp $
 
 COMMENT=	GIS TIFF interchange library
 
@@ -29,9 +29,9 @@ CONFIGURE_ARGS=		--with-jpeg=${LOCALBASE} \
 			--with-proj=${LOCALBASE} \
 			--with-libtiff=${LOCALBASE}
 
-WANTLIB=		c jpeg m z
+WANTLIB=		c jpeg m z proj tiff
 
-LIB_DEPENDS=		proj::devel/proj \
-			tiff::graphics/tiff
+LIB_DEPENDS=		::devel/proj \
+			::graphics/tiff
 
 .include <bsd.port.mk>
diff --git a/devel/giblib/Makefile b/devel/giblib/Makefile
index e41fa397d1a..3a786ce82e1 100644
--- a/devel/giblib/Makefile
+++ b/devel/giblib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/10/24 21:10:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/11/08 09:57:39 espie Exp $
 
 COMMENT=		utility library including a imlib2 wrapper
 
@@ -21,7 +21,8 @@ WANTLIB=		X11 Xau Xdmcp Xext freetype m pthread-stubs xcb z
 
 MASTER_SITES=		http://www.linuxbrit.co.uk/downloads/
 
-LIB_DEPENDS=		Imlib2.>=1::graphics/imlib2
+LIB_DEPENDS=		::graphics/imlib2
+WANTLIB +=		Imlib2.>=1
 
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index bd93dc33124..130c7a3f972 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/18 13:28:51 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/08 09:57:39 espie Exp $
 
 COMMENT=	gtk-based git repository viewer
 CATEGORIES=	devel x11
@@ -29,14 +29,15 @@ CONFIGURE_ARGS+=--disable-evolution-data-server
 RUN_DEPENDS=	::devel/git
 BUILD_DEPENDS+=	::devel/git
 
-LIB_DEPENDS=	vte::devel/vte \
-		gtksourceview-2.0.>=0::x11/gtksourceview
+LIB_DEPENDS=	::devel/vte \
+		::x11/gtksourceview
 
 WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
 		freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
 		gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
 		pangoft2-1.0 pcre pixman-1 png pthread-stubs xcb xml2 z \
-		gthread-2.0 ncurses pthread xcb-render xcb-render-util
+		gthread-2.0 ncurses pthread xcb-render xcb-render-util \
+		vte gtksourceview-2.0.>=0
 
 .include <bsd.port.mk>
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 02c4590e065..0936ceb3c6d 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2010/10/18 13:28:51 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2010/11/08 09:57:39 espie Exp $
 
 COMMENT=		user interface builder for the GTK2+ toolkit
 
@@ -32,13 +32,13 @@ WANTLIB += gnomecanvas-2 gnomevfs-2 gobject-2.0 gpg-error gthread-2.0
 WANTLIB += gtk-x11-2.0 ltdl m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png popt pthread pthread-stubs ssl util
 WANTLIB += vorbis vorbisfile xcb xcb-render xcb-render-util xml2
-WANTLIB += z
+WANTLIB += z dbus-glib-1 gnomeui-2
 
 MODULES=		devel/gettext \
 			x11/gnome
     
-LIB_DEPENDS=            dbus-glib-1::x11/dbus-glib \
-			gnomeui-2::x11/gnome/libgnomeui
+LIB_DEPENDS=            ::x11/dbus-glib \
+			::x11/gnome/libgnomeui
 RUN_DEPENDS=		::x11/gnome/devhelp
 
 DESKTOP_FILES = 	Yes
diff --git a/devel/glib2mm/Makefile b/devel/glib2mm/Makefile
index 7d212331931..a40b3121c03 100644
--- a/devel/glib2mm/Makefile
+++ b/devel/glib2mm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2010/10/19 15:21:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2010/11/08 09:57:39 espie Exp $
 
 COMMENT=	C++ interface for glib2
 
@@ -26,13 +26,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += pcre z m stdc++
+WANTLIB += pcre z m stdc++ sigc-2.0 glib-2.0.>=1803 gmodule-2.0 gobject-2.0
+WANTLIB += gio-2.0 gthread-2.0
+
 
 MODULES=	devel/gettext \
 		x11/gnome
 
-LIB_DEPENDS=	sigc-2.0:libsigc++->=2,<3:devel/libsigc++-2 \
-		glib-2.0.>=1803,gmodule-2.0,gobject-2.0,gio-2.0,gthread-2.0:glib2->=2.24.0:devel/glib2
+LIB_DEPENDS=	:libsigc++->=2,<3:devel/libsigc++-2 \
+		:glib2->=2.24.0:devel/glib2
 
 
 CONFIGURE_STYLE=gnu
diff --git a/devel/glpk/Makefile b/devel/glpk/Makefile
index cd22f47bde7..3bb6e2fa8c7 100644
--- a/devel/glpk/Makefile
+++ b/devel/glpk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2008/09/05 14:37:43 okan Exp $
+# $OpenBSD: Makefile,v 1.3 2010/11/08 09:57:39 espie Exp $
 
 COMMENT=	GNU Linear Programming Kit
 
@@ -17,9 +17,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c m
+WANTLIB=		c m gmp.>=7
 
-LIB_DEPENDS=		gmp.>=7::devel/gmp
+LIB_DEPENDS=		::devel/gmp
 
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index 4cb2c2bbdd8..1a39ad5c4c8 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/24 15:53:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/08 09:57:39 espie Exp $
 
 COMMENT =	Gtk debugging tool
 
@@ -23,7 +23,7 @@ MODULES =	lang/python
 USE_LIBTOOL =	Yes
 
 LIB_DEPENDS =	${MODPY_LIB_DEPENDS} \
-		gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2
+		::x11/gtk+2
 
 RUN_DEPENDS =	::x11/py-gtk2
 BUILD_DEPENDS+=	${RUN_DEPENDS}
@@ -33,7 +33,7 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat ffi fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread-stubs util xcb z gdk_pixbuf-2.0
-WANTLIB += ${MODPY_WANTLIB}
+WANTLIB += ${MODPY_WANTLIB} gtk-x11-2.0 gdk-x11-2.0
 
 CONFIGURE_STYLE =	gnu
 
diff --git a/devel/guilib/Makefile b/devel/guilib/Makefile
index 2ff1c5adfef..2df6962d090 100644
--- a/devel/guilib/Makefile
+++ b/devel/guilib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/10/24 21:10:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=	SDL C++ GUI widget library
 
@@ -20,9 +20,9 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB=	X11 Xau Xrandr Xrender iconv Xdmcp Xext m pthread-stubs sndio \
-		stdc++ usbhid xcb
+		stdc++ usbhid xcb SDL
 
-LIB_DEPENDS=	SDL.::devel/sdl
+LIB_DEPENDS=	::devel/sdl
 
 USE_LIBTOOL=	Yes
 SEPARATE_BUILD=		concurrent
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 51660cd4243..8ba34847f7a 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2010/10/24 21:10:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2010/11/08 09:57:40 espie Exp $
 
 SHARED_ONLY=	Yes
 COMMENT=	graphical debugger for KDE
@@ -16,13 +16,14 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	art_lgpl_2 jpeg ICE SM X11 Xext Xrender c m \
 		fam rpcsvc png pthread stdc++ util z idn Xau Xdmcp \
-		pthread-stubs xcb
+		pthread-stubs xcb kdecore.>=4 DCOP kdefx kdesu kdeui \
+		kio kwalletclient
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdbg/}
 
 MODULES=	x11/kde devel/gettext
 
-LIB_DEPENDS=	kdecore.>=4,DCOP,kdefx,kdesu,kdeui,kio,kwalletclient::x11/kde/libs3
+LIB_DEPENDS=	::x11/kde/libs3
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= autoconf autoheader
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index d6f518520cb..31583a21959 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2010/10/19 15:21:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=		IDL parsing library
 
@@ -23,8 +23,8 @@ PERMIT_DISTFILES_FTP=	Yes
 MODULES=		devel/gettext \
 			x11/gnome
 
-WANTLIB=		pcre
-LIB_DEPENDS=		glib-2.0::devel/glib2
+WANTLIB=		pcre glib-2.0
+LIB_DEPENDS=		::devel/glib2
 
 
 CONFIGURE_STYLE=	gnu
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 3ba15572820..8033d610caa 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/10/24 21:10:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=		library of assorted spiffy things
 
@@ -15,11 +15,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		ICE m SM freetype X11 Xau Xdmcp Xext pthread-stubs \
-			xcb z
+			xcb z Imlib2.>=2
 
 MASTER_SITES=		http://www.eterm.org/download/
 
-LIB_DEPENDS=		Imlib2.>=2::graphics/imlib2
+LIB_DEPENDS=		::graphics/imlib2
 
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index f2d524f7d38..744f87f7485 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/19 15:21:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/08 09:57:40 espie Exp $
 
 SHARED_ONLY=		Yes
 
@@ -25,12 +25,12 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB += ORBit-2 dbus-1 dbus-glib-1 gconf-2 gcrypt gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gnome-keyring gnutls gobject-2.0 gpg-error
 WANTLIB += gthread-2.0 m pcre proxy soup-2.4 sqlite3 tasn1 xml2 z
-WANTLIB += eggdbus-1
+WANTLIB += eggdbus-1 soup-gnome-2.4.>=1
 
 MODULES=		devel/gettext \
 			x11/gnome
 
-LIB_DEPENDS=		soup-gnome-2.4.>=1::devel/libsoup,-gnome \
+LIB_DEPENDS=		::devel/libsoup,-gnome \
 			::devel/eggdbus
 
 FAKE_FLAGS+=		DATADIRNAME="share"
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index d573404528b..56d59fcf96f 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2010/10/19 15:21:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.54 2010/11/08 09:57:40 espie Exp $
 
 COMMENT-main=		GNOME Structured File library
 COMMENT-gnome=		GNOME specific extensions to libgsf
@@ -28,7 +28,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MULTI_PACKAGES=		-main -gnome
 
-WANTLIB += c m z pcre pthread
+WANTLIB += c m z pcre pthread bz2.>=10.2 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gthread-2.0 xml2.>=8.4
 
 MODULES=		devel/gettext \
 			lang/python \
@@ -37,9 +38,9 @@ MODULES=		devel/gettext \
 
 BUILD_DEPENDS=  	:py-gtk2->=2.10:x11/py-gtk2 \
 			:popt-*:devel/popt
-LIB_DEPENDS=		bz2.>=10.2::archivers/bzip2 \
-			gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0,gthread-2.0::devel/glib2 \
-			xml2.>=8.4::textproc/libxml
+LIB_DEPENDS=		::archivers/bzip2 \
+			::devel/glib2 \
+			::textproc/libxml
 
 RUN_DEPENDS-main=	${MODPY_RUN_DEPENDS} \
 			${MODGETTEXT_RUN_DEPENDS}
@@ -62,9 +63,9 @@ USE_GROFF =	Yes
 RUN_DEPENDS-gnome=	${RUN_DEPENDS} \
 			${MODGCONF2_RUN_DEPENDS}
 LIB_DEPENDS-gnome=	${LIB_DEPENDS} \
-			gsf-1::${BUILD_PKGPATH} \
-			bonobo-2,bonobo-activation::x11/gnome/libbonobo
-WANTLIB-gnome += ${WANTLIB}
+			::${BUILD_PKGPATH} \
+			::x11/gnome/libbonobo
+WANTLIB-gnome += ${WANTLIB} gsf-1 bonobo-2 bonobo-activation
 WANTLIB-gnome += ORBit-2 ORBitCosNaming-2 gdk_pixbuf-2.0 gthread-2.0
 
 .include <bsd.port.mk>
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 9b3c0dcc262..4f1510c6a2a 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2010/10/27 12:52:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=		portable library for obtaining system information
 
@@ -18,12 +18,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += Xau c kvm pcre pthread
+WANTLIB += Xau c kvm pcre pthread glib-2.0
 
 MODULES=		devel/gettext \
 			x11/gnome
 
-LIB_DEPENDS=		glib-2.0::devel/glib2
+LIB_DEPENDS=		::devel/glib2
 RUN_DEPENDS=		::sysutils/lsof
 
 CONFIGURE_STYLE=	gnu
diff --git a/devel/libmpc/Makefile b/devel/libmpc/Makefile
index 483958602c9..5a1354ca013 100644
--- a/devel/libmpc/Makefile
+++ b/devel/libmpc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1.1.1 2010/04/02 20:33:21 jsg Exp $
+#	$OpenBSD: Makefile,v 1.2 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=	complex numbers math library
 
@@ -18,8 +18,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS=		mpfr.>=0.2::devel/mpfr \
-			gmp.>=8.0::devel/gmp
+LIB_DEPENDS=		::devel/mpfr \
+			::devel/gmp
+WANTLIB =		mpfr.>=0.2 gmp.>=8.0
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-mpfr=${LOCALBASE} \
diff --git a/devel/libmtp/Makefile b/devel/libmtp/Makefile
index 48737da23a0..e6c925a4fe8 100644
--- a/devel/libmtp/Makefile
+++ b/devel/libmtp/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2009/06/04 22:23:27 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=		Media Transfer Protocol (MTP) implementation
 
 DISTNAME=		libmtp-0.2.6.1
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}
+REVISION=		2
 SHARED_LIBS=		mtp	3.0	# .8.0
 CATEGORIES=		devel
 
@@ -16,12 +17,12 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
+WANTLIB=		c usb.>=8
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libmtp/}
 
 MODULES=		converters/libiconv
-LIB_DEPENDS=		usb.>=8::devel/libusb
+LIB_DEPENDS=		::devel/libusb
 
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
diff --git a/devel/libofx/Makefile b/devel/libofx/Makefile
index fba895db501..fe5233bc900 100644
--- a/devel/libofx/Makefile
+++ b/devel/libofx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2009/11/24 20:32:35 landry Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=	opensource implementation of the OFX specification
 
@@ -20,9 +20,9 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libofx/}
 
 MODULES=	devel/gettext
-WANTLIB=	c m pthread stdc++
+WANTLIB=	c m pthread stdc++ osp
 
-LIB_DEPENDS=	osp::textproc/opensp
+LIB_DEPENDS=	::textproc/opensp
 
 USE_LIBTOOL=	Yes
 
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 8e234f960cc..ee0c650a6fb 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/06/11 08:54:16 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/08 09:57:40 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -22,7 +22,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://www.opensync.org/download/releases/${V}/
 
-WANTLIB=	c pthread
+WANTLIB=	c pthread sqlite3.>=8 xml2.>=9 glib-2.0.>=1200 \
+		gmodule-2.0.>=1200 gthread-2.0.>=1200
 
 SEPARATE_BUILD=	simple
 
@@ -31,9 +32,9 @@ MODULES=	devel/cmake \
 
 CFLAGS+=	-pthread
 
-LIB_DEPENDS=	sqlite3.>=8::databases/sqlite3 \
-		xml2.>=9::textproc/libxml \
-		glib-2.0.>=1200,gmodule-2.0.>=1200,gthread-2.0.>=1200::devel/glib2
+LIB_DEPENDS=	::databases/sqlite3 \
+		::textproc/libxml \
+		::devel/glib2
 
 CONFIGURE_ARGS=	-DCMAKE_INSTALL_PREFIX="${PREFIX}"
 
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 6fbafe22830..59f8b7bbdbe 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2010/10/19 15:21:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2010/11/08 09:57:40 espie Exp $
 
 COMMENT-main =		SOAP implementation in C
 COMMENT-gnome =		GNOME specific libsoup parts
@@ -23,19 +23,22 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB =		gcrypt gpg-error m pcre tasn1 z
+WANTLIB =		gcrypt gpg-error m pcre tasn1 z \
+			gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
+			gthread-2.0 gnutls.>=12 xml2.>=7
 
-LIB_DEPENDS =		gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0,gthread-2.0:glib2->=2.22.2:devel/glib2 \
-			gnutls.>=12::security/gnutls \
-			xml2.>=7::textproc/libxml
+LIB_DEPENDS =		:glib2->=2.22.2:devel/glib2 \
+			::security/gnutls \
+			::textproc/libxml
 
-WANTLIB-gnome =		${WANTLIB-main} ORBit-2 dbus-1 sqlite3
+WANTLIB-gnome =		${WANTLIB-main} ORBit-2 dbus-1 sqlite3 \
+			soup-2.4 gnome-keyring.>=6 gconf-2 proxy
 
 LIB_DEPENDS-gnome =	${LIB_DEPENDS-main} \
-			soup-2.4::${BUILD_PKGPATH},-main \
-			gnome-keyring.>=6:libgnome-keyring-*:x11/gnome/libgnome-keyring \
-			gconf-2::devel/gconf2 \
-			proxy::net/libproxy
+			::${BUILD_PKGPATH},-main \
+			:libgnome-keyring-*:x11/gnome/libgnome-keyring \
+			::devel/gconf2 \
+			::net/libproxy
 
 MODULES =		devel/gettext \
 			x11/gnome
diff --git a/devel/libspectrum/Makefile b/devel/libspectrum/Makefile
index 68300e4e4d1..c0a82cc6dde 100644
--- a/devel/libspectrum/Makefile
+++ b/devel/libspectrum/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/10/18 17:47:54 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=		ZX Spectrum emulator file format library
 DISTNAME=		libspectrum-0.5.0.1
@@ -15,15 +15,16 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		gpg-error pcre m z 
+WANTLIB=		gpg-error pcre m z glib-2.0.>=0.11 \
+			gcrypt.>=12 bz2.>=10 audiofile.>=0
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 
 MODULES=		devel/gettext
-LIB_DEPENDS=		glib-2.0.>=0.11::devel/glib2 \
-			gcrypt.>=12::security/libgcrypt \
-			bz2.>=10::archivers/bzip2 \
-			audiofile.>=0::devel/libaudiofile
+LIB_DEPENDS=		::devel/glib2 \
+			::security/libgcrypt \
+			::archivers/bzip2 \
+			::devel/libaudiofile
 
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
diff --git a/devel/libunique/Makefile b/devel/libunique/Makefile
index 417b61ec5a2..f79d53b900e 100644
--- a/devel/libunique/Makefile
+++ b/devel/libunique/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/18 13:28:51 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/08 09:57:40 espie Exp $
 
 COMMENT =	library for writing single instance application
 
@@ -29,13 +29,14 @@ CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
 MODULES =	devel/gettext \
 		x11/gnome
 
-LIB_DEPENDS =	gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
-		dbus-glib-1::x11/dbus-glib
+LIB_DEPENDS =	::x11/gtk+2 \
+		::x11/dbus-glib
 
 WANTLIB =	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 expat \
 		fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 \
 		gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
-		pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0
+		pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 \
+		gdk-x11-2.0 gtk-x11-2.0 dbus-glib-1
 
 .include <bsd.port.mk>
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile
index e820b0cc907..a45a370fa74 100644
--- a/devel/libuta/Makefile
+++ b/devel/libuta/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2010/10/24 21:10:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.30 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=	graphical user interface library for C++
 
@@ -20,15 +20,16 @@ PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB=	SDL X11 Xau Xdmcp Xext m mikmod ogg pthread stdc++ usbhid \
 		Xrandr Xrender iconv sndio vorbis vorbisfile z \
-		pthread-stubs xcb
+		pthread-stubs xcb smpeg.>=1.3 SDL_mixer png.>=2 \
+		sigc ttf.>=1.3
 
 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,<2:devel/libsigc++ \
-		ttf.>=1.3::print/freetype
+LIB_DEPENDS=	::devel/smpeg \
+		::devel/sdl-mixer \
+		::graphics/png \
+		:libsigc++->=1,<2:devel/libsigc++ \
+		::print/freetype
 
 USE_LIBTOOL=	Yes
 
diff --git a/devel/libvmime/Makefile b/devel/libvmime/Makefile
index 0786508ddf0..9e58dd498fe 100644
--- a/devel/libvmime/Makefile
+++ b/devel/libvmime/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2009/10/11 13:18:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=	C++ class library for working with Internet mail
 
@@ -22,11 +22,11 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vmime/}
 
-WANTLIB=	gcrypt gpg-error tasn1 z
+WANTLIB=	gcrypt gpg-error tasn1 z gnutls.>=14
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS=	gnutls.>=14::security/gnutls
+LIB_DEPENDS=	::security/gnutls
 
 USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes
diff --git a/devel/luarexlib/Makefile b/devel/luarexlib/Makefile
index 897cf34ef15..58109907587 100644
--- a/devel/luarexlib/Makefile
+++ b/devel/luarexlib/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2010/06/18 18:06:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/08 09:57:40 espie Exp $
 
 SHARED_ONLY=	Yes
 COMMENT=	lua binding of posix and pcre regex libraries
 DISTNAME=	lrexlib-2.4.0
-PKGNAME=	luarexlib-2.4.0p1
+PKGNAME=	luarexlib-2.4.0
+REVISION=	1
 CATEGORIES=	devel
 
 MASTER_SITES=	http://luaforge.net/frs/download.php/3599/
@@ -21,9 +22,10 @@ MAKE_ENV+=	MAKE_PROGRAM=${MAKE_PROGRAM} \
 		INC_LUA=-I${LOCALBASE}/include \
 		LIB_LUA="-L${LOCALBASE}/lib -llua"
 MODULES=	lang/lua
-LIB_DEPENDS=	pcre.>=1.0::devel/pcre \
-		lua::lang/lua \
-		onig::textproc/oniguruma
+LIB_DEPENDS=	::devel/pcre \
+		::lang/lua \
+		::textproc/oniguruma
+WANTLIB =	pcre.>=1.0 lua onig
 REGRESS_DEPENDS+=::devel/luarexlib
 
 do-install:
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index ca115478430..86a18498065 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2010/10/18 17:47:54 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2010/11/08 09:57:40 espie Exp $
 
 COMMENT=	GNU m4
 
@@ -13,9 +13,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
+WANTLIB=		c sigsegv
 
-LIB_DEPENDS=	sigsegv::devel/libsigsegv
+LIB_DEPENDS=	::devel/libsigsegv
 
 CONFIGURE_STYLE= gnu 
 CONFIGURE_ARGS=	--program-prefix="g"