4 files changed, 25 insertions, 45 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 67fd3ccef25b..b7a34fc5d8b8 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -41,6 +41,7 @@
     SUBDIR += gnome
     SUBDIR += gnome2
     SUBDIR += gnome-fifth-toe
+    SUBDIR += gnome-fifth-toe2
     SUBDIR += gnomeapplets
     SUBDIR += gnomeapplets2
     SUBDIR += gnomecore
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index c304174900d3..4e946974d513 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -1,13 +1,12 @@
-# New ports collection makefile for:	gnome
-# Date created:				18th April 2001
-# Whom:					Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for:	gnome2-fifth-toe
+# Date created:				20 September 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnome-fifth-toe
-PORTVERSION=	1.4.1b2
-PORTREVISION=	2
+PORTNAME=	gnome2-fifth-toe
+PORTVERSION=	2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -15,43 +14,21 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	gnome@FreeBSD.org
 
-RUN_DEPENDS=	gabber:${PORTSDIR}/net/gabber \
-		galeon:${PORTSDIR}/www/galeon \
-		pan:${PORTSDIR}/news/pan \
-		gnumeric:${PORTSDIR}/math/gnumeric \
-		sodipodi:${PORTSDIR}/graphics/sodipodi \
-		atomix:${PORTSDIR}/games/atomix \
-		balsa:${PORTSDIR}/mail/balsa \
-		bombermaze:${PORTSDIR}/games/bombermaze \
-		dia:${PORTSDIR}/graphics/dia \
-		eog:${PORTSDIR}/graphics/eog \
-		gedit:${PORTSDIR}/editors/gedit \
-		gimp:${PORTSDIR}/graphics/gimp1 \
-		glimmer:${PORTSDIR}/editors/glimmer \
-		gnomeicu:${PORTSDIR}/net/gnomeicu \
-		gob:${PORTSDIR}/x11-toolkits/gob \
-		gtm:${PORTSDIR}/ftp/gtm \
-		gnucash:${PORTSDIR}/deskutils/gnucash \
-		AbiWord:${PORTSDIR}/editors/AbiWord \
-		anjuta:${PORTSDIR}/devel/anjuta \
-		guppi-gnumeric:${PORTSDIR}/math/guppi \
-		gnomoku:${PORTSDIR}/games/gnomoku \
-		evolution:${PORTSDIR}/mail/evolution
-
-# We're still missing a few things from the "official" distribution
-# All can be found in stable/sources on MASTER_SITE_GNOME
-#
-# firestarter, fpm, gfax, gnome-db, gnome-lokkit,
-# gnorpm, googlizer, merlin-cpufire, radioactive, toutdoux
+RUN_DEPENDS=	gnumeric:${PORTSDIR}/math/gnumeric2 \
+		pan:${PORTSDIR}/news/pan2 \
+		xchat:${PORTSDIR}/irc/xchat2 \
+		balsa:${PORTSDIR}/mail/balsa2 \
+		gimp-1.3:${PORTSDIR}/graphics/gimp-devel \
+		gnomeicu:${PORTSDIR}/net/gnomeicu2 \
+		ggv:${PORTSDIR}/print/ggv2 \
+		gcalctool:${PORTSDIR}/math/gcalctool \
+		gthumb:${PORTSDIR}/graphics/gthumb2 \
+		${X11BASE}/lib/gtk-2.0/2.0.0/engines/libcrux-engine.so:${PORTSDIR}/x11-toolkits/crux \
+		gnome-db:${PORTSDIR}/databases/gnomedb2 \
+		mergeant:${PORTSDIR}/databases/mergeant \
+		ghex2:${PORTSDIR}/editors/ghex2
 
 NO_BUILD=	yes
-USE_PYTHON=	yes
-
-.if defined(WITH_MOZILLA_DEVEL)
-RUN_DEPENDS+=	${X11BASE}/lib/mozilla-devel/run-mozilla.sh:${PORTSDIR}/www/mozilla-devel
-.else
-RUN_DEPENDS+=	${X11BASE}/lib/mozilla/run-mozilla.sh:${PORTSDIR}/www/mozilla
-.endif
 
 do-install:	# empty
 
diff --git a/x11/gnome2-fifth-toe/pkg-comment b/x11/gnome2-fifth-toe/pkg-comment
index 76f066e9d170..06faff4d4ed9 100644
--- a/x11/gnome2-fifth-toe/pkg-comment
+++ b/x11/gnome2-fifth-toe/pkg-comment
@@ -1 +1 @@
-The "meta-port" for the GNOME "Fifth-Toe" extra package set
+The "meta-port" for the GNOME 2 "Fifth-Toe" extra package set
diff --git a/x11/gnome2-fifth-toe/pkg-descr b/x11/gnome2-fifth-toe/pkg-descr
index a3bb199588d4..b8984f4fde84 100644
--- a/x11/gnome2-fifth-toe/pkg-descr
+++ b/x11/gnome2-fifth-toe/pkg-descr
@@ -1,4 +1,6 @@
-GNOME "Fifth-Toe"
+GNOME 2 "Fifth-Toe"
 
-A collection of programs that GNOME users may find useful, all brought
-together with the convenience of a single "meta-port".
+A collection of programs that GNOME 2 users may find useful, all brought
+together with the convenience of a single "meta-port".  Note, this an
+unofficial Fifth Toe.  It is currently comprised of all the GNOME 2 
+applications in the tree.