diff --git a/games/ggz/libggz/Makefile b/games/ggz/libggz/Makefile
index 9d541951d9f..eeb75cdef5e 100644
--- a/games/ggz/libggz/Makefile
+++ b/games/ggz/libggz/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2008/12/22 22:57:45 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2009/06/18 01:07:52 sthen Exp $
 
 COMMENT=		GGZ Gaming Zone - base library
 
 DISTNAME=		libggz-$V
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 SHARED_LIBS +=	ggz                  0.0      # .5.0
 
 CONFIGURE_ARGS+=	--with-gcrypt \
@@ -13,7 +13,7 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 
 MODULES=		devel/gettext
 
-WANTLIB=		crypto gpg-error ssl
+WANTLIB=		crypto gpg-error ssl pthread
 
 LIB_DEPENDS=		gcrypt::security/libgcrypt
 
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index b455b7b2012..f014ccdfcec 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2009/06/11 18:26:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2009/06/18 01:07:52 sthen Exp $
 
 MULTI_PACKAGES=	-main -themes
 
 COMMENT-main=	tetrinet client
 COMMENT-themes=	collection of gtetrinet themes
 DISTNAME=	gtetrinet-0.7.11
-PKGNAME-main=	${DISTNAME}p7
+PKGNAME-main=	${DISTNAME}p8
 PKGNAME-themes=	gtetrinet-themes-20070623p1
 CATEGORIES=	x11 games
 
@@ -47,16 +47,15 @@ RUN_DEPENDS-main=	${RUN_DEPENDS} \
 RUN_DEPENDS-themes=	::games/gtetrinet
 PKG_ARCH-themes=	*
 
-WANTLIB-main=	ICE ORBit-2 SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi \
-		Xcomposite Xdamage \
-		Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 audiofile \
-		bonobo-2 bonobo-activation bonoboui-2 c cairo expat \
-		fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
-		glib-2.0 glitz gmodule-2.0 gnome-keyring gnomecanvas-2 \
-		gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv \
-		intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 png popt \
-		pthread xml2 z gailutil pixman-1
-WANTLIB-themes=
+WANTLIB-main += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB-main += Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0
+WANTLIB-main += audiofile bonobo-2 bonobo-activation bonoboui-2 c cairo
+WANTLIB-main += dbus-1 expat fontconfig freetype gailutil gdk-x11-2.0
+WANTLIB-main += gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gnome-keyring
+WANTLIB-main += gnomecanvas-2 gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0
+WANTLIB-main += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB-main += pixman-1 png popt pthread sndio xml2 z
+WANTLIB-themes =
 
 MODGCONF2_SCHEMAS_DIR= gtetrinet
 MODGCONF2_LIBDEP= No
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index ca49c8e144f..02bb220ff6e 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2008/06/15 00:08:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2009/06/18 01:07:52 sthen Exp $
 
 COMMENT=	gtk+ clone of the lines ball logic game
 
 DISTNAME=	gtkballs-3.1.5
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6
 CATEGORIES=	games x11
 MASTER_SITES=	${HOMEPAGE}dist/ \
 		${MASTER_SITE_SUNSITE:=games/strategy/}
@@ -17,11 +17,11 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB=	c fontconfig freetype m z X11 Xext Xrender Xrandr expat \
-		Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes Xi Xinerama \
-		gobject-2.0 glib-2.0 gmodule-2.0 glitz png \
-		pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-		atk-1.0 cairo pixman-1
+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
 
 MODULES=	devel/gettext
 
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 9e7d1c0b245..4971a30c3d4 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2009/04/16 08:13:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2009/06/18 01:07:52 sthen Exp $
 
 COMMENT=	Settlers of Catan for GNOME/Gtk
 
 GNOME_PROJECT=	pioneers
 GNOME_VERSION=	0.12.2
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 
 CATEGORIES=	games
 
@@ -25,7 +25,8 @@ WANTLIB=	ORBit-2 ORBitCosNaming-2 X11 Xau Xcomposite Xcursor \
 		freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
 		glitz gmodule-2.0 gnomevfs-2 gobject-2.0 gthread-2.0 \
 		gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-		pcre pixman-1 png popt pthread ssl util xml2 z gio-2.0
+		pcre pixman-1 png popt pthread ssl util xml2 z gio-2.0 \
+		avahi-client avahi-common avahi-glib
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pio/}
 
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 4c71a900c20..81a1cd75654 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2008/12/28 10:48:11 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2009/06/18 01:07:52 sthen Exp $
 
 COMMENT=	Qt4 poker game with online capabilities
 
 V=		0.6.3
 DISTNAME=	PokerTH-${V}-src
-PKGNAME=	pokerth-${V}
+PKGNAME=	pokerth-${V}p0
 CATEGORIES=	games x11
 
 HOMEPAGE=	http://www.pokerth.net/
@@ -21,9 +21,10 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pokerth/}
 
 EXTRACT_SUFX=	.tar.bz2
 
-WANTLIB=	ICE SDL SM X11 Xext Xi Xinerama Xrandr \
+WANTLIB=	ICE SDL SM X11 Xext Xi Xinerama \
 		Xrender c crypto fontconfig freetype glib-2.0 \
-		gthread-2.0 m png pthread stdc++ z QtGui ssl
+		gthread-2.0 m png pthread stdc++ z QtGui ssl \
+		expat gobject-2.0
 
 MODULES=	devel/gettext \
 		x11/qt4
diff --git a/games/quake2/Makefile b/games/quake2/Makefile
index 2665ee66e42..105ff82b23c 100644
--- a/games/quake2/Makefile
+++ b/games/quake2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2008/06/28 02:50:59 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.13 2009/06/18 01:07:52 sthen Exp $
 
 ONLY_FOR_ARCHS= 	amd64 i386
 SHARED_ONLY=		Yes
@@ -6,7 +6,7 @@ SHARED_ONLY=		Yes
 COMMENT=		first person shooter
 
 DISTNAME=		quake2-0.3
-PKGNAME=		${DISTNAME}p7
+PKGNAME=		${DISTNAME}p8
 CATEGORIES=		games
 
 HOMEPAGE=		http://www.quakeforge.net/
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=		ICE GL SM X11 Xext Xau Xdmcp Xrandr Xrender Xxf86dga \
-			Xxf86vm c m ossaudio pthread usbhid
+			Xxf86vm c m ossaudio pthread sndio usbhid
 
 MASTER_SITES=		http://humppa.nl/distfiles/
 
diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index 85b3354e233..bd43093bfa4 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2007/10/27 15:24:30 kili Exp $
+# $OpenBSD: Makefile,v 1.16 2009/06/18 01:07:52 sthen Exp $
 
 COMMENT=		Nebulous rewrite of Tower Toppler
 
 DISTNAME=		toppler-1.1.3
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		games
 
 HOMEPAGE=		http://toppler.sourceforge.net/
@@ -12,7 +13,7 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 WANTLIB=		SDL X11 Xau Xdmcp Xext Xrandr Xrender c m \
-			mikmod ogg pthread smpeg stdc++ usbhid vorbis \
+			mikmod ogg pthread smpeg sndio stdc++ usbhid vorbis \
 			vorbisfile z
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=toppler/}
diff --git a/geo/libchamplain/core/Makefile b/geo/libchamplain/core/Makefile
index cd6cfa28c1f..d20e19bbec1 100644
--- a/geo/libchamplain/core/Makefile
+++ b/geo/libchamplain/core/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2009/05/08 12:38:28 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2009/06/18 01:07:52 sthen Exp $
 
 COMMENT=		library to provide a Gtk+ widget to display maps
 
 DISTNAME=		libchamplain-${VERSION}
+PKGNAME=		${DISTNAME}p0
 
 SHARED_LIBS +=  champlain-0.3       0.0          # .0.0
 SHARED_LIBS +=  champlain-gtk-0.3   0.0          # .0.0
@@ -13,7 +14,7 @@ WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gnutls gobject-2.0
 WANTLIB += gpg-error gthread-2.0 gtk-x11-2.0 json-glib-1.0 m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png tasn1
-WANTLIB += xml2 z
+WANTLIB += xml2 z gcrypt
 
 MODULES=		devel/gettext
 
diff --git a/geo/osm-gps-map/Makefile b/geo/osm-gps-map/Makefile
index 5e6fe01142a..972065810d0 100644
--- a/geo/osm-gps-map/Makefile
+++ b/geo/osm-gps-map/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2009/04/23 09:19:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2009/06/18 01:07:52 sthen Exp $
 
 COMMENT=		Gtk+ Widget for Displaying OpenStreetMap tiles
 
 # original tarball is an archive from git and lacks sane numbering
 # in the filename.
 DISTNAME=		osm-gps-map-0.3
+PKGNAME=		${DISTNAME}p0
 SHARED_LIBS +=  osmgpsmap 0.0 # .0.0
 CATEGORIES=		geo x11
 
@@ -24,7 +25,7 @@ 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 gnutls
 WANTLIB += gobject-2.0 gpg-error gthread-2.0 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread tasn1 xml2 z
+WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread tasn1 xml2 z gcrypt
 
 USE_LIBTOOL=		Yes
 
diff --git a/geo/qlandkarte/Makefile b/geo/qlandkarte/Makefile
index 81dadd4aa27..acf2a57797c 100644
--- a/geo/qlandkarte/Makefile
+++ b/geo/qlandkarte/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2009/03/14 12:52:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2009/06/18 01:07:52 sthen Exp $
 
 COMMENT=	garmin gps map management tool
 
 DISTNAME=	QLandkarte_0.7.3
-PKGNAME=	${DISTNAME:L:S/_/-/}p2
+PKGNAME=	${DISTNAME:L:S/_/-/}p3
 CATEGORIES=	geo x11
 
 HOMEPAGE=	http://qlandkarte.sourceforge.net/
@@ -25,9 +25,9 @@ LIB_DEPENDS+=	proj::devel/proj \
 		QtGui,QtNetwork,QtXml::x11/qt4
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
-WANTLIB+=	ICE SM X11 Xext Xi Xinerama Xrandr Xrender \
+WANTLIB+=	ICE SM X11 Xext Xi Xinerama Xrender \
 		fontconfig freetype glib-2.0 gthread-2.0 iconv \
-		c intl m png pthread stdc++ z
+		c intl m png pthread stdc++ z expat gobject-2.0
 
 PORTHOME=	${WRKDIR}