Presenting GNOME 2.11.3 for FreeBSD. While there hasn't been an official

release announcement from the GNOME camp, this is the current version.
I've also added gnome-keyring-manager to the Desktop.  I have a feeling it
will end up there anyway.


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

10 files changed, 174 insertions, 2 deletions

diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
new file mode 100644
index 000000000..d49c098fe
--- /dev/null
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:	gnome2-fifth-toe
+# Date created:				20 September 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/gnome2-fifth-toe/Makefile,v 1.65 2005/04/18 21:02:56 marcus Exp $
+#
+
+PORTNAME=	gnome2-fifth-toe
+PORTVERSION=	2.11.3
+CATEGORIES=	x11 gnome
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Additional GNOME 2 applications not included in the core desktop
+
+RUN_DEPENDS=	pan:${PORTSDIR}/news/pan2 \
+		xchat:${PORTSDIR}/irc/xchat2 \
+		gimp-2.2:${PORTSDIR}/graphics/gimp \
+		sodipodi:${PORTSDIR}/graphics/sodipodi \
+		gnomeicu:${PORTSDIR}/net/gnomeicu2 \
+		gthumb:${PORTSDIR}/graphics/gthumb \
+		${X11BASE}/lib/gaim/docklet.so:${PORTSDIR}/net/gaim \
+		tsclient:${PORTSDIR}/net/tsclient \
+		galeon:${PORTSDIR}/www/galeon \
+		seahorse:${PORTSDIR}/security/seahorse \
+		${X11BASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \
+		bluefish:${PORTSDIR}/www/bluefish \
+		gossip:${PORTSDIR}/net/gossip \
+		straw:${PORTSDIR}/net/straw \
+		liferea:${PORTSDIR}/net/liferea \
+		gnotime:${PORTSDIR}/deskutils/gnotime \
+		rhythmbox:${PORTSDIR}/audio/rhythmbox \
+		jamboree:${PORTSDIR}/audio/jamboree \
+		${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data \
+		nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \
+		evince:${PORTSDIR}/graphics/evince \
+		goobox:${PORTSDIR}/audio/goobox \
+		inkscape:${PORTSDIR}/graphics/inkscape
+
+.include <bsd.port.pre.mk>
+
+NO_BUILD=	yes
+
+do-install:	# empty
+
+.include <bsd.port.post.mk>
diff --git a/x11/gnome2-fifth-toe/pkg-descr b/x11/gnome2-fifth-toe/pkg-descr
new file mode 100644
index 000000000..afa6e891d
--- /dev/null
+++ b/x11/gnome2-fifth-toe/pkg-descr
@@ -0,0 +1,8 @@
+GNOME 2 "Fifth Toe"
+
+The Fifth Toe is a collection of stable GNOME 2 applications that 
+many users expect to be part of a usable desktop.  Included are image
+manipulation programs, chat applications, music and multimedia players,
+much more.
+
+WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome2-fifth-toe/pkg-plist b/x11/gnome2-fifth-toe/pkg-plist
new file mode 100644
index 000000000..549a621fe
--- /dev/null
+++ b/x11/gnome2-fifth-toe/pkg-plist
@@ -0,0 +1 @@
+@comment this plist intentionally left empty
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
new file mode 100644
index 000000000..f26bca883
--- /dev/null
+++ b/x11/gnome2-lite/Makefile
@@ -0,0 +1,61 @@
+# New ports collection makefile for:	gnome2-lite
+# Date created:		30 November 2003
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/gnome2-lite/Makefile,v 1.21 2005/04/18 21:02:55 marcus Exp $
+#
+
+PORTNAME=	gnome2
+PORTVERSION=	2.11.3
+CATEGORIES=	x11 gnome
+MASTER_SITES=	# empty
+PKGNAMESUFFIX=	-lite
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases
+
+RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
+		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
+	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
+		eog:${PORTSDIR}/graphics/eog \
+		gedit:${PORTSDIR}/editors/gedit \
+		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
+		gnome-session:${PORTSDIR}/x11/gnomesession \
+		gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \
+		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
+		yelp:${PORTSDIR}/x11/yelp \
+		${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome \
+		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \
+		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \
+		file-roller:${PORTSDIR}/archivers/fileroller \
+		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
+		ggv:${PORTSDIR}/print/ggv \
+		gcalctool:${PORTSDIR}/math/gcalctool \
+		gucharmap:${PORTSDIR}/deskutils/gucharmap \
+		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
+		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
+		totem:${PORTSDIR}/multimedia/totem-gstreamer
+
+NO_BUILD=	yes
+
+USE_PYTHON=	yes
+
+CONFLICTS=	gnome2-[0-9]*
+
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+pre-configure:
+	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.endif
+
+do-install:	# empty
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386" || ${OSVERSION} > 500035
+RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/gnome2-lite/pkg-descr b/x11/gnome2-lite/pkg-descr
new file mode 100644
index 000000000..1c85098c1
--- /dev/null
+++ b/x11/gnome2-lite/pkg-descr
@@ -0,0 +1,15 @@
+GNU Network Object Model Environment
+
+This metaport installs the pieces of the GNOME 2 desktop that
+are needed to provide a functional desktop.  x11/gnome2
+contains the full version of the GNOME 2 desktop environment.
+
+Other popular GNOME applications can be installed from the other
+GNOME 2 metaports:
+
+    * x11/gnome2-fifth-toe
+    * x11/gnome2-power-tools
+    * editors/gnome2-office
+    * devel/gnome2-hacker-tools
+
+WWW: http://www.FreeBSD.org/gnome/
diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install
new file mode 100644
index 000000000..3040e98bd
--- /dev/null
+++ b/x11/gnome2-lite/pkg-install
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
+export PATH
+
+if [ "$2" = "PRE-INSTALL" ]; then
+     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames gnomeaudio"
+     for package in ${GNOME_ONE_DESKTOP}; do
+	 if pkg_info | grep "^${package}-[0-9]" >/dev/null 2>&1; then
+	     echo "${package} was detected on the system.  This package is part of the GNOME 1.x"
+	     echo "desktop, and cannot coexist with the GNOME 2 desktop."
+	     echo ""
+	     echo "Please deinstall the GNOME 1.x desktop before installing this package."
+	     false
+	 fi
+    done
+fi
diff --git a/x11/gnome2-lite/pkg-message b/x11/gnome2-lite/pkg-message
new file mode 100644
index 000000000..0b0e5564e
--- /dev/null
+++ b/x11/gnome2-lite/pkg-message
@@ -0,0 +1,21 @@
+************************************************************
+
+The GNOME 2 desktop Lite edition has been successfully installed.
+
+The Lite edition does not include all the components of the standard
+GNOME 2 desktop as detailed at http://www.gnome.org.  If you wish to
+install the full desktop, you can remove this port, and install the
+x11/gnome2 port or package.  That can be best accomplished using
+the following commands:
+
+# pkg_delete gnome2-lite
+# cd /usr/ports/x11/gnome2
+# 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/gnome2-lite/pkg-plist b/x11/gnome2-lite/pkg-plist
new file mode 100644
index 000000000..549a621fe
--- /dev/null
+++ b/x11/gnome2-lite/pkg-plist
@@ -0,0 +1 @@
+@comment this plist intentionally left empty
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 9aec0b4c7..e9f2605c2 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2-power-tools
-PORTVERSION=	2.10.1
+PORTVERSION=	2.11.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -26,7 +26,6 @@ RUN_DEPENDS=	${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PO
 		gnomesu:${PORTSDIR}/security/libgnomesu \
 		bpm:${PORTSDIR}/sysutils/bpm \
 		gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
-		gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \
 		gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor
 #		${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \
 
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index f2c86fe75..6dc4f6d99 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -57,6 +57,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
 		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
 		${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
 		sound-juicer:${PORTSDIR}/audio/sound-juicer \
+		gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \
 		${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml
 
 NO_BUILD=	yes