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>

5 files changed, 32 insertions, 22 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index bfd82d8dd2ec..e27e91a8da7d 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.4.1.1
-PORTREVISION=	2
+PORTVERSION=	2.6.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.4
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.6
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,7 +19,8 @@ COMMENT=	Additional UI API for GNOME 2
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
+USE_REINPLACE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_BISON=	yes
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 886b1521819b..213352fd1c8d 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = c85489c7befc79b5cc9bda1b2006cacc
-SIZE (gnome2/gnome-desktop-2.4.1.1.tar.bz2) = 1054097
+MD5 (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 2d40b7d7a15f23770265246979529327
+SIZE (gnome2/gnome-desktop-2.6.0.1.tar.bz2) = 1077853
diff --git a/x11/gnome-desktop/files/patch-configure b/x11/gnome-desktop/files/patch-configure
deleted file mode 100644
index caf5b493a9eb..000000000000
--- a/x11/gnome-desktop/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sun May  4 06:56:20 2003
-+++ configure	Sun May  4 19:20:27 2003
-@@ -8374,6 +8374,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnome-desktop/pkg-descr b/x11/gnome-desktop/pkg-descr
index 500857a54f14..bda4df7913d6 100644
--- a/x11/gnome-desktop/pkg-descr
+++ b/x11/gnome-desktop/pkg-descr
@@ -1,4 +1,3 @@
-This is a collection of APIs not included in libgnomeui as they have
-not undergone sufficient testing.
+This is a collection of APIs not included in libgnomeui.
 
 WWW: http://www.gnome.org/
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index a3384f7d3a88..9a87be2a25b4 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -21,6 +21,14 @@ share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
 share/gnome/help/lgpl/C/lgpl.xml
+share/gnome/omf/gnome-desktop/fdl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gnome-feedback-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/lgpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
@@ -117,6 +125,7 @@ share/gnome/vfolders/Other.directory
 share/gnome/vfolders/Root.directory
 share/gnome/vfolders/Settings.directory
 share/gnome/vfolders/System.directory
+share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -131,6 +140,7 @@ share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -143,6 +153,7 @@ share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -162,6 +173,7 @@ share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -175,6 +187,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -182,13 +195,21 @@ share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrm share/gnome/help/lgpl/C/figures
-@dirrm share/gnome/help/gpl/C/figures
-@dirrm share/gnome/help/gnome-feedback/C/figures
+@dirrm share/gnome/omf/gnome-desktop
+@dirrm share/gnome/help/lgpl/C
+@dirrm share/gnome/help/lgpl
+@dirrm share/gnome/help/gpl/C
+@dirrm share/gnome/help/gpl
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
-@dirrm share/gnome/help/fdl/C/figures
+@dirrm share/gnome/help/fdl/C
+@dirrm share/gnome/help/fdl
 @dirrm share/gnome/gnome-about/headers
+@dirrm share/gnome/gnome-about
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true