4 files changed, 44 insertions, 29 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 12e8b192149f..c3885927c261 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -38,6 +38,7 @@
     SUBDIR += gmessage
     SUBDIR += gnoclip
     SUBDIR += gnome
+    SUBDIR += gnome2
     SUBDIR += gnome-fifth-toe
     SUBDIR += gnomeapplets
     SUBDIR += gnomeapplets2
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index d017fbed01f9..5f9b3c8cc0cb 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -1,13 +1,12 @@
-# New ports collection makefile for:	gnome
-# Date created:		17 Aug 1998
-# Whom:			Yukihiro Nakai <Nakai@technologist.com>
+# New ports collection makefile for:	gnome2
+# Date created:		21 May 2002
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnome
-PORTVERSION=	1.4.1b2
-PORTREVISION=	2
+PORTNAME=	gnome2
+PORTVERSION=	2.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -15,32 +14,47 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	gnome@FreeBSD.org
 
-RUN_DEPENDS=	another_clock_applet:${PORTSDIR}/x11/gnomeapplets \
-		gtcd:${PORTSDIR}/audio/gnomemedia \
-		${X11BASE}/share/gnome/help/glossary/C/index.html:${PORTSDIR}/misc/gnomeuserdocs \
-	 	gcalc:${PORTSDIR}/misc/gnomeutils \
-		gnomecard:${PORTSDIR}/deskutils/gnomepim \
-		gnomine:${PORTSDIR}/games/gnomegames \
-		sawfish:${PORTSDIR}/x11-wm/sawfish \
-		ggv:${PORTSDIR}/print/ggv \
-		ghex:${PORTSDIR}/editors/ghex \
-		bug-buddy:${PORTSDIR}/devel/bugbuddy \
-		glade:${PORTSDIR}/devel/glade \
-		gtop:${PORTSDIR}/sysutils/gtop \
-		gdm:${PORTSDIR}/x11/gdm \
-		xalf:${PORTSDIR}/x11/xalf \
-		${X11BASE}/share/themes/Metal/ICON.png:${PORTSDIR}/x11-toolkits/gtk-engines \
-		${PYTHON_SITELIBDIR}/_appletmodule.so:${PORTSDIR}/x11-toolkits/py-gnome \
-		gnomeg:${PORTSDIR}/x11-toolkits/guile-gnome \
-		${X11BASE}/etc/panelmmConf.sh:${PORTSDIR}/x11-toolkits/panel-- \
-		nautilus:${PORTSDIR}/x11-fm/nautilus \
-		screensaver-properties-capplet:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS=	battstat-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
+		CDDBSlave2:${PORTSDIR}/audio/gnomemedia2 \
+	 	archive-generator:${PORTSDIR}/misc/gnomeutils2 \
+		eog:${PORTSDIR}/graphics/eog2 \
+		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
+		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
+		gnect:${PORTSDIR}/games/gnomegames2 \
+		gedit:${PORTSDIR}/editors/gedit2 \
+		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
+		gnome-session:${PORTSDIR}/x11/gnomesession \
+		metatheme-edit:${PORTSDIR}/misc/metatheme2 \
+		metacity:${PORTSDIR}/x11-wm/metacity \
+		metacity-setup:${PORTSDIR}/x11-wm/metacity-setup \
+		bug-buddy:${PORTSDIR}/devel/bugbuddy2 \
+		gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \
+		yelp:${PORTSDIR}/x11/yelp \
+		gdm:${PORTSDIR}/x11/gdm2 \
+		${X11BASE}/share/themes/Metal/gtk-2.0/gtkrc:${PORTSDIR}/x11-toolkits/gtk-engines2 \
+		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
+		nautilus-gtkhtml-view:${PORTSDIR}/www/nautilus-gtkhtml \
+		xscreensaver:${PORTSDIR}/x11/xscreensaver
 
 NO_BUILD=	yes
 
-USE_GNOME=	yes
 USE_PYTHON=	yes
 
+GNOME_ONE_DESKTOP=	gnomecore gnomeapplets gnomemedia gnomeutils \
+			gnomecontrolcenter gtop libgtop sawfish \
+			nautilus glade gedit xalf bugbuddy gnomegames
+
+pre-everything::
+	@for package in ${GNOME_ONE_DESKTOP}; do \
+		if ${PKG_INFO} | ${GREP} $$package"-[0-9]" >/dev/null 2>&1; then \
+		    ${ECHO_MSG} "$$package was detected on the system.  This package is part of the GNOME 1.x"; \
+		    ${ECHO_MSG} "desktop, and cannot coexist with the GNOME 2.0 desktop."; \
+		    ${ECHO_MSG} ""; \
+		    ${ECHO_MSG} "Please deinstall the GNOME 1.x desktop before installing this port."; \
+		    ${FALSE}; \
+		fi; \
+	done
+
 do-install:	# empty
 
 .include <bsd.port.mk>
diff --git a/x11/gnome2/pkg-comment b/x11/gnome2/pkg-comment
index c4330c2b9fbc..36da79d914e6 100644
--- a/x11/gnome2/pkg-comment
+++ b/x11/gnome2/pkg-comment
@@ -1 +1 @@
-The "meta-port" for the GNOME integrated X11 desktop
+The "meta-port" for the GNOME 2.0 integrated X11 desktop
diff --git a/x11/gnome2/pkg-descr b/x11/gnome2/pkg-descr
index 7a9987ce53f7..32942d8c11b8 100644
--- a/x11/gnome2/pkg-descr
+++ b/x11/gnome2/pkg-descr
@@ -3,5 +3,5 @@ GNU Network Object Model Environment
 This package does not contain anything by itself -- it is a
 "meta-port" that depends on other GNOME packages.  Its sole purpose is
 to require dependencies so users can install this package only and
-have all the GNOME stuff pulled in by the port/package dependency
+have all the GNOME 2.0 stuff pulled in by the port/package dependency
 mechanism.