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>

6 files changed, 57 insertions, 66 deletions

diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index dda4ab248728..15cef2fa322c 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	x11-toolkits 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
@@ -19,7 +18,8 @@ COMMENT=	GUI frontend to the libbonobo component of GNOME 2
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomecanvas libgnome
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack \
+		libgnomecanvas libgnome
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 389b480a34e6..105514cc5b47 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libbonoboui-2.4.3.tar.bz2) = b2e4b0e62d5d32ba713221fb63faa6d1
-SIZE (gnome2/libbonoboui-2.4.3.tar.bz2) = 889106
+MD5 (gnome2/libbonoboui-2.6.0.tar.bz2) = 948dbd0ffe2c460ff2986254a40a5c7f
+SIZE (gnome2/libbonoboui-2.6.0.tar.bz2) = 917849
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
index 156a4f587188..fcdbe416ba34 100644
--- a/x11-toolkits/libbonoboui/files/patch-Makefile.in
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Sat Jun 14 04:47:53 2003
-+++ Makefile.in	Sat Jun 14 04:48:13 2003
-@@ -192,7 +192,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig	Fri Jan 16 13:17:47 2004
++++ Makefile.in	Fri Jan 16 13:18:13 2004
+@@ -146,7 +146,7 @@
+ am__quote = @am__quote@
+ gnomelocaledir = @gnomelocaledir@
+ install_sh = @install_sh@
 -SUBDIRS = bonobo glade samples tests po doc
 +SUBDIRS = bonobo glade samples po doc
  
diff --git a/x11-toolkits/libbonoboui/files/patch-configure b/x11-toolkits/libbonoboui/files/patch-configure
deleted file mode 100644
index e33f9e6ceb4e..000000000000
--- a/x11-toolkits/libbonoboui/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/04/26 11:11:58	1.1
-+++ configure	2002/04/26 11:12:23
-@@ -7013,6 +7013,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-toolkits/libbonoboui/pkg-descr b/x11-toolkits/libbonoboui/pkg-descr
index 22194d3a1d97..8ca4e661c557 100644
--- a/x11-toolkits/libbonoboui/pkg-descr
+++ b/x11-toolkits/libbonoboui/pkg-descr
@@ -1,9 +1,7 @@
-Bonobo is a set of language and system independant CORBA
-interfaces for creating reusable components and creating compound
-documents.
+Bonobo is a set of language- and system-independant CORBA
+interfaces for creating reusable components and compound documents.
 
-libbonoboui includes a Gtk+ based implementation of the Bonobo
-interfaces, enabling developers to create reusable components
-and applications that can be used to form more complex documents.
+libbonoboui includes a Gtk+-based implementation of the Bonobo
+interfaces.
 
 WWW: http://www.gnome.org/
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 7360b136d008..a2dba1c8cc79 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -39,40 +39,40 @@ lib/libglade/2.0/libbonobo.so
 libdata/bonobo/servers/Bonobo_Sample_Controls.server
 libdata/bonobo/servers/CanvDemo.server
 libdata/pkgconfig/libbonoboui-2.0.pc
-share/doc/libbonoboui/bonobo-controls.html
-share/doc/libbonoboui/bonobo-support-utilities.html
-share/doc/libbonoboui/bonobo-ui.html
-share/doc/libbonoboui/ch01.html
-share/doc/libbonoboui/control-frame.png
-share/doc/libbonoboui/control.png
-share/doc/libbonoboui/home.png
-share/doc/libbonoboui/index.html
-share/doc/libbonoboui/index.sgml
-share/doc/libbonoboui/left.png
-share/doc/libbonoboui/libbonoboui-bonobo-a11y.html
-share/doc/libbonoboui/libbonoboui-bonobo-control-frame.html
-share/doc/libbonoboui/libbonoboui-bonobo-control.html
-share/doc/libbonoboui/libbonoboui-bonobo-file-selector-util.html
-share/doc/libbonoboui/libbonoboui-bonobo-plug.html
-share/doc/libbonoboui/libbonoboui-bonobo-property-control.html
-share/doc/libbonoboui/libbonoboui-bonobo-selector-widget.html
-share/doc/libbonoboui/libbonoboui-bonobo-selector.html
-share/doc/libbonoboui/libbonoboui-bonobo-socket.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-component.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-container.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-engine-config.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-engine.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-node.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-preferences.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-sync.html
-share/doc/libbonoboui/libbonoboui-bonobo-ui-util.html
-share/doc/libbonoboui/libbonoboui-bonobo-widget.html
-share/doc/libbonoboui/libbonoboui-bonobo-window.html
-share/doc/libbonoboui/libbonoboui-bonobo-wrapper.html
-share/doc/libbonoboui/libbonoboui-faq.html
-share/doc/libbonoboui/libbonoboui.devhelp
-share/doc/libbonoboui/right.png
-share/doc/libbonoboui/up.png
+%%DOCSDIR%%/bonobo-controls.html
+%%DOCSDIR%%/bonobo-support-utilities.html
+%%DOCSDIR%%/bonobo-ui.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/control-frame.png
+%%DOCSDIR%%/control.png
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libbonoboui-bonobo-a11y.html
+%%DOCSDIR%%/libbonoboui-bonobo-control-frame.html
+%%DOCSDIR%%/libbonoboui-bonobo-control.html
+%%DOCSDIR%%/libbonoboui-bonobo-file-selector-util.html
+%%DOCSDIR%%/libbonoboui-bonobo-plug.html
+%%DOCSDIR%%/libbonoboui-bonobo-property-control.html
+%%DOCSDIR%%/libbonoboui-bonobo-selector-widget.html
+%%DOCSDIR%%/libbonoboui-bonobo-selector.html
+%%DOCSDIR%%/libbonoboui-bonobo-socket.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-component.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-container.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-engine-config.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-engine.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-node.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-preferences.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-sync.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-util.html
+%%DOCSDIR%%/libbonoboui-bonobo-widget.html
+%%DOCSDIR%%/libbonoboui-bonobo-window.html
+%%DOCSDIR%%/libbonoboui-bonobo-wrapper.html
+%%DOCSDIR%%/libbonoboui-faq.html
+%%DOCSDIR%%/libbonoboui.devhelp
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/up.png
 share/gnome/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
 share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
 share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo
@@ -87,12 +87,16 @@ share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/en_GB/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/es/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/et/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/fa/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/fi/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/fr/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ga/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/he/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/hr/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/id/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/is/LC_MESSAGES/libbonoboui-2.0.mo
@@ -111,6 +115,7 @@ share/locale/ne/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/no/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pt/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/libbonoboui-2.0.mo
@@ -121,6 +126,7 @@ share/locale/sl/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sq/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sr/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo
@@ -134,4 +140,4 @@ share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
 @dirrm lib/bonobo-2.0
 @dirrm include/libbonoboui-2.0/bonobo
 @dirrm include/libbonoboui-2.0
-@dirrm share/doc/libbonoboui
+@dirrm %%DOCSDIR%%