diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 466bb91a224..d604e03be0a 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2005/11/21 23:37:18 alek Exp $
+# $OpenBSD: Makefile,v 1.54 2006/01/19 17:11:21 steven Exp $
 
 COMMENT=	"Civilization clone for X11; multiplayer; game server"
 COMMENT-client=	"Freeciv client"
@@ -7,7 +7,7 @@ COMMENT-share=	"shared data files for Freeciv"
 VERSION=	2.0.7
 DISTNAME=	freeciv-${VERSION}
 PKGNAME=	freeciv-server-${VERSION}
-PKGNAME-client=	freeciv-client-${VERSION}
+PKGNAME-client=	freeciv-client-${VERSION}p0
 PKGNAME-share=	freeciv-share-${VERSION}
 CATEGORIES=	games
 HOMEPAGE=	http://www.freeciv.org/
@@ -44,9 +44,9 @@ LIB_DEPENDS=	gtk-x11-2.0.0.5,gdk-x11-2.0.0.5,gdk_pixbuf-2.0.0.5::x11/gtk+2 \
 CONFIGURE_ARGS=	--enable-client=gtk2 \
 		--disable-sdl-mixer \
 		--with-esd-prefix=${LOCALBASE}
-WANTLIB-client=	X11 atk-1.0.0.0 cairo fontconfig freetype audiofile \
+WANTLIB-client=	X11 Xext Xft Xrender atk-1.0.0.0 fontconfig freetype audiofile \
 		glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 pango-1.0.0.0 \
-		pangocairo-1.0.0.0 pangoft2-1.0.0.0 audiofile
+		pangox-1.0.0.0 pangoxft-1.0.0.0 pangoft2-1.0.0.0 audiofile
 .else
 CONFIGURE_ARGS=	--enable-client=no
 .endif
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index b17743f11ed..aa03637e060 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2005/11/15 13:35:10 wilfried Exp $
+# $OpenBSD: Makefile,v 1.18 2006/01/19 17:11:21 steven Exp $
 
 COMMENT=	"gtk+ clone of the lines ball logic game"
 
 DISTNAME=	gtkballs-3.1.5
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	games x11
 MASTER_SITES=	${HOMEPAGE}dist/ \
 		${MASTER_SITE_SUNSITE:=games/strategy/}
@@ -16,9 +16,10 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		c fontconfig freetype m X11 atk-1.0.0.0 cairo \
+WANTLIB=		c fontconfig freetype m X11 Xext Xft Xrender \
 			gobject-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \
-			pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0
+			pango-1.0.0.0 pangox-1.0.0.0 pangoft2-1.0.0.0 \
+			pangoxft-1.0.0.0 atk-1.0.0.0
 
 MODULES=	devel/gettext
 
diff --git a/games/gtkballs/pkg/PLIST b/games/gtkballs/pkg/PLIST
index e35268af7c5..7005fea901d 100644
--- a/games/gtkballs/pkg/PLIST
+++ b/games/gtkballs/pkg/PLIST
@@ -1,15 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.7 2005/06/05 20:00:30 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.8 2006/01/19 17:11:21 steven Exp $
 @mode g+s
 @group games
 bin/gtkballs
-@group
 @mode
+@group
 @man man/man6/gtkballs.6x
 @mode g+w
 @group games
 @sample /var/games/gtkballs-scores
-@group
 @mode
+@group
 share/examples/gtkballs-scores
 share/gtkballs/
 share/gtkballs/COPYING
@@ -540,16 +540,7 @@ share/gtkballs/themes/mascots/walk6.xpm
 share/gtkballs/themes/mascots/walk7.xpm
 share/gtkballs/themes/mascots/walk8.xpm
 share/gtkballs/themes/mascots/walk_small.xpm
-share/locale/
-share/locale/de/
-share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/gtkballs.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/gtkballs.mo
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
 share/locale/pl/LC_MESSAGES/gtkballs.mo
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
 share/locale/ru/LC_MESSAGES/gtkballs.mo