Update to 2.2.1:

Library:
        * Init gettext earlier to catch some bugs (Hidetoshi Tajima)
          Bug #99224
        * Fix search path for locale.alias. (Julio Merino) Bug #106180.
        * Fix url substitution with custom web browser command
          (Pasupathi Duraisamy) Bug #108909
        * Plug a leak in the help routines. (Kjartan)

Help converters:
        * Fix manual pages that have non-numeric filetypes such as
          open.3pm. Patch from Roderich Schupp. Bug #101440.
        * Fix crashes when feeding directories to the help converters.
          Patch from John Fleck. Bug #104056.
        * Generate help-methods.conf based on libexecdir value.
          Patch from Frédéric Crozat. Bug #91169.

Build:
        * Honor --disable-schemas-install. (Julio Merino)
        * Require newer intltool (Kjartan)

Translations:
        az (Metin Amiroff), be (Dmitry Mastrukov), bn (Taneem Ahmed),
        cs (Miloslav Trmac), de (Christian Neumair), el (Kostas
	Papadimas),
        es (Carlos Perello Martin), id (Mohammad DAMT), ja (Takeshi
	AIHANA),
        ml (Guntupalli Karunkar), mn (Badral Saulig), ms (Hasbullah Bin
	Pit),
        ko (Changwoo Ryu), nl (Vincent Van Adrighem), no (Kjartan
	Maraas),
        pl (Zbigniew Chyla), pt (Duarte Loreto), ru (Dmitry Mastrukov)

3 files changed, 10 insertions, 22 deletions

diff --git a/devel/libgnome/patches/patch-aa b/devel/libgnome/patches/patch-aa
index b43a6277961..ffa73aeba10 100644
--- a/devel/libgnome/patches/patch-aa
+++ b/devel/libgnome/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/02/14 20:11:50 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2003/05/25 07:58:06 jmmv Exp $
 
---- gnome-data/Makefile.in.orig	Thu Jan 23 15:08:16 2003
+--- gnome-data/Makefile.in.orig	2003-05-18 19:36:01.000000000 +0200
 +++ gnome-data/Makefile.in
-@@ -132,7 +132,7 @@ YACC = @YACC@
- Z_LIBS = @Z_LIBS@
+@@ -147,7 +147,7 @@ Z_LIBS = @Z_LIBS@
+ cxxflags_set = @cxxflags_set@
  gnomelocaledir = @gnomelocaledir@
  
 -soundlistdir = $(sysconfdir)/sound/events
 +soundlistdir = $(datadir)/examples/libgnome/sound/events
  
- soundlist_in_files = \
- 	gnome-2.soundlist.in		\
+ soundlist_in_files =  	gnome-2.soundlist.in			gtk-events-2.soundlist.in
+ 
diff --git a/devel/libgnome/patches/patch-ab b/devel/libgnome/patches/patch-ab
index 4ea71d97c43..d7c2f94a4ce 100644
--- a/devel/libgnome/patches/patch-ab
+++ b/devel/libgnome/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/02/14 20:11:51 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2003/05/25 07:58:06 jmmv Exp $
 
---- help-converters/gnome-vfs-module/Makefile.in.orig	Thu Jan 23 15:08:20 2003
+--- help-converters/gnome-vfs-module/Makefile.in.orig	2003-05-18 19:36:04.000000000 +0200
 +++ help-converters/gnome-vfs-module/Makefile.in
-@@ -150,7 +150,7 @@ libvfs_help_la_SOURCES = \
+@@ -161,7 +161,7 @@ libvfs_help_la_SOURCES =  	help-method.c
  libvfs_help_la_LDFLAGS = $(module_flags)
  libvfs_help_la_LIBADD = $(HELP_VFS_MODULE_LIBS)
  
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.2 2003/02/14 20:11:51 jmmv Exp $
 +modulesconfdir = $(datadir)/examples/libgnome/gnome-vfs-2.0/modules
  modulesconf_DATA = help-methods.conf
  
- EXTRA_DIST = help-methods.conf
+ EXTRA_DIST = help-methods.conf.in
diff --git a/devel/libgnome/patches/patch-af b/devel/libgnome/patches/patch-af
deleted file mode 100644
index ac880973c68..00000000000
--- a/devel/libgnome/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/02/15 17:01:43 jmmv Exp $
-
---- libgnome/gnome-i18n.c.orig	2002-07-12 14:44:11.000000000 +0200
-+++ libgnome/gnome-i18n.c
-@@ -69,6 +69,7 @@ unalias_lang (char *lang)
-   int i;
-   if (!alias_table)
-     {
-+      read_aliases (LIBGNOME_DATADIR "/locale/locale.alias");
-       read_aliases ("/usr/share/locale/locale.alias");
-       read_aliases ("/usr/local/share/locale/locale.alias");
-       read_aliases ("/usr/lib/X11/locale/locale.alias");