Update to 2.6.0:

What's new since 2.4:

* Improvements:
	- Add File Chooser backend schema (Jonathan Blandford)

* Bug fixes:
	- Fix translation of program arguments (Hidetoshi Tajima,
						Christian Neumair,
						Anders Carlsson)

* Translations:
	- Added Canadian English translation (Adam Weinberger)
	- Added Croatian translation (Robert Sedak)
	- Added Serbian Jekavian translation (Bojan Suziϙʤ)
	- Added Romanian translation (Miœô ÿu Moldovan, Mugurel Tudor)

	- Updated Albanian translation (Laurent Dhima)
	- Updated Arabic translation (Arafat Medini)
	- Updated Azerbaijani translation (Mœô£Ùtin œô¡Ïmirov)
	- Updated Belarusian translation (Ales Nyakhaychyk)
	- Updated Brazilian Portuguese translation (Augusta Margues da Silva,
					            Raphael Higino,
					  	    Everson Santos Araujo)
	- Updated British translation (Gareth Owen)
	- Updated Catalan translation (Jordi Mallach)
	- Updated Czech translation (Miloslav Trmac)
 	- Updated Danish translation (Ole Laursen)
	- Updated Dutch translation (Vincent van Adrighem,
				     Reinout van Schouwen)
	- Updated Estonian translation (Tõivo Leedjärv)
	- Updated Finnish translation (Pauli Virtanen)
 	- Updated French translation (Christophe Merlet)
	- Updated German translation (Christian Neumair)
	- Updated Greek translation (Kostas Papadimas)
	- Updated Hungarian translation (Andras Timar)
	- Updated Irish translation (Alastair McKinstry)
	- Updated Italian translation (Alesso Frusciante)
	- Updated Japanese translation (Takeshi AIHANA)
	- Updated Korean translation (Changwoo Ryu)
	- Updated Lithuanian translation (œô¡½ygimantas Beruœô ­ka, Tomas Kuliavas)
	- Updated Mongolian translation (Sanlig Badral)
	- Updated Norwegian translation (Kjartan Maraas)
	- Updated Norwegian Nynorsk translation (Åsmund Skjæveland)
	- Updated Polish translation (GNOME PL Team)
	- Updated Portuguese translation (Duarte Loreto)
	- Updated Russian translation (Russian Team)
	- Updated Serbian translations (Danilo œô¡ egan)
	- Updated Simplified Chinese translation (Funda Wang)
	- Updated Slovak translation (Marcel Telka)
	- Updated Spanish translation (Francisco Javier F. Serrador)
	- Updated Swedish translation (Christian Rose)
	- Updated Tamil translation (Dinesh Nadarajah)
	- Updated Thai translation (Paisa Seeluangsawat)
	- Updated Turkish translation (Ismail Aslan)
	- Updated Ukranian translation (Maxim Dziumanenko, Yuriy Syrota)
	- Updated Welsh translation (Dafydd Harries, Rhys Jones)

7 files changed, 36 insertions, 31 deletions

diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 6777677fdb3..fd3706afb72 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2004/04/01 18:22:04 jmmv Exp $
 #
 
-DISTNAME=	libgnome-2.4.0
-PKGREVISION=	4
+DISTNAME=	libgnome-2.6.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -46,12 +45,12 @@ GCONF2_SCHEMAS+=	desktop_gnome_applications_window_manager.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_background.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_file_views.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_interface.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_lockdown.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_peripherals_keyboard.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_peripherals_mouse.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_sound.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_thumbnailers.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_typing_break.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_url_handlers.schemas
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/libgnome/PLIST b/devel/libgnome/PLIST
index a74f32c21ba..9871e49729c 100644
--- a/devel/libgnome/PLIST
+++ b/devel/libgnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/12/14 19:48:04 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/01 18:22:04 jmmv Exp $
 bin/gnome-open
 include/libgnome-2.0/libgnome/gnome-config.h
 include/libgnome-2.0/libgnome/gnome-exec.h
@@ -22,8 +22,8 @@ lib/bonobo/servers/GNOME_Moniker_std.server
 lib/libgnome-2.a
 lib/libgnome-2.la
 lib/libgnome-2.so
-lib/libgnome-2.so.400
-lib/libgnome-2.so.400.0
+lib/libgnome-2.so.600
+lib/libgnome-2.so.600.0
 lib/pkgconfig/libgnome-2.0.pc
 share/doc/html/libgnome/ch01s02.html
 share/doc/html/libgnome/ch01s03.html
@@ -61,12 +61,12 @@ share/gconf/schemas/desktop_gnome_applications_window_manager.schemas
 share/gconf/schemas/desktop_gnome_background.schemas
 share/gconf/schemas/desktop_gnome_file_views.schemas
 share/gconf/schemas/desktop_gnome_interface.schemas
+share/gconf/schemas/desktop_gnome_lockdown.schemas
 share/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas
 share/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
 share/gconf/schemas/desktop_gnome_sound.schemas
 share/gconf/schemas/desktop_gnome_thumbnailers.schemas
 share/gconf/schemas/desktop_gnome_typing_break.schemas
-share/gconf/schemas/desktop_gnome_url_handlers.schemas
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnome-2.0.mo
@@ -80,6 +80,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnome-2.0.mo
@@ -91,6 +92,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libgnome-2.0.mo
@@ -116,6 +118,7 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgnome-2.0.mo
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index b46ac756d7b..a1c1115da2f 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:22:04 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOME_BUILDLINK3_MK:=	${LIBGNOME_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnome}
 BUILDLINK_PACKAGES+=	libgnome
 
 .if !empty(LIBGNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.4.0
-BUILDLINK_RECOMMENDED.libgnome?=	libgnome>=2.4.0nb4
+BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.6.0
 BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 .endif	# LIBGNOME_BUILDLINK3_MK
 
diff --git a/devel/libgnome/distinfo b/devel/libgnome/distinfo
index 30785d91b7d..027e408cd02 100644
--- a/devel/libgnome/distinfo
+++ b/devel/libgnome/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2003/12/14 19:48:04 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2004/04/01 18:22:04 jmmv Exp $
 
-SHA1 (libgnome-2.4.0.tar.bz2) = 060f42e140d86fb67d43c6b57798ea1293f813f5
-Size (libgnome-2.4.0.tar.bz2) = 964070 bytes
-SHA1 (patch-aa) = 3413cbf561e723710b28b37d6ca696b3d6cddab0
-SHA1 (patch-ac) = f5aaa1cd464d85b9ceea42a29edec950658620f8
-SHA1 (patch-ae) = 3e9d43e3608cbf9e180c06e690f53c030580fbb2
+SHA1 (libgnome-2.6.0.tar.bz2) = 1e5e3025af775b24b21226f610672089fe251fe5
+Size (libgnome-2.6.0.tar.bz2) = 1070613 bytes
+SHA1 (patch-aa) = 809d964c6233d1a30eb195272a59970e497caea5
+SHA1 (patch-ac) = 3322e5de39ebe36b2174fceec4adecb6b168a4f1
+SHA1 (patch-ae) = 9a1f197ced91e37757aef84b0f3160bea5d0cf78
diff --git a/devel/libgnome/patches/patch-aa b/devel/libgnome/patches/patch-aa
index 95cbc222b13..632c8d62b17 100644
--- a/devel/libgnome/patches/patch-aa
+++ b/devel/libgnome/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2003/12/14 19:48:04 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2004/04/01 18:22:04 jmmv Exp $
 
---- gnome-data/Makefile.in.orig	2003-10-26 01:53:29.000000000 +0000
-+++ gnome-data/Makefile.in	2003-10-26 01:53:42.000000000 +0000
-@@ -141,7 +141,7 @@
- cxxflags_set = @cxxflags_set@
+--- gnome-data/Makefile.in.orig	2004-03-09 20:18:25.000000000 +0100
++++ gnome-data/Makefile.in
+@@ -146,7 +146,7 @@ WARN_CXXFLAGS = @WARN_CXXFLAGS@
+ YACC = @YACC@
  gnomelocaledir = @gnomelocaledir@
  
 -soundlistdir = $(sysconfdir)/sound/events
 +soundlistdir = $(datadir)/examples/libgnome/sound/events
  
- soundlist_in_files =  	gnome-2.soundlist.in			gtk-events-2.soundlist.in
- 
+ soundlist_in_files = \
+ 	gnome-2.soundlist.in		\
diff --git a/devel/libgnome/patches/patch-ac b/devel/libgnome/patches/patch-ac
index 1f36fb1438d..3c726154846 100644
--- a/devel/libgnome/patches/patch-ac
+++ b/devel/libgnome/patches/patch-ac
@@ -1,6 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2003/02/15 13:30:50 jmmv Exp $
+$NetBSD: patch-ac,v 1.4 2004/04/01 18:22:04 jmmv Exp $
 
---- libgnome/gnome-init.c.orig	2002-11-22 14:47:27.000000000 +0100
+http://bugzilla.gnome.org/show_bug.cgi?id=106117
+
+--- libgnome/gnome-init.c.orig	2004-03-16 11:44:07.000000000 +0100
 +++ libgnome/gnome-init.c
 @@ -53,6 +53,8 @@
  
@@ -19,7 +21,7 @@ $NetBSD: patch-ac,v 1.3 2003/02/15 13:30:50 jmmv Exp $
 +	if (libgnome_mkdir (gnome_user_dir, 0700) < 0) { /* private permissions, but we
  						   don't check that we got them */
  		if (errno != EEXIST) {
- 			fprintf(stderr, _("Could not create per-user gnome configuration directory `%s': %s\n"),
+ 			g_printerr (_("Could not create per-user gnome configuration directory `%s': %s\n"),
 @@ -308,7 +310,7 @@ libgnome_userdir_setup (gboolean create_
  		}
  	}
@@ -36,9 +38,9 @@ $NetBSD: patch-ac,v 1.3 2003/02/15 13:30:50 jmmv Exp $
 -	if (mkdir (gnome_user_accels_dir, 0700) < 0) {
 +	if (libgnome_mkdir (gnome_user_accels_dir, 0700) < 0) {
  		if (errno != EEXIST) {
- 			fprintf(stderr, _("Could not create gnome accelerators directory `%s': %s\n"),
+ 			g_printerr (_("Could not create gnome accelerators directory `%s': %s\n"),
  				gnome_user_accels_dir, strerror(errno));
-@@ -462,3 +464,24 @@ libgnome_module_info_get (void)
+@@ -461,3 +463,24 @@ libgnome_module_info_get (void)
  
  	return &module_info;
  }
diff --git a/devel/libgnome/patches/patch-ae b/devel/libgnome/patches/patch-ae
index 7f13f826264..a14dfd5bfab 100644
--- a/devel/libgnome/patches/patch-ae
+++ b/devel/libgnome/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2003/02/15 13:30:50 jmmv Exp $
+$NetBSD: patch-ae,v 1.2 2004/04/01 18:22:04 jmmv Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=106117
 
 --- libgnome/gnome-config.c.orig	2002-07-12 14:44:10.000000000 +0200
 +++ libgnome/gnome-config.c