diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index 3536adb0501..2cb8a1514bb 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/10/31 20:14:11 alek Exp $
+# $OpenBSD: Makefile,v 1.2 2005/11/14 16:14:57 wilfried Exp $
 
 COMMENT=		"switch GTK+2 themes quickly"
 
 DISTNAME=		gtk-theme-switch-2.0.0rc2
-PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGNAME=		${DISTNAME:S/gtk/gtk2/}p0
 CATEGORIES=		x11 graphics
 
 HOMEPAGE=		http://www.muhri.net/nav.php3?node=gts
@@ -13,9 +13,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		Xrender c X11 fontconfig m freetype Xft glib-2.0.0.0 \
-			gmodule-2.0.0.0 pangox-1.0.0.0 gobject-2.0.0.0 \
-			pangoxft-1.0.0.0 pango-1.0.0.0 atk-1.0.0.0
+WANTLIB=		X11 atk-1.0.0.0 c cairo fontconfig freetype \
+			glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 m \
+			pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0
 
 MASTER_SITES=		http://www.muhri.net/
 
diff --git a/x11/xfce4/gtk-xfce-engine/Makefile b/x11/xfce4/gtk-xfce-engine/Makefile
index f373d662c8e..2457fb33dd3 100644
--- a/x11/xfce4/gtk-xfce-engine/Makefile
+++ b/x11/xfce4/gtk-xfce-engine/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2005/11/10 22:57:37 jolan Exp $
+# $OpenBSD: Makefile,v 1.5 2005/11/14 16:11:46 wilfried Exp $
 
 COMMENT=	"theme engine for GTK2"
 V=		4.2.3.1
 DISTNAME=	gtk-xfce-engine-2.2.8
+PKGNAME=	${DISTNAME}p0
 MASTER_SITES=	http://www.xfce.org/archive/xfce-${V}/src/
 
 HOMEPAGE=	http://www.xfce.org/
@@ -14,11 +15,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	devel/gettext
-BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig
+BUILD_DEPENDS=	::devel/pkgconfig
 LIB_DEPENDS=	gdk-x11-2.0.600.0,gdk_pixbuf-2.0.600.0,gtk-x11-2.0.600.0::x11/gtk+2
-RUN_DEPENDS=	:xfwm4-*:x11/xfce4/xfwm4
-WANTLIB=	X11 Xcursor Xext Xft Xinerama Xrender fontconfig freetype m \
-		atk-1.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
-		pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0
+RUN_DEPENDS=	::x11/xfce4/xfwm4
+WANTLIB=	X11 Xext Xrender atk-1.0.0.0 cairo fontconfig freetype \
+		glib-2.0.0.0 glitz gmodule-2.0.0.0 gobject-2.0.0.0 m \
+		pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0 png z
 
 .include <bsd.port.mk>