Update uim to 1.8.4.

based on PR pkg/47468 by YAMASHIRO, Jun.

Overview of changes from 1.8.3 to 1.8.4
=======================================
* Enhancements
  - uim-xim
    * Add Hungarian locale support (by Kővágó Zoltán)
  - uim-tutcode
    * Enhance postfix katakana conversion
      - Take characters while hiragana continues
      - Exclude specified number of characters
      - Shrink last postfix katakana conversion
    * Updated trycode composition table retrieved 2012-11-22


Overview of changes from 1.8.2 to 1.8.3
=======================================
* Fixes
  - uim-toolbar-gtk-systray
  - uim-toolbar-gtk3-systray
    * Avoid SEGV in some environments ([uim-ja 337])
    * Fix typo ([uim-ja 339])

  - uim-tutcode
    * Fix bug: <Shift>left/right key erases current selection text
      on Google Chrome

7 files changed, 27 insertions, 31 deletions

diff --git a/inputmethod/uim-elisp/Makefile b/inputmethod/uim-elisp/Makefile
index 146f52779ef..25f4b194234 100644
--- a/inputmethod/uim-elisp/Makefile
+++ b/inputmethod/uim-elisp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/02/17 19:18:04 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2013/03/06 11:06:56 obache Exp $
 
 .include		"../../inputmethod/uim/Makefile.common"
 PKGNAME=		${EMACS_PKGNAME_PREFIX}uim-elisp-${UIM_VERSION}
-PKGREVISION=		1
 CATEGORIES=		inputmethod editors
 
 COMMENT=		Emacs LISP for inputmethod/uim
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 684e5f6bcd9..7b7d4006f8b 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2013/02/16 11:22:50 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2013/03/06 11:06:55 obache Exp $
 #
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=		8
-
 COMMENT=		Multilingual input method library
 #LICENSE=		See ${WRKSRC}/COPYING
 
@@ -56,5 +54,4 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgcroots+=	libgcroots>=0.2.3
 .include "../../devel/libgcroots/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/uim/Makefile.common b/inputmethod/uim/Makefile.common
index 88b665faddb..388765cf6a8 100644
--- a/inputmethod/uim/Makefile.common
+++ b/inputmethod/uim/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2012/09/15 12:05:00 obache Exp $
+# $NetBSD: Makefile.common,v 1.10 2013/03/06 11:06:55 obache Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=		1.8.2
+UIM_VERSION=		1.8.4
 DISTNAME=		uim-${UIM_VERSION}
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.googlecode.com/files/
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index 2630c7258f1..e1989b410a9 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2012/09/15 12:05:00 obache Exp $
+$NetBSD: distinfo,v 1.24 2013/03/06 11:06:55 obache Exp $
 
-SHA1 (uim-1.8.2.tar.bz2) = 838807d016e3540d8ffb302a0b53f71de2b5e3ca
-RMD160 (uim-1.8.2.tar.bz2) = 21fd64dbda8372a4c27188e71f3be03a7c2aa8ed
-Size (uim-1.8.2.tar.bz2) = 6480613 bytes
-SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5
-SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
-SHA1 (patch-ad) = e1d14a5455a6db1087c5e64d57d68b1d19f79f98
+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 (patch-ab) = 56a7d5aadd2339f5bacae80b28ce520e6df3d1ab
+SHA1 (patch-ac) = 7c36bc67764925c9d87ad0aa963a53cfd1948224
+SHA1 (patch-ad) = 9c47fa28b6478bf2e720c1c0e7bf7793eb71fbab
 SHA1 (patch-ae) = 59944fc9c7256056125fa3a623aecf6a2e9dfe42
 SHA1 (patch-af) = 9f543b90bfefc5f560e1eaac97d60af70ffed5cc
diff --git a/inputmethod/uim/patches/patch-ab b/inputmethod/uim/patches/patch-ab
index 59ce4b3306a..96559560fba 100644
--- a/inputmethod/uim/patches/patch-ab
+++ b/inputmethod/uim/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2010/09/18 03:08:31 obache Exp $
+$NetBSD: patch-ab,v 1.4 2013/03/06 11:06:56 obache Exp $
 
 Avoid to install of header files of sigscheme, conflict with lang/sigscheme.
 
---- sigscheme/src/Makefile.in.orig	2010-08-11 07:29:39.000000000 +0000
+--- sigscheme/src/Makefile.in.orig	2012-12-30 06:12:17.000000000 +0000
 +++ sigscheme/src/Makefile.in
-@@ -22,7 +22,7 @@
- 
- VPATH = @srcdir@
+@@ -39,7 +39,7 @@ am__make_dryrun = \
+     test $$am__dry = yes; \
+   }
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkgincludedir = $(includedir)/@PACKAGE@
-+pkgincludedir = 
++pkgincludedir =
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
diff --git a/inputmethod/uim/patches/patch-ac b/inputmethod/uim/patches/patch-ac
index 3237452c9bf..df8620518bd 100644
--- a/inputmethod/uim/patches/patch-ac
+++ b/inputmethod/uim/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2009/01/23 13:40:32 obache Exp $
+$NetBSD: patch-ac,v 1.3 2013/03/06 11:06:56 obache Exp $
 
 Avoid to install of document files of sigscheme, conflict with lang/sigscheme.
 
---- sigscheme/doc/Makefile.in.orig	2009-01-21 11:48:57.000000000 +0000
+--- sigscheme/doc/Makefile.in.orig	2012-12-30 06:12:16.000000000 +0000
 +++ sigscheme/doc/Makefile.in
-@@ -160,7 +160,7 @@ build_vendor = @build_vendor@
+@@ -210,7 +210,7 @@ build_vendor = @build_vendor@
  builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
diff --git a/inputmethod/uim/patches/patch-ad b/inputmethod/uim/patches/patch-ad
index 7e08382290f..c499fcf1d4d 100644
--- a/inputmethod/uim/patches/patch-ad
+++ b/inputmethod/uim/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.2 2012/09/15 12:05:00 obache Exp $
+$NetBSD: patch-ad,v 1.3 2013/03/06 11:06:56 obache Exp $
 
 * Fix for SunOS, Add $(SunOS_LDFLAGS) where $(LDFLALGS) requested
 
---- uim/Makefile.in.orig	2011-05-17 06:16:18.000000000 +0200
-+++ uim/Makefile.in	2011-09-13 15:25:17.188833173 +0200
-@@ -166,7 +166,7 @@ libuim_custom_enabler_la_OBJECTS =  \
+--- uim/Makefile.in.orig	2012-12-30 06:12:26.000000000 +0000
++++ uim/Makefile.in
+@@ -184,7 +184,7 @@ libuim_custom_enabler_la_OBJECTS =  \
  	$(am_libuim_custom_enabler_la_OBJECTS)
  libuim_custom_enabler_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.2 2012/09/15 12:05:00 obache Exp $
  libuim_custom_la_DEPENDENCIES = libuim-scm.la libuim.la
  am_libuim_custom_la_OBJECTS = libuim_custom_la-uim-custom.lo
  libuim_custom_la_OBJECTS = $(am_libuim_custom_la_OBJECTS)
-@@ -219,7 +219,7 @@ am_libuim_lolevel_la_OBJECTS = libuim_lo
+@@ -237,7 +237,7 @@ am_libuim_lolevel_la_OBJECTS = libuim_lo
  libuim_lolevel_la_OBJECTS = $(am_libuim_lolevel_la_OBJECTS)
  libuim_lolevel_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.2 2012/09/15 12:05:00 obache Exp $
  libuim_look_la_DEPENDENCIES = libuim-scm.la libuim.la \
  	libuim-bsdlook.la
  am_libuim_look_la_OBJECTS = libuim_look_la-look.lo
-@@ -273,7 +273,7 @@ am_libuim_scm_la_OBJECTS = libuim_scm_la
+@@ -300,7 +300,7 @@ am_libuim_scm_la_OBJECTS = libuim_scm_la
  libuim_scm_la_OBJECTS = $(am_libuim_scm_la_OBJECTS)
  libuim_scm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libuim_scm_la_CFLAGS) \
@@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.2 2012/09/15 12:05:00 obache Exp $
  libuim_skk_la_DEPENDENCIES = libuim-scm.la libuim.la libuim-bsdlook.la
  am_libuim_skk_la_OBJECTS = libuim_skk_la-skk.lo
  libuim_skk_la_OBJECTS = $(am_libuim_skk_la_OBJECTS)
-@@ -382,7 +382,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
+@@ -409,7 +409,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
  CCLD = $(CC)
  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \