Welcome to GNOME 2.8.0!

I've left some dependencies commented out in the meta-pkgs meaning that
those packages are part of the standard GNOME Desktop but I haven't had
time to package them.  If you import one of those packages, please enable
the corresponding line (though keep the same version number listed).

4 files changed, 128 insertions, 47 deletions

diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index 425e752abc7..8196ef23dfe 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/06/28 19:36:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/09/21 17:26:35 jmmv Exp $
 
-DISTNAME=	gnome-base-2.6.2
+DISTNAME=	gnome-base-2.8.0
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,17 +9,74 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Meta-package for basic components of the GNOME desktop
 
-DEPENDS+=	gdm>=2.6.0.3:../../x11/gdm
-DEPENDS+=	gnome-icon-theme>=1.2.3:../../graphics/gnome-icon-theme
-DEPENDS+=	gnome-panel>=2.6.2:../../x11/gnome-panel
-DEPENDS+=	gnome-session>=2.6.2:../../x11/gnome-session
-DEPENDS+=	gnome2-control-center>=2.6.1nb1:../../x11/gnome2-control-center
-DEPENDS+=	gnome2-terminal>=2.6.1:../../x11/gnome2-terminal
-DEPENDS+=	gnome-vfs2>=2.6.1.1:../../sysutils/gnome-vfs2
-DEPENDS+=	metacity>=2.8.1:../../wm/metacity
-DEPENDS+=	nautilus>=2.6.3:../../sysutils/nautilus
+# 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.
+#
+# Keep this order as it helps in updating the whole GNOME Desktop to a
+# newer version.  Note that the list includes all the packages listed as
+# part of either the GNOME Desktop and the GNOME Platform; nothing else
+# should be included here.
+#
+# Packages commented out are either because they are just build time
+# dependencies or because they are not yet ready to be enabled.
+#DEPENDS+=	pkgconfig>=0.15.0:../../devel/pkgconfig
+#DEPENDS+=	intltool-0.31.2>=0.31.2:../../textproc/intltool
+DEPENDS+=	startup-notification>=0.7:../../x11/startup-notification
+DEPENDS+=	glib2>=2.4.6:../../devel/glib2
+DEPENDS+=	atk>=1.8.0:../../devel/atk
+DEPENDS+=	pango>=1.6.0:../../devel/pango
+DEPENDS+=	gtk2+>=2.4.9:../../x11/gtk2
+DEPENDS+=	libIDL>=0.8.4:../../net/libIDL
+DEPENDS+=	ORBit2>=2.12.0:../../net/ORBit2
+DEPENDS+=	libxml2>=2.6.13:../../textproc/libxml2
+DEPENDS+=	libxslt>=1.1.10:../../textproc/libxslt
+DEPENDS+=	GConf2>=2.8.0.1:../../devel/GConf2
+DEPENDS+=	GConf2-ui>=2.8.0.1:../../devel/GConf2-ui
+DEPENDS+=	libbonobo>=2.8.0:../../devel/libbonobo
+DEPENDS+=	gnome-mime-data>=2.4.1:../../databases/gnome-mime-data
+DEPENDS+=	libaudiofile>=0.2.6:../../audio/libaudiofile
+DEPENDS+=	esound>=0.2.34:../../audio/esound
+DEPENDS+=	gnome-vfs2>=2.8.0:../../sysutils/gnome-vfs2
+DEPENDS+=	gnome-vfs2-cdda>=2.8.0:../../audio/gnome-vfs2-cdda
+DEPENDS+=	gnome-vfs2-smb>=2.8.0:../../net/gnome-vfs2-smb
+DEPENDS+=	libgnome>=2.8.0:../../devel/libgnome
+DEPENDS+=	libglade2>=2.4.0:../../devel/libglade2
+DEPENDS+=	libart2>=2.3.16:../../graphics/libart2
+DEPENDS+=	libgnomecanvas>=2.8.0:../../graphics/libgnomecanvas
+DEPENDS+=	libbonoboui>=2.8.0:../../devel/libbonoboui
+DEPENDS+=	gnome-keyring>=0.4.0:../../security/gnome-keyring
+DEPENDS+=	libgnomeui>=2.8.0:../../devel/libgnomeui
+DEPENDS+=	gnome-icon-theme>=2.8.0:../../graphics/gnome-icon-theme
+DEPENDS+=	libgnomeprint>=2.8.0:../../print/libgnomeprint
+DEPENDS+=	libgnomeprintui>=2.8.0:../../print/libgnomeprintui
+DEPENDS+=	libgtop2>=2.8.0:../../sysutils/libgtop2
+DEPENDS+=	librsvg2>=2.8.1:../../graphics/librsvg2
+DEPENDS+=	librsvg2-gtk2>=2.8.1:../../graphics/librsvg2-gtk2
+DEPENDS+=	libxklavier>=1.02:../../x11/libxklavier
+DEPENDS+=	libgtkhtml>=2.6.2:../../www/libgtkhtml
+DEPENDS+=	libsoup-devel>=2.2.0:../../net/libsoup-devel
+DEPENDS+=	libwnck>=2.8.0:../../devel/libwnck
+DEPENDS+=	gail>=1.8.0:../../devel/gail
+DEPENDS+=	gtkhtml3>=3.2.1:../../www/gtkhtml3
+DEPENDS+=	gtk2-engines>=2.2.0:../../x11/gtk2-engines
+DEPENDS+=	scrollkeeper>=0.3.14:../../textproc/scrollkeeper
+DEPENDS+=	gnome2-pixmaps>=2.8.0:../../graphics/gnome2-pixmaps
+DEPENDS+=	gnome-desktop>=2.8.0:../../x11/gnome-desktop
+DEPENDS+=	eel2>=2.8.0:../../devel/eel2
+DEPENDS+=	nautilus>=2.8.0:../../sysutils/nautilus
+DEPENDS+=	metacity>=2.8.5:../../wm/metacity
+DEPENDS+=	gstreamer>=0.8.5:../../multimedia/gstreamer
+DEPENDS+=	gst-plugins>=0.8.4:../../multimedia/gst-plugins
+DEPENDS+=	gnome2-control-center>=2.8.0:../../x11/gnome2-control-center
+DEPENDS+=	evolution-data-server>=1.0.0:../../mail/evolution-data-server
+DEPENDS+=	gnome-panel>=2.8.0:../../x11/gnome-panel
+DEPENDS+=	gnome-applets>=2.8.0:../../x11/gnome2-applets
+DEPENDS+=	gnome-themes>=2.8.0:../../x11/gnome-themes
+DEPENDS+=	vte>=0.11.11:../../x11/vte
+DEPENDS+=	gnome2-terminal>=2.7.3:../../x11/gnome2-terminal
+DEPENDS+=	gnome-session>=2.8.0:../../x11/gnome-session
+# Not really part of GNOME, but we need it.
 DEPENDS+=	xscreensaver>=4.16:../../x11/xscreensaver
-DEPENDS+=	yelp>=2.6.1:../../misc/yelp
 
 USE_X11=	yes
 EXTRACT_ONLY=	# empty
diff --git a/meta-pkgs/gnome-devel/Makefile b/meta-pkgs/gnome-devel/Makefile
index de95de1ccb2..ffebb2b3720 100644
--- a/meta-pkgs/gnome-devel/Makefile
+++ b/meta-pkgs/gnome-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/06/28 19:36:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/09/21 17:26:35 jmmv Exp $
 
-DISTNAME=	gnome-devel-2.6.2
+DISTNAME=	gnome-devel-2.8.0
 CATEGORIES=	meta-pkgs devel gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/meta-pkgs/gnome-extras/Makefile b/meta-pkgs/gnome-extras/Makefile
index 29e796b649b..6d587848d31 100644
--- a/meta-pkgs/gnome-extras/Makefile
+++ b/meta-pkgs/gnome-extras/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2004/06/28 19:36:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/09/21 17:26:35 jmmv Exp $
 
-DISTNAME=	gnome-extras-2.6.2
+DISTNAME=	gnome-extras-2.8.0
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -12,20 +12,21 @@ COMMENT=	Meta-package for applications related to the GNOME desktop
 DEPENDS+=	abiword>=2.0.2:../../editors/abiword
 DEPENDS+=	balsa>=2.0.10:../../mail/balsa2
 DEPENDS+=	conglomerate>=0.7.12:../../editors/conglomerate
-DEPENDS+=	epiphany-extensions>=0.8.2:../../www/epiphany-extensions
+DEPENDS+=	epiphany-extensions>=1.4.0:../../www/epiphany-extensions
 DEPENDS+=	evolution>=1.4.6:../../mail/evolution
 DEPENDS+=	gaim>=0.77:../../chat/gaim
-DEPENDS+=	glade2>=2.0.0:../../devel/glade2
+DEPENDS+=	glade2>=2.6.0:../../devel/glade2
 DEPENDS+=	gnome>=2.6.2:../../meta-pkgs/gnome
 DEPENDS+=	gnome-audio>=2.0.0:../../audio/gnome-audio
 DEPENDS+=	gnome-themes-extras>=0.6:../../x11/gnome-themes-extras
 DEPENDS+=	gqview>=1.4.3:../../graphics/gqview
 DEPENDS+=	mergeant>=0.12.1:../../databases/mergeant
 DEPENDS+=	pan>=0.14.2:../../news/pan
-DEPENDS+=	rhythmbox>=0.8.5:../../audio/rhythmbox
+DEPENDS+=	rhythmbox>=0.8.6:../../audio/rhythmbox
 DEPENDS+=	seahorse>=0.7.3nb11:../../security/seahorse
 DEPENDS+=	xcdroast>=0.98a15:../../sysutils/xcdroast
 DEPENDS+=	xchat>=2.0.9:../../chat/xchat2
+#DEPENDS+=	gnome-games-extra-data-2.8.x
 
 USE_X11=	yes
 EXTRACT_ONLY=	# empty
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 280bf9bc263..b2b4a9f3b78 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2004/06/28 19:36:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2004/09/21 17:26:35 jmmv Exp $
 
-DISTNAME=	gnome-2.6.2
+DISTNAME=	gnome-2.8.0
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,33 +9,56 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Meta-package for the GNU Network Object Model Environment
 
-DEPENDS+=	bug-buddy>=2.6.1:../../net/bug-buddy
-DEPENDS+=	eog>=2.6.1:../../graphics/eog2
-DEPENDS+=	epiphany>=1.2.6:../../www/epiphany
-DEPENDS+=	file-roller>=2.6.1:../../archivers/file-roller
-DEPENDS+=	gcalctool>=4.3.51:../../math/gcalctool
-DEPENDS+=	gconf-editor>=2.6.2:../../editors/gconf-editor
-DEPENDS+=	gedit>=2.6.2:../../editors/gedit
-DEPENDS+=	ggv>=2.6.1:../../print/ggv2
-DEPENDS+=	gnome-accessibility>=2.6.2:../../meta-pkgs/gnome-accessibility
-DEPENDS+=	gnome-applets>=2.6.2:../../x11/gnome2-applets
-DEPENDS+=	gnome-base>=2.6.2:../../meta-pkgs/gnome-base
-DEPENDS+=	gnome-games>=2.6.2:../../games/gnome2-games
-DEPENDS+=	gnome-media>=2.6.2:../../multimedia/gnome2-media
-DEPENDS+=	gnome-netstatus>=2.6.2:../../net/gnome-netstatus
-DEPENDS+=	gnome-themes>=2.6.2:../../x11/gnome-themes
-DEPENDS+=	gnome2-user-docs>=2.6.0:../../misc/gnome2-user-docs
-DEPENDS+=	gnome2-system-monitor>=2.6.0:../../sysutils/gnome2-system-monitor
-DEPENDS+=	gnome-utils>=2.6.2:../../misc/gnome2-utils
-DEPENDS+=	gpdf>=0.132:../../print/gpdf
-DEPENDS+=	gstreamer>=0.8.3:../../multimedia/gstreamer
-DEPENDS+=	gst-plugins>=0.8.2:../../multimedia/gst-plugins
+# 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.
+#
+# Keep this order as it helps in updating the whole GNOME Desktop to a
+# newer version.  Note that the list includes all the packages listed as
+# part of either the GNOME Desktop and the GNOME Platform; nothing else
+# should be included here.
+#
+# 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.8.0:../../meta-pkgs/gnome-base
+DEPENDS+=	at-spi>=1.6.0:../../devel/at-spi
+DEPENDS+=	libgail-gnome>=1.1.0:../../devel/libgail-gnome
+#DEPENDS+=	gtk-doc>=1.2:../../textproc/gtk-doc
+DEPENDS+=	gtksourceview>=1.1.0:../../x11/gtksourceview
+DEPENDS+=	gdm>=2.6.0.5:../../x11/gdm
+DEPENDS+=	epiphany>=1.4.0:../../www/epiphany
+DEPENDS+=	yelp>=2.6.3:../../misc/yelp
+DEPENDS+=	zenity>=2.8.0:../../x11/zenity
+DEPENDS+=	bug-buddy>=2.8.0:../../net/bug-buddy
+DEPENDS+=	gnome-speech>=0.3.5:../../audio/gnome-speech
+DEPENDS+=	dasher>=3.2.11:../../editors/dasher
+DEPENDS+=	eog>=2.8.0:../../graphics/eog2
+DEPENDS+=	file-roller>=2.8.0:../../archivers/file-roller
+DEPENDS+=	gal2>=2.2.1:../../devel/gal2
+DEPENDS+=	gcalctool>=4.4.18:../../math/gcalctool
+DEPENDS+=	gconf-editor>=2.8.0:../../editors/gconf-editor
+DEPENDS+=	gedit>=2.8.0:../../editors/gedit
+DEPENDS+=	ggv>=2.8.0:../../print/ggv2
+DEPENDS+=	gok>=0.11.8:../../misc/gok
+DEPENDS+=	gnome-mag>=0.11.5:../../x11/gnome-mag
+DEPENDS+=	gnopernicus>=0.9.12:../../x11/gnopernicus
+DEPENDS+=	gpdf>=2.8.0:../../print/gpdf
 DEPENDS+=	gucharmap>=1.4.1:../../fonts/gucharmap
-DEPENDS+=	gtk2-extras>=2.4.0:../../meta-pkgs/gtk2-extras
-DEPENDS+=	nautilus-cd-burner>=2.6.1:../../sysutils/nautilus-cd-burner
-DEPENDS+=	nautilus-media>=0.8.0:../../multimedia/nautilus-media
-DEPENDS+=	vera-ttf>=1.10:../../fonts/vera-ttf
-DEPENDS+=	zenity>=2.6.2:../../x11/zenity
+DEPENDS+=	gnome-games>=2.8.0:../../games/gnome2-games
+DEPENDS+=	gnome-media>=2.8.0:../../multimedia/gnome2-media
+DEPENDS+=	gnome-netstatus>=2.8.0:../../net/gnome-netstatus
+DEPENDS+=	gnome2-system-monitor>=2.7.0:../../sysutils/gnome2-system-monitor
+DEPENDS+=	gnome-utils>=2.8.0:../../misc/gnome2-utils
+DEPENDS+=	gnome2-user-docs>=2.8.0:../../misc/gnome2-user-docs
+DEPENDS+=	nautilus-cd-burner>=2.8.0:../../sysutils/nautilus-cd-burner
+DEPENDS+=	nautilus-media>=0.8.1:../../multimedia/nautilus-media
+DEPENDS+=	evolution>=2.0.0:../../mail/evolution
+#DEPENDS+=	gnome-nettool>=0.99.3:../../net/gnome-nettool
+#DEPENDS+=	gnome-system-tools>=1.0.0:../../sysutils/gnome-system-tools
+#DEPENDS+=	gnome-volume-manager>=1.0.2:../../sysutils/gnome-volume-manager
+#DEPENDS+=	gnomemeeting>=1.0.2:../../net/gnomemeeting
+#DEPENDS+=	vino>=2.8.0:../../net/vino
+#DEPENDS+=	ximian-connector>=2.0.0:../../mail/ximian-connector
+#DEPENDS+=	evolution-webcal>=2.0.0:../../time/evolution-webcal
 
 USE_X11=	yes
 EXTRACT_ONLY=	# empty