diff --git a/net/gftp/Makefile b/net/gftp/Makefile
index 87c8ef37e37..07c3db786e7 100755
--- a/net/gftp/Makefile
+++ b/net/gftp/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/11/02 20:19:29 alek Exp $
+# $OpenBSD: Makefile,v 1.2 2005/11/15 16:33:19 wilfried Exp $
 
 COMMENT=	"multithreaded gtk2 file transfer client"
 
 DISTNAME=	gftp-2.0.18
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net
 
 HOMEPAGE=	http://gftp.seul.org/
@@ -40,10 +41,10 @@ CONFIGURE_ARGS+=--disable-gtkport --disable-gtk20
 .else
 BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig
 LIB_DEPENDS=	gtk-x11-2.0.600.10,gdk_pixbuf-2.0.600.0,gdk-x11-2.0.600.0::x11/gtk+2
-WANTLIB+=	Xrender freetype pthread Xft X11 fontconfig \
+WANTLIB+=	freetype pthread X11 fontconfig \
 		gthread-2.0.0.0 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
+		gobject-2.0.0.0 atk-1.0.0.0 cairo pango-1.0.0.0 \
+		pangocairo-1.0.0.0 pangoft2-1.0.0.0
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 350889b8425..46515160ec5 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2005/08/07 21:27:52 sturm Exp $
+# $OpenBSD: Makefile,v 1.24 2005/11/15 16:25:50 wilfried Exp $
 
 COMMENT=		"Gtk-based GUI client for the Gnutella Network"
 
 DISTNAME=		gtk-gnutella-0.95.4
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=     	net 
 
 HOMEPAGE=		http://gtk-gnutella.sourceforge.net/
@@ -14,9 +15,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	X11 Xft.5 Xrender.3 atk-1.0.0.0 c fontconfig.2 freetype.13 \
+WANTLIB=	X11 atk-1.0.0.0 c cairo fontconfig.2 freetype.13 \
 		glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 iconv intl m \
-		pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 z
+		pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0 z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/xchat/Makefile b/net/xchat/Makefile
index 75fb0dbd907..adba02f1a51 100644
--- a/net/xchat/Makefile
+++ b/net/xchat/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.49 2005/10/03 20:39:59 couderc Exp $
+# $OpenBSD: Makefile,v 1.50 2005/11/15 16:29:57 wilfried Exp $
 
 COMMENT=	"GTK+2 IRC client"
 
 MAJOR=		2.4
 VERSION=	${MAJOR}.5
 DISTNAME=	xchat-${VERSION}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net x11
 
 HOMEPAGE=	http://www.xchat.org/
@@ -15,10 +16,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xft Xinerama Xrender atk-1.0.0.0 c crypto \
-			fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
+WANTLIB=		X11 Xext Xrender atk-1.0.0.0 c cairo crypto \
+			fontconfig freetype glib-2.0.0.0 glitz gmodule-2.0.0.0 \
 			gobject-2.0.0.0 m pango-1.0.0.0 pangoft2-1.0.0.0 \
-			pangox-1.0.0.0 pangoxft-1.0.0.0 ssl Xcursor
+			pangocairo-1.0.0.0 png ssl z
 
 MASTER_SITES=	${HOMEPAGE}files/source/2.4/
 MASTER_SITES0=	${MASTER_SITE_SOURCEFORGE:=xchat/}