Update to 1.4.0:

* View by script as well as by Unicode block.
* New documentation in the following languages: de es fr it ja ko sv zh_CN
  zh_HK zh_TW
* English documentation improved and updated.
* Search modified to look in CJK ideograph definitions as well as character
  names.  Search heuristic also improved in other areas.
* Bothersome gucharmap input method removed.
* Many user interface improvements.
* Much code reorganized.
* New and updated translations: ar az bn ca cs cy da de el en_CA en_GB es fa
  fi fr ga hi id it ja ko lt mn ms nl no pa pl pt pt_BR sk sq sr sr@Latn sv
  th uk zh_CN

6 files changed, 83 insertions, 53 deletions

diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 5194fa86c8c..0cc5d3ecdf9 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/01 19:04:59 jmmv Exp $
 #
 
-DISTNAME=	gucharmap-1.2.0
-PKGREVISION=	8
+DISTNAME=	gucharmap-1.4.0
 CATEGORIES=	fonts gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/1.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/1.4/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	xtraeme@NetBSD.org
diff --git a/fonts/gucharmap/PLIST b/fonts/gucharmap/PLIST
index 1cef6710d49..f986ac37ac0 100644
--- a/fonts/gucharmap/PLIST
+++ b/fonts/gucharmap/PLIST
@@ -1,27 +1,59 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/16 00:13:17 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/01 19:04:59 jmmv Exp $
 bin/charmap
 bin/gnome-character-map
 bin/gucharmap
+include/gucharmap/gucharmap-block-chapters.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.h
+include/gucharmap/gucharmap-script-codepoint-list.h
+include/gucharmap/gucharmap-search-dialog.h
 include/gucharmap/gucharmap-table.h
 include/gucharmap/gucharmap-unicode-info.h
 include/gucharmap/gucharmap-window.h
 include/gucharmap/gucharmap.h
-lib/gtk-2.0/2.2.0/immodules/im-gucharmap.a
-lib/gtk-2.0/2.2.0/immodules/im-gucharmap.la
-lib/gtk-2.0/2.2.0/immodules/im-gucharmap.so
 lib/libgucharmap.a
 lib/libgucharmap.la
 lib/libgucharmap.so
-lib/libgucharmap.so.3
-lib/libgucharmap.so.3.3
+lib/libgucharmap.so.4
+lib/libgucharmap.so.4.3
 lib/pkgconfig/gucharmap.pc
 share/applications/gucharmap.desktop
 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
 share/gnome/help/gucharmap/C/legal.xml
+share/gnome/help/gucharmap/de/figures/gucharmap_window.png
+share/gnome/help/gucharmap/de/gucharmap.xml
+share/gnome/help/gucharmap/de/legal.xml
+share/gnome/help/gucharmap/es/figures/gucharmap_window.png
+share/gnome/help/gucharmap/es/gucharmap.xml
+share/gnome/help/gucharmap/es/legal.xml
+share/gnome/help/gucharmap/fr/figures/gucharmap_window.png
+share/gnome/help/gucharmap/fr/gucharmap.xml
+share/gnome/help/gucharmap/fr/legal.xml
+share/gnome/help/gucharmap/it/figures/gucharmap_window.png
+share/gnome/help/gucharmap/it/gucharmap.xml
+share/gnome/help/gucharmap/it/legal.xml
+share/gnome/help/gucharmap/ja/figures/gucharmap_window.png
+share/gnome/help/gucharmap/ja/gucharmap.xml
+share/gnome/help/gucharmap/ja/legal.xml
+share/gnome/help/gucharmap/ko/figures/gucharmap_window.png
+share/gnome/help/gucharmap/ko/gucharmap.xml
+share/gnome/help/gucharmap/ko/legal.xml
+share/gnome/help/gucharmap/sv/figures/gucharmap_window.png
+share/gnome/help/gucharmap/sv/gucharmap.xml
+share/gnome/help/gucharmap/sv/legal.xml
+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_TW/figures/gucharmap_window.png
+share/gnome/help/gucharmap/zh_TW/gucharmap.xml
+share/gnome/help/gucharmap/zh_TW/legal.xml
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gucharmap.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gucharmap.mo
@@ -31,6 +63,8 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gucharmap.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gucharmap.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gucharmap.mo
@@ -38,15 +72,20 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gucharmap.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gucharmap.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gucharmap.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gucharmap.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gucharmap.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gucharmap.mo
@@ -57,19 +96,47 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gucharmap.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gucharmap.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 share/omf/gucharmap/gucharmap-C.omf
+share/omf/gucharmap/gucharmap-de.omf
+share/omf/gucharmap/gucharmap-es.omf
+share/omf/gucharmap/gucharmap-fr.omf
+share/omf/gucharmap/gucharmap-it.omf
+share/omf/gucharmap/gucharmap-ja.omf
+share/omf/gucharmap/gucharmap-ko.omf
+share/omf/gucharmap/gucharmap-sv.omf
+share/omf/gucharmap/gucharmap-zh_CN.omf
+share/omf/gucharmap/gucharmap-zh_TW.omf
 share/pixmaps/gucharmap.png
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gucharmap
 @comment in scrollkeeper: @dirrm share/omf
+@dirrm share/gnome/help/gucharmap/zh_TW/figures
+@dirrm share/gnome/help/gucharmap/zh_TW
+@dirrm share/gnome/help/gucharmap/zh_CN/figures
+@dirrm share/gnome/help/gucharmap/zh_CN
+@dirrm share/gnome/help/gucharmap/sv/figures
+@dirrm share/gnome/help/gucharmap/sv
+@dirrm share/gnome/help/gucharmap/ko/figures
+@dirrm share/gnome/help/gucharmap/ko
+@dirrm share/gnome/help/gucharmap/ja/figures
+@dirrm share/gnome/help/gucharmap/ja
+@dirrm share/gnome/help/gucharmap/it/figures
+@dirrm share/gnome/help/gucharmap/it
+@dirrm share/gnome/help/gucharmap/fr/figures
+@dirrm share/gnome/help/gucharmap/fr
+@dirrm share/gnome/help/gucharmap/es/figures
+@dirrm share/gnome/help/gucharmap/es
+@dirrm share/gnome/help/gucharmap/de/figures
+@dirrm share/gnome/help/gucharmap/de
 @dirrm share/gnome/help/gucharmap/C/figures
 @dirrm share/gnome/help/gucharmap/C
 @dirrm share/gnome/help/gucharmap
 @comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in gnome2-dirs: @dirrm share/applications
-@comment in gtk2: @dirrm lib/gtk-2.0/2.2.0/immodules
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm include/gucharmap
diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk
index a471b43cc35..26ba46e3d92 100644
--- a/fonts/gucharmap/buildlink3.mk
+++ b/fonts/gucharmap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/04/01 19:04:59 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GUCHARMAP_BUILDLINK3_MK:=	${GUCHARMAP_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngucharmap}
 BUILDLINK_PACKAGES+=	gucharmap
 
 .if !empty(GUCHARMAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gucharmap+=	gucharmap>=1.2.0nb2
-BUILDLINK_RECOMMENDED.gucharmap?=	gucharmap>=1.2.0nb8
+BUILDLINK_DEPENDS.gucharmap+=	gucharmap>=1.4.0
 BUILDLINK_PKGSRCDIR.gucharmap?=	../../fonts/gucharmap
 .endif	# GUCHARMAP_BUILDLINK3_MK
 
diff --git a/fonts/gucharmap/distinfo b/fonts/gucharmap/distinfo
index c8516439a19..2f18eacf5d9 100644
--- a/fonts/gucharmap/distinfo
+++ b/fonts/gucharmap/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/03/14 16:11:33 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/04/01 19:04:59 jmmv Exp $
 
-SHA1 (gucharmap-1.2.0.tar.bz2) = 6807bbc0c917f6863fae55aba1196f89aa672aa8
-Size (gucharmap-1.2.0.tar.bz2) = 1176137 bytes
-SHA1 (patch-aa) = 9273f3a0b7746a01d28d88b4cfe2744eec7cd90d
-SHA1 (patch-ab) = b04dc7feadd15dbad7b70e60d51760494edaa1f3
+SHA1 (gucharmap-1.4.0.tar.bz2) = 8bfdb7aeda8a6afb8bdd3450aa581dfb518ccd5c
+Size (gucharmap-1.4.0.tar.bz2) = 1468964 bytes
diff --git a/fonts/gucharmap/patches/patch-aa b/fonts/gucharmap/patches/patch-aa
deleted file mode 100644
index a52c8385a4c..00000000000
--- a/fonts/gucharmap/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/02/16 00:04:08 jmmv Exp $
-
-Don't try to rebuild gtk2's immodules database from here; modules.mk will
-do it for us.
-
---- gucharmap/Makefile.in.orig	2003-11-20 23:01:33.000000000 +0100
-+++ gucharmap/Makefile.in
-@@ -814,10 +814,8 @@ gucharmap_marshal.c: gucharmap_marshal.h
- @BUILD_GTK_IMMODULES_TRUE@all-local: gtk.immodules
- 
- @BUILD_GTK_IMMODULES_TRUE@gtk.immodules: $(module_LTLIBRARIES)
--@BUILD_GTK_IMMODULES_TRUE@	$(GTK_QUERY_IMMODULES) $(module_LTLIBRARIES) > gtk.immodules ;
- 
--@BUILD_GTK_IMMODULES_TRUE@install-data-hook: im-module-file
--@BUILD_GTK_IMMODULES_TRUE@	LD_LIBRARY_PATH=$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH GTK_PATH=$$GTK_PATH:$(DESTDIR)$(libdir)/gtk-2.0 $(GTK_QUERY_IMMODULES) > `./im-module-file` ;
-+@BUILD_GTK_IMMODULES_TRUE@install-data-hook:
- 
- @BUILD_GTK_IMMODULES_FALSE@install-data-hook: 
- 
diff --git a/fonts/gucharmap/patches/patch-ab b/fonts/gucharmap/patches/patch-ab
deleted file mode 100644
index f12a56b0a64..00000000000
--- a/fonts/gucharmap/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/03/14 16:11:33 wiz Exp $
-
---- gucharmap/gucharmap-window.c.orig	Tue Nov 18 17:30:12 2003
-+++ gucharmap/gucharmap-window.c
-@@ -113,8 +113,8 @@ do_search (GucharmapWindow *guw, 
- {
-   const gchar *no_leading_space, *nptr;
-   char *endptr;
--  g_assert (direction == -1 || direction == 1);
-   gunichar wc;
-+  g_assert (direction == -1 || direction == 1);
- 
-   if (search_text[0] == '\0')
-     {