diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile
index eeaef534ac1..4472e94d385 100644
--- a/x11/gnome/applets2/Makefile
+++ b/x11/gnome/applets2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2004/12/10 20:36:42 marcm Exp $
+# $OpenBSD: Makefile,v 1.18 2004/12/15 13:57:55 alek Exp $
 
 COMMENT=		"applets for use with the GNOME panel"
 COMMENT-battstat=	"GNOME applet for monitoring battery level"
@@ -20,6 +20,15 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft \
+		Xinerama Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 c crypto esd fontconfig \
+		freetype gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \
+		glade-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 \
+		gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \
+		gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg kvm m \
+		ossaudio pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 \
+		pangoxft-1.0.0.0 popt pthread ssl xkbfile xml2 z
 
 MODULES=		devel/gettext
 
diff --git a/x11/gnome/bonobo-conf/Makefile b/x11/gnome/bonobo-conf/Makefile
index 8c4873daaf8..d5a694a7140 100644
--- a/x11/gnome/bonobo-conf/Makefile
+++ b/x11/gnome/bonobo-conf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/08/10 10:56:42 xsa Exp $
+# $OpenBSD: Makefile,v 1.7 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"bonobo configuration system"
 
@@ -14,6 +14,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		IIOP ORBit ORBitCosNaming ORBitutil audiofile esd \
+			gdk gdk_imlib gdk_pixbuf glib gmodule gnome \
+			gnomesupport gnomeui gtk jpeg oaf ungif xml ICE SM \
+			X11 Xext Xi art_lgpl c m png tiff wrap z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo-conf/0.16/}
 
diff --git a/x11/gnome/bonobo/Makefile b/x11/gnome/bonobo/Makefile
index c32f3fa471d..88dd3f54da1 100644
--- a/x11/gnome/bonobo/Makefile
+++ b/x11/gnome/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2004/08/10 10:56:42 xsa Exp $
+# $OpenBSD: Makefile,v 1.10 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"architecture for creating reusable software components"
 COMMENT-docs=		"documentation for the bonobo architecture"
@@ -16,6 +16,9 @@ PERMIT_PACKAGE_CDROM= 	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE IIOP ORBit ORBitCosNaming ORBitutil SM X11 Xext \
+			Xi audiofile c esd freetype gdk gdk_imlib gdk_pixbuf \
+			glib gmodule gtk jpeg m png popt tiff ungif wrap xml z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo/1.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/controlcenter/Makefile b/x11/gnome/controlcenter/Makefile
index 8a0234d8df5..f46fb6f9ec3 100644
--- a/x11/gnome/controlcenter/Makefile
+++ b/x11/gnome/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2003/07/12 06:27:12 marcm Exp $
+# $OpenBSD: Makefile,v 1.22 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"GNOME control center"
 
@@ -24,6 +24,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE IIOP Imlib ORBit ORBitCosNaming ORBitutil SM X11 \
+			Xext Xi Xpm Xxf86misc art_lgpl audiofile c esd \
+			gconf-1 gconf-gtk-1 gdk gdk_imlib glib gmodule gnome \
+			gnomesupport gnomeui gthread gtk iconv intl jpeg m \
+			oaf png pthread tiff ungif wrap xml z
 
 USE_X11=		Yes
 CONFIGURE_STYLE= 	gnu
diff --git a/x11/gnome/controlcenter2/Makefile b/x11/gnome/controlcenter2/Makefile
index 59f8a594e2b..0a5f2aa56e6 100644
--- a/x11/gnome/controlcenter2/Makefile
+++ b/x11/gnome/controlcenter2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/12/10 20:36:42 marcm Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"GNOME control center"
 
@@ -26,6 +26,17 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft \
+		Xinerama Xrandr Xrender Xxf86misc art_lgpl_2 atk-1.0.0.0 \
+		audiofile bonobo-2 bonobo-activation bonoboui-2 c crypto \
+		eel-2 esd fontconfig freetype gailutil gconf-2 \
+		gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 gnome-desktop-2 \
+		gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \
+		gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg m \
+		pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 \
+		pangoxft-1.0.0.0 popt pthread ssl startup-notification-1 \
+		xkbfile xml2 z
 
 USE_X11=		Yes
 USE_GMAKE=		Yes
diff --git a/x11/gnome/desktop/Makefile b/x11/gnome/desktop/Makefile
index d4e12b1929d..14561839ce7 100644
--- a/x11/gnome/desktop/Makefile
+++ b/x11/gnome/desktop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/12/10 20:36:42 marcm Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"components for the GNOME desktop"
 
@@ -14,6 +14,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft \
+		Xinerama Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 c crypto esd fontconfig \
+		freetype gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 gnome-keyring \
+		gnomecanvas-2 gnomevfs-2 gobject-2.0.0.0 gthread-2.0.0.0 \
+		gtk-x11-2.0.0.0 jpeg m pango-1.0.0.0 pangoft2-1.0.0.0 \
+		pangox-1.0.0.0 pangoxft-1.0.0.0 popt pthread ssl xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/eel/Makefile b/x11/gnome/eel/Makefile
index d0a894492e5..9f7fbca012f 100644
--- a/x11/gnome/eel/Makefile
+++ b/x11/gnome/eel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/12/10 20:36:42 marcm Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"Eazel Extensions Library"
 
@@ -16,6 +16,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 SM X11 Xcursor Xext Xft Xinerama Xrender \
+		art_lgpl_2 atk-1.0.0.0 bonobo-2 bonobo-activation bonoboui-2 \
+		fontconfig freetype gconf-2 gdk-x11-2.0.0.0 \
+		gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 \
+		gmodule-2.0.0.0 gnome-2 gnomecanvas-2 gnomevfs-2 \
+		gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-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 popt xml2 z
 
 MODULES=		devel/gettext
 
diff --git a/x11/gnome/eog/Makefile b/x11/gnome/eog/Makefile
index ecda1cfa314..da9f9820549 100644
--- a/x11/gnome/eog/Makefile
+++ b/x11/gnome/eog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2004/12/10 20:36:43 marcm Exp $
+# $OpenBSD: Makefile,v 1.5 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"Eye of GNOME: an image viewing and cataloging program"
 DISTNAME=		eog-2.8.2
@@ -13,6 +13,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 SM X11 Xcursor Xext Xft Xinerama Xrender \
+		art_lgpl_2 atk-1.0.0.0 bonobo-2 bonobo-activation bonoboui-2 \
+		c fontconfig freetype gconf-2 gdk-x11-2.0.0.0 \
+		gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 \
+		gmodule-2.0.0.0 gnome-2 gnomecanvas-2 gnomevfs-2 \
+		gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg m \
+		pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 \
+		pangoxft-1.0.0.0 popt pthread xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eog/2.8/}	
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/gail/Makefile b/x11/gnome/gail/Makefile
index 67f3cdd74ad..01eb8f8f6bf 100644
--- a/x11/gnome/gail/Makefile
+++ b/x11/gnome/gail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2004/12/10 20:36:43 marcm Exp $
+# $OpenBSD: Makefile,v 1.9 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"GNOME Accessibility Implementation Library"
 
@@ -16,6 +16,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	X11 Xcursor Xext Xft Xinerama Xrender art_lgpl_2 fontconfig \
+		freetype gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glib-2.0.0.0 \
+		gmodule-2.0.0.0 gobject-2.0.0.0 gtk-x11-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
 
 MODULES=		devel/gettext
 
diff --git a/x11/gnome/gdm/Makefile b/x11/gnome/gdm/Makefile
index f5cb77a74c5..8229c4a907e 100644
--- a/x11/gnome/gdm/Makefile
+++ b/x11/gnome/gdm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/12/10 20:36:43 marcm Exp $
+# $OpenBSD: Makefile,v 1.7 2004/12/15 13:57:56 alek Exp $
 
 
 COMMENT=		"GNOME display manager"
@@ -15,6 +15,15 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft \
+		Xinerama Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 bz2 c crypto esd fontconfig \
+		freetype gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \
+		glade-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 \
+		gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0.0.0 gsf-1 \
+		gthread-2.0.0.0 gtk-x11-2.0.0.0 iconv intl jpeg m \
+		pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 \
+		pangoxft-1.0.0.0 popt pthread ssl util xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gdm/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/gedit/Makefile b/x11/gnome/gedit/Makefile
index 366acb208bd..eed19b55c93 100644
--- a/x11/gnome/gedit/Makefile
+++ b/x11/gnome/gedit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2004/12/10 20:36:43 marcm Exp $
+# $OpenBSD: Makefile,v 1.6 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"Lightweight GNOME text editor"
 DISTNAME=		gedit-2.8.2
@@ -13,6 +13,15 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft \
+		Xinerama Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 c crypto esd fontconfig \
+		freetype gailutil gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \
+		glade-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 \
+		gnome-keyring gnomecanvas-2 gnomeprint-2-2 gnomevfs-2 \
+		gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg m \
+		pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 \
+		pangoxft-1.0.0.0 popt pthread ssl stdc++ xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.8/}	
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/ggv/Makefile b/x11/gnome/ggv/Makefile
index c195af3b4eb..43f12141928 100644
--- a/x11/gnome/ggv/Makefile
+++ b/x11/gnome/ggv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2004/12/10 20:36:43 marcm Exp $
+# $OpenBSD: Makefile,v 1.5 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"GNOME frontend for GhostScript"
 DISTNAME=		ggv-2.8.1
@@ -13,6 +13,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft \
+		Xinerama Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 c crypto esd fontconfig \
+		freetype gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 gnome-keyring \
+		gnomecanvas-2 gnomevfs-2 gobject-2.0.0.0 gthread-2.0.0.0 \
+		gtk-x11-2.0.0.0 jpeg m pango-1.0.0.0 pangoft2-1.0.0.0 \
+		pangox-1.0.0.0 pangoxft-1.0.0.0 popt pthread ssl xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/2.8/}	
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/keyring/Makefile b/x11/gnome/keyring/Makefile
index 5a6f6342b77..b5e447a892a 100644
--- a/x11/gnome/keyring/Makefile
+++ b/x11/gnome/keyring/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/12/10 20:36:43 marcm Exp $
+# $OpenBSD: Makefile,v 1.4 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"password agent for the GNOME project"
 
@@ -14,6 +14,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xcursor Xext Xft Xinerama Xrender atk-1.0.0.0 c \
+			fontconfig freetype glib-2.0.0.0 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
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-keyring/0.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/libbonobo/Makefile b/x11/gnome/libbonobo/Makefile
index bdb33e60917..2f4c8aa2521 100644
--- a/x11/gnome/libbonobo/Makefile
+++ b/x11/gnome/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/12/10 20:36:43 marcm Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"GNOME component and compound document system" 
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
+			gthread-2.0.0.0 m popt pthread z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/libbonoboui/Makefile b/x11/gnome/libbonoboui/Makefile
index 007c65b7d42..b86e461ec63 100644
--- a/x11/gnome/libbonoboui/Makefile
+++ b/x11/gnome/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/12/10 20:36:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"user interface components for bonobo"
 
@@ -14,6 +14,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft \
+		Xinerama Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation c crypto esd fontconfig freetype gconf-2 \
+		gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gnomevfs-2 gobject-2.0.0.0 \
+		gthread-2.0.0.0 gtk-x11-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 pthread ssl \
+		xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonoboui/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/libgnome/Makefile b/x11/gnome/libgnome/Makefile
index eacb7d50a01..7c8fa8cd5a0 100644
--- a/x11/gnome/libgnome/Makefile
+++ b/x11/gnome/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2004/12/10 20:36:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.10 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"libraries for the GNOME project"
 
@@ -14,6 +14,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ORBit-2 ORBitCosNaming-2 bonobo-2 bonobo-activation c \
+			crypto gconf-2 glib-2.0.0.0 gmodule-2.0.0.0 \
+			gobject-2.0.0.0 gthread-2.0.0.0 m popt pthread ssl \
+			xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnome/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/libgnomecanvas/Makefile b/x11/gnome/libgnomecanvas/Makefile
index 4bb4c111b34..95675614cfb 100644
--- a/x11/gnome/libgnomecanvas/Makefile
+++ b/x11/gnome/libgnomecanvas/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2004/12/10 20:36:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.9 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"graphics library for GNOME"
 
@@ -16,6 +16,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 Xcursor Xext Xft Xinerama Xrender atk-1.0.0.0 \
+			fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
+			gobject-2.0.0.0 m pango-1.0.0.0 pangox-1.0.0.0 \
+			pangoxft-1.0.0.0 xml2 z
 
 MODULES=		devel/gettext
 
diff --git a/x11/gnome/libgnomeprint/Makefile b/x11/gnome/libgnomeprint/Makefile
index 173570fab7b..2da4d5d4800 100644
--- a/x11/gnome/libgnomeprint/Makefile
+++ b/x11/gnome/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2004/12/10 20:36:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.9 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"printing framework for GNOME"
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		X11 fontconfig freetype m pangoft2-1.0.0.0 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeprint/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/libgnomeprintui/Makefile b/x11/gnome/libgnomeprintui/Makefile
index de8f3b30cca..9c03180dff3 100644
--- a/x11/gnome/libgnomeprintui/Makefile
+++ b/x11/gnome/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2004/12/10 20:36:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"user interface components for libgnomeprint"
 
@@ -14,6 +14,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	X11 Xcursor Xext Xft Xinerama Xrender art_lgpl_2 atk-1.0.0.0 \
+		fontconfig freetype gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 gtk-x11-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 \
+		xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/libgnomeui/Makefile b/x11/gnome/libgnomeui/Makefile
index 76105d6a090..4feeaf24038 100644
--- a/x11/gnome/libgnomeui/Makefile
+++ b/x11/gnome/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2004/12/10 20:36:45 marcm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"user interface components for GNOME"
 
@@ -14,6 +14,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft Xinerama \
+		Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation c crypto esd fontconfig freetype gconf-2 \
+		gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 \
+		gmodule-2.0.0.0 gnome-2 gnomecanvas-2 gnomevfs-2 \
+		gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg m \
+		pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
+		popt pthread ssl xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeui/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/libgtkhtml/Makefile b/x11/gnome/libgtkhtml/Makefile
index 20daf993ad8..248432ed44b 100644
--- a/x11/gnome/libgtkhtml/Makefile
+++ b/x11/gnome/libgtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/06/23 03:26:17 marcm Exp $
+# $OpenBSD: Makefile,v 1.7 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"lightweight HTML rendering/printing/editing engine"
 
@@ -14,6 +14,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	X11 Xcursor Xext Xft Xinerama Xrender art_lgpl_2 atk-1.0.0.0 \
+		fontconfig freetype gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gnomecanvas-2 gobject-2.0.0.0 \
+		gtk-x11-2.0.0.0 iconv intl m pango-1.0.0.0 pangoft2-1.0.0.0 \
+		pangox-1.0.0.0 pangoxft-1.0.0.0 xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/librsvg/Makefile b/x11/gnome/librsvg/Makefile
index 19735b993c0..0dece8bfc2a 100644
--- a/x11/gnome/librsvg/Makefile
+++ b/x11/gnome/librsvg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/12/10 20:36:45 marcm Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"SAX-based render library for SVG files"
 
@@ -16,6 +16,12 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ORBit-2 ORBitCosNaming-2 X11 Xcursor Xext Xft Xinerama Xrender \
+		atk-1.0.0.0 bonobo-2 bonobo-activation c crypto fontconfig \
+		freetype gconf-2 glib-2.0.0.0 gmodule-2.0.0.0 gnomevfs-2 \
+		gobject-2.0.0.0 gthread-2.0.0.0 iconv intl m pango-1.0.0.0 \
+		pangox-1.0.0.0 pangoxft-1.0.0.0 pthread ssl z gnomecanvas-2 \
+		gnomeprint-2-2 gnomeprintui-2-2
 
 BUILD_DEPENDS= 		:pkgconfig-*:devel/pkgconfig
 LIB_DEPENDS=		art_lgpl_2.5::graphics/libart \
diff --git a/x11/gnome/libs/Makefile b/x11/gnome/libs/Makefile
index d8e945c9988..a4c8dc97eee 100644
--- a/x11/gnome/libs/Makefile
+++ b/x11/gnome/libs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2004/11/09 22:56:43 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"libraries for the GNOME project"
 
@@ -26,6 +26,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xext Xi Xpm audiofile c glib gmodule gtk \
+			iconv intl jpeg m png tiff ungif util wrap z
 
 USE_X11=		Yes
 USE_GMAKE=		Yes
diff --git a/x11/gnome/libxklavier/Makefile b/x11/gnome/libxklavier/Makefile
index d953dcb784d..345302b7808 100644
--- a/x11/gnome/libxklavier/Makefile
+++ b/x11/gnome/libxklavier/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2004/12/10 20:36:45 marcm Exp $
+# $OpenBSD: Makefile,v 1.3 2004/12/15 13:57:56 alek Exp $
 
 COMMENT=		"utility library for XKB"
 
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		iconv m xkbfile z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libxklavier/1.04/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/metacity/Makefile b/x11/gnome/metacity/Makefile
index f1c78d38ead..f55fa346c8c 100644
--- a/x11/gnome/metacity/Makefile
+++ b/x11/gnome/metacity/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/12/14 01:14:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"Boring window manager for the adult in you."
 
@@ -14,6 +14,12 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 SM X11 Xcursor Xext Xft Xinerama Xrandr Xrender \
+		atk-1.0.0.0 c fontconfig freetype gdk-x11-2.0.0.0 \
+		gdk_pixbuf-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \
+		gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-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 \
+		popt pthread
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/metacity/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/nautilus/Makefile b/x11/gnome/nautilus/Makefile
index 15cbfc83dff..5ff0bce5a5e 100644
--- a/x11/gnome/nautilus/Makefile
+++ b/x11/gnome/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2004/12/14 01:14:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.13 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"GNOME shell and file manager"
 
@@ -16,6 +16,16 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft Xinerama \
+		Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 bz2 c cdda_interface \
+		cdda_paranoia crypto esd fontconfig freetype gailutil gconf-2 \
+		gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 \
+		gmodule-2.0.0.0 gnome-2 gnome-keyring gnomecanvas-2 gnomeui-2 \
+		gnomevfs-2 gobject-2.0.0.0 gsf-1 gthread-2.0.0.0 \
+		gtk-x11-2.0.0.0 jpeg m pango-1.0.0.0 pangoft2-1.0.0.0 \
+		pangox-1.0.0.0 pangoxft-1.0.0.0 popt pthread ssl \
+		startup-notification-1 xml2 z
 
 MODULES=		devel/gettext
 
diff --git a/x11/gnome/oaf/Makefile b/x11/gnome/oaf/Makefile
index de0633c636a..e14ce6911bc 100644
--- a/x11/gnome/oaf/Makefile
+++ b/x11/gnome/oaf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2003/06/21 02:05:58 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.15 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"Object Activation Framework for GNOME"
 
@@ -20,6 +20,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c glib gmodule iconv intl m wrap z
 
 USE_X11=		Yes
 CONFIGURE_STYLE= 	gnu
diff --git a/x11/gnome/panel/Makefile b/x11/gnome/panel/Makefile
index f4cf180e04d..59c899e80cf 100644
--- a/x11/gnome/panel/Makefile
+++ b/x11/gnome/panel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2004/12/14 01:14:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"GNOME panel"
 
@@ -16,6 +16,15 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 XRes Xcursor Xext Xft \
+		Xinerama Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 c crypto esd fontconfig freetype \
+		gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 gnome-keyring \
+		gnomecanvas-2 gnomeui-2 gnomevfs-2 gobject-2.0.0.0 \
+		gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg m pango-1.0.0.0 \
+		pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 png popt \
+		pthread ssl startup-notification-1 xml2 z
 
 MODULES=		devel/gettext
 
diff --git a/x11/gnome/print/Makefile b/x11/gnome/print/Makefile
index 6ded9d7e985..d7c5b961745 100644
--- a/x11/gnome/print/Makefile
+++ b/x11/gnome/print/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2003/01/21 03:56:12 brad Exp $
+# $OpenBSD: Makefile,v 1.5 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"printing framework for GNOME"
 
@@ -27,6 +27,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ICE SM X11 Xext Xi audiofile c esd freetype gdk \
+			gdk_imlib glib gmodule gtk iconv intl jpeg m png tiff \
+			ungif z
 
 SEPARATE_BUILD=		concurrent
 USE_X11=		Yes
diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile
index a70f61a836f..dc80d68cf41 100644
--- a/x11/gnome/session/Makefile
+++ b/x11/gnome/session/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2004/12/10 20:36:46 marcm Exp $
+# $OpenBSD: Makefile,v 1.13 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"GNOME session"
 
@@ -16,6 +16,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft Xinerama \
+		Xmu Xrender Xt art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 c crypto esd fontconfig freetype \
+		gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glib-2.0.0.0 \
+		gmodule-2.0.0.0 gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 \
+		gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg m \
+		pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
+		popt pthread ssl wrap xml2 z
 
 MODULES=		devel/gettext
 
diff --git a/x11/gnome/terminal/Makefile b/x11/gnome/terminal/Makefile
index f8b919f2708..7fa7ab0ac58 100644
--- a/x11/gnome/terminal/Makefile
+++ b/x11/gnome/terminal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2004/12/14 01:14:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"GNOME terminal"
 
@@ -14,6 +14,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft Xinerama \
+		Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 c crypto esd fontconfig freetype \
+		gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 gnome-keyring \
+		gnomecanvas-2 gnomevfs-2 gobject-2.0.0.0 gthread-2.0.0.0 \
+		gtk-x11-2.0.0.0 jpeg m ncurses pango-1.0.0.0 pangoft2-1.0.0.0 \
+		pangox-1.0.0.0 pangoxft-1.0.0.0 popt pthread ssl xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/themes/Makefile b/x11/gnome/themes/Makefile
index af0d2402c11..c22584996ab 100644
--- a/x11/gnome/themes/Makefile
+++ b/x11/gnome/themes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/12/14 04:52:41 marcm Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"themes collection for GNOME"
 
@@ -16,6 +16,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	X11 Xcursor Xext Xft Xinerama Xrender atk-1.0.0.0 fontconfig \
+		freetype gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glib-2.0.0.0 \
+		gmodule-2.0.0.0 gobject-2.0.0.0 gtk-x11-2.0.0.0 m \
+		pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0
 
 MODULES=		devel/gettext
 
diff --git a/x11/gnome/utils/Makefile b/x11/gnome/utils/Makefile
index 5b8bf873897..89f876f24f4 100644
--- a/x11/gnome/utils/Makefile
+++ b/x11/gnome/utils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2004/12/10 20:36:46 marcm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"GNOME utility programs"
 
@@ -14,6 +14,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 SM X11 Xcursor Xext Xft Xinerama Xrender \
+		art_lgpl_2 atk-1.0.0.0 bonobo-2 bonobo-activation bonoboui-2 c \
+		fontconfig freetype gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 gnome-desktop-2 \
+		gnomecanvas-2 gnomevfs-2 gobject-2.0.0.0 gthread-2.0.0.0 \
+		gtk-x11-2.0.0.0 iconv intl m pango-1.0.0.0 pangoft2-1.0.0.0 \
+		pangox-1.0.0.0 pangoxft-1.0.0.0 popt pthread \
+		startup-notification-1 xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/vfs/Makefile b/x11/gnome/vfs/Makefile
index a8daf93d42f..e2ae96b12f8 100644
--- a/x11/gnome/vfs/Makefile
+++ b/x11/gnome/vfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2002/12/01 19:59:31 marcm Exp $
+# $OpenBSD: Makefile,v 1.18 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"GNOME Virtual File System"
 
@@ -26,6 +26,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		IIOP ORBit ORBitCosNaming ORBitutil X11 Xext Xi gdk \
+			glib gmodule gtk iconv intl m oaf pthread wrap z
 
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
diff --git a/x11/gnome/vfs2/Makefile b/x11/gnome/vfs2/Makefile
index 4e5e19ca47e..a00afddc60c 100644
--- a/x11/gnome/vfs2/Makefile
+++ b/x11/gnome/vfs2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2004/12/14 01:14:44 marcm Exp $
+# $OpenBSD: Makefile,v 1.14 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"GNOME Virtual File System"
 
@@ -30,6 +30,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		ORBit-2 ORBitCosNaming-2 glib-2.0.0.0 \
+			gmodule-2.0.0.0 gobject-2.0.0.0 gthread-2.0.0.0 popt \
+			xml2 c crypto m pthread ssl z
 
 USE_X11=		Yes
 USE_GMAKE=		Yes
diff --git a/x11/gnome/yelp/Makefile b/x11/gnome/yelp/Makefile
index 3d108f9ce8c..6125b81cdf0 100644
--- a/x11/gnome/yelp/Makefile
+++ b/x11/gnome/yelp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/12/14 01:14:45 marcm Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"GNOME help browser"
 
@@ -14,6 +14,15 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcursor Xext Xft Xinerama \
+		Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 bz2 c crypto esd fontconfig \
+		freetype gailutil gconf-2 gcrypt gdk-x11-2.0.0.0 \
+		gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \
+		gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0.0.0 \
+		gpg-error gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg m pango-1.0.0.0 \
+		pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 popt pthread \
+		ssl xml2 xslt z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome/zenity/Makefile b/x11/gnome/zenity/Makefile
index bced428a974..4f986a5067b 100644
--- a/x11/gnome/zenity/Makefile
+++ b/x11/gnome/zenity/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/12/10 20:36:47 marcm Exp $
+# $OpenBSD: Makefile,v 1.4 2004/12/15 13:57:57 alek Exp $
 
 COMMENT=		"dialogs for Gnome"
 
@@ -14,6 +14,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=	ICE SM X11 Xcursor Xext Xft Xinerama Xrender art_lgpl_2 \
+		atk-1.0.0.0 c fontconfig freetype gdk-x11-2.0.0.0 \
+		gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \
+		gobject-2.0.0.0 gtk-x11-2.0.0.0 iconv intl m pango-1.0.0.0 \
+		pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 popt xml2 z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/zenity/2.8/}
 EXTRACT_SUFX=		.tar.bz2