Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact).

This release notes detailing all of the new goodies in GNOME 2.8 can
be found at http://www.gnome.org/start/2.8/notes/, and the list of what
was fixed in GNOME 2.8.1 can be found at
http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html.

This release, as well as all of our others, would not have been possible
without the great efforts of our FreeBSD GNOME Team.  The list of
current members can be found at http://www.freebsd.org/gnome/contact.html
(including our newest member, Michael Johnson <ahze@FreeBSD.org>).

Special thanks also goes out to all of the loyal FreeBSD GNOME users that
put up with crashes and hangs to test and debug GNOME on FreeBSD.  We would
especially like to thank those users that provided patches for GNOME 2.7 and
2.8:

Franz Klammer <klammer@webonaut.com>
Piotr Smyrak <piotr.smyrak@heron.pl>
Radek Kozlowski <radek@raadradd.com>
Khairil Yusof <kaeru@pd.jaring.my>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Vladimir Grebenschikov <vova@fbsd.ru>

GNOME 2.8 also features a new, FreeBSD-specific splashscreen that
was designed by jimmac for GNOME 2.8, then daemonized by
Franz Klammer <klammer@webonaut.com> and Radek Kozlowski
<radek@raadradd.com>.

As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8.  There is
a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh
that will aid in the upgrade process.  Full documentation on the GNOME 2.8
upgrade is coming following this commit.

From all of us at FreeBSD GNOME, ENJOY!

4 files changed, 95 insertions, 82 deletions

diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index f452eeceab5f..8d9b9b136b20 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gedit2
-PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTVERSION=	2.8.1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
 DISTNAME=	gedit-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,13 +22,15 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier \
-		libgnomeprintui libgnomeui eel2 gtksourceview
+USE_LIBTOOL_VER=15
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier \
+		libgnomeprintui libgnomeui eel2 gtksourceview desktopfileutils
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB=	VERSION="2.6"
+PLIST_SUB=	VERSION="2.8" \
+		POVERSION="2.6"
 
 MAN1=		gedit.1
+GCONF_SCHEMAS=	gedit.schemas
 
 .include <bsd.port.mk>
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index 95c1d00d87b1..a609c0bcd54b 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gedit-2.6.2.tar.bz2) = a4773bd9884371041cf6236f0fe1505f
-SIZE (gnome2/gedit-2.6.2.tar.bz2) = 2370962
+MD5 (gnome2/gedit-2.8.1.tar.bz2) = 89052aec40b7447eb11d73134d71e812
+SIZE (gnome2/gedit-2.8.1.tar.bz2) = 2520837
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index 0ec5bc0a3db5..4d33342cb12e 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -1,8 +1,5 @@
 bin/gedit
 bin/gnome-text-editor
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gedit.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gedit.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gedit.schemas > /dev/null || /usr/bin/true
 include/gedit-%%VERSION%%/gedit/bonobo-mdi-child.h
 include/gedit-%%VERSION%%/gedit/bonobo-mdi.h
 include/gedit-%%VERSION%%/gedit/gedit-convert.h
@@ -30,8 +27,10 @@ include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-bonobo.h
 include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-gtk.h
 include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view.h
 lib/bonobo/libgedit-control.so
+lib/gedit-2/plugins/changecase.gedit-plugin
 lib/gedit-2/plugins/docinfo.gedit-plugin
 lib/gedit-2/plugins/indent.gedit-plugin
+lib/gedit-2/plugins/libchangecase.so
 lib/gedit-2/plugins/libdocinfo.so
 lib/gedit-2/plugins/libindent.so
 lib/gedit-2/plugins/libsample.so
@@ -50,6 +49,7 @@ libdata/bonobo/servers/GNOME_Gedit.server
 libdata/pkgconfig/gedit-%%VERSION%%.pc
 share/gnome/application-registry/gedit.applications
 share/gnome/applications/gedit.desktop
+@exec update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/gedit-2/glade/docinfo.glade2
 share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2
 share/gnome/gedit-2/glade/gedit-preferences.glade2
@@ -85,6 +85,10 @@ share/gnome/help/gedit/es/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/es/figures/gedit_window.png
 share/gnome/help/gedit/es/gedit.xml
 share/gnome/help/gedit/es/legal.xml
+share/gnome/help/gedit/eu/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/eu/figures/gedit_window.png
+share/gnome/help/gedit/eu/gedit.xml
+share/gnome/help/gedit/eu/legal.xml
 share/gnome/help/gedit/fr/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/fr/figures/gedit_window.png
 share/gnome/help/gedit/fr/gedit.xml
@@ -128,6 +132,8 @@ share/gnome/omf/gedit/gedit-de.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gedit/gedit-es.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-eu.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gedit/gedit-fr.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gedit/gedit-it.omf
@@ -149,73 +155,76 @@ share/gnome/omf/gedit/gedit-zh_TW.omf
 share/gnome/pixmaps/gedit-icon.png
 share/gnome/pixmaps/gedit-logo.png
 share/gnome/pixmaps/gedit-plugin-manager.png
-share/locale/af/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/am/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ar/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/bn/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/cy/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/fa/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/gu/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/hi/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/is/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/kn/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/mi/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/mk/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/mn/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/mr/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/sl/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/th/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/tk/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/wa/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/gedit-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/af/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/am/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ar/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/az/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/be/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/bg/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/bn/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/bs/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ca/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/cs/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/cy/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/da/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/de/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/el/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/es/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/et/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/eu/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/fa/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/fi/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/fr/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ga/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/gl/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/gu/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/he/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/hi/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/hr/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/hu/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/id/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/is/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/it/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ja/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/kn/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ko/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/lt/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/lv/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/mi/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/mk/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ml/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/mn/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/mr/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ms/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/nb/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ne/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/nl/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/nn/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/no/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/or/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/pa/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/pl/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/pt/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ro/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ru/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/sk/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/sl/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/sq/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/sr/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/sv/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/ta/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/th/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/tk/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/tr/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/uk/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/vi/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/wa/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/gedit-%%POVERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/gedit-%%POVERSION%%.mo
 @dirrm share/gnome/omf/gedit
 @dirrm share/gnome/help/gedit/zh_TW/figures
 @dirrm share/gnome/help/gedit/zh_TW
@@ -235,6 +244,8 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo
 @dirrm share/gnome/help/gedit/it
 @dirrm share/gnome/help/gedit/fr/figures
 @dirrm share/gnome/help/gedit/fr
+@dirrm share/gnome/help/gedit/eu/figures
+@dirrm share/gnome/help/gedit/eu
 @dirrm share/gnome/help/gedit/es/figures
 @dirrm share/gnome/help/gedit/es
 @dirrm share/gnome/help/gedit/de/figures
@@ -254,6 +265,7 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-eu.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
@@ -263,3 +275,4 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_HK.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true
+@unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile
index ba618e7a31cd..f4199e67aeb6 100644
--- a/editors/gnome2-office/Makefile
+++ b/editors/gnome2-office/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2-office
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 CATEGORIES=	editors gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -19,8 +19,7 @@ RUN_DEPENDS=	gnumeric:${PORTSDIR}/math/gnumeric2 \
 		planner:${PORTSDIR}/deskutils/planner \
 		dia:${PORTSDIR}/graphics/dia \
 		glabels:${PORTSDIR}/deskutils/glabels \
-		evolution:${PORTSDIR}/mail/evolution \
-		AbiWord-2.0:${PORTSDIR}/editors/AbiWord2 \
+		AbiWord-2.2:${PORTSDIR}/editors/AbiWord2 \
 		mergeant:${PORTSDIR}/databases/mergeant
 
 NO_BUILD=	yes