Update to 2.4.1nb2 (really merge from the gnome2 meta-pkg).

2 files changed, 33 insertions, 29 deletions

diff --git a/meta-pkgs/gnome/DESCR b/meta-pkgs/gnome/DESCR
index 62b5c5659aa..d956c0543e4 100644
--- a/meta-pkgs/gnome/DESCR
+++ b/meta-pkgs/gnome/DESCR
@@ -3,3 +3,5 @@ GNOME is the GNU Network Object Model Environment.
 The GNOME project intends to build a complete, easy-to-use desktop
 environment for the user, and a powerful application framework for
 the software developer.
+
+This is a meta package for version 2 of the GNOME project.
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 09373d92cff..7cf4729e3ee 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2004/01/20 13:47:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 21:26:40 jmmv Exp $
 
-DISTNAME=	gnome-1.4.2.1
-PKGREVISION=	5
+DISTNAME=	gnome-2.4.1
+PKGREVISION=	2
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,31 +10,34 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Meta-package for the GNU Network Object Model Environment
 
-DEPENDS+=	gnome-core>=1.4.2:../../x11/gnome-core
-DEPENDS+=	ee>=0.3.12nb3:../../graphics/ee
-DEPENDS+=	gdm>=2.2.0nb2:../../x11/gdm1
-DEPENDS+=	ggv>=1.0.2nb5:../../print/ggv
-DEPENDS+=	glade>=0.6.2nb4:../../devel/glade
-DEPENDS+=	gmc>=4.5.51nb2:../../sysutils/gmc
-DEPENDS+=	gnome-applets>=1.4.0.4nb3:../../x11/gnome-applets
-DEPENDS+=	gnome-audio>=1.4.0:../../audio/gnome-audio
-DEPENDS+=	gnome-chess>=0.3.3nb4:../../games/gnome-chess
-DEPENDS+=	gnome-games>1.4.0:../../games/gnome-games
-DEPENDS+=	gnome-media>=1.2.3nb3:../../audio/gnome-media
-DEPENDS+=	gnome-pim>=1.4.6:../../misc/gnome-pim
-DEPENDS+=	gnome-users-guide>=1.2:../../x11/gnome-users-guide
-DEPENDS+=	gnome-utils>=1.4.1.2:../../misc/gnome-utils
-DEPENDS+=	evolution>=1.2.1:../../mail/evolution12
-.if exists(/usr/include/wctype.h)
-DEPENDS+=	gnumeric>=0.75nb5:../../math/gnumeric
-.else
-DEPENDS+=	gnumeric>=0.75nb5:../../math/gnumeric0
-.endif
-DEPENDS+=	gtk-->=1.2.10:../../x11/gtk--
-DEPENDS+=	gtk-engines>=0.12:../../x11/gtk-engines
-DEPENDS+=	gtop>=1.0.13nb2:../../sysutils/gtop
-DEPENDS+=	pan>=0.11.4nb2:../../news/pan
-DEPENDS+=	xchat-gnome>=1.8.10nb3:../../chat/xchat-gnome
+DEPENDS+=	balsa>=2.0.10:../../mail/balsa2
+DEPENDS+=	eog>=2.5.1:../../graphics/eog2
+DEPENDS+=	file-roller>=2.4.2:../../archivers/file-roller
+DEPENDS+=	gcalctool>=4.2.83:../../math/gcalctool
+DEPENDS+=	gconf-editor>=2.4.0:../../editors/gconf-editor
+DEPENDS+=	gedit>=2.4.1:../../editors/gedit
+DEPENDS+=	gdm>=2.4.4.7:../../x11/gdm
+DEPENDS+=	ggv>=2.4.0.2:../../print/ggv2
+DEPENDS+=	glade2>=2.0.0:../../devel/glade2
+DEPENDS+=	gnome-applets>=2.4.1:../../x11/gnome2-applets
+DEPENDS+=	gnome-audio>=2.0.0:../../audio/gnome-audio
+DEPENDS+=	gnome-games>=2.4.1:../../games/gnome2-games
+DEPENDS+=	gnome-icon-theme>=1.0.9:../../graphics/gnome-icon-theme
+DEPENDS+=	gnome-media>=2.4.1.1:../../audio/gnome2-media
+DEPENDS+=	gnome-panel>=2.4.1:../../x11/gnome-panel
+DEPENDS+=	gnome-session>=2.4.1:../../x11/gnome-session
+DEPENDS+=	gnome-themes>=2.4.1:../../x11/gnome-themes
+DEPENDS+=	gnome2-user-docs>=2.4.1:../../misc/gnome2-user-docs
+DEPENDS+=	gnome2-terminal>=2.4.1:../../x11/gnome2-terminal
+DEPENDS+=	gnome2-system-monitor>=2.4.0:../../sysutils/gnome2-system-monitor
+DEPENDS+=	gnome-utils>=2.4.1:../../misc/gnome2-utils
+DEPENDS+=	gnome-vfs2>=2.4.1:../../sysutils/gnome-vfs2
+DEPENDS+=	gtk2-engines>=2.2.0:../../x11/gtk2-engines
+DEPENDS+=	librsvg2-gtk2>=2.5.0:../../graphics/librsvg2-gtk2
+DEPENDS+=	nautilus>=2.4.1:../../sysutils/nautilus
+DEPENDS+=	swfdec-gtk2>=0.2.1:../../graphics/swfdec-gtk2
+DEPENDS+=	xscreensaver>=4.14nb1:../../x11/xscreensaver
+DEPENDS+=	yelp>=2.4.2:../../misc/yelp
 
 USE_X11=	yes
 USE_BUILDLINK2=	yes
@@ -45,5 +48,4 @@ NO_BUILD=	yes
 
 do-install:	# empty
 
-.include "../../x11/gnome-python/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"