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, 31 insertions, 49 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index db28208..7db61fe 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.4.0
-PORTREVISION=	4
+PORTVERSION=	2.6.0
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
@@ -23,7 +22,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier esound gnomevfs2 libxslt
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack esound gnomevfs2 \
+		libxslt
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index fdfafd2..7c8c192 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnome-2.4.0.tar.bz2) = caec1e12d64b98a2925a4317ac16429f
-SIZE (gnome2/libgnome-2.4.0.tar.bz2) = 964070
+MD5 (gnome2/libgnome-2.6.0.tar.bz2) = c3fd920119581ba1da531222ed69a5e0
+SIZE (gnome2/libgnome-2.6.0.tar.bz2) = 1070613
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 4a73422..a3e14ed 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,11 +1,12 @@
---- libgnome/Makefile.in.orig	Sat Jun 14 05:07:39 2003
-+++ libgnome/Makefile.in	Sat Jun 14 05:10:06 2003
-@@ -156,7 +156,7 @@
- 
+--- libgnome/Makefile.in.orig	Wed Feb 25 01:17:58 2004
++++ libgnome/Makefile.in	Wed Feb 25 01:20:59 2004
+@@ -159,6 +159,9 @@
  libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
  
--INCLUDES =  	-I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
-+INCLUDES =  	-DPREFIX=\""$(PREFIX)"\" -DLOCALBASE=\""$(LOCALBASE)"\" -DX11BASE=\""$(X11BASE)"\" -I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
- 
- 
- libgnome_2_la_SOURCES =  	libgnometypebuiltins.h		libgnometypebuiltins.c		gnome-config.c			gnome-sound.c			gnome-triggers.c		gnome-triggersP.h		gnome-program.c			gnome-help.c			gnome-exec.c			gnome-gconf.c			gnome-gconfP.h			gnome-i18n.c			gnome-i18nP.h			gnome-url.c			gnome-util.c			gnome-score.c			gnome-init.c
+ INCLUDES = \
++	-DPREFIX=\""$(PREFIX)"\"				\
++	-DLOCALBASE=\""$(LOCALBASE)"\"				\
++	-DX11BASE=\""$(X11BASE)"\"				\
+ 	-I..							\
+ 	-I$(srcdir)/..						\
+ 	$(WARN_CFLAGS)						\
diff --git a/x11/libgnome/pkg-descr b/x11/libgnome/pkg-descr
index f7f1564..b78aaf2 100644
--- a/x11/libgnome/pkg-descr
+++ b/x11/libgnome/pkg-descr
@@ -1,3 +1,3 @@
-Libraries for GNOME, a GNU desktop environment
+LibGnome provides the non-GUI backend for the GNOME environment.
 
 WWW: http://www.gnome.org/
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 109fc1e..3f2d20d 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -10,19 +10,13 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xm
 etc/gconf/gconf.xml.defaults/desktop/gnome/background/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/file_views/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/interface/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/lockdown/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
@@ -35,19 +29,13 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager/%
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/lockdown/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
 etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas
 etc/gconf/schemas/desktop_gnome_applications_browser.schemas
@@ -57,12 +45,12 @@ etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas
 etc/gconf/schemas/desktop_gnome_background.schemas
 etc/gconf/schemas/desktop_gnome_file_views.schemas
 etc/gconf/schemas/desktop_gnome_interface.schemas
+etc/gconf/schemas/desktop_gnome_lockdown.schemas
 etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas
 etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
 etc/gconf/schemas/desktop_gnome_sound.schemas
 etc/gconf/schemas/desktop_gnome_thumbnailers.schemas
 etc/gconf/schemas/desktop_gnome_typing_break.schemas
-etc/gconf/schemas/desktop_gnome_url_handlers.schemas
 etc/sound/events/gnome-2.soundlist
 etc/sound/events/gtk-events-2.soundlist
 include/libgnome-2.0/libgnome/gnome-config.h
@@ -83,7 +71,7 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h
 lib/bonobo/monikers/libmoniker_extra_2.so
 lib/libgnome-2.a
 lib/libgnome-2.so
-lib/libgnome-2.so.400
+lib/libgnome-2.so.600
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
 share/doc/libgnome/ch01s02.html
@@ -94,6 +82,7 @@ share/doc/libgnome/home.png
 share/doc/libgnome/index.html
 share/doc/libgnome/index.sgml
 share/doc/libgnome/left.png
+share/doc/libgnome/libgnome.html
 share/doc/libgnome/libgnome-gnome-config.html
 share/doc/libgnome/libgnome-gnome-exec.html
 share/doc/libgnome/libgnome-gnome-gconf.html
@@ -108,7 +97,6 @@ share/doc/libgnome/libgnome-gnome-url.html
 share/doc/libgnome/libgnome-gnome-util.html
 share/doc/libgnome/libgnome-libgnometypebuiltins.html
 share/doc/libgnome/libgnome.devhelp
-share/doc/libgnome/libgnome.html
 share/doc/libgnome/right.png
 share/doc/libgnome/up.png
 share/locale/am/LC_MESSAGES/libgnome-2.0.mo
@@ -124,6 +112,7 @@ share/locale/cy/LC_MESSAGES/libgnome-2.0.mo
 share/locale/da/LC_MESSAGES/libgnome-2.0.mo
 share/locale/de/LC_MESSAGES/libgnome-2.0.mo
 share/locale/el/LC_MESSAGES/libgnome-2.0.mo
+share/locale/en_CA/LC_MESSAGES/libgnome-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo
 share/locale/es/LC_MESSAGES/libgnome-2.0.mo
 share/locale/et/LC_MESSAGES/libgnome-2.0.mo
@@ -135,6 +124,7 @@ share/locale/ga/LC_MESSAGES/libgnome-2.0.mo
 share/locale/gl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/he/LC_MESSAGES/libgnome-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnome-2.0.mo
+share/locale/hr/LC_MESSAGES/libgnome-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnome-2.0.mo
 share/locale/id/LC_MESSAGES/libgnome-2.0.mo
 share/locale/is/LC_MESSAGES/libgnome-2.0.mo
@@ -159,6 +149,7 @@ share/locale/sk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sq/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sr/LC_MESSAGES/libgnome-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnome-2.0.mo
@@ -173,19 +164,13 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm share/doc/libgnome
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/lockdown
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background
@@ -193,23 +178,16 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/startup
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/lockdown
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/interface
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/file_views
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/background
@@ -217,7 +195,10 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/startup
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility
+etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/%gconf.xml