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)

6 files changed, 24 insertions, 33 deletions

diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 4db90915e7f..a2cf2c2bd8e 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/05/05 13:50:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/25 07:58:05 jmmv Exp $
 #
 
-DISTNAME=	libgnome-2.2.0.1
-PKGREVISION=	2
+DISTNAME=	libgnome-2.2.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnome/PLIST b/devel/libgnome/PLIST
index 65894a3392a..1d53c4016dd 100644
--- a/devel/libgnome/PLIST
+++ b/devel/libgnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/02/14 20:11:49 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/05/25 07:58:05 jmmv Exp $
 include/libgnome-2.0/libgnome/gnome-config.h
 include/libgnome-2.0/libgnome/gnome-exec.h
 include/libgnome-2.0/libgnome/gnome-gconf.h
@@ -25,7 +25,7 @@ lib/libgnome-2.a
 lib/libgnome-2.la
 lib/libgnome-2.so
 lib/libgnome-2.so.200
-lib/libgnome-2.so.200.0
+lib/libgnome-2.so.200.1
 lib/pkgconfig/libgnome-2.0.pc
 libexec/gnome2-db2html
 libexec/gnome2-info2html
@@ -75,6 +75,7 @@ ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgnome-2.0.mo
@@ -92,12 +93,14 @@ ${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/hu/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnome-2.0.mo
@@ -110,6 +113,8 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/sl/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/sv/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnome-2.0.mo
diff --git a/devel/libgnome/distinfo b/devel/libgnome/distinfo
index 5ccb6e4204a..db4590ab982 100644
--- a/devel/libgnome/distinfo
+++ b/devel/libgnome/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2003/02/18 20:52:05 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2003/05/25 07:58:05 jmmv Exp $
 
-SHA1 (libgnome-2.2.0.1.tar.bz2) = 50a7dd086638094723f47788d399d1826647710e
-Size (libgnome-2.2.0.1.tar.bz2) = 716319 bytes
-SHA1 (patch-aa) = edb9f86dbc9defefab5a31ebc6303a7488dab639
-SHA1 (patch-ab) = f1d44227b78406e7daece28e734ac239cda41518
+SHA1 (libgnome-2.2.1.tar.bz2) = 00e998aea7b3e22debf26566c38abdaed10f83b0
+Size (libgnome-2.2.1.tar.bz2) = 900739 bytes
+SHA1 (patch-aa) = 03b4fffa903a57baf6efe9a980954280986e45fe
+SHA1 (patch-ab) = 1329d047c2898eabb105289541a9301db3c6d70c
 SHA1 (patch-ac) = f5aaa1cd464d85b9ceea42a29edec950658620f8
 SHA1 (patch-ae) = 3e9d43e3608cbf9e180c06e690f53c030580fbb2
-SHA1 (patch-af) = 91ce8f910ed54e6186ab6592494ae9190705629b
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");