diff -ruN --exclude=CVS gnome2.orig/Makefile gnome2/Makefile
--- gnome2.orig/Makefile	Mon Feb  6 21:12:39 2006
+++ gnome2/Makefile	Mon Feb  6 21:11:36 2006
@@ -17,51 +17,21 @@
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	The "meta-port" for the GNOME 2 integrated X11 desktop
 
-RUN_DEPENDS?=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
-		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
-	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
-		eog:${PORTSDIR}/graphics/eog \
-		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
-		gnect:${PORTSDIR}/games/gnomegames2 \
-		gedit:${PORTSDIR}/editors/gedit \
-		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
-		gnome-session:${PORTSDIR}/x11/gnomesession \
-		bug-buddy:${PORTSDIR}/devel/bugbuddy \
-		gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \
-		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
-		yelp:${PORTSDIR}/x11/yelp \
-		${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
-		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \
-		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \
-		${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
-		file-roller:${PORTSDIR}/archivers/fileroller \
-		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
-		gok:${PORTSDIR}/accessibility/gok \
-		nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \
-		gcalctool:${PORTSDIR}/math/gcalctool \
-		gucharmap:${PORTSDIR}/deskutils/gucharmap \
-		zenity:${PORTSDIR}/x11/zenity \
-		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		gnopernicus:${PORTSDIR}/accessibility/gnopernicus \
-		${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \
-		dasher:${PORTSDIR}/accessibility/dasher \
-		evolution-2.6:${PORTSDIR}/mail/evolution \
-		${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
-		network-admin:${PORTSDIR}/sysutils/gnomesystemtools \
-		gnome-nettool:${PORTSDIR}/net/gnomenettool \
-		vino-session:${PORTSDIR}/net/vino \
-		ximian-connector-setup-2.6:${PORTSDIR}/mail/evolution-exchange \
-		${X11BASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
-		${X11BASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
-		totem:${PORTSDIR}/multimedia/totem-gstreamer \
-		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
-		${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
-		sound-juicer:${PORTSDIR}/audio/sound-juicer \
-		gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \
-		${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
-		evince:${PORTSDIR}/graphics/evince \
-		${X11BASE}/libexec/fast-user-switch-applet:${PORTSDIR}/x11/fast-user-switch-applet \
-		${X11BASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet
+
+#GNOME_DEPENDS?=	gnomeapplets2 gnomemedia2 gnomeutils2 eog gconf-editor \
+#		gnomegames2 gedit gnometerminal gnomesession bugbuddy \
+#		gnomesystemmonitor nautilus2 yelp gdm gnomeuserdocs2 \
+#		gnomeaudio2 libgail-gnome fileroller gnome-themes gok \
+#		nautilus-cd-burner gcalctool gucharmap zenity bitstream-vera \
+#		gnopernicus gnomenetstatus dasher evolution evolution-webcal \
+#		gnomesystemtools gnomenettool vino evolution-exchange \
+#		gstreamer-plugins-core gstreamer-plugins-gconf totem-gstreamer \
+#		gnomecontrolcenter2 gnome-backgrounds sound-juicer gnomekeyringmanager \
+#		libgtkhtml evince fast-user-switch-applet deskbar-applet
+
+GNOME_DEPENDS?=	gnomeapplets2 gnomemedia2
+gnomeapplets2_DEPENDS=	x11/gnomeapplets2
+gnomemedia2_DEPENDS=	audio/gnomemedia2
 
 NO_BUILD=	yes
 
@@ -84,16 +54,23 @@
 
 .if !defined(GNOME_SLAVE)
 .if ${ARCH} == "i386" || ${OSVERSION} > 500035
-RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
+#GNOME_DEPENDS+=	epiphany
 .endif
 .endif
 
 .if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
 .if defined(WITH_XSCREENSAVER)
-RUN_DEPENDS+=	${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+#GNOME_DEPENDS+=	xscreensaver-gnome
 .else
-RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
+#GNOME_DEPENDS+=	gnome-screensaver
 .endif
 .endif
 
+_update-gnome-versions:
+	${MV} Makefile.versions Makefile.versions.bak
+.for depend in ${GNOME_DEPENDS}
+	cd ${PORTSDIR}/${${depend}_DEPENDS} && \
+		${ECHO_CMD} "RUN_DEPENDS+=${depend}>="`${MAKE} -V PORTVERSION`":${PORTSDIR}/${${depend}_DEPENDS}" >> ${.CURDIR}/Makefile.versions
+.endfor
+.include "${.CURDIR}/Makefile.versions"
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS gnome2.orig/Makefile.versions gnome2/Makefile.versions
--- gnome2.orig/Makefile.versions	Wed Dec 31 19:00:00 1969
+++ gnome2/Makefile.versions	Mon Feb  6 21:11:39 2006
@@ -0,0 +1,2 @@
+RUN_DEPENDS+=gnomeapplets2>=2.13.3:/usr/ports/x11/gnomeapplets2
+RUN_DEPENDS+=gnomemedia2>=2.13.91:/usr/ports/audio/gnomemedia2