Update uim to 1.8.6.

(now, editline is in pkgsrc, so optionify editline support).

Overview of changes from 1.8.5 to 1.8.6
=======================================
* Fixes
  - libuim
    * Add XDG_RUNTIME_DIR support (by tagoh)
  - po
    * List language names on each line in LINGUAS (by naota)
  - uim-canna
    * Avoid a crash when a Canna server name is specified (by Kouichi ONO)

* Enhancements
  - uim-m17nlib
    * Add an option to set a candidate windows to be visiable or hidden
  - uim-tutcode
    * Updated trycode composition table retrieved 2013-06-26


Overview of changes from 1.8.4 to 1.8.5
=======================================
* Fixes
  - uim-gtk2
  - uim-gtk3
    * Avoid an infinite recursion when no preedit is started (by tagoh)

  - uim-tutcode
    * Fix behavior of postfix katakana conversion

4 files changed, 26 insertions, 18 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index d88512cd718..fac0ff403aa 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2013/07/19 10:08:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.83 2013/08/11 07:50:51 obache Exp $
 #
 
 .include "../../inputmethod/uim/Makefile.common"
 
 COMMENT=		Multilingual input method library
-PKGREVISION=		6
 #LICENSE=		See ${WRKSRC}/COPYING
 
 CONFLICTS+=		uim-qt4-immodule-[0-9]*
@@ -26,15 +25,6 @@ CFLAGS.SunOS+=	-std=c99 -D__EXTENSIONS__
 
 .include "options.mk"
 
-PLIST_VARS+=		editline
-.include "../../mk/readline.builtin.mk"
-
-.if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
-PLIST.editline=		yes
-.else
-CONFIGURE_ARGS+=	--with-libedit=no
-.endif
-
 INSTALLATION_DIRS+=	share/doc/uim
 
 post-install:
diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common
index 388765cf6a8..2288d10cf9f 100644
--- a/inputmethod/uim/Makefile.common
+++ b/inputmethod/uim/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.10 2013/03/06 11:06:55 obache Exp $
+# $NetBSD: Makefile.common,v 1.11 2013/08/11 07:50:51 obache Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=		1.8.4
+UIM_VERSION=		1.8.6
 DISTNAME=		uim-${UIM_VERSION}
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.googlecode.com/files/
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index e1989b410a9..d8f322a11dd 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2013/03/06 11:06:55 obache Exp $
+$NetBSD: distinfo,v 1.25 2013/08/11 07:50:51 obache Exp $
 
-SHA1 (uim-1.8.4.tar.bz2) = d2c699ce7a6037accc6f3342db1de8d696f361e9
-RMD160 (uim-1.8.4.tar.bz2) = 9722ae76020db093e0a8f8aa0f146caddcf3fff5
-Size (uim-1.8.4.tar.bz2) = 6494902 bytes
+SHA1 (uim-1.8.6.tar.bz2) = 43b9dbdead6797880e6cfc9c032ecb2d37d42777
+RMD160 (uim-1.8.6.tar.bz2) = 5f94218d82475ac463534ec681769f34547e5707
+Size (uim-1.8.6.tar.bz2) = 6500739 bytes
 SHA1 (patch-ab) = 56a7d5aadd2339f5bacae80b28ce520e6df3d1ab
 SHA1 (patch-ac) = 7c36bc67764925c9d87ad0aa963a53cfd1948224
 SHA1 (patch-ad) = 9c47fa28b6478bf2e720c1c0e7bf7793eb71fbab
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index 540040df60b..eddcd4cecc5 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,12 +1,20 @@
-# $NetBSD: options.mk,v 1.27 2012/10/23 10:24:07 wiz Exp $
+# $NetBSD: options.mk,v 1.28 2013/08/11 07:50:51 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_SUPPORTED_OPTIONS+=	editline
 PKG_OPTIONS_OPTIONAL_GROUPS=	kde qt
 PKG_OPTIONS_GROUP.kde=	kde kde3
 PKG_OPTIONS_GROUP.qt=	qt qt3
 PKG_SUGGESTED_OPTIONS=	anthy expat gtk prime uim-fep xim
 
+CHECK_BUILTIN.editline:=	yes
+.include "../../devel/editline/builtin.mk"
+CHECK_BUILTIN.editline:=	no
+.if !empty(USE_BUILTIN.editline:M[Yy][Ee][Ss])
+PKG_SUGGESTED_OPTIONS+=	editline
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mqt)
@@ -22,6 +30,16 @@ PKG_FAIL_REASON+=	"'qt3' conflict with 'qt' or 'kde' option"
 
 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
+PLIST_VARS+=		editline
+
+.if !empty(PKG_OPTIONS:Meditline)
+PLIST.editline=		yes
+.include "../../devel/editline/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libedit=${BUILDLINK_PREFIX.editline}
+.else
+CONFIGURE_ARGS+=	--with-libedit=no
+.endif
+
 
 .if !empty(PKG_OPTIONS:Mxim)
 .include "../../x11/libXft/buildlink3.mk"