Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

3 files changed, 15 insertions, 17 deletions

diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 1e53eaad346c..87f504646fc9 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2
-PORTVERSION=	2.4.2
+PORTVERSION=	2.6.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -37,7 +37,6 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		file-roller:${PORTSDIR}/archivers/fileroller \
 		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-toolkits/gnome-themes \
 		ggv:${PORTSDIR}/print/ggv2 \
-		acme:${PORTSDIR}/multimedia/acme \
 		gok:${PORTSDIR}/accessibility/gok \
 		gpdf:${PORTSDIR}/graphics/gpdf \
 		nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \
@@ -46,14 +45,14 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		zenity:${PORTSDIR}/x11/zenity \
 		gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \
 		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		gnopernicus:${PORTSDIR}/accessibility/gnopernicus
+		gnopernicus:${PORTSDIR}/accessibility/gnopernicus \
+		${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \
+		dasher:${PORTSDIR}/accessibility/dasher
 
 NO_BUILD=	yes
 
 USE_PYTHON=	yes
 
-CONFLICTS=	gnome2-lite*
-
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 pre-configure:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@@ -63,12 +62,12 @@ do-install:	# empty
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "amd64" && ( ${ARCH} == "i386" || ${OSVERSION} > 500035 )
+.if ${ARCH} == "i386" || ${OSVERSION} > 500035
 RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
 .endif
 
-#.if ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 #RUN_DEPENDS+=	gnomemeeting:${PORTSDIR}/net/gnomemeeting
-#.endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/gnome2/pkg-descr b/x11/gnome2/pkg-descr
index 8632de99722e..a7051fc7b5cd 100644
--- a/x11/gnome2/pkg-descr
+++ b/x11/gnome2/pkg-descr
@@ -1,9 +1,12 @@
 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 2 stuff pulled in by the port/package dependency
-mechanism.
+This metaport installs the entire GNOME 2 desktop, including
+the the most common user applications.  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/pkg-install b/x11/gnome2/pkg-install
index 1324bb12a5b0..870432d238a3 100644
--- a/x11/gnome2/pkg-install
+++ b/x11/gnome2/pkg-install
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-if [ -n "${PACKAGE_BUILDING}" ]; then
-    exit 0
-fi
-
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
 export PATH