Update uim to 1.7.3.

Based on PR 46030 by YAMASHIRO, Jun.
(enable commented out wnn4 option additionally)

Overview of changes from 1.7.2 to 1.7.3
=======================================
* Fixes
  - Qt4 bridge
    * Fix im-delete-text in QTextEdit
    * Build fix for NetBSD ([uim-ja 322])

  - uim-m17nlib
    * Don't discard key release event when input mode is off (#45734)
    * Fix crashes with some IMs (regressed in 1.7.0-alpha).

* Others
  - Generic build fix for GNU/Hurd ([uim-ja 310])


Overview of changes from 1.7.1 to 1.7.2
=======================================
* Fixes
  - libuim
    * Fix crash in im-acquire-text with selection

  - uim-pref-qt4
    * Fix build failure when --as-needed is used (#40385, Julian Taylor)

* Enhancements
  - Qt4 bridge
    * Support text acquisition API with QTextEdit

* Others
  - Plug very minor memory leak in uim-xim
  - Plug very minor file descriptor leak in libuim-custom


Overview of changes from 1.7.0 to 1.7.1
=======================================
* Fixes
  - uim-tutcode
    * Fix behavior when on-key and off-key are different

  - uim-dict-gtk
  - uim-dict-gtk3
    * Fix compilation with Canna >= 3.7

 - fileio.scm
    * Fix for files with no newline at the end

* Enhancements
  - uim-byeoru
    * Speedup in conversion by change of system dictionary format
    * Introduce a new way to define a personal dictionary

  - uim-tutcode
    * Show stroke help temporarily by keys in kanji combination guide
    * Support bushu composition which consists of three or more bushu
      on auto help
    * Use bushu.help file on auto help and bushu conversion

  - uim-toolbar-gtk3-systray
  - uim-toolbar-gtk-systray
    * gnome-shell support

  - uim-notify
    * Support dynamic reconfiguration of the agent selection

* Others
  - Make uim functional when --disable-notify is set at configure

5 files changed, 19 insertions, 20 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 2d2a1e29127..720d5c01ae9 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2012/02/06 12:40:45 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2012/02/18 11:46:14 obache Exp $
 #
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=		6
 COMMENT=		Multilingual input method library
 
 CONFLICTS+=		uim-qt4-immodule-[0-9]*
diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common
index 890cd605f52..04809361d3f 100644
--- a/inputmethod/uim/Makefile.common
+++ b/inputmethod/uim/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.6 2011/05/29 06:13:57 obache Exp $
+# $NetBSD: Makefile.common,v 1.7 2012/02/18 11:46:14 obache Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=		1.7.0
+UIM_VERSION=		1.7.3
 DISTNAME=		uim-${UIM_VERSION}
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.googlecode.com/files/
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index e87529a7a3e..3737ae679b9 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2011/05/29 06:13:57 obache Exp $
+@comment $NetBSD: PLIST,v 1.19 2012/02/18 11:46:14 obache Exp $
 ${PLIST.qt3}bin/uim-chardict-qt
 ${PLIST.qt}bin/uim-chardict-qt4
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
@@ -108,7 +108,7 @@ share/uim/anthy-utf8-custom.scm
 share/uim/anthy-utf8.scm
 share/uim/anthy.scm
 share/uim/byeoru-custom.scm
-share/uim/byeoru-dic.scm
+share/uim/byeoru-data/byeoru-dict
 share/uim/byeoru-key-custom.scm
 share/uim/byeoru-symbols.scm
 share/uim/byeoru.scm
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index 3ca09a23847..f3194d67a1d 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2011/09/14 16:57:41 hans Exp $
+$NetBSD: distinfo,v 1.21 2012/02/18 11:46:14 obache Exp $
 
-SHA1 (uim-1.7.0.tar.bz2) = b79ed80c2557e804e6d3d2771a213a29cd932a73
-RMD160 (uim-1.7.0.tar.bz2) = e866f4270e60d0590a0a37331f3ccf64d7e48fbf
-Size (uim-1.7.0.tar.bz2) = 6402469 bytes
+SHA1 (uim-1.7.3.tar.bz2) = 5c07416b01383d0d8047035a98af9af16f776ff9
+RMD160 (uim-1.7.3.tar.bz2) = 2cc9fda13289c2f0e4cf04d7dfb1472630bc5746
+Size (uim-1.7.3.tar.bz2) = 6380469 bytes
 SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5
 SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
 SHA1 (patch-ad) = bf898a6dfe50ed24a9644a4384aa78b0c7910b91
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index 92e66630ae6..7d4050022f1 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.24 2011/05/29 06:13:57 obache Exp $
+# $NetBSD: options.mk,v 1.25 2012/02/18 11:46:14 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
-#PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn xim
-PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep xim
+PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn4 xim
 PKG_OPTIONS_OPTIONAL_GROUPS=	kde qt
 PKG_OPTIONS_GROUP.kde=	kde kde3
 PKG_OPTIONS_GROUP.qt=	qt qt3
@@ -204,13 +203,14 @@ CONFIGURE_ARGS+=	--with-sqlite3
 PLIST.sqlite=		yes
 .endif
 
-#.if !empty(PKG_OPTIONS:Mwnn)
-#.  include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
-#CONFIGURE_ARGS+=	--with-wnn
-#CONFIGURE_ARGS+=	--with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn
-#CONFIGURE_ARGS+=	--with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
-#PLIST.wnn=		yes
-#.endif
+.if !empty(PKG_OPTIONS:Mwnn4)
+.  include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-wnn
+CONFIGURE_ARGS+=	--with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn
+CONFIGURE_ARGS+=	--with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
+CPPFLAGS+=		-DWNNENVDIR=\"${BUILDLINK_PREFIX.ja-FreeWnn-lib}/share/wnn\"
+PLIST.wnn=		yes
+.endif
 
 .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
 CONFIGURE_ARGS+=	--enable-default-toolkit=gtk