Update to 2.18.1. Some entries are still commented out (like before).

1 files changed, 46 insertions, 45 deletions

diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 07cd45a5f0c..8e8749ae550 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2007/04/11 22:46:00 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2007/04/15 11:27:44 wiz Exp $
 
-DISTNAME=	gnome-2.16.0
-PKGREVISION=	1
+DISTNAME=	gnome-2.18.1
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,6 +9,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Meta-package for the GNU Network Object Model Environment
 
+.include "../../lang/python/pyversion.mk"
+
 # The dependencies listed here are in an order such as a package in a line
 # can be installed if all the packages listed above it are installed.
 #
@@ -20,51 +21,51 @@ COMMENT=	Meta-package for the GNU Network Object Model Environment
 #
 # Packages commented out are either because they are just build time
 # dependencies or because they are not yet ready to be enabled.
-DEPENDS+=	gnome-base>=2.16.0:../../meta-pkgs/gnome-base
-DEPENDS+=	at-spi>=1.7.11:../../devel/at-spi
+DEPENDS+=	gnome-base>=2.18.1:../../meta-pkgs/gnome-base
+DEPENDS+=	at-spi>=1.18.1:../../devel/at-spi
 DEPENDS+=	libgail-gnome>=1.1.3:../../devel/libgail-gnome
-DEPENDS+=	gtksourceview>=1.8.0:../../x11/gtksourceview
-DEPENDS+=	zenity>=2.16.0:../../x11/zenity
-DEPENDS+=	gdm>=2.16.0:../../x11/gdm
-DEPENDS+=	gnome-screensaver>=2.16.0:../../x11/gnome-screensaver
-DEPENDS+=	fast-user-switch-applet>=2.16.0:../../x11/fast-user-switch-applet
-DEPENDS+=	epiphany>=2.16.0:../../www/epiphany
-DEPENDS+=	yelp>=2.16.0:../../misc/yelp
-DEPENDS+=	bug-buddy>=2.16.0:../../net/bug-buddy
-DEPENDS+=	gnome-speech>=0.4.5:../../audio/gnome-speech
-DEPENDS+=	dasher>=4.2.0:../../editors/dasher
-DEPENDS+=	eog>=2.16.0.1:../../graphics/eog2
-DEPENDS+=	file-roller>=2.16.0:../../archivers/file-roller
-DEPENDS+=	gcalctool>=5.8.24:../../math/gcalctool
-DEPENDS+=	gconf-editor>=2.16.0:../../editors/gconf-editor
-DEPENDS+=	gedit>=2.16.0:../../editors/gedit
-DEPENDS+=	evince>=0.6.0:../../print/evince
-DEPENDS+=	gok>=1.2.0:../../misc/gok
-DEPENDS+=	gnome-mag>=0.13.1:../../x11/gnome-mag
-DEPENDS+=	gnome-games>=2.15.92:../../games/gnome2-games
-#DEPENDS+=	nautilus-cd-burner>=2.16.0:../../sysutils/nautilus-cd-burner
-DEPENDS+=	gnome-media>=2.16.1:../../multimedia/gnome2-media
-DEPENDS+=	gnome-netstatus>=2.12.0:../../net/gnome-netstatus
-DEPENDS+=	gnome2-system-monitor>=2.15.92:../../sysutils/gnome2-system-monitor
-DEPENDS+=	gnome-utils>=2.16.0:../../misc/gnome2-utils
-DEPENDS+=	gnome-user-docs>=2.16.0:../../misc/gnome-user-docs
-DEPENDS+=	vino>=2.13.5:../../net/vino
-DEPENDS+=	{totem>=2.16.0,totem-xine>=2.16.0}:../../multimedia/totem
-DEPENDS+=	gnome-keyring-manager>=2.16.0:../../security/gnome-keyring-manager
-DEPENDS+=	deskbar-applet>=2.16.0:../../misc/deskbar-applet
-DEPENDS+=	evolution-webcal>=2.8.0:../../time/evolution-webcal
-DEPENDS+=	evolution>=2.8.0:../../mail/evolution
-DEPENDS+=	evolution-exchange>=2.8.0:../../mail/evolution-exchange
-#DEPENDS+=	gnome-nettool>=2.15.92:../../net/gnome-nettool
-#DEPENDS+=	system-tools-backends>=1.4.2:../../sysutils/system-tools-backends
-#DEPENDS+=	gnome-system-tools>=2.14.0:../../sysutils/gnome-system-tools
-#DEPENDS+=	gnome-volume-manager>=2.15.0:../../sysutils/gnome-volume-manager
-#DEPENDS+=	sound-juicer>=2.16.0:../../audio/sound-juicer
-#DEPENDS+=	ekiga-2.0.3:../../net/ekiga
-#DEPENDS+=	gnome-python-desktop>=2.16.0
+DEPENDS+=	gtksourceview>=1.8.5:../../x11/gtksourceview
+DEPENDS+=	zenity>=2.18.1:../../x11/zenity
+DEPENDS+=	gdm>=2.18.1:../../x11/gdm
+DEPENDS+=	gnome-screensaver>=2.18.1:../../x11/gnome-screensaver
+DEPENDS+=	fast-user-switch-applet>=2.18.0:../../x11/fast-user-switch-applet
+DEPENDS+=	epiphany>=2.18.1:../../www/epiphany
+DEPENDS+=	yelp>=2.18.1:../../misc/yelp
+DEPENDS+=	bug-buddy>=2.18.1:../../net/bug-buddy
+DEPENDS+=	gnome-speech>=0.4.11:../../audio/gnome-speech
+DEPENDS+=	dasher>=4.4.1:../../editors/dasher
+DEPENDS+=	eog>=2.18.1:../../graphics/eog2
+DEPENDS+=	file-roller>=2.18.1:../../archivers/file-roller
+DEPENDS+=	gcalctool>=5.9.14:../../math/gcalctool
+DEPENDS+=	gconf-editor>=2.18.0:../../editors/gconf-editor
+DEPENDS+=	gedit>=2.18.1:../../editors/gedit
+DEPENDS+=	evince>=0.8.1:../../print/evince
+DEPENDS+=	gok>=1.2.3:../../misc/gok
+DEPENDS+=	gnome-mag>=0.14.3:../../x11/gnome-mag
+DEPENDS+=	gnome-games>=2.18.1:../../games/gnome2-games
+#DEPENDS+=	nautilus-cd-burner>=2.18.0:../../sysutils/nautilus-cd-burner
+DEPENDS+=	gnome-media>=2.18.0:../../multimedia/gnome2-media
+DEPENDS+=	gnome-netstatus>=2.12.1:../../net/gnome-netstatus
+DEPENDS+=	gnome2-system-monitor>=2.18.1.1:../../sysutils/gnome2-system-monitor
+DEPENDS+=	gnome-utils>=2.18.0:../../misc/gnome2-utils
+DEPENDS+=	gnome-user-docs>=2.18.1:../../misc/gnome-user-docs
+DEPENDS+=	vino>=2.18.1:../../net/vino
+DEPENDS+=	{totem>=2.18.1,totem-xine>=2.18.1}:../../multimedia/totem
+DEPENDS+=	gnome-keyring-manager>=2.18.0:../../security/gnome-keyring-manager
+DEPENDS+=	deskbar-applet>=2.18.1:../../misc/deskbar-applet
+DEPENDS+=	evolution-webcal>=2.10.0:../../time/evolution-webcal
+DEPENDS+=	evolution>=2.10.1:../../mail/evolution
+DEPENDS+=	evolution-exchange>=2.10.1:../../mail/evolution-exchange
+#DEPENDS+=	gnome-nettool>=2.18.0:../../net/gnome-nettool
+#DEPENDS+=	system-tools-backends>=2.2.1:../../sysutils/system-tools-backends
+#DEPENDS+=	gnome-system-tools>=2.18.1:../../sysutils/gnome-system-tools
+#DEPENDS+=	gnome-volume-manager>=2.17.0:../../sysutils/gnome-volume-manager
+#DEPENDS+=	sound-juicer>=2.16.3:../../audio/sound-juicer
+#DEPENDS+=	ekiga>=2.0.9:../../net/ekiga
+DEPENDS+=	${PYPKGPREFIX}-gnome-desktop>=2.18.0:../../x11/py-gnome2-desktop
 #DEPENDS+=	gnome-power-manager-2.16.0.tar.bz2
 #DEPENDS+=	gnome-sharp-2.16.0.tar.bz2
-#DEPENDS+=	gnome-vfs-monikers-2.15.3.tar.bz2
+DEPENDS+=	gnome-vfs-monikers>=2.15.3:../../sysutils/gnome-vfs-monikers
 #DEPENDS+=	orca-1.0.0.tar.bz2
 #DEPENDS+=	tomboy-0.4.0.tar.bz2