Update uim to 1.6.0.

patch provided by YAMASHIRO, Jun via PR#44861.

pkgsrc changelog:
* remove "canna" option from default.

Overview of changes from 1.6.0 to 1.6.1
=======================================
* Fixes
  - IM management system
    * Fix crash while switching to the IM which has been once used but
      then disabled and re-enabled again by "Enabled input methods"
      widget of uim-pref.

  - uim-skk
    * Don't crash with malformed words having brackets which are not
      intended for skk-henkan-strict-okuri-precedence.

  - libuim-skk.so
    * Fix possible contamination of dictionary files of SKK-JISYO and
      tutcode's mazegaki dictionary when user switches between uim-skk
      and uim-tutcode dynamically.

* Enhancements
  - uim-tutcode
    * Interactive bushu conversion
    * Postfix bushu conversion in yomi of mazegaki.
    * Completion
    * Input prediction in mazegaki conversion
    * Input prediction in bushu conversion
    * Kanji combination guide on completion and input prediction
    * Another symbol (kigou) input mode like "KI"
    * Add function to redisplay last auto help
    * Show kanji on auto help
    * Show hint kanji for intermediate sequence on virtual keyboard

  - uim-pref
    * Add configuration 'uim-pref-suppress-dot-uim-warning-dialog?'
      (Set this variable #t in ~/.uim if you'd like to suppress the
      dialog)

  - uim.el
    * Support Emacs24 (by Kan-Ru Chen, #31539)

* Others
  - Enable compilation even when the home directory of chrooted build
    environment is non-writable (e.g. nobody user)

  - tcode, trycode, and hangul modules are no longer enabled by
    default.  Use more sophisticated tutcode and byeoru modules
    instead.

5 files changed, 15 insertions, 13 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 64e69a4121f..71579782e7f 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2011/01/13 13:53:28 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2011/04/13 13:45:16 obache Exp $
 #
 
 .include "../../inputmethod/uim/Makefile.common"
 
 COMMENT=		Multilingual input method library
-PKGREVISION=		2
 
 CONFLICTS+=		uim-qt4-immodule-[0-9]*
 
diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common
index 3e46523393c..ffa3d5cb82e 100644
--- a/inputmethod/uim/Makefile.common
+++ b/inputmethod/uim/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2010/09/18 03:08:31 obache Exp $
+# $NetBSD: Makefile.common,v 1.5 2011/04/13 13:45:16 obache Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=		1.6.0
+UIM_VERSION=		1.6.1
 DISTNAME=		uim-${UIM_VERSION}
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.googlecode.com/files/
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index 1f335e2ccc9..c85de4382fc 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2010/09/18 03:08:31 obache Exp $
+@comment $NetBSD: PLIST,v 1.17 2011/04/13 13:45:16 obache Exp $
 ${PLIST.qt3}bin/uim-chardict-qt
 ${PLIST.qt}bin/uim-chardict-qt4
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
@@ -47,11 +47,11 @@ ${PLIST.editline}lib/uim/plugin/libuim-editline.la
 ${PLIST.expat}lib/uim/plugin/libuim-expat.la
 ${PLIST.ffi}lib/uim/plugin/libuim-ffi.la
 lib/uim/plugin/libuim-fileio.la
+lib/uim/plugin/libuim-lolevel.la
 lib/uim/plugin/libuim-look.la
 ${PLIST.m17nlib}lib/uim/plugin/libuim-m17nlib.la
 ${PLIST.openssl}lib/uim/plugin/libuim-openssl.la
 ${PLIST.sqlite}lib/uim/plugin/libuim-sqlite3.la
-lib/uim/plugin/libuim-lolevel.la
 lib/uim/plugin/libuim-process.la
 lib/uim/plugin/libuim-skk.la
 lib/uim/plugin/libuim-socket.la
@@ -167,10 +167,10 @@ share/uim/lolevel.scm
 share/uim/look-custom.scm
 share/uim/look.scm
 share/uim/m17nlib.scm
-share/uim/match.scm
 share/uim/mana-custom.scm
 share/uim/mana-key-custom.scm
 share/uim/mana.scm
+share/uim/match.scm
 share/uim/ng-action.scm
 share/uim/ng-key.scm
 share/uim/openssl.scm
@@ -372,11 +372,13 @@ share/uim/tables/zm.table
 share/uim/tcode.scm
 share/uim/trec.scm
 share/uim/trycode.scm
+share/uim/tutcode-bushu.scm
 share/uim/tutcode-bushudic.scm
 share/uim/tutcode-custom.scm
 share/uim/tutcode-dialog.scm
 share/uim/tutcode-editor.scm
 share/uim/tutcode-key-custom.scm
+share/uim/tutcode-kigou-rule.scm
 share/uim/tutcode-kigoudic.scm
 share/uim/tutcode-rule.scm
 share/uim/tutcode.scm
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index dbc17a13594..72cf3e797ba 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2010/09/18 03:08:31 obache Exp $
+$NetBSD: distinfo,v 1.18 2011/04/13 13:45:16 obache Exp $
 
-SHA1 (uim-1.6.0.tar.bz2) = d27f2ca8136da0702c82f0522911d06b2b8f8ea7
-RMD160 (uim-1.6.0.tar.bz2) = 14881fe9ff1af64cee1317d0b51af69294377e47
-Size (uim-1.6.0.tar.bz2) = 6154925 bytes
+SHA1 (uim-1.6.1.tar.bz2) = 412bb2df6041185084e2f64fb73357389bf992b5
+RMD160 (uim-1.6.1.tar.bz2) = 26c4e30f59c8eb005189d6778333079c81f8489c
+Size (uim-1.6.1.tar.bz2) = 6192431 bytes
 SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5
 SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index 54b3468fbfc..96bd6ff9201 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2010/10/15 07:01:08 obache Exp $
+# $NetBSD: options.mk,v 1.23 2011/04/13 13:45:16 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
 #PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gtk m17nlib openssl prime sj3 sqlite uim-fep wnn xim
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gtk m17nlib openssl p
 PKG_OPTIONS_OPTIONAL_GROUPS=	kde qt
 PKG_OPTIONS_GROUP.kde=	kde kde3
 PKG_OPTIONS_GROUP.qt=	qt qt3
-PKG_SUGGESTED_OPTIONS=	anthy canna gtk uim-fep xim
+PKG_SUGGESTED_OPTIONS=	anthy gtk uim-fep xim
 
 .include "../../mk/bsd.options.mk"
 
@@ -79,6 +79,7 @@ CONFIGURE_ARGS+=	--with-eb-conf=${PKG_SYSCONFDIR}/eb.conf
 PLIST.eb=		yes
 .endif
 
+# For uim-yahoo-jp
 .if !empty(PKG_OPTIONS:Mexpat)
 .  include "../../textproc/expat/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}