pkg/44861: pkgsrc/inputmethod/uim: Update to uim-1.6.1

[yamajun%ofug.net@localhost]

>Number:         44861
>Category:       pkg
>Synopsis:       pkgsrc/inputmethod/uim: Update to uim-1.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Apr 12 17:00:00 +0000 2011
>Originator:     YAMASHIRO, Jun
>Release:        NetBSD/amd64 5.99.48
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD yamajun 5.99.48 NetBSD 5.99.48 (YAMAJUN) #40: Fri Apr  8 10:52:42 JST 
2011  yamajun@:/usr/src/sys/arch/amd64/compile/YAMAJUN amd64
>Description:
update inputmethod/uim to uim-1.6.1 .

pkgsrc changelog:
* update to uim-1.6.1
* remove "canna" option from default.


uim changelog:
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.


>How-To-Repeat:

>Fix:
Apply this patch:

diff -Nru uim.orig/Makefile uim/Makefile
--- uim.orig/Makefile   2011-01-13 22:53:28.000000000 +0900
+++ uim/Makefile        2011-04-08 09:31:40.000000000 +0900
@@ -4,7 +4,6 @@
 .include "../../inputmethod/uim/Makefile.common"
 
 COMMENT=               Multilingual input method library
-PKGREVISION=           2
 
 CONFLICTS+=            uim-qt4-immodule-[0-9]*
 
diff -Nru uim.orig/Makefile.common uim/Makefile.common
--- uim.orig/Makefile.common    2010-09-18 12:08:31.000000000 +0900
+++ uim/Makefile.common 2011-04-08 09:31:40.000000000 +0900
@@ -3,7 +3,7 @@
 # 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 -Nru uim.orig/PLIST uim/PLIST
--- uim.orig/PLIST      2010-09-18 12:08:31.000000000 +0900
+++ uim/PLIST   2011-04-08 09:31:40.000000000 +0900
@@ -47,11 +47,11 @@
 ${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/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/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 -Nru uim.orig/distinfo uim/distinfo
--- uim.orig/distinfo   2010-09-18 12:08:31.000000000 +0900
+++ uim/distinfo        2011-04-08 09:31:40.000000000 +0900
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.17 2010/09/18 03:08:31 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 -Nru uim.orig/options.mk uim/options.mk
--- uim.orig/options.mk 2010-10-15 16:01:08.000000000 +0900
+++ uim/options.mk      2011-04-08 09:32:06.000000000 +0900
@@ -6,7 +6,7 @@
 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 @@
 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}