diff --git a/x11/awn/Makefile b/x11/awn/Makefile
index 156e11b6867..017b129b617 100644
--- a/x11/awn/Makefile
+++ b/x11/awn/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2010/07/30 06:58:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/07/30 08:02:59 ajacoutot Exp $
 
 COMMENT=		avant window navigator
 
 V=			0.3.2
 DISTNAME=		avant-window-navigator-$V
-REVISION=		7
+REVISION=		8
 
 SHARED_LIBS +=	awn                  0.0      # .0.1
 
@@ -32,7 +32,7 @@ WANTLIB += Xrender atk-1.0 avahi-client avahi-common
 WANTLIB += avahi-glib bonobo-activation bonobo-2 c
 WANTLIB += cairo crypto dbus-1 dbus-glib-1 expat fontconfig freetype
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += glitz gmodule-2.0 gnome-2
+WANTLIB += glitz gmodule-2.0 gnome-2 wnck-1 gnome-desktop-2
 WANTLIB += gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
 WANTLIB += png popt pthread ssl startup-notification-1 util xml2
@@ -43,8 +43,8 @@ BUILD_DEPENDS=		::devel/py-xdg \
 RUN_DEPENDS=		::devel/desktop-file-utils \
 			::devel/py-xdg \
 			::x11/py-gtk2
-LIB_DEPENDS=		wnck-1::devel/libwnck \
-			gnome-desktop-2::x11/gnome/desktop \
+LIB_DEPENDS=		::devel/libwnck \
+			::x11/gnome/desktop \
 			${MODPY_LIB_DEPENDS}
 
 USE_LIBTOOL=		Yes
diff --git a/x11/p5-X-Osd/Makefile b/x11/p5-X-Osd/Makefile
index fb5b5727999..8f778bc948c 100644
--- a/x11/p5-X-Osd/Makefile
+++ b/x11/p5-X-Osd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2009/09/06 10:46:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2010/07/30 08:02:59 ajacoutot Exp $
 
 COMMENT =	Perl extension to the X On Screen Display library (xosd)
 SHARED_ONLY =	Yes
@@ -13,7 +13,9 @@ PERMIT_PACKAGE_FTP =		Yes
 PERMIT_DISTFILES_CDROM =	Yes
 PERMIT_DISTFILES_FTP =		Yes
 
-LIB_DEPENDS =	xosd::x11/xosd
+WANTLIB += xosd
+
+LIB_DEPENDS =	::x11/xosd
 
 USE_X11 =	Yes
 
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index 82854c8ecfe..191c0ba54e4 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2010/07/30 06:59:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2010/07/30 08:02:59 ajacoutot Exp $
 
-COMMENT=		Display Control Panel for X.org SiS driver
+COMMENT=		display control panel for X.org SiS driver
 
 DISTNAME=		sisctrl-0.0.20051202
-REVISION=		4
+REVISION=		5
 CATEGORIES=		x11
 
 HOMEPAGE=		http://www.winischhofer.eu/linuxsispart1.shtml\#sisctrl
@@ -21,9 +21,9 @@ WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xv Xxf86vm atk-1.0
 WANTLIB += c cairo expat fontconfig freetype gio-2.0 glib-2.0
 WANTLIB += glitz gmodule-2.0 gobject-2.0 iconv intl m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png z
-WANTLIB += pthread-stubs xcb
+WANTLIB += pthread-stubs xcb gtk-x11-2.0 gdk_pixbuf-2.0 gdk-x11-2.0
 
-LIB_DEPENDS=		gtk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gdk-x11-2.0.>=1000::x11/gtk+2
+LIB_DEPENDS=		::x11/gtk+2
 
 NO_REGRESS=		Yes
 
diff --git a/x11/skippy/Makefile b/x11/skippy/Makefile
index 401d26cca92..a460ff11e6e 100644
--- a/x11/skippy/Makefile
+++ b/x11/skippy/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2010/07/30 06:59:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/07/30 08:02:59 ajacoutot Exp $
 
 COMMENT=		full-screen X11 task-switcher like Apple's Expose
 
 DISTNAME=		skippy-0.5.0
-REVISION=		3
+REVISION=		4
 CATEGORIES=		x11
 
 MASTER_SITES=		http://thegraveyard.org/files/
@@ -18,13 +18,13 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	X11 Xau Xdmcp Xext Xft Xinerama Xrender c expat fontconfig \
-		freetype m z pthread-stubs xcb
+		freetype m z pthread-stubs xcb Imlib2
 
 USE_X11=		Yes
 
 NO_REGRESS=		Yes
 
-LIB_DEPENDS=		Imlib2.>=2::graphics/imlib2
+LIB_DEPENDS=		::graphics/imlib2
 
 MAKE_FLAGS+=		PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
 
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index 766416407f7..04bf5bf0b7a 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2010/07/30 06:59:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/07/30 08:02:59 ajacoutot Exp $
 
 COMMENT=	simple login manager
 
 DISTNAME=	slim-1.3.1
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	x11
 HOMEPAGE=	http://slim.berlios.de/
@@ -19,10 +19,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=	Yes
 NO_REGRESS=	Yes
-LIB_DEPENDS=	jpeg::graphics/jpeg \
-		png::graphics/png
+LIB_DEPENDS=	::graphics/jpeg \
+		::graphics/png
 
-WANTLIB=	X11 Xft Xmu Xrender fontconfig c m stdc++ z freetype
+WANTLIB=	X11 Xft Xmu Xrender fontconfig c m stdc++ z freetype jpeg png
 
 MAKE_FILE=	Makefile.openbsd
 MAKE_FLAGS+=	CFGDIR=${SYSCONFDIR}
diff --git a/x11/thewidgetfactory/Makefile b/x11/thewidgetfactory/Makefile
index afa128fe800..bab50c06860 100644
--- a/x11/thewidgetfactory/Makefile
+++ b/x11/thewidgetfactory/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2010/07/30 06:59:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2010/07/30 08:02:59 ajacoutot Exp $
 
 COMMENT=	showcase for GTK+ 2 widgets
 
 DISTNAME=	thewidgetfactory-0.2.1
-REVISION=	1
+REVISION=	2
 CATEGORIES=	x11
 
 HOMEPAGE=	http://www.stellingwerff.com/?page_id=10
@@ -18,13 +18,13 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://www.stellingwerff.com/TheWidgetFactory/
 
-LIB_DEPENDS=	gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=	::x11/gtk+2
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png z pthread-stubs xcb
+WANTLIB += png z pthread-stubs xcb gdk_pixbuf-2.0 gdk-x11-2.0 gtk-x11-2.0
 
 CONFIGURE_STYLE=gnu
 
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 20c8ac8dfda..16b657a7985 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/07/30 06:59:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/07/30 08:02:59 ajacoutot Exp $
 
 COMMENT=		drop-down terminal emulator
 
 DISTNAME=		tilda-0.9.6
-REVISION=		2
+REVISION=		3
 CATEGORIES=		x11
 
 HOMEPAGE=		http://tilda.sourceforge.net/
@@ -19,16 +19,16 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tilda/}
 MODULES=		devel/gettext
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat glade-2.0
 WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0
 WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pixman-1 png pthread xml2 z pthread-stubs xcb
+WANTLIB += pixman-1 png pthread xml2 z pthread-stubs xcb confuse vte
 
 RUN_DEPENDS=		:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS=		confuse::devel/libconfuse \
-			glade-2.0::devel/libglade2 \
-			vte::devel/vte
+LIB_DEPENDS=		::devel/libconfuse \
+			::devel/libglade2 \
+			::devel/vte
 
 USE_GMAKE=		Yes
 USE_X11=		Yes
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index a7d37fa17f6..fd32025043c 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2010/07/30 06:59:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2010/07/30 08:02:59 ajacoutot Exp $
 
 COMMENT=		lightweight GTK2-based systray
 
 DISTNAME=		trayer-1.0
-REVISION=		3
+REVISION=		4
 CATEGORIES=		x11
 
 HOMEPAGE=		http://fvwm-crystal.org/
@@ -18,7 +18,8 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xmu Xrandr Xrender atk-1.0 c cairo expat
 WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
 WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pixman-1 png z pthread-stubs xcb
+WANTLIB += pixman-1 png z pthread-stubs xcb gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gdk_pixbuf_xlib-2.0 gtk-x11-2.0
 
 MASTER_SITES=		${MASTER_SITE_BERLIOS:=fvwm-crystal/}
 
@@ -26,7 +27,7 @@ USE_GMAKE=		Yes
 
 MODULES=		devel/gettext
 
-LIB_DEPENDS=		gdk-x11-2.0,gdk_pixbuf-2.0,gdk_pixbuf_xlib-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=		::x11/gtk+2
 
 MAKE_FLAGS=		CC="${CC}" CFLAGS="${CFLAGS} -DG_DISABLE_DEPRECATED \
 			-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index a8502ca77a5..3f64f4318dc 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.76 2010/07/30 06:59:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.77 2010/07/30 08:02:59 ajacoutot Exp $
 
 COMMENT-main=		window manager that emulates NEXTSTEP(tm)
 COMMENT-lang=		language subpackage for Window Maker
@@ -6,7 +6,7 @@ COMMENT-lang=		language subpackage for Window Maker
 V=			0.92.0
 DISTNAME=		WindowMaker-${V}
 PKGNAME-main=		${DISTNAME:L}
-REVISION-main=		9
+REVISION-main=		10
 FULLPKGNAME-lang=       windowmaker-lang-${V}
 REVISION-lang=		1
 SHARED_LIBS=		wraster 5.0
@@ -42,12 +42,12 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng"
 MULTI_PACKAGES=         -main -lang
 
 MODULES=		devel/gettext
-LIB_DEPENDS=		jpeg.>=62::graphics/jpeg \
-			tiff.>=35::graphics/tiff \
-			png.>=2::graphics/png \
-			ungif.>=5::graphics/libungif
+LIB_DEPENDS=		::graphics/tiff \
+			::graphics/png \
+			::graphics/libungif
 WANTLIB=		X11 Xau Xdmcp Xext Xft Xinerama Xpm Xrender c expat \
-	 		fontconfig freetype m z pthread-stubs xcb
+	 		fontconfig freetype m z pthread-stubs xcb jpeg \
+			tiff png ungif
 
 RUN_DEPENDS-lang=	:windowmaker->=0.90.0:x11/windowmaker
 LIB_DEPENDS-lang=
diff --git a/x11/wmclockmon/Makefile b/x11/wmclockmon/Makefile
index 639dccc6a91..09e365f1214 100644
--- a/x11/wmclockmon/Makefile
+++ b/x11/wmclockmon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2010/07/30 08:03:00 ajacoutot Exp $
 
-COMMENT=		Window Maker dock.app clock
+COMMENT=		WindowMaker dock.app clock
 
 DISTNAME=		wmclockmon-0.8.0
-REVISION=		0
+REVISION=		1
 CATEGORIES=		x11 x11/windowmaker
 
 HOMEPAGE=		http://tnemeth.free.fr/projets/dockapps.html
@@ -24,9 +24,10 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xpm Xrandr Xrender atk-1.0 c cairo expat
 WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
 WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pixman-1 png pthread-stubs xcb z
+WANTLIB += pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 gdk-x11-2.0
+WANTLIB += gtk-x11-2.0
 
-LIB_DEPENDS=		gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=		::x11/gtk+2
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/x11/wmctrl/Makefile b/x11/wmctrl/Makefile
index 526704e165c..1eb79343b64 100644
--- a/x11/wmctrl/Makefile
+++ b/x11/wmctrl/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2008/02/13 17:51:13 jcs Exp $
+# $OpenBSD: Makefile,v 1.8 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	interact with an EWMH/NetWM window manager
 DISTNAME=	wmctrl-1.07
+REVISION=	0
+
 CATEGORIES=	x11
 MASTER_SITES=	${HOMEPAGE}dist/
 
@@ -12,11 +14,14 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-WANTLIB=		ICE SM X11 Xmu c iconv intl
+
+WANTLIB=		ICE SM X11 Xmu c glib-2.0
+
+MODULES=		devel/gettext
 
 USE_X11=	Yes
 
-LIB_DEPENDS=	glib-2.0.>=0.11::devel/glib2
+LIB_DEPENDS=	::devel/glib2
 
 CONFIGURE_STYLE=gnu
 
diff --git a/x11/wmdate/Makefile b/x11/wmdate/Makefile
index 9d75b1f9a08..98f3d842810 100644
--- a/x11/wmdate/Makefile
+++ b/x11/wmdate/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=		wm-dockapp; shows the current date
 
 DISTNAME=		wmdate-0.7
-REVISION=		0
+REVISION=		1
 CATEGORIES=		x11 x11/windowmaker
 
 MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>
@@ -14,9 +14,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		X11 Xau Xdmcp Xext Xpm c
+WANTLIB=		X11 Xau Xdmcp Xext Xpm c dockapp
 
-LIB_DEPENDS=		dockapp::devel/libdockapp
+LIB_DEPENDS=		::devel/libdockapp
 
 USE_X11=		Yes
 NO_REGRESS=		Yes
diff --git a/x11/wmfishtime/Makefile b/x11/wmfishtime/Makefile
index e4ff4359b47..9ef32aeaa3e 100644
--- a/x11/wmfishtime/Makefile
+++ b/x11/wmfishtime/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=		wm-dockapp; clock application with clock, date and fish
 
 DISTNAME=		wmfishtime-1.23
-REVISION=		0
+REVISION=		1
 CATEGORIES=     	x11 x11/windowmaker
 
 HOMEPAGE=		http://www.ne.jp/asahi/linux/timecop/
@@ -24,9 +24,9 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
-WANTLIB += pthread-stubs xcb z
+WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 gdk-x11-2.0 gtk-x11-2.0
 
-LIB_DEPENDS=		gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=		::x11/gtk+2
 
 MAKE_FLAGS=		CC="${CC}" \
 			CFLAGS="${CFLAGS} -Wall `pkg-config --cflags gtk+-2.0`" \
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 5f36da9a48d..2601480a331 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=		wm-dockapp; A popup menu of icons that launch programs
 
 DISTNAME=		wmmenu-1.2
-REVISION=		1
+REVISION=		2
 CATEGORIES=     	x11 x11/windowmaker
 
 HOMEPAGE=		http://www.fcoutant.freesurf.fr/wmmenu.html
@@ -15,23 +15,24 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xpm c m
+
+WANTLIB=		X11 Xext Xpm c m dockapp
 
 MASTER_SITES=		http://www.fcoutant.freesurf.fr/download/
 
 USE_X11=		Yes
 
-LIB_DEPENDS=		dockapp::devel/libdockapp
+LIB_DEPENDS=		::devel/libdockapp
 
 FLAVORS=		gdk_pixbuf
 FLAVOR?=
 
 .if ${FLAVOR:L:Mgdk_pixbuf}
 MAKE_FLAGS=		GDKPIXBUF2=1
-LIB_DEPENDS+=		gdk_pixbuf_xlib-2.0::x11/gtk+2
+LIB_DEPENDS+=		::x11/gtk+2
 CFLAGS+=		-pthread
 MAKE_ENV+=		LDFLAGS="-pthread"
-WANTLIB += pthread
+WANTLIB += pthread gdk_pixbuf_xlib-2.0
 .endif
 
 WRKDIST=		${WRKDIR}/wmmenu
diff --git a/x11/wmthemeinstall/Makefile b/x11/wmthemeinstall/Makefile
index fc83874b2d6..174396a1fd5 100644
--- a/x11/wmthemeinstall/Makefile
+++ b/x11/wmthemeinstall/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2007/09/15 20:04:25 merdely Exp $
+# $OpenBSD: Makefile,v 1.17 2010/07/30 08:03:00 ajacoutot 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
@@ -6,6 +6,8 @@ COMMENT=		neat theme manager for Window Maker
 DISTNAME=		wmthemeinstall-0.62
 CATEGORIES=		x11 x11/windowmaker
 
+REVISION=		0
+
 MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>
 
 # GPL
@@ -13,10 +15,13 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m z
 
-RUN_DEPENDS=		:windowmaker-*:x11/windowmaker
-LIB_DEPENDS=		gtk.>=1,gdk.>=1::x11/gtk+
+WANTLIB=		X11 Xext Xi c glib gmodule gdk m z gtk
+
+MODULES=		devel/gettext
+
+RUN_DEPENDS=		::x11/windowmaker
+LIB_DEPENDS=		::x11/gtk+
 
 SEPARATE_BUILD=		concurrent
 USE_X11=		Yes
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index 6ccac44b8ed..da816cfbb7c 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=		wm-dockapp; weather monitor
 
 DISTNAME=		wmweather-2.4.3
-REVISION=		1
+REVISION=		2
 CATEGORIES=		x11 x11/windowmaker
 
 HOMEPAGE=		http://people.debian.org/~godisch/wmweather/
@@ -15,11 +15,12 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xpm c
+
+WANTLIB=		X11 Xext Xpm c curl
 
 MASTER_SITES=		${HOMEPAGE}
 
-LIB_DEPENDS=		curl.::net/curl
+LIB_DEPENDS=		::net/curl
 
 USE_GMAKE=		Yes
 USE_X11=		Yes
diff --git a/x11/wxWidgets/Makefile b/x11/wxWidgets/Makefile
index 3c5f1330d26..8beb6f707a4 100644
--- a/x11/wxWidgets/Makefile
+++ b/x11/wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2010/07/30 08:03:00 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,7 +7,7 @@ COMMENT=	c++ cross-platform GUI toolkit
 V=		2.8.10
 DISTNAME=	wxWidgets-${V}
 PKGNAME=	wxWidgets-gtk2-${V}
-REVISION=	2
+REVISION=	3
 
 SHARED_LIBS=	wx_base			2.0	\
 		wx_base_net		2.0	\
@@ -48,18 +48,19 @@ USE_X11=	Yes
 VMEM_WARNING=	Yes
 
 BUILD_DEPENDS=	::devel/cppunit
-LIB_DEPENDS=	mspack::archivers/libmspack \
-		SDL::devel/sdl \
-		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
-		iodbc::databases/iodbc \
-		esd::audio/esound
+LIB_DEPENDS=	::archivers/libmspack \
+		::devel/sdl \
+		::x11/gtk+2 \
+		::databases/iodbc \
+		::audio/esound
 
 WANTLIB += GL GLU SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
 WANTLIB += c expat fontconfig freetype gio-2.0 glib-2.0 glitz
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m ossaudio
-WANTLIB += pango-1.0 pangoft2-1.0 pixman-1 png pthread stdc++
-WANTLIB += tiff z pthread-stubs xcb xcb-render xcb-render-util
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jpeg m ossaudio esd
+WANTLIB += pango-1.0 pangoft2-1.0 pixman-1 png pthread stdc++ SDL iodbc
+WANTLIB += tiff z pthread-stubs xcb xcb-render xcb-render-util mspack
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
 
 AUTOCONF_VERSION=2.59
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread" \
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index fb5ab365f58..794b0447a37 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2010/04/02 00:42:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT =		VNC server for real X displays
 
 DISTNAME =		x11vnc-0.9.9
+REVISION =		0
 
 CATEGORIES =		x11
 HOMEPAGE =		http://www.karlrunge.com/x11vnc/
@@ -16,7 +17,7 @@ PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
 WANTLIB += X11 Xdamage Xext Xfixes Xinerama Xrandr Xtst c crypto
-WANTLIB += pthread ssl z
+WANTLIB += pthread ssl z jpeg avahi-client avahi-common
 
 USE_X11 =		Yes
 
@@ -24,8 +25,8 @@ MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 MODULES =		x11/tk
 RUN_DEPENDS =		::devel/desktop-file-utils \
 			${MODTK_RUN_DEPENDS}
-LIB_DEPENDS =		jpeg::graphics/jpeg \
-			avahi-client,avahi-common::net/avahi
+LIB_DEPENDS =		::graphics/jpeg \
+			::net/avahi
 
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
diff --git a/x11/xarchive/Makefile b/x11/xarchive/Makefile
index de88e173231..8694ae65203 100644
--- a/x11/xarchive/Makefile
+++ b/x11/xarchive/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2010/01/27 14:47:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	GTK+2 front-end for command line archiving tools
 
 V=		0.2.8-6
 DISTNAME=	xarchive-$V
 PKGNAME=	xarchive-${V:S/-/./}
+REVISION=	0
 CATEGORIES=	x11
 
 HOMEPAGE=	http://xarchive.sourceforge.net/
@@ -23,10 +24,11 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
-WANTLIB += z pthread-stubs xcb
+WANTLIB += z pthread-stubs xcb gdk_pixbuf-2.0 gdk-x11-2.0
+WANTLIB += gtk-x11-2.0
 
 MODULES=	devel/gettext
-LIB_DEPENDS=	gdk_pixbuf-2.0.>=1000,gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2
+LIB_DEPENDS=	::x11/gtk+2
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
 USE_X11=	Yes
diff --git a/x11/xawtv/Makefile b/x11/xawtv/Makefile
index d2de7ff8381..6a0e732351c 100644
--- a/x11/xawtv/Makefile
+++ b/x11/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2010/07/30 08:03:00 ajacoutot Exp $
 
 # we use "macppc" and not "powerpc" on purpose here ; i.e. bktr(4) needed
 ONLY_FOR_ARCHS=	i386 macppc amd64
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS=	i386 macppc amd64
 COMMENT=	TV viewing application for bktr(4) cards
 
 DISTNAME=	xawtv-3.94
-REVISION=	3
+REVISION=	4
 CATEGORIES=	x11
 
 MAINTAINER=	Robert Nagy <robert@openbsd.org>
@@ -23,9 +23,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	ICE SM X11 Xaw Xau Xdmcp Xext Xft Xinerama Xmu Xpm Xrandr \
 		Xrender Xt Xv Xxf86dga Xxf86vm c fontconfig freetype m z \
-		ncurses ossaudio pthread expat pthread-stubs xcb
+		ncurses ossaudio pthread expat pthread-stubs xcb jpeg
 
-LIB_DEPENDS=	jpeg.>=62::graphics/jpeg
+LIB_DEPENDS=	::graphics/jpeg
 
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-mmx
diff --git a/x11/xchm/Makefile b/x11/xchm/Makefile
index cc234e56745..972cf4407f0 100644
--- a/x11/xchm/Makefile
+++ b/x11/xchm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	display chm files
 
 DISTNAME=	xchm-1.16
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	devel textproc x11
 
@@ -17,12 +17,14 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xchm/}
 
-LIB_DEPENDS=	chm::devel/chmlib \
-		wx_base_xml,wx_gtk2_qa,wx_base_odbc,wx_gtk2_html,wx_base,wx_gtk2_adv,wx_gtk2_xrc,wx_gtk2_core,wx_base_net,wx_gtk2_dbgrid,wx_gtk2_aui,wx_gtk2_richtext:wxWidgets-gtk2->=2.6.3:x11/wxWidgets
+LIB_DEPENDS=	::devel/chmlib \
+		:wxWidgets-gtk2->=2.6.3:x11/wxWidgets
 
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
-WANTLIB=	m c stdc++ pthread
+WANTLIB += m c stdc++ pthread chm wx_base_xml wx_gtk2_qa wx_base_odbc
+WANTLIB += wx_gtk2_html wx_base wx_gtk2_adv wx_gtk2_xrc wx_gtk2_core
+WANTLIB += wx_base_net wx_gtk2_dbgrid wx_gtk2_aui wx_gtk2_richtext
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index 82038b2984d..7fd4b1c94a2 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,18 +1,18 @@
-# $OpenBSD: Makefile,v 1.17 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	X11 Cursors themes generator
 DIST_VERS=	1.0.2
 XORG_VERS=	7.3
 DISTNAME=	xcursorgen-${DIST_VERS}
 PKGNAME=	xcursorgen-${XORG_VERS}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	http://wiki.X.Org/
 
 MAINTAINER=	Matthieu Herrb <matthieu@openbsd.org>
 
-LIB_DEPENDS=	png.>=2::graphics/png
+LIB_DEPENDS=	::graphics/png
 
 # X11
 PERMIT_PACKAGE_CDROM=	Yes
@@ -24,7 +24,7 @@ MASTER_SITES=	ftp://ftp.x.org/pub/X11R${XORG_VERS}/src/app/ \
 		ftp://x.mirrors.skynet.be/pub/ftp.x.org/pub/X11R${XORG_VERS}/src/app/
 
 WANTLIB=		Xrender Xcursor X11 Xfixes Xdmcp Xau c m z \
-			pthread-stubs xcb
+			pthread-stubs xcb png
 
 SEPARATE_BUILD= 	concurrent
 USE_X11=		Yes
diff --git a/x11/xfm/Makefile b/x11/xfm/Makefile
index d857e5ea861..d1f16a5d9f5 100644
--- a/x11/xfm/Makefile
+++ b/x11/xfm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	X11 File Manager
 
 DISTNAME=	xfm-1.4.3
-REVISION=	4
+REVISION=	5
 CATEGORIES=	x11
 
 HOMEPAGE=	http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
@@ -14,11 +14,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xmu Xpm Xt c
+WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xmu Xpm Xt c Xaw3d
 
 MASTER_SITES=	${HOMEPAGE}
 
-LIB_DEPENDS=	Xaw3d.>=6::x11/Xaw3d
+LIB_DEPENDS=	::x11/Xaw3d
 
 USE_X11=	Yes
 CONFIGURE_STYLE= imake
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 5b8c7801268..0df55c656d6 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	GUI toolkit for X11
 
 DISTNAME=	xforms-1.0
-REVISION=	0
+REVISION=	1
 SHARED_LIBS=	flimage	1.0 \
 		forms	1.0 \
 		formsGL	1.0
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		GL X11 Xau Xdmcp Xext Xpm c jpeg m
+WANTLIB=		GL X11 Xau Xdmcp Xext Xpm c jpeg m tiff
 
 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
@@ -29,7 +29,7 @@ MAKE_FLAGS=		LIBflimage_VERSION=${LIBflimage_VERSION} \
 
 BUILD_DEPENDS=		::graphics/jpeg
 
-LIB_DEPENDS=		tiff.>=35::graphics/tiff
+LIB_DEPENDS=		::graphics/tiff
 
 NO_REGRESS=		Yes
 
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 2efc9279ca7..5e8c8ea29b9 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	graphics file viewer for X11
 
@@ -7,7 +7,7 @@ REV=		16	# Debian
 
 DISTNAME=	xloadimage.${VERSION}
 PKGNAME=	xloadimage-${VERSION}.${REV}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	x11 graphics
 
 FAKE=		lib
@@ -26,8 +26,9 @@ MASTER_SITES0=	ftp://ftp.debian.org/debian/pool/main/x/xloadimage/ \
 PATCHFILES=	xloadimage_${VERSION}-${REV}.diff.gz:0
 PATCH_DIST_STRIP= -p1
 
-LIB_DEPENDS=	png.>=2::graphics/png tiff.>=35::graphics/tiff
-WANTLIB=	X11 c jpeg m z 
+LIB_DEPENDS=	::graphics/png \
+		::graphics/tiff
+WANTLIB=	X11 c jpeg m z png tiff
 
 USE_X11=	Yes
 CONFIGURE_STYLE=gnu
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 39157930ecf..32ddf139796 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2010/05/13 15:42:04 giovanni Exp $
+# $OpenBSD: Makefile,v 1.22 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	virtual sticky pad system
 
 DISTNAME=	xpad-4.0
+REVISION=	0
 CATEGORIES=	x11
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xpad/}
@@ -14,7 +15,7 @@ HOMEPAGE=	http://xpad.sourceforge.net/
 MODULES=	devel/gettext \
 		textproc/intltool
 
-LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=	::x11/gtk+2
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
 WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
@@ -23,6 +24,7 @@ WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
 WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png z pthread-stubs xcb
 WANTLIB += gthread-2.0 pthread xcb-render xcb-render-util
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 136c7d7e583..d287f5ee35b 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.44 2010/07/30 06:59:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	draw pictures of the earth textured by an image
 
 DISTNAME=	xplanet-1.2.0
-REVISION=	1
+REVISION=	2
 CATEGORIES=	astro geo x11
 
 MAINTAINER=	Robert Nagy <robert@openbsd.org>
@@ -18,12 +18,13 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	X11 c charset expat fontconfig freetype glib-2.0 gmodule-2.0 \
-		gobject-2.0 iconv intl m stdc++ z
+		gobject-2.0 iconv intl m stdc++ z pango-1.0 gif jpeg png \
+		pangoft2-1.0
 
-LIB_DEPENDS=		pango-1.0.>=399.1,pangoft2-1.0.>=399.1::devel/pango \
-			gif.>=5::graphics/libungif \
-			jpeg.>=62::graphics/jpeg \
-			png.>=4::graphics/png
+LIB_DEPENDS=		::devel/pango \
+			::graphics/libungif \
+			::graphics/jpeg \
+			::graphics/png
 
 RUN_DEPENDS=		::geo/openbsd-developers
 
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index b9851623ada..717aab3e64d 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2010/07/30 06:59:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2010/07/30 08:03:00 ajacoutot Exp $
 
 COMMENT=	yet another kuake KDE terminal emulator
 
 DISTNAME=	yakuake-2.8.1
-REVISION=	2
+REVISION=	3
 CATEGORIES=	x11 x11/kde
 
 EXTRACT_SUFX=	.tar.bz2
@@ -19,13 +19,14 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_BERLIOS:=yakuake/}
 
 WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c fam idn \
-		jpeg m png pthread rpcsvc stdc++ util z pthread-stubs xcb
+		jpeg m png pthread rpcsvc stdc++ util z pthread-stubs xcb \
+		kdecore kdefx kdesu kdeui kio kwalletclient DCOP
 
 MODULES=	devel/gettext \
 		x11/kde
 
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS=	kdecore.>=7,kdefx,kdesu,kdeui,kio,kwalletclient,DCOP::x11/kde/libs3
+LIB_DEPENDS=	::x11/kde/libs3
 
 USE_X11=	Yes
 USE_GMAKE=	Yes