diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index f83b46c9a2c..a6d9f41526b 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/11/08 15:54:53 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/08 23:12:31 espie Exp $
 
 SHARED_ONLY =		Yes
 
@@ -49,13 +49,13 @@ LIB_DEPENDS-main =	${MODGETTEXT_LIB_DEPENDS} \
 			::devel/glib2
 
 LIB_DEPENDS-server =	${MODGETTEXT_LIB_DEPENDS} \
-			glib-2.0::devel/glib2
+			::devel/glib2
 
 WANTLIB-main =		${MODGETTEXT_WANTLIB} \
 			SDL X11 m pango-1.0 pthread pthread-stubs xcb \
 			SDL_Pango SDL_mixer glib-2.0 gmodule-2.0 \
 			gobject-2.0
-WANTLIB-server =	${MODGETTEXT_WANTLIB} c
+WANTLIB-server =	${MODGETTEXT_WANTLIB} c glib-2.0
 
 MULTI_PACKAGES =	-main -server
 
diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index 6e8262254ea..226d4f25940 100644
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2010/10/24 21:19:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/08 23:12:32 espie Exp $
 
 COMMENT=	silly little game based on Spacetaxi for the C64
 
 DISTNAME=	taxipilot-0.7.2
-PKGNAME=	${DISTNAME}p2
+REVISION =	2
 CATEGORIES=	games
 
 HOMEPAGE=	http://taxipilot.sourceforge.net/
@@ -17,11 +17,12 @@ PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
 WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c fam idn jpeg \
-		m png pthread pthread-stubs rpcsvc stdc++ util xcb z
+		m png pthread pthread-stubs rpcsvc stdc++ util xcb z \
+		kdecore.>=4 DCOP kdefx kdesu kdeui kio kwalletclient
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=taxipilot/}
 
-LIB_DEPENDS=	kdecore.>=4,DCOP,kdecore,kdefx,kdesu,kdeui,kio,kwalletclient::x11/kde/libs3
+LIB_DEPENDS=	::x11/kde/libs3
 
 MODULES=	x11/qt3 devel/gettext
 
diff --git a/games/wormux/Makefile b/games/wormux/Makefile
index 7202119fa66..414046d9303 100644
--- a/games/wormux/Makefile
+++ b/games/wormux/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/10/18 18:00:19 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/08 23:12:32 espie Exp $
 
 COMMENT=		free software clone of Worms(R) game concept
 
@@ -12,19 +12,20 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		SDL X11 c m png pthread stdc++
+WANTLIB=		SDL X11 c m png pthread stdc++ SDL_gfx SDL_image \
+			SDL_mixer SDL_net SDL_ttf curl.>=5 xml2
 
 MASTER_SITES=		http://download.gna.org/wormux/
 EXTRACT_SUFX=		.tar.bz2
 
 RUN_DEPENDS=		:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS=		SDL_gfx::devel/sdl-gfx \
-			SDL_image::devel/sdl-image \
-			SDL_mixer::devel/sdl-mixer \
-			SDL_net::devel/sdl-net \
-			SDL_ttf::devel/sdl-ttf \
-			curl.>=5::net/curl \
-			xml2::textproc/libxml
+LIB_DEPENDS=		::devel/sdl-gfx \
+			::devel/sdl-image \
+			::devel/sdl-mixer \
+			::devel/sdl-net \
+			::devel/sdl-ttf \
+			::net/curl \
+			::textproc/libxml
 
 MODULES=		devel/gettext
 CONFIGURE_STYLE=	gnu
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index c1e979c216b..8316d9074cb 100755
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/08 23:12:32 espie Exp $
 
 COMMENT=	x bust a move clone
 
 DISTNAME=	xbubble-0.5.8
-PKGNAME=	${DISTNAME}p0
+REVISION =	0
 CATEGORIES=	games x11
 
 HOMEPAGE=	http://www.nongnu.org/xbubble/
@@ -14,17 +14,17 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		X11 c m pthread-stubs xcb z
+WANTLIB=		X11 c m pthread-stubs xcb z png.>=2
 
 MASTER_SITES=		ftp://ftp.belnet.be/mirror/rsync.gentoo.org/gentoo/distfiles/ \
 			http://gentoo.osuosl.org/distfiles/
 
 MODULES=		devel/gettext
 
-LIB_DEPENDS=		png.>=2::graphics/png
+LIB_DEPENDS=		::graphics/png
 
 USE_GMAKE=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
 
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/libpng" \
diff --git a/games/xcowsay/Makefile b/games/xcowsay/Makefile
index 9608ace551f..64898b01ba2 100644
--- a/games/xcowsay/Makefile
+++ b/games/xcowsay/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/18 18:00:19 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/08 23:12:32 espie Exp $
 
 COMMENT =		displays a cute cow and message on your desktop
 DISTNAME =		xcowsay-1.1
@@ -15,15 +15,16 @@ PERMIT_DISTFILES_FTP =	Yes
 
 MASTER_SITES =		http://www.nickg.me.uk/files/
 CONFIGURE_STYLE =	gnu
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 MODULES =	devel/gettext
-LIB_DEPENDS =	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 gmodule-2.0 gobject-2.0
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0
+WANTLIB += gdk-x11-2.0 gtk-x11-2.0
 
 .include <bsd.port.mk>
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 80e86cf8080..cafc1d7ef1d 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2010/11/08 23:12:32 espie Exp $
 
 COMMENT=	Athena port of xminesweeper
 
 DISTNAME=	xmine-1.0.3-Xaw
-PKGNAME=	xmine-1.0.3p2
+PKGNAME=	xmine-1.0.3
+REVISION =	2
 CATEGORIES=	games
 
 MAINTAINER=	Paul Janzen <pjanzen@openbsd.org>
@@ -14,9 +15,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	ICE SM Xau Xdmcp X11 Xext Xmu Xpm Xt c pthread-stubs xcb
+WANTLIB=	ICE SM Xau Xdmcp X11 Xext Xmu Xpm Xt c pthread-stubs xcb Xaw3d
 
-LIB_DEPENDS=    Xaw3d.::x11/Xaw3d
+LIB_DEPENDS=    ::x11/Xaw3d
 
 CONFIGURE_STYLE=imake
 USE_GROFF =	Yes
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 90e567917f6..dd25ab614d9 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/08 23:12:32 espie Exp $
 
 COMMENT =	challenging 2D motocross platform game
 
@@ -19,22 +19,23 @@ PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
 WANTLIB += GL GLU SDL X11 c m pthread pthread-stubs stdc++ xcb z
+WANTLIB += SDL_mixer SDL_net SDL_ttf bz2 curl jpeg ode lua png sqlite3
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS =	SDL_mixer::devel/sdl-mixer \
-		SDL_net::devel/sdl-net \
-		SDL_ttf::devel/sdl-ttf \
-		bz2::archivers/bzip2 \
-		curl::net/curl \
-		jpeg::graphics/jpeg \
-		ode::devel/ode \
-		lua::lang/lua \
-		png::graphics/png \
-		sqlite3::databases/sqlite3
+LIB_DEPENDS =	::devel/sdl-mixer \
+		::devel/sdl-net \
+		::devel/sdl-ttf \
+		::archivers/bzip2 \
+		::net/curl \
+		::graphics/jpeg \
+		::devel/ode \
+		::lang/lua \
+		::graphics/png \
+		::databases/sqlite3
 
 USE_GMAKE =		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index a586ef22955..9f77d39c8bb 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/08 23:12:32 espie Exp $
 
 COMMENT=		Scorched Earth-clone
 
@@ -21,14 +21,15 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c 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 pcre pixman-1
 WANTLIB += png pthread-stubs readline sndio termcap xcb z gdk_pixbuf-2.0
+WANTLIB += gdk-x11-2.0 gtk-x11-2.0 mikmod
 
 MODULES=		devel/gettext
 
-LIB_DEPENDS=		mikmod::audio/libmikmod \
-			gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=		::audio/libmikmod \
+			::x11/gtk+2
 
 USE_LIBTOOL=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-x \
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index df082869dc8..3612e7559af 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2010/11/08 23:12:32 espie Exp $
 
 COMMENT=	X11 version of the popular board game
 
 V=		2.12
 DISTNAME=	xscrabble-${V}
-PKGNAME=	${DISTNAME}p2
+REVISION =	2
 CATEGORIES=	games
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -22,9 +22,9 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c pthread-stubs \
-		xcb z
+		xcb z bz2.>=10
 
-LIB_DEPENDS=	bz2.>=10::archivers/bzip2
+LIB_DEPENDS=	::archivers/bzip2
 
 CONFIGURE_STYLE=imake noman
 
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 17169f93d49..61023c62e8c 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/08 23:12:32 espie Exp $
 
 COMMENT=	cuddlesome teddy for the X11 desktop
 
@@ -14,9 +14,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += X11 Xext c
+WANTLIB += X11 Xext c Imlib2
 
-LIB_DEPENDS=	Imlib2::graphics/imlib2
+LIB_DEPENDS=	::graphics/imlib2
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=  CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
diff --git a/games/xwelltris/Makefile b/games/xwelltris/Makefile
index d795b0b3d9a..2a86e8b5ec7 100644
--- a/games/xwelltris/Makefile
+++ b/games/xwelltris/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/08 23:12:32 espie Exp $
 
 COMMENT=	2.5 dimensional tetris-like game
 
 DISTNAME=	xwelltris-1.0.1
 DISTFILES=	${DISTNAME}.src.tar.gz
-PKGNAME=	${DISTNAME}p2
+REVISION =	2
 CATEGORIES=	games x11
 MASTER_SITES=	${HOMEPAGE}src/
 
@@ -30,8 +30,8 @@ CONFIGURE_ARGS+=--with-x
 WANTLIB+=	ICE SM X11 Xext pthread-stubs xcb
 .else
 CONFIGURE_ARGS+=--with-sdl
-LIB_DEPENDS=	SDL_image::devel/sdl-image
-WANTLIB+=	SDL pthread
+LIB_DEPENDS=	::devel/sdl-image
+WANTLIB+=	SDL pthread SDL_image
 .endif
 
 do-install:
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index 66ae284c6e1..87414fe4f05 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/10/24 21:19:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/11/08 23:12:32 espie Exp $
 
 COMMENT=		Z-code interpreter for X11
 
@@ -14,12 +14,13 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes 
 
 WANTLIB=		ICE SM X11 Xau Xdmcp Xext Xft Xrender c expat \
-			fontconfig freetype m pthread-stubs xcb z
+			fontconfig freetype m pthread-stubs xcb z \
+			png.>=6 t1.>=6
 
 MASTER_SITES=		${HOMEPAGE}
 
-LIB_DEPENDS=		png.>=6::graphics/png \
-			t1.>=6::devel/t1lib
+LIB_DEPENDS=		::graphics/png \
+			::devel/t1lib
 
 USE_GMAKE=		Yes