Overhall the gnome 3 metaports. x11/gnome3-lite (*) is now a minimal desktop port.

The x11/gnome3 meta port now pulls all the applications that are released with
the GNOME desktop.

*) may need more tweaking.


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

5 files changed, 101 insertions, 71 deletions

diff --git a/x11/gnome3-lite/Makefile b/x11/gnome3-lite/Makefile
new file mode 100644
index 000000000..4f407b673
--- /dev/null
+++ b/x11/gnome3-lite/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	gnome2-lite
+# Date created:		30 November 2003
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11/gnome2-lite/Makefile,v 1.62 2009/11/26 20:39:06 marcus Exp $
+#
+
+PORTREVISION=	0
+CATEGORIES=	x11 gnome
+PKGNAMESUFFIX=	-lite
+
+COMMENT=	The "meta-port" of the GNOME desktop slimmed down for only the basics
+
+MASTERDIR=	${.CURDIR}/../gnome3
+CONFLICTS=	gnome3-[0-9]*
+
+DESCR=		${.CURDIR}/pkg-descr
+PKGMESSAGE=	${.CURDIR}/pkg-message
+
+.include "${MASTERDIR}/Makefile"
+
+
+
diff --git a/x11/gnome3-lite/pkg-descr b/x11/gnome3-lite/pkg-descr
new file mode 100644
index 000000000..479debf38
--- /dev/null
+++ b/x11/gnome3-lite/pkg-descr
@@ -0,0 +1,7 @@
+GNU Network Object Model Environment
+
+This metaport installs the pieces of the GNOME 3 desktop that
+are needed to provide a functional desktop. The x11/gnome3
+meta port, contains the full version of the GNOME 3 desktop environment.
+
+WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome3-lite/pkg-message b/x11/gnome3-lite/pkg-message
new file mode 100644
index 000000000..209a46ca8
--- /dev/null
+++ b/x11/gnome3-lite/pkg-message
@@ -0,0 +1,21 @@
+************************************************************
+
+The GNOME 3 desktop Lite edition has been successfully installed.
+
+The Lite edition only includes the minimal components to get a working GNOME 3
+Desktop. The user then has to install prefered applications like editor, 
+web browser or e-mail client. If you wish to install the full desktop, you can
+remove this port, and install the x11/gnome3 port or package.  That can be best
+accomplished using the following commands:
+
+# pkg_delete gnome3-lite
+# cd /usr/ports/x11/gnome3
+# make install clean
+
+Alternatively, you can install additional GNOME components individually
+using either their ports or packages.
+
+For more help on using GNOME on FreeBSD, please see the FreeBSD GNOME project
+site at http://www.FreeBSD.org/gnome.
+
+************************************************************
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 03cc98fb0..329d3d4ff 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.17 2011/03/09 16:25:57 kwm Exp $
+#   $MCom: ports/x11/gnome3/Makefile,v 1.18 2011/03/16 04:20:01 mezz Exp $
 #
 
 PORTNAME=	gnome3
-PORTVERSION=	2.32.1
-PORTREVISION?=	1
+PORTVERSION=	2.91.93
+PORTREVISION?=	0
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -17,100 +17,78 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	The "meta-port" for the GNOME 3 integrated X11 desktop
 
+CONFLICTS?=	gnome3-lite-[0-9]*
+
 RUN_DEPENDS?=	gnome-panel>=2.91.0:${PORTSDIR}/x11/gnome-panel3 \
 		dconf:${PORTSDIR}/devel/dconf \
-		eog>=2.91.0:${PORTSDIR}/graphics/eog3 \
-		gedit>=2.91.0:${PORTSDIR}/editors/gedit3 \
-		zenity>=2.91.0:${PORTSDIR}/x11/zenity3 \
-		gnome-terminal>=2.33.0:${PORTSDIR}/x11/gnome-terminal3 \
-		mousetweaks>=2.91.0:${PORTSDIR}/accessibility/mousetweaks3 \
 		gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \
-		brasero>=2.91.0:${PORTSDIR}/sysutils/brasero3 \
-		nautilus>=2.91.0:${PORTSDIR}/x11-fm/nautilus3 \
-		gdm>=2.91.0:${PORTSDIR}/x11/gdm3 \
-		metacity>=2.30.0:${PORTSDIR}/x11-wm/metacity \
-		gcalctool>=2.91.0:${PORTSDIR}/math/gcalctool3 \
-		gnome-utils>=2.91.0:${PORTSDIR}/deskutils/gnome-utils3 \
-		gnome-system-monitor>=2.99.0:${PORTSDIR}/sysutils/gnome-system-monitor3 \
-		file-roller>=2.91.0:${PORTSDIR}/archivers/file-roller3 \
 		gnome-themes>=2.91.0:${PORTSDIR}/x11-themes/gnome-themes3 \
 		gnome-themes-standard>=2.91.0:${PORTSDIR}/x11-themes/gnome-themes-standard \
-		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		${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 \
 		gnome-screensaver>=2.91.0:${PORTSDIR}/x11/gnome-screensaver3 \
-		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>=2.91.0:${PORTSDIR}/graphics/evince3 \
 		gnome-keyring>=2.91.0:${PORTSDIR}/security/gnome-keyring3 \
 		gnome-power-manager>=2.91.0:${PORTSDIR}/sysutils/gnome-power-manager3 \
 		gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
-		gnome-games>=2.91.90:${PORTSDIR}/games/gnome-games3 \
-		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \
+		nautilus>=2.91.0:${PORTSDIR}/x11-fm/nautilus3 \
+		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
-		totem>=2.91.0:${PORTSDIR}/multimedia/totem3 \
-		evolution>=2.91.0:${PORTSDIR}/mail/evolution3 \
-		evolution-exchange>=2.91.0:${PORTSDIR}/mail/evolution-exchange3 \
-		evolution-mapi>=2.91.0:${PORTSDIR}/mail/evolution-mapi3 \
+		yelp>=2.91.0:${PORTSDIR}/x11/yelp3 \
+		zenity>=2.91.0:${PORTSDIR}/x11/zenity3 \
+		metacity>=2.30.0:${PORTSDIR}/x11-wm/metacity \
+		gnome-control-center>=2.91.0:${PORTSDIR}/sysutils/gnome-control-center3 \
+		${LOCALBASE}/share/gnome-background-properties/gnome-nature.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
+		gnome-tweak-tool:${PORTSDIR}/deskutils/gnome-tweak-tool \
 		${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme
 
 NO_BUILD=	yes
 
-.if !defined(GNOME_SLAVE)
-USE_PYTHON=	yes
-.endif
-
-.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
-#OPTIONS=	XSCREENSAVER "Use xscreensaver as screen saver app" off \
 OPTIONS=	GNOME_SHELL "Build Gnome-shell (pulls in libxul)" off
-#		MAPI "Depend on evolution-mapi (pulls in samba4)" on
+
+.if ${.CURDIR:T}!="gnome3-lite"
+OPTIONS+=	MAPI "Depend on evolution-mapi (pulls in samba4)" on
 .endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GNOME_SHELL)
 RUN_DEPENDS+=	gnome-shell>=2.91.0:${PORTSDIR}/x11/gnome-shell
 .endif
 
+.if ${.CURDIR:T}!="gnome3-lite"
+RUN_DEPENDS+=	empathy>=2.91.0:${PORTSDIR}/net-im/empathy3 \
+		epiphany>=2.91.0:${PORTSDIR}/www/epiphany3 \
+		epiphany-extensions>=2.91.0:${PORTSDIR}/www/epiphany-extensions3 \
+		gucharmap>=2.33.0:${PORTSDIR}/deskutils/gucharmap3 \
+		brasero>=2.91.0:${PORTSDIR}/sysutils/brasero3 \
+		eog>=2.91.0:${PORTSDIR}/graphics/eog3 \
+		eog-plugins>=2.91.0:${PORTSDIR}/graphics/eog-plugins3 \
+		gedit>=2.91.0:${PORTSDIR}/editors/gedit3 \
+		gedit-plugins>=2.91.0:${PORTSDIR}/editors/gedit-plugins3 \
+		gnome-terminal>=2.33.0:${PORTSDIR}/x11/gnome-terminal3 \
+		mousetweaks>=2.91.0:${PORTSDIR}/accessibility/mousetweaks3 \
+		brasero>=2.91.0:${PORTSDIR}/sysutils/brasero3 \
+		gcalctool>=2.91.0:${PORTSDIR}/math/gcalctool3 \
+		gnome-utils>=2.91.0:${PORTSDIR}/deskutils/gnome-utils3 \
+		gnome-system-monitor>=2.99.0:${PORTSDIR}/sysutils/gnome-system-monitor3 \
+		file-roller>=2.91.0:${PORTSDIR}/archivers/file-roller3 \
+		evince>=2.91.0:${PORTSDIR}/graphics/evince3 \
+		vino>=2.91.0:${PORTSDIR}/net/vino3 \
+		vinagre>=2.91.0:${PORTSDIR}/net/vinagre3 \
+		gnome-games>=2.91.90:${PORTSDIR}/games/gnome-games3 \
+		totem>=2.91.0:${PORTSDIR}/multimedia/totem3 \
+		gconf-editor>=2.91.0:${PORTSDIR}/sysutils/gconf-editor3 \
+		gdm>=2.91.0:${PORTSDIR}/x11/gdm3 \
+		evolution>=2.91.0:${PORTSDIR}/mail/evolution3 \
+		evolution-exchange>=2.91.0:${PORTSDIR}/mail/evolution-exchange3 \
+		${LOCALBASE}/lib/gtk-3.0/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi2-atk
 
-.if !defined(GNOME_SLAVE)
-# see if they build on these args.
-#.if ${ARCH}!="sparc64" && ${ARCH}!="ia64"
-RUN_DEPENDS+=	yelp>=2.91.0:${PORTSDIR}/x11/yelp3 \
-		epiphany>=2.91.0:${PORTSDIR}/www/epiphany3
-#.endif
-#.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
-.endif
-#.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
+RUN_DEPENDS+=	cheese>=2.91.0:${PORTSDIR}/multimedia/cheese3
 .endif
 
-.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
-.if defined(WITH_XSCREENSAVER)
-#RUN_DEPENDS+=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
-.else
-#RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
-.endif
+.if defined(WITH_MAPI)
+RUN_DEPENDS+=	evolution-mapi>=2.91.0:${PORTSDIR}/mail/evolution-mapi3
 .endif
+.endif # !gnome3-lite section
 
 do-install:	# empty
 
diff --git a/x11/gnome3/pkg-descr b/x11/gnome3/pkg-descr
index d3f5a6dbb..dd54db0e3 100644
--- a/x11/gnome3/pkg-descr
+++ b/x11/gnome3/pkg-descr
@@ -1,7 +1,7 @@
 GNU Network Object Model Environment
 
 This metaport installs the entire GNOME 3 desktop, including
-the the most common user applications.  Other popular GNOME
+the user applications released with it. Other popular GNOME
 applications can be installed from the other GNOME 3 metaports:
 
     * x11/gnome2-power-tools