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, 16 insertions, 54 deletions

diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 0b251b03ac0d..a62fd2a08e7f 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgnomecanvas
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	graphics 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
@@ -21,8 +20,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
-USE_GNOMENG=	yes
-USE_GNOME=	gnomehack libglade2 libartlgpl2
+USE_GNOME=	gnomehack lthack libglade2 libartlgpl2
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index fb320bbdc46a..ba48aa4d6e38 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomecanvas-2.4.0.tar.bz2) = c212a7cac06b7f9e68ed2de38df6e54d
-SIZE (gnome2/libgnomecanvas-2.4.0.tar.bz2) = 535399
+MD5 (gnome2/libgnomecanvas-2.6.0.tar.bz2) = a670348ceecaa85b35940dcbd9f8c20e
+SIZE (gnome2/libgnomecanvas-2.6.0.tar.bz2) = 512743
diff --git a/graphics/libgnomecanvas/files/patch-configure b/graphics/libgnomecanvas/files/patch-configure
deleted file mode 100644
index a00b21e828d1..000000000000
--- a/graphics/libgnomecanvas/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/04/26 10:26:12	1.1
-+++ configure	2002/04/26 10:26:32
-@@ -7092,6 +7092,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/graphics/libgnomecanvas/pkg-descr b/graphics/libgnomecanvas/pkg-descr
index 8900db783bf3..a3d2ae327b86 100644
--- a/graphics/libgnomecanvas/pkg-descr
+++ b/graphics/libgnomecanvas/pkg-descr
@@ -1,6 +1,2 @@
-The GNOMECanvas library provides a number of features:
-
-	- Image loading facilities.
-	- Rendering of a GdkPixBuf into various formats:
-	  drawables (windows, pixmaps), GdkRGB buffers.
-	- A cache interface
+The GNOMECanvas library allows images to be used directly within
+GUIs.
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index a20514a4aaa6..303dcc19ef74 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -15,33 +15,8 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h
 lib/libglade/2.0/libcanvas.so
 lib/libgnomecanvas-2.a
 lib/libgnomecanvas-2.so
-lib/libgnomecanvas-2.so.400
+lib/libgnomecanvas-2.so.600
 libdata/pkgconfig/libgnomecanvas-2.0.pc
-share/doc/libgnomecanvas/c35.html
-share/doc/libgnomecanvas/c4.html
-share/doc/libgnomecanvas/index.html
-share/doc/libgnomecanvas/index.sgml
-share/doc/libgnomecanvas/gnomecanvas.html
-share/doc/libgnomecanvas/gnomecanvasbpath.html
-share/doc/libgnomecanvas/gnomecanvasclipgroup.html
-share/doc/libgnomecanvas/gnomecanvasellipse.html
-share/doc/libgnomecanvas/gnomecanvasgroup.html
-share/doc/libgnomecanvas/gnomecanvasitem.html
-share/doc/libgnomecanvas/gnomecanvasline.html
-share/doc/libgnomecanvas/gnomecanvaspixbuf.html
-share/doc/libgnomecanvas/gnomecanvaspolygon.html
-share/doc/libgnomecanvas/gnomecanvasre.html
-share/doc/libgnomecanvas/gnomecanvasrect.html
-share/doc/libgnomecanvas/gnomecanvasrichtext.html
-share/doc/libgnomecanvas/gnomecanvasshape.html
-share/doc/libgnomecanvas/gnomecanvastext.html
-share/doc/libgnomecanvas/gnomecanvaswidget.html
-share/doc/libgnomecanvas/home.png
-share/doc/libgnomecanvas/left.png
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
-share/doc/libgnomecanvas/right.png
-share/doc/libgnomecanvas/up.png
 share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -54,8 +29,10 @@ share/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo
-share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/en_CA/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/en_GB/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/eo/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fa/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -63,14 +40,16 @@ share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ga/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/hr/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/id/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/is/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
-share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/lt/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ml/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -80,6 +59,7 @@ share/locale/ne/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/pa/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -89,6 +69,7 @@ share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sq/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sr/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo