Update uim to 1.8.1.

Based on PR 46595 by YAMASHIRO, Jun (fixes some missing PLIST entry).
* switch to enable expat and prime options by default.

Overview of changes from 1.8.0 to 1.8.1
=======================================
* Fixes
  - uim-toolbar-gtk3-systray
  - uim-toolbar-gtk-systray
    * Fix bug: prevent from becoming a zombie process

  - uim-candwin-gtk3
  - uim-candwin-gtk
    * Redraw unselected text with normal color

  - uim-tutcode
    * Fix bug: key which is not in rule (ex. "5")
      is not entered on (interactive) bushu conversion

  - po
    * Correct the path to GNOME_UimApplet.server.in in POTFILES.skip

  - uim-qt4
    * Honor the environment variable LDFLAGS during build

  - uim-notify
    * Fix compilation with glib >= 2.32

* Enhancements
  - uim-tutcode
    * New customs
      - Show pending key sequences
      - New custom group for tutcode-rule.scm: support TUT+ code
        which has rules for Shin Joyo Kanji
      - Key sequences to change katakana/hiragana mode (not toggle)
    * New command to dump last help content shown on candidate window
    * Pseudo table style for bridge which does not support
      table style candidate window
    * Updated trycode composition table retrieved 2012-05-26

* Others
  - GTK+2 immodule
  - uim-xim
    * Replace deprecated XKeycodeToKeysym() with XkbKeycodeToKeysym()

Overview of changes from 1.8.0-beta to 1.8.0
============================================
* Fixes
  - libgcroots
    * Fix version ([uim-en 438])
  - doc
    * Fix release manual.

Overview of changes from 1.8.0-alpha to 1.8.0-beta
==================================================
* Fixes
  - libuim
    * Fix version number
  - po
    * Fix build failure with intltool 0.50 again (#58097)
  - uim-toolbar-gtk
  - uim-toolbar-gtk3
  - uim-toolbar-qt4
    * Change behavior when toolbar-display-time is "mode"
  - uim-chardict-qt
  - uim-chardict-qt4
    * Update Unicode block list
  - ChangeLog
    * Add ChangeLog.old.2

Overview of changes from 1.7.3 to 1.8.0-alpha
=============================================
* New features
  - uim-google-cgiapi-jp (new IM)
    * A web-based Japanese multi-segment input method
  - uim-baidu-olime-jp (new IM)
    * A web-based Japanese multi-segment input method
  - osx-dcs
    * OS X Dictionary Services support
  - uim-knotify4
    * notify agent for KDE4

* Fixes
  - uim-xim
    * Check if libXext is installed at configure
  - uim-gtk2
    * Check if gdk-x11-2.0 is installed at configure (#36024)
  - po
    * Fix build failure with intltool 0.50 (#58097)
  - pixmaps
    * Use rsvg-convert instead of rsvg (#47204)

* Enhancements
  - libuim
    * New custom type "table"

  - libuim
  - Gtk+ bridge
  - Qt4 bridge
  - XIM bridge (uim-xim)
    * New API for delay showing candidate window

  - Gtk+ bridge
  - Qt4 bridge
  - XIM bridge (uim-xim)
    * Add horizontal candidate window

  - uim-candwin-gtk
    * Add previous and next page buttons

  - uim-chardict-qt
  - uim-chardict-qt4
    * Merge translation files for chardict into the main translation file

  - uim-m17nlib
    * Make toolbar settings configurable in uim-pref

  - uim-pref-gtk
  - uim-pref-gtk3
  - uim-pref-qt4
    * Support custom type "table"
    * Make Japanese Romaji-Kana composing rule configurable

  - uim-skk
    * Kanji code (JIS/Kuten/Unicode) input mode
    * Add skkserver completion feature (by @eagletmt)

  - uim-tutcode
    * Delay showing candidate window
    * New postfix conversions: katakana,
      kanji to key sequence and key sequence to kanji
    * Conversion on selection: mazegaki, katakana,
      kanji to key sequence and key sequence to kanji
    * New help functions: for character at current position
      and for string in clipboard
    * Clipboard support
      - Paste from clipboard to preedit
      - Key sequence to kanji conversion from clipboard
    * Undo last commit
    * Treat button click on stroke help window as key press
    * New customs
      - Add choice of bushu conversion algorithm:
	tc-2.3.1 and Kanchoku Win
      - New custom to exclude specified number of candidates
	from mazegaki learning
      - New custom to keep key sequence not convertible to kanji
      - Add choice about behavior of commit candidate by label key
      - Support binding user defined procedure to key sequence
    * Updated trycode composition table retrieved 2012-02-18

6 files changed, 35 insertions, 17 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 664910e8f42..df155c053b5 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2012/07/15 08:22:50 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2012/07/22 06:15:22 obache Exp $
 #
 
 .include "../../inputmethod/uim/Makefile.common"
-PKGREVISION=4
 
 COMMENT=		Multilingual input method library
 
diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common
index 04809361d3f..febb1cdf165 100644
--- a/inputmethod/uim/Makefile.common
+++ b/inputmethod/uim/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2012/02/18 11:46:14 obache Exp $
+# $NetBSD: Makefile.common,v 1.8 2012/07/22 06:15:22 obache Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=		1.7.3
+UIM_VERSION=		1.8.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 3737ae679b9..b77a2e3b4b8 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2012/02/18 11:46:14 obache Exp $
+@comment $NetBSD: PLIST,v 1.20 2012/07/22 06:15:22 obache Exp $
 ${PLIST.qt3}bin/uim-chardict-qt
 ${PLIST.qt}bin/uim-chardict-qt4
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
@@ -36,11 +36,12 @@ include/uim/uim-scm-abbrev.h
 include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
+include/uim/version.h
 ${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server
 ${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
 ${PLIST.gtk3}lib/gtk-3.0/3.0.0/immodules/im-uim.la
 ${PLIST.kde3}lib/kde3/uim_panelapplet.la
-${PLIST.kde}lib/kde4/uim_panelapplet.la
+${PLIST.kde}lib/kde4/plasma_applet_uim.so
 lib/libuim-custom.la
 lib/libuim-scm.la
 lib/libuim.la
@@ -65,6 +66,8 @@ lib/uim/plugin/libuim-socket.la
 ${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
 ${PLIST.gtk}libexec/uim-candwin-gtk
 ${PLIST.gtk3}libexec/uim-candwin-gtk3
+${PLIST.gtk}libexec/uim-candwin-horizontal-gtk
+${PLIST.gtk3}libexec/uim-candwin-horizontal-gtk3
 ${PLIST.qt3}libexec/uim-candwin-qt
 ${PLIST.qt}libexec/uim-candwin-qt4
 ${PLIST.gtk}libexec/uim-candwin-tbl-gtk
@@ -88,25 +91,28 @@ share/doc/uim/UIM-SH
 ${PLIST.fep}share/doc/uim/uim-fep/README
 ${PLIST.fep}share/doc/uim/uim-fep/README.ja
 ${PLIST.kde3}share/kde/apps/kicker/applets/uimapplet.desktop
-${PLIST.kde}share/kde4/apps/kicker/applets/uimapplet.desktop
+${PLIST.kde}share/kde4/services/plasma-applet-uim.desktop
 share/locale/fr/LC_MESSAGES/uim.mo
 share/locale/ja/LC_MESSAGES/uim.mo
-${PLIST.qt3}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
-${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt4.mo
 share/locale/ko/LC_MESSAGES/uim.mo
 share/uim/action.scm
 share/uim/ajax-ime-custom.scm
 share/uim/ajax-ime-key-custom.scm
 share/uim/ajax-ime.scm
+share/uim/annotation-custom.scm
 share/uim/annotation-dict.scm
 share/uim/annotation-eb.scm
 share/uim/annotation-filter.scm
+share/uim/annotation-osx-dcs.scm
 share/uim/annotation.scm
 share/uim/anthy-custom.scm
 share/uim/anthy-key-custom.scm
 share/uim/anthy-utf8-custom.scm
 share/uim/anthy-utf8.scm
 share/uim/anthy.scm
+share/uim/baidu-olime-jp-custom.scm
+share/uim/baidu-olime-jp-key-custom.scm
+share/uim/baidu-olime-jp.scm
 share/uim/byeoru-custom.scm
 share/uim/byeoru-data/byeoru-dict
 share/uim/byeoru-key-custom.scm
@@ -135,6 +141,9 @@ share/uim/generic-custom.scm
 share/uim/generic-key-custom.scm
 share/uim/generic-predict.scm
 share/uim/generic.scm
+share/uim/google-cgiapi-jp-custom.scm
+share/uim/google-cgiapi-jp-key-custom.scm
+share/uim/google-cgiapi-jp.scm
 share/uim/hangul.scm
 share/uim/hangul2.scm
 share/uim/hangul3.scm
@@ -158,6 +167,8 @@ share/uim/japanese-custom.scm
 share/uim/japanese-kana.scm
 share/uim/japanese-kzik.scm
 share/uim/japanese.scm
+share/uim/json-parser-expanded.scm
+share/uim/json.scm
 share/uim/key.scm
 share/uim/latin.scm
 share/uim/lazy-load.scm
@@ -176,6 +187,7 @@ share/uim/loader.scm
 share/uim/lolevel.scm
 share/uim/look-custom.scm
 share/uim/look.scm
+share/uim/m17nlib-custom.scm
 share/uim/m17nlib.scm
 share/uim/mana-custom.scm
 share/uim/mana-key-custom.scm
@@ -184,11 +196,14 @@ share/uim/match.scm
 share/uim/ng-action.scm
 share/uim/ng-key.scm
 share/uim/openssl.scm
+share/uim/packrat.scm
 share/uim/pinyin-big5.scm
 share/uim/pixmaps/ajax-ime.png
 share/uim/pixmaps/ajax-ime.svg
 share/uim/pixmaps/anthy.png
 ${PLIST.anthy}share/uim/pixmaps/anthy-utf8.png
+share/uim/pixmaps/baidu-olime-jp.png
+share/uim/pixmaps/baidu-olime-jp.svg
 share/uim/pixmaps/byeoru.png
 share/uim/pixmaps/byeoru.svg
 share/uim/pixmaps/canna.png
@@ -202,6 +217,8 @@ share/uim/pixmaps/direct_input_dark_background.png
 share/uim/pixmaps/direct_input_dark_background.svg
 share/uim/pixmaps/elatin.png
 share/uim/pixmaps/elatin.svg
+share/uim/pixmaps/google-cgiapi-jp.png
+share/uim/pixmaps/google-cgiapi-jp.svg
 share/uim/pixmaps/hangul2.png
 share/uim/pixmaps/hangul2.svg
 share/uim/pixmaps/hangul3.png
@@ -391,6 +408,7 @@ 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-custom.scm
 share/uim/tutcode-rule.scm
 share/uim/tutcode.scm
 share/uim/uim-help.scm
diff --git a/inputmethod/uim/buildlink3.mk b/inputmethod/uim/buildlink3.mk
index 16d29b3c038..d38736c0326 100644
--- a/inputmethod/uim/buildlink3.mk
+++ b/inputmethod/uim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2012/05/07 01:53:39 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2012/07/22 06:15:22 obache Exp $
 
 BUILDLINK_TREE+=	uim
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	uim
 UIM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.uim+=	uim>=1.5.1
-BUILDLINK_ABI_DEPENDS.uim+=	uim>=1.6.1nb1
+BUILDLINK_ABI_DEPENDS.uim+=	uim>=1.8.0
 BUILDLINK_PKGSRCDIR.uim?=	../../inputmethod/uim
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index f3194d67a1d..b4701e139d2 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2012/02/18 11:46:14 obache Exp $
+$NetBSD: distinfo,v 1.22 2012/07/22 06:15:22 obache Exp $
 
-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 (uim-1.8.1.tar.bz2) = 99cce8af737bd2caea0b865fb03e8abca3c1bbdd
+RMD160 (uim-1.8.1.tar.bz2) = 9eac06602dd0352cc759a328f6dd8c35bc884ec3
+Size (uim-1.8.1.tar.bz2) = 6478153 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 7d4050022f1..c4b8db56a3d 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.25 2012/02/18 11:46:14 obache Exp $
+# $NetBSD: options.mk,v 1.26 2012/07/22 06:15:22 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 wnn4 xim
 PKG_OPTIONS_OPTIONAL_GROUPS=	kde qt
 PKG_OPTIONS_GROUP.kde=	kde kde3
 PKG_OPTIONS_GROUP.qt=	qt qt3
-PKG_SUGGESTED_OPTIONS=	anthy gtk uim-fep xim
+PKG_SUGGESTED_OPTIONS=	anthy expat gtk prime uim-fep xim
 
 .include "../../mk/bsd.options.mk"
 
@@ -24,6 +24,7 @@ PLIST_VARS+=		helperdata uim-dict-gtk uim-dict-gtk3 uim-dict-helperdata fep
 PLIST_VARS+=		anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde kde3 m17nlib openssl qt qt3 sqlite wnn xim
 
 .if !empty(PKG_OPTIONS:Mxim)
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"