update to 2.32.1

This switches to the gnome-2.32 release branch.

3 files changed, 25 insertions, 22 deletions

diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 639ec76f0e6..e09a3ff813a 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.73 2010/11/15 22:56:59 abs Exp $
+# $NetBSD: Makefile,v 1.74 2010/11/29 18:29:17 drochner Exp $
 #
 
-DISTNAME=	gucharmap-2.30.3
-PKGREVISION=	2
+DISTNAME=	gucharmap-2.32.1
 CATEGORIES=	fonts gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/fonts/gucharmap/PLIST b/fonts/gucharmap/PLIST
index bc3f478a915..f13784dae44 100644
--- a/fonts/gucharmap/PLIST
+++ b/fonts/gucharmap/PLIST
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.22 2010/07/06 15:01:56 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2010/11/29 18:29:17 drochner Exp $
 bin/charmap
 bin/gnome-character-map
 bin/gucharmap
-include/gucharmap-2/gucharmap/gucharmap-block-chapters-model.h
-include/gucharmap-2/gucharmap/gucharmap-block-codepoint-list.h
-include/gucharmap-2/gucharmap/gucharmap-chapters-model.h
-include/gucharmap-2/gucharmap/gucharmap-chapters-view.h
-include/gucharmap-2/gucharmap/gucharmap-charmap.h
-include/gucharmap-2/gucharmap/gucharmap-chartable.h
-include/gucharmap-2/gucharmap/gucharmap-codepoint-list.h
-include/gucharmap-2/gucharmap/gucharmap-script-chapters-model.h
-include/gucharmap-2/gucharmap/gucharmap-script-codepoint-list.h
-include/gucharmap-2/gucharmap/gucharmap-type-builtins.h
-include/gucharmap-2/gucharmap/gucharmap-unicode-info.h
-include/gucharmap-2/gucharmap/gucharmap.h
+include/gucharmap-2.0/gucharmap/gucharmap-block-chapters-model.h
+include/gucharmap-2.0/gucharmap/gucharmap-block-codepoint-list.h
+include/gucharmap-2.0/gucharmap/gucharmap-chapters-model.h
+include/gucharmap-2.0/gucharmap/gucharmap-chapters-view.h
+include/gucharmap-2.0/gucharmap/gucharmap-charmap.h
+include/gucharmap-2.0/gucharmap/gucharmap-chartable.h
+include/gucharmap-2.0/gucharmap/gucharmap-codepoint-list.h
+include/gucharmap-2.0/gucharmap/gucharmap-script-chapters-model.h
+include/gucharmap-2.0/gucharmap/gucharmap-script-codepoint-list.h
+include/gucharmap-2.0/gucharmap/gucharmap-type-builtins.h
+include/gucharmap-2.0/gucharmap/gucharmap-unicode-info.h
+include/gucharmap-2.0/gucharmap/gucharmap.h
 lib/libgucharmap.la
 lib/pkgconfig/gucharmap-2.pc
 share/applications/gucharmap.desktop
@@ -73,9 +73,12 @@ share/gnome/help/gucharmap/sv/gucharmap.xml
 share/gnome/help/gucharmap/vi/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/vi/figures/gucharmap_window.png
 share/gnome/help/gucharmap/vi/gucharmap.xml
+share/gnome/help/gucharmap/zh_CN/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/zh_CN/figures/gucharmap_window.png
 share/gnome/help/gucharmap/zh_CN/gucharmap.xml
-share/gnome/help/gucharmap/zh_CN/legal.xml
+share/gnome/help/gucharmap/zh_HK/figures/gucharmap_window.png
+share/gnome/help/gucharmap/zh_HK/gucharmap.xml
+share/gnome/help/gucharmap/zh_HK/legal.xml
 share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
 share/gnome/help/gucharmap/zh_TW/gucharmap.xml
 share/gnome/help/gucharmap/zh_TW/legal.xml
@@ -183,4 +186,5 @@ share/omf/gucharmap/gucharmap-ru.omf
 share/omf/gucharmap/gucharmap-sv.omf
 share/omf/gucharmap/gucharmap-vi.omf
 share/omf/gucharmap/gucharmap-zh_CN.omf
+share/omf/gucharmap/gucharmap-zh_HK.omf
 share/omf/gucharmap/gucharmap-zh_TW.omf
diff --git a/fonts/gucharmap/distinfo b/fonts/gucharmap/distinfo
index 3e81473b2bc..7ed2a18e5b6 100644
--- a/fonts/gucharmap/distinfo
+++ b/fonts/gucharmap/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.29 2010/09/01 11:45:34 drochner Exp $
+$NetBSD: distinfo,v 1.30 2010/11/29 18:29:17 drochner Exp $
 
-SHA1 (gucharmap-2.30.3.tar.bz2) = ea2cc180ad6cf892a6e68fc3a0527e0ecc0eaec5
-RMD160 (gucharmap-2.30.3.tar.bz2) = c563a052ed400305e8dd52e98df8d87012629b83
-Size (gucharmap-2.30.3.tar.bz2) = 3151573 bytes
+SHA1 (gucharmap-2.32.1.tar.bz2) = 4cb86f114e4ed2921fb4ffa58caa0370e4f82f0c
+RMD160 (gucharmap-2.32.1.tar.bz2) = 10faecd24f2e7b3a150b0e7edba2a2dd419336c8
+Size (gucharmap-2.32.1.tar.bz2) = 3242939 bytes