update to 2.22.1

This switches to the gnome-2.22 release branch.

3 files changed, 27 insertions, 10 deletions

diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 2114a0cca1e..e6e5af2e152 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2008/03/06 14:53:50 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2008/04/15 18:00:48 drochner Exp $
 #
 
-DISTNAME=	gucharmap-1.10.2
-PKGREVISION=	1
+DISTNAME=	gucharmap-2.22.1
 CATEGORIES=	fonts gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/1.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -21,6 +20,8 @@ PKGCONFIG_OVERRIDE+=	gucharmap.pc.in
 
 GTK2_IMMODULES=		yes
 
+GCONF_SCHEMAS+=	gucharmap.schemas
+
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.6.0
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.13.7
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.13.2
@@ -35,4 +36,5 @@ BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.13.2
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/modules.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/gucharmap/PLIST b/fonts/gucharmap/PLIST
index 84a9d534923..2810e818075 100644
--- a/fonts/gucharmap/PLIST
+++ b/fonts/gucharmap/PLIST
@@ -1,15 +1,20 @@
-@comment $NetBSD: PLIST,v 1.15 2008/01/11 13:51:41 drochner Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/04/15 18:00:48 drochner Exp $
 bin/charmap
 bin/gnome-character-map
 bin/gucharmap
+include/gucharmap/gucharmap-block-chapters-model.h
 include/gucharmap/gucharmap-block-chapters.h
+include/gucharmap/gucharmap-chapters-model.h
+include/gucharmap/gucharmap-chapters-view.h
 include/gucharmap/gucharmap-chapters.h
 include/gucharmap/gucharmap-charmap.h
 include/gucharmap/gucharmap-codepoint-list.h
 include/gucharmap/gucharmap-mini-fontsel.h
+include/gucharmap/gucharmap-script-chapters-model.h
 include/gucharmap/gucharmap-script-chapters.h
 include/gucharmap/gucharmap-script-codepoint-list.h
 include/gucharmap/gucharmap-search-dialog.h
+include/gucharmap/gucharmap-settings.h
 include/gucharmap/gucharmap-table.h
 include/gucharmap/gucharmap-unicode-info.h
 include/gucharmap/gucharmap-window.h
@@ -17,6 +22,7 @@ include/gucharmap/gucharmap.h
 lib/libgucharmap.la
 lib/pkgconfig/gucharmap.pc
 share/applications/gucharmap.desktop
+share/gconf/schemas/gucharmap.schemas
 share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/C/figures/gucharmap_window.png
 share/gnome/help/gucharmap/C/gucharmap.xml
@@ -51,6 +57,9 @@ share/gnome/help/gucharmap/ko/gucharmap.xml
 share/gnome/help/gucharmap/oc/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/oc/figures/gucharmap_window.png
 share/gnome/help/gucharmap/oc/gucharmap.xml
+share/gnome/help/gucharmap/pt_BR/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/pt_BR/figures/gucharmap_window.png
+share/gnome/help/gucharmap/pt_BR/gucharmap.xml
 share/gnome/help/gucharmap/ru/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/ru/figures/gucharmap_window.png
 share/gnome/help/gucharmap/ru/gucharmap.xml
@@ -68,6 +77,7 @@ share/locale/am/LC_MESSAGES/gucharmap.mo
 share/locale/ar/LC_MESSAGES/gucharmap.mo
 share/locale/az/LC_MESSAGES/gucharmap.mo
 share/locale/be/LC_MESSAGES/gucharmap.mo
+share/locale/be@latin/LC_MESSAGES/gucharmap.mo
 share/locale/bg/LC_MESSAGES/gucharmap.mo
 share/locale/bn/LC_MESSAGES/gucharmap.mo
 share/locale/bn_IN/LC_MESSAGES/gucharmap.mo
@@ -91,6 +101,7 @@ share/locale/fr/LC_MESSAGES/gucharmap.mo
 share/locale/ga/LC_MESSAGES/gucharmap.mo
 share/locale/gl/LC_MESSAGES/gucharmap.mo
 share/locale/gu/LC_MESSAGES/gucharmap.mo
+share/locale/he/LC_MESSAGES/gucharmap.mo
 share/locale/hi/LC_MESSAGES/gucharmap.mo
 share/locale/hr/LC_MESSAGES/gucharmap.mo
 share/locale/hu/LC_MESSAGES/gucharmap.mo
@@ -149,12 +160,13 @@ share/omf/gucharmap/gucharmap-it.omf
 share/omf/gucharmap/gucharmap-ja.omf
 share/omf/gucharmap/gucharmap-ko.omf
 share/omf/gucharmap/gucharmap-oc.omf
+share/omf/gucharmap/gucharmap-pt_BR.omf
 share/omf/gucharmap/gucharmap-ru.omf
 share/omf/gucharmap/gucharmap-sv.omf
 share/omf/gucharmap/gucharmap-zh_CN.omf
 share/omf/gucharmap/gucharmap-zh_TW.omf
 @dirrm share/omf/gucharmap
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/gucharmap/zh_TW/figures
@@ -165,6 +177,8 @@ share/omf/gucharmap/gucharmap-zh_TW.omf
 @dirrm share/gnome/help/gucharmap/sv
 @dirrm share/gnome/help/gucharmap/ru/figures
 @dirrm share/gnome/help/gucharmap/ru
+@dirrm share/gnome/help/gucharmap/pt_BR/figures
+@dirrm share/gnome/help/gucharmap/pt_BR
 @dirrm share/gnome/help/gucharmap/oc/figures
 @dirrm share/gnome/help/gucharmap/oc
 @dirrm share/gnome/help/gucharmap/ko/figures
@@ -189,5 +203,6 @@ share/omf/gucharmap/gucharmap-zh_TW.omf
 @dirrm share/gnome/help/gucharmap/C
 @dirrm share/gnome/help/gucharmap
 @comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm include/gucharmap
diff --git a/fonts/gucharmap/distinfo b/fonts/gucharmap/distinfo
index 2c836b25118..e1c208f5798 100644
--- a/fonts/gucharmap/distinfo
+++ b/fonts/gucharmap/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2008/01/11 13:51:41 drochner Exp $
+$NetBSD: distinfo,v 1.16 2008/04/15 18:00:48 drochner Exp $
 
-SHA1 (gucharmap-1.10.2.tar.bz2) = b9f1f1eddfce148e733f6a2b43f3108e8edbb26b
-RMD160 (gucharmap-1.10.2.tar.bz2) = de189901ea4f2e9eabfbd475cea402e2125f57db
-Size (gucharmap-1.10.2.tar.bz2) = 2514969 bytes
+SHA1 (gucharmap-2.22.1.tar.bz2) = 4663b36b725eed7c8e2f7025768993202def465c
+RMD160 (gucharmap-2.22.1.tar.bz2) = bcd60893e611d61022b18870b4ed19220680780a
+Size (gucharmap-2.22.1.tar.bz2) = 2632367 bytes