Update to 0.4.6, provided by Ei Ohno in PR 29812; originally from Jun

Yamashiro.

Changes in 0.4.6:
A GUI preference tool was introduced, both for Gtk and Qt. uim-kdehelper and
UimQt were merged. A plugin system was introduced.

Package changes:
conversion engine anthy or canna can select by setting the
PKG_OPTIONS.uim variable.
buildlink3.mk added.

11 files changed, 150 insertions, 47 deletions

diff --git a/inputmethod/uim/DESCR b/inputmethod/uim/DESCR
index 4c871ae790a..bc7cdf74816 100644
--- a/inputmethod/uim/DESCR
+++ b/inputmethod/uim/DESCR
@@ -1,2 +1,5 @@
 Uim is a lightweight and full featured multilingual input method library
 and is simple, secure and flexible.
+
+Supported languages:
+Japanese, Chinese(PinYin), Korean, Vietnamese
diff --git a/inputmethod/uim/MESSAGE b/inputmethod/uim/MESSAGE
deleted file mode 100644
index f2a16f6f40c..00000000000
--- a/inputmethod/uim/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/12/28 17:10:17 wiz Exp $
-
-	For Japanese Kanji input, consider installing the
-	inputmethod/anthy package.
-
-===========================================================================
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index bcaee3d658a..27afb9d6cf6 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/01/10 16:30:18 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/03/29 18:47:52 wiz Exp $
 #
 
-DISTNAME=		uim-0.4.5
-PKGREVISION=		1
+DISTNAME=		uim-0.4.6
 CATEGORIES=		inputmethod
-MASTER_SITES=		http://freedesktop.org/~tkng/
+MASTER_SITES=		http://uim.freedesktop.org/releases/
 
 MAINTAINER=		VEG03617@nifty.com
 HOMEPAGE=		http://uim.freedesktop.org/wiki/
@@ -14,22 +13,32 @@ USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 USE_NCURSES=		# clear_screen, clr_eos
+USE_GNU_TOOLS+=		make
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/uim.pc.in
 GNU_CONFIGURE=		YES
 USE_X11=		YES
 GTK2_IMMODULES=		YES
 
+.include "options.mk"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uim
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/uim
+	${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/HELPER-CANDWIN ${PREFIX}/share/doc/uim
+	${INSTALL_DATA} ${WRKSRC}/doc/HELPER-PROTOCOL ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/KEY ${PREFIX}/share/doc/uim
+	${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${PREFIX}/share/doc/uim
+	${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/XIM-SERVER ${PREFIX}/share/doc/uim
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uim/uim-fep
+	${INSTALL_DATA} ${WRKSRC}/fep/README ${PREFIX}/share/doc/uim/uim-fep
+	${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${PREFIX}/share/doc/uim/uim-fep
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk2/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/uim/PLIST.anthy b/inputmethod/uim/PLIST.anthy
new file mode 100644
index 00000000000..cc4413f2387
--- /dev/null
+++ b/inputmethod/uim/PLIST.anthy
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.anthy,v 1.1 2005/03/29 18:47:52 wiz Exp $
+lib/uim/plugin/libuim-anthy.la
diff --git a/inputmethod/uim/PLIST.canna b/inputmethod/uim/PLIST.canna
new file mode 100644
index 00000000000..f27788f3193
--- /dev/null
+++ b/inputmethod/uim/PLIST.canna
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.canna,v 1.1 2005/03/29 18:47:52 wiz Exp $
+lib/uim/plugin/libuim-canna.la
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST.common
index 218acc48c9b..b4da29efc37 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/28 17:10:17 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2005/03/29 18:47:52 wiz Exp $
 bin/uim-candwin-gtk
 bin/uim-fep
 bin/uim-fep-tick
@@ -6,56 +6,91 @@ bin/uim-helper-candwin-gtk
 bin/uim-helper-server
 bin/uim-helper-toolbar-gtk
 bin/uim-helper-toolbar-gtk-systray
-bin/uim-im-switcher
+bin/uim-im-switcher-gtk
 bin/uim-input-pad-ja
+bin/uim-pref-gtk
 bin/uim-sh
 bin/uim-toolbar-gtk
 bin/uim-toolbar-gtk-systray
 bin/uim-xim
+include/uim/plugin.h
+include/uim/uim-compat-scm.h
+include/uim/uim-custom.h
 include/uim/uim-helper.h
 include/uim/uim-im-switcher.h
 include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
 lib/gtk-2.0/2.4.0/immodules/im-uim.la
+lib/libuim-custom.la
 lib/libuim.la
 lib/pkgconfig/uim.pc
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/uim.mo
+lib/uim/plugin/libuim-custom-enabler.la
+lib/uim/plugin/libuim-skk.la
+share/applications/uim.desktop
 share/doc/uim/HELPER-CANDWIN
+share/doc/uim/HELPER-PROTOCOL
 share/doc/uim/KEY
+share/doc/uim/PLUGIN
+share/doc/uim/README
+share/doc/uim/README.ja
+share/doc/uim/UIM-SCM
 share/doc/uim/UIM-SH
 share/doc/uim/XIM-SERVER
+share/doc/uim/uim-fep/README
+share/doc/uim/uim-fep/README.ja
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/uim.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/uim.mo
 share/uim/PY.scm
+share/uim/action.scm
+share/uim/anthy-custom.scm
+share/uim/anthy-key-custom.scm
 share/uim/anthy.scm
+share/uim/canna-custom.scm
+share/uim/canna-key-custom.scm
 share/uim/canna.scm
+share/uim/custom-rt.scm
 share/uim/custom.scm
-share/uim/default-im.scm
 share/uim/default.scm
-share/uim/generic-key.scm
+share/uim/direct.scm
+share/uim/generic-custom.scm
+share/uim/generic-key-custom.scm
 share/uim/generic.scm
 share/uim/hangul.scm
 share/uim/hangul2.scm
 share/uim/hangul3.scm
-share/uim/hk.scm
 share/uim/i18n.scm
-share/uim/icons/alphabet_a.png
+share/uim/im-custom.scm
 share/uim/im.scm
-share/uim/ipa.scm
+share/uim/init.scm
+share/uim/installed-modules.scm
+share/uim/ipa-x-sampa.scm
 share/uim/japanese-azik.scm
 share/uim/japanese-kana.scm
 share/uim/japanese.scm
 share/uim/key.scm
 share/uim/latin.scm
+share/uim/lazy-load.scm
+share/uim/load-action.scm
 share/uim/loader.scm
 share/uim/m17nlib.scm
+share/uim/manage-modules.scm
 share/uim/pinyin-big5.scm
+share/uim/pixmaps/configure-qt.png
+share/uim/pixmaps/switcher-icon.png
+share/uim/plugin.scm
+share/uim/prime-custom.scm
+share/uim/prime-key-custom.scm
 share/uim/prime.scm
 share/uim/pyload.scm
 share/uim/pyunihan.scm
 share/uim/rk.scm
 share/uim/romaja.scm
+share/uim/skk-custom.scm
 share/uim/skk-editor.scm
+share/uim/skk-key-custom.scm
 share/uim/skk.scm
+share/uim/spellcheck-custom.scm
 share/uim/spellcheck.scm
 share/uim/tables/japanese-azik.table
 share/uim/tables/japanese-kana.table
@@ -65,14 +100,19 @@ share/uim/tables/japanese-tutcode.table
 share/uim/tables/korean-hangul2.table
 share/uim/tables/korean-hangul3.table
 share/uim/tcode.scm
+share/uim/tutcode-key-custom.scm
 share/uim/tutcode.scm
 share/uim/uim-sh.scm
+share/uim/ustr.scm
 share/uim/util.scm
 share/uim/viqr.scm
 share/uim/zaurus.scm
 @dirrm share/uim/tables
-@dirrm share/uim/icons
+@dirrm share/uim/pixmaps
 @dirrm share/uim
+@dirrm share/doc/uim/uim-fep
 @dirrm share/doc/uim
+@dirrm lib/uim/plugin
+@dirrm lib/uim
 @comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/immodules
 @dirrm include/uim
diff --git a/inputmethod/uim/PLIST.qt b/inputmethod/uim/PLIST.qt
new file mode 100644
index 00000000000..9900fde0bc9
--- /dev/null
+++ b/inputmethod/uim/PLIST.qt
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST.qt,v 1.1 2005/03/29 18:47:52 wiz Exp $
+bin/uim-candwin-qt
+bin/uim-chardict-qt
+bin/uim-im-switcher-qt
+bin/uim-pref-qt
+bin/uim-toolbar-qt
+share/uim/helperdata/bushu.t
diff --git a/inputmethod/uim/buildlink3.mk b/inputmethod/uim/buildlink3.mk
new file mode 100644
index 00000000000..22d34a0fa47
--- /dev/null
+++ b/inputmethod/uim/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/03/29 18:47:52 wiz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+UIM_BUILDLINK3_MK:=	${UIM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	uim
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nuim}
+BUILDLINK_PACKAGES+=	uim
+
+.if !empty(UIM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.uim+=		uim>=0.4.6
+BUILDLINK_PKGSRCDIR.uim?=	../../inputmethod/uim
+.endif  # UIM_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index 6fd01670550..be2b1bb8f33 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/03/16 12:36:20 rillig Exp $
+$NetBSD: distinfo,v 1.4 2005/03/29 18:47:52 wiz Exp $
 
-SHA1 (uim-0.4.5.tar.gz) = a7f11c914bb8a6e23190fa9781892d8b3d3267f8
-RMD160 (uim-0.4.5.tar.gz) = 79347829c20eacd618280423c255b2e21a276ff7
-Size (uim-0.4.5.tar.gz) = 1112696 bytes
-SHA1 (patch-aa) = 1fe9938cfff5b10e926a1232fa90257490149916
+SHA1 (uim-0.4.6.tar.gz) = 34cfe11c88817a39913d3fc66adb90ec86f75f2c
+RMD160 (uim-0.4.6.tar.gz) = 258266aac3d0fe0b876f0345543d01c8ae21e0af
+Size (uim-0.4.6.tar.gz) = 1467039 bytes
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
new file mode 100644
index 00000000000..57893ecb2b2
--- /dev/null
+++ b/inputmethod/uim/options.mk
@@ -0,0 +1,51 @@
+# $NetBSD: options.mk,v 1.1 2005/03/29 18:47:52 wiz Exp $
+
+# Global and legacy options
+.if defined(UIM_USE_ANTHY) && !empty(UIM_USE_ANTHY:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=   anthy
+.endif
+
+.if defined(UIM_USE_CANNA) && !empty(UIM_USE_CANNA:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=   canna
+.endif
+
+.if defined(UIM_USE_EB) && !empty(UIM_USE_EB:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=   eb
+.endif
+
+.if defined(UIM_USE_QT) && !empty(UIM_USE_QT:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=   qt
+.endif
+
+PKG_OPTIONS_VAR=        PKG_OPTIONS.uim
+PKG_SUPPORTED_OPTIONS=  anthy canna eb qt
+PKG_DEFAULT_OPTIONS+=	anthy canna
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Manthy)
+.include "../../inputmethod/anthy/buildlink3.mk"
+PLIST_SRC+=		PLIST.anthy
+.endif
+
+.if !empty(PKG_OPTIONS:Mcanna)
+.include "../../inputmethod/canna-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-canna
+PLIST_SRC+=		PLIST.canna
+.endif
+
+.if !empty(PKG_OPTIONS:Meb)
+.include "../../textproc/eb/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-eb
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt)
+.include "../../x11/qt3-libs/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-qt
+# Not worked this option.  need immodule patch for Qt3
+CONFIGURE_ARGS+=	--with-qt-immodule
+PLIST_SRC+=		PLIST.qt
+.endif
+
+PLIST_SRC+=		PLIST.common
diff --git a/inputmethod/uim/patches/patch-aa b/inputmethod/uim/patches/patch-aa
deleted file mode 100644
index 1fb69891bdf..00000000000
--- a/inputmethod/uim/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/03/16 12:36:20 rillig Exp $
-
---- xim/xim.h.orig	Fri Oct 15 11:18:48 2004
-+++ xim/xim.h	Wed Mar 16 13:16:01 2005
-@@ -34,10 +34,16 @@
- #ifndef _xim_h_included_
- #define _xim_h_included_
- 
-+/* FIXME: config.h should be included from the C files, not from a header. */
-+#include <config.h>
-+
- #include <X11/X.h>
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include <list>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
- #include "ximserver.h"
- #include "ximpn.h"
-