Only use GNOME components that are ported to gtk3.

Do s/GNOME 2/GNOME 3/ in several places.
leave the other meta ports stuck as gnome2-* in pkg-descr, this as
a reminder they will need updating when we get closer to porting all the
components.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15102 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 47 insertions, 73 deletions

diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 2b21b7bb1..337967101 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome3/Makefile,v 1.2 2011/01/23 19:26:23 marcus Exp $
+#   $MCom$
 #
 
 PORTNAME=	gnome3
 PORTVERSION=	2.32.1
-PORTREVISION?=	2
+PORTREVISION?=	0
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -17,50 +17,26 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	The "meta-port" for the GNOME 3 integrated X11 desktop
 
-RUN_DEPENDS?=	${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
-		gnome-audio-profiles-properties:${PORTSDIR}/audio/gnome-media \
-	 	gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
-		eog:${PORTSDIR}/graphics/eog3 \
-		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
-		gnect:${PORTSDIR}/games/gnome-games \
-		gedit:${PORTSDIR}/editors/gedit3 \
-		gnome-terminal:${PORTSDIR}/x11/gnome-terminal3 \
-		gnome-session:${PORTSDIR}/x11/gnome-session3 \
-		bug-buddy:${PORTSDIR}/devel/bug-buddy \
-		gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
-		nautilus:${PORTSDIR}/x11-fm/nautilus3 \
-		${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
-		${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
-		${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
-		file-roller:${PORTSDIR}/archivers/file-roller3 \
-		${LOCALBASE}/share/themes/HighContrast/gtk-3.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes3 \
-		gok:${PORTSDIR}/accessibility/gok \
-		gcalctool:${PORTSDIR}/math/gcalctool3 \
+RUN_DEPENDS?=	gnome-panel>=2.91.0:${PORTSDIR}/x11/gnome-panel3 \
+		eog>=2.91.0:${PORTSDIR}/graphics/eog3 \
+		gedit>=2.91.0:${PORTSDIR}/editors/gedit3 \
+		zenity>=2.91.0:${PORTSDIR}/x11/zenity3 \
+		metacity:${PORTSDIR}/x11-wm/metacity \
+		gnome-terminal>=2.33.0:${PORTSDIR}/x11/gnome-terminal3 \
+		gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \
+		nautilus>=2.91.0:${PORTSDIR}/x11-fm/nautilus3 \
+		file-roller>=2.91.0:${PORTSDIR}/archivers/file-roller3 \
+		${LOCALBASE}/share/themes/Glider/gtk-3.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes3 \
 		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
-		dasher:${PORTSDIR}/accessibility/dasher \
-		evolution:${PORTSDIR}/mail/evolution \
-		${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
-		network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
-		vino-passwd:${PORTSDIR}/net/vino \
-		exchange-connector-setup-2.32:${PORTSDIR}/mail/evolution-exchange \
 		${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
 		${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
-		totem:${PORTSDIR}/multimedia/totem3 \
-		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center3 \
+		gnome-control-center>=2.91.0:${PORTSDIR}/sysutils/gnome-control-center3 \
 		${LOCALBASE}/share/gnome-background-properties/gnome-nature.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
-		evince:${PORTSDIR}/graphics/evince3 \
-		alacarte:${PORTSDIR}/deskutils/alacarte \
-		gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager3 \
-		orca:${PORTSDIR}/accessibility/orca \
+		evince>=2.91.0:${PORTSDIR}/graphics/evince3 \
 		gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
 		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \
-		seahorse-agent:${PORTSDIR}/security/seahorse-plugins \
-		mousetweaks:${PORTSDIR}/accessibility/mousetweaks \
 		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
-		${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme \
-		gnome-shell:${PORTSDIR}/x11/gnome-shell \
-		mutter:${PORTSDIR}/x11-wm/mutter
+		${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme
 
 NO_BUILD=	yes
 
@@ -68,9 +44,9 @@ NO_BUILD=	yes
 USE_PYTHON=	yes
 .endif
 
-.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome3-lite"
-OPTIONS=	XSCREENSAVER "Use xscreensaver as screen saver app" off \
-		MAPI "Depend on evolution-mapi (pulls in samba4)" on
+.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
+#OPTIONS=	XSCREENSAVER "Use xscreensaver as screen saver app" off \
+#		MAPI "Depend on evolution-mapi (pulls in samba4)" on
 .endif
 
 do-install:	# empty
@@ -79,41 +55,40 @@ do-install:	# empty
 
 .if !defined(GNOME_SLAVE)
 .if ${ARCH}!="sparc64" && ${ARCH}!="ia64"
-RUN_DEPENDS+=	yelp:${PORTSDIR}/x11/yelp3 \
-		epiphany:${PORTSDIR}/www/epiphany
+RUN_DEPENDS+=	yelp>=2.91.0:${PORTSDIR}/x11/yelp3 \
+#		epiphany:${PORTSDIR}/www/epiphany
 .endif
-.if ${.CURDIR:T}!="gnome3-lite"
-RUN_DEPENDS+=	empathy:${PORTSDIR}/net-im/empathy \
-		gucharmap:${PORTSDIR}/deskutils/gucharmap \
-		sound-juicer:${PORTSDIR}/audio/sound-juicer \
-		zenity:${PORTSDIR}/x11/zenity3 \
-		gnome-nettool:${PORTSDIR}/net/gnome-nettool \
-		swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \
-		vinagre:${PORTSDIR}/net/vinagre \
-		brasero:${PORTSDIR}/sysutils/brasero \
-		gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
-		${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
-		${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \
-		${LOCALBASE}/lib/gtk-2.0/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi \
-		gpk-application:${PORTSDIR}/ports-mgmt/gnome-packagekit \
-		ekiga:${PORTSDIR}/net/ekiga3
+#.if ${.CURDIR:T}!="gnome2-lite"
+#RUN_DEPENDS+=	empathy:${PORTSDIR}/net-im/empathy \
+#		gucharmap:${PORTSDIR}/deskutils/gucharmap \
+#		sound-juicer:${PORTSDIR}/audio/sound-juicer \
+#		zenity:${PORTSDIR}/x11/zenity \
+#		gnome-nettool:${PORTSDIR}/net/gnome-nettool \
+#		vinagre:${PORTSDIR}/net/vinagre \
+#		brasero:${PORTSDIR}/sysutils/brasero \
+#		gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
+#		${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
+#		${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \
+#		${LOCALBASE}/lib/gtk-2.0/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi \
+#		gpk-application:${PORTSDIR}/ports-mgmt/gnome-packagekit \
+#		ekiga:${PORTSDIR}/net/ekiga3
 .if ${OSVERSION}>=800000
-RUN_DEPENDS+=	cheese:${PORTSDIR}/multimedia/cheese
+#RUN_DEPENDS+=	cheese:${PORTSDIR}/multimedia/cheese
 .endif
-.if ${ARCH} == "i386"
+#.if ${ARCH} == "i386"
 #RUN_DEPENDS+=	tomboy:${PORTSDIR}/deskutils/tomboy
-.endif
-.if defined(WITH_MAPI)
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi
-.endif
-.endif
+#.endif
+#.if defined(WITH_MAPI)
+#RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi
+#.endif
+#.endif
 .endif
 
-.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome3-lite"
+.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
 .if defined(WITH_XSCREENSAVER)
-RUN_DEPENDS+=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+#RUN_DEPENDS+=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
 .else
-RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
+#RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
 .endif
 .endif
 
diff --git a/x11/gnome3/pkg-descr b/x11/gnome3/pkg-descr
index a7051fc7b..d3f5a6dbb 100644
--- a/x11/gnome3/pkg-descr
+++ b/x11/gnome3/pkg-descr
@@ -1,10 +1,9 @@
 GNU Network Object Model Environment
 
-This metaport installs the entire GNOME 2 desktop, including
+This metaport installs the entire GNOME 3 desktop, including
 the the most common user applications.  Other popular GNOME
-applications can be installed from the other GNOME 2 metaports:
+applications can be installed from the other GNOME 3 metaports:
 
-    * x11/gnome2-fifth-toe
     * x11/gnome2-power-tools
     * editors/gnome2-office
     * devel/gnome2-hacker-tools
diff --git a/x11/gnome3/pkg-message b/x11/gnome3/pkg-message
index d8f296a70..a93129857 100644
--- a/x11/gnome3/pkg-message
+++ b/x11/gnome3/pkg-message
@@ -1,5 +1,5 @@
 **************************************************************************
-Congratulations!  GNOME 2 has been successfully installed on your system.
+Congratulations!  GNOME 3 has been successfully installed on your system.
 For help on starting it up, as well as answers to common questions, and
 some known issues, please see the FreeBSD GNOME homepage at: