Update to 1.0.1:

Overview of changes from 1.0.0 to 1.0.1
==
* Fixes
  o Minor
    - uim-xim
      - Workaround fix for preventing SEGV if compiled with g++-4.x.

Overview of changes from 1.0.0-beta to 1.0.0-final
==
* Fixes
  o Minor
    - uim.el
      - Sync with uim-el 0.0.6-beta4
    - gtk+ immodule
      - fix SEGV with gvim when the caret state indicator is enabled
	with a timeout value (Etsushi)
      - workaround fix for preedit handling on gvim when use-with-vi?
	is enabled with anthy and mana (Masanari, YamaKen, Etsushi)
    - SKK
      - improve completion behavior (Masanari, Etsushi)

Overview of changes from 1.0.0-alpha to 1.0.0-beta
==
* New features

  o IM related
    - SKK
      - enable word completion with UNIX look command (Etsushi)

* Fixes
  o Critical
    - uim-pref-qt
      - fix behavior of custom widget with integer number when the
        value in the stored file is greater than 99 (Etsushi)

  o Minor
    - update configure script (Etsushi)
      - don't require XML::Parser
      - more strict check for canna
    - Qt immodule
      - fix to respond to uim-pref-gtk's custom messages on the fly in
	addition to uim-pref-qt's (Etsushi)
    - uim-pref-qt
      - code cleanup (Kazuki)

    - Canna
      - fix behavior of backspace key in conversion state (Etsushi)

  o Others
    - Update translations

Overview of changes from 0.4.9.1 to 1.0.0-alpha
==
* New features
  o Main features
    - uim.el (bridge for Emacs) (Konosuke)
    - byeoru Hangul input suite (Jae-hyeon)
    - mana Japanese input (Masanari)

  o IM related
    - toggle-im facility (Etsushi, YamaKen)
    - Anthy
      - vi-cooperative mode (Masanari)
    - Canna
      - vi-cooperative mode (Masanari)
    - SKK (Etsushi)
      - dynamic completion
      - ddskk compatible behavior with mistypes while starting
	kanji-mode, e.g. "kAnnji" for "Kannji"
      - improved numeric conversion
      - support commit with opposite case in latin-conversion
      - support completion with conversion and/or commit at once

* Fixes
  o Critical
    - fix segmentation fault if uim is compiled with '--enabled-debug'
      (Etsushi, dai <d+r AT vdr.jp>)
    - fix IPC (connection to PRIME) in some rare cases (Masanari)
    - fix possible GC crash with anti-stack smashing compilers such as
      GCC4 (Jun, YamaKen)

  o Minor
    - preedit reset with IM switch (Masanari)
    - some build fixes (Masanari)

    - gtk+ immodule
      - disable warnings (Etsushi)
    - uim-xim
      - support changes in X modifier keys on-the-fly (Etsushi)

    - Anthy
      - improve kana-input mode (Masanari)
    - SKK
      - improve completion behavior (Etsushi)
      - improve skkserv connection (Masahito, Etsushi)
    - PRIME
      - proper custom setting (YamaKen)

    - uim-im-switcher-qt
      - show list of IM properly (Etsushi)
    - uim-pref-qt
      - compatible behavior with uim-pref-gtk (Etsushi)

* Others
  o obsolete table API
  o translations
    - add ko (Jae-hyeon)
    - update ja (Daichi Kawahata, YamaKen)

5 files changed, 24 insertions, 40 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 762cbcadd19..66e75d437b2 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/11/25 22:17:15 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/31 00:04:28 wiz Exp $
 #
 
-DISTNAME=		uim-0.4.9.1
-PKGREVISION=		1
+DISTNAME=		uim-1.0.1
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.freedesktop.org/releases/
 
@@ -17,20 +16,20 @@ USE_TOOLS+=		gmake pkg-config
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/uim.pc.in
 GNU_CONFIGURE=		YES
 GTK2_IMMODULES=		YES
+CONFIGURE_ARGS+=	--disable-emacs
 
 .include "options.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/uim
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/share/doc/uim
+	${INSTALL_DATA} ${WRKSRC}/doc/DOT-UIM ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/HELPER-CANDWIN ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/HELPER-PROTOCOL ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/KEY ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${PREFIX}/share/doc/uim
-	${INSTALL_DATA} ${WRKSRC}/doc/XIM-SERVER ${PREFIX}/share/doc/uim
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uim/uim-fep
 	${INSTALL_DATA} ${WRKSRC}/fep/README ${PREFIX}/share/doc/uim/uim-fep
 	${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${PREFIX}/share/doc/uim/uim-fep
diff --git a/inputmethod/uim/PLIST.common b/inputmethod/uim/PLIST.common
index 261d6fdfc07..64f6616270c 100644
--- a/inputmethod/uim/PLIST.common
+++ b/inputmethod/uim/PLIST.common
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST.common,v 1.3 2005/09/30 12:43:35 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2005/12/31 00:04:28 wiz Exp $
 bin/uim-fep
 bin/uim-fep-tick
-bin/uim-helper-server
 bin/uim-input-pad-ja
 bin/uim-module-manager
 bin/uim-sh
@@ -19,26 +18,32 @@ lib/libuim.la
 lib/pkgconfig/uim.pc
 lib/uim/plugin/libuim-custom-enabler.la
 lib/uim/plugin/libuim-skk.la
+libexec/uim-helper-server
 man/man1/uim-xim.1
 share/applications/uim.desktop
+share/doc/uim/DOT-UIM
 share/doc/uim/HELPER-CANDWIN
 share/doc/uim/HELPER-PROTOCOL
 share/doc/uim/KEY
 share/doc/uim/PLUGIN
 share/doc/uim/README
-share/doc/uim/README.ja
 share/doc/uim/UIM-SCM
 share/doc/uim/UIM-SH
-share/doc/uim/XIM-SERVER
 share/doc/uim/uim-fep/README
 share/doc/uim/uim-fep/README.ja
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/uim.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/uim.mo
-share/uim/PY.scm
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/uim.mo
 share/uim/action.scm
 share/uim/anthy-custom.scm
 share/uim/anthy-key-custom.scm
 share/uim/anthy.scm
+share/uim/byeoru-custom.scm
+share/uim/byeoru-dic.scm
+share/uim/byeoru-key-custom.scm
+share/uim/byeoru-symbols.scm
+share/uim/byeoru.scm
 share/uim/canna-custom.scm
 share/uim/canna-key-custom.scm
 share/uim/canna.scm
@@ -67,6 +72,9 @@ share/uim/lazy-load.scm
 share/uim/load-action.scm
 share/uim/loader.scm
 share/uim/m17nlib.scm
+share/uim/mana-custom.scm
+share/uim/mana-key-custom.scm
+share/uim/mana.scm
 share/uim/manage-modules.scm
 share/uim/pinyin-big5.scm
 share/uim/pixmaps/configure-qt.png
@@ -76,6 +84,7 @@ share/uim/plugin.scm
 share/uim/prime-custom.scm
 share/uim/prime-key-custom.scm
 share/uim/prime.scm
+share/uim/py.scm
 share/uim/pyload.scm
 share/uim/pyunihan.scm
 share/uim/rk.scm
@@ -88,13 +97,6 @@ share/uim/skk-key-custom.scm
 share/uim/skk.scm
 share/uim/spellcheck-custom.scm
 share/uim/spellcheck.scm
-share/uim/tables/japanese-azik.table
-share/uim/tables/japanese-kana.table
-share/uim/tables/japanese-roma.table
-share/uim/tables/japanese-tcode.table
-share/uim/tables/japanese-tutcode.table
-share/uim/tables/korean-hangul2.table
-share/uim/tables/korean-hangul3.table
 share/uim/tcode.scm
 share/uim/tutcode-key-custom.scm
 share/uim/tutcode.scm
@@ -105,7 +107,6 @@ share/uim/ustr.scm
 share/uim/util.scm
 share/uim/viqr.scm
 share/uim/zaurus.scm
-@dirrm share/uim/tables
 @dirrm share/uim/pixmaps
 @dirrm share/uim
 @dirrm share/doc/uim/uim-fep
diff --git a/inputmethod/uim/PLIST.gtk b/inputmethod/uim/PLIST.gtk
index 479352fd6f2..3f48b522337 100644
--- a/inputmethod/uim/PLIST.gtk
+++ b/inputmethod/uim/PLIST.gtk
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.gtk,v 1.1 2005/06/03 10:21:51 uebayasi Exp $
-bin/uim-candwin-gtk
-bin/uim-helper-candwin-gtk
+@comment $NetBSD: PLIST.gtk,v 1.2 2005/12/31 00:04:28 wiz Exp $
 bin/uim-helper-toolbar-gtk
 bin/uim-helper-toolbar-gtk-systray
 bin/uim-im-switcher-gtk
@@ -8,4 +6,5 @@ bin/uim-pref-gtk
 bin/uim-toolbar-gtk
 bin/uim-toolbar-gtk-systray
 lib/gtk-2.0/2.4.0/immodules/im-uim.la
+libexec/uim-candwin-gtk
 @comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/immodules
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index 400ef62629f..6cad9e7cd96 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/11/25 22:17:15 wiz Exp $
+$NetBSD: distinfo,v 1.7 2005/12/31 00:04:28 wiz Exp $
 
-SHA1 (uim-0.4.9.1.tar.gz) = 9037499c47187aeee758ee2bfd60ba9d7d4f40ec
-RMD160 (uim-0.4.9.1.tar.gz) = a610157a3aabdd9c1f35718fd8dddce27ffc8831
-Size (uim-0.4.9.1.tar.gz) = 1602849 bytes
-SHA1 (patch-aa) = 15c80df9ab4c9c799be22c31a223cacd7b6389f0
+SHA1 (uim-1.0.1.tar.gz) = a81e208856793edb6bfe748f6a5400ac03bf07b2
+RMD160 (uim-1.0.1.tar.gz) = fa0e0057a554382c06dc1f8c7287617db203bcee
+Size (uim-1.0.1.tar.gz) = 1924484 bytes
diff --git a/inputmethod/uim/patches/patch-aa b/inputmethod/uim/patches/patch-aa
deleted file mode 100644
index 34824141163..00000000000
--- a/inputmethod/uim/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/11/25 22:17:15 wiz Exp $
-
---- gtk/gtk-im-uim.c.orig	2005-09-26 22:56:59.000000000 +0200
-+++ gtk/gtk-im-uim.c
-@@ -667,7 +667,8 @@ im_uim_finalize(GObject *obj)
-   }
-   if (uic->caret_state_indicator) {
-     guint tag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(uic->caret_state_indicator), "timeout-tag"));
--    g_source_remove(tag);
-+    if (tag > 0)
-+      g_source_remove(tag);
-     gtk_widget_destroy(uic->caret_state_indicator);
-     uic->caret_state_indicator = NULL;
-   }