update to 1.5.3

ok ajacoutot@

inputmethods/uim/Makefile

@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile,v 1.13 2008/07/27 21:44:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2008/10/14 02:16:46 kevlo Exp $
+
 COMMENT-main=	multilingual input method library
 COMMENT-gtk=	uim for gtk
 COMMENT-qt=	uim for qt
@@ -8,15 +9,15 @@ COMMENT-gnome=	uim for gnome
 SHARED_ONLY=	Yes
 CATEGORIES=	inputmethods japanese chinese
 
-V=		1.4.1
+V=		1.5.3
 DISTNAME=	uim-$V
-MASTER_SITES=	http://uim.freedesktop.org/releases/uim/stable/
+MASTER_SITES=	http://uim.googlecode.com/files/
-HOMEPAGE=	http://uim.freedesktop.org/wiki/
+HOMEPAGE=	http://code.google.com/p/uim/
-PKGNAME-main=	uim-$Vp0
+PKGNAME-main=	uim-$V
-PKGNAME-gtk=	uim-gtk-$Vp1
+PKGNAME-gtk=	uim-gtk-$V
-PKGNAME-qt=	uim-qt-$Vp1
+PKGNAME-qt=	uim-qt-$V
 PKGNAME-kde=	uim-kde-$V
-PKGNAME-gnome=	uim-gnome-$Vp0
+PKGNAME-gnome=	uim-gnome-$V
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -24,43 +25,50 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-SHARED_LIBS +=	gcroots              0.0      # .0.0
+SHARED_LIBS +=	gcroots              0.0      # .1.0
-SHARED_LIBS +=	uim                  1.0      # .5.0
+SHARED_LIBS +=	uim-scm              0.0      # .0.0
+SHARED_LIBS +=	uim                  1.0      # .6.0
 SHARED_LIBS +=	uim-custom           0.0      # .2.0
 
 MULTI_PACKAGES=	-main -gtk -qt -kde -gnome
 
 CONFIGURE_STYLE=	autoconf
 
-MODULES=converters/libiconv devel/gettext x11/qt3
+MODULES=	converters/libiconv \
+		devel/gettext \
+		x11/qt3 \
+		textproc/intltool
 
-USE_GMAKE=Yes
+USE_GMAKE=	Yes
-USE_LIBTOOL=Yes
+USE_LIBTOOL=	Yes
-USE_X11=Yes
+USE_X11=	Yes
-AUTOCONF_VERSION=	2.61
+AUTOCONF_VERSION=	2.62
-AUTOCONF_DIR=	${WRKDIST} ${WRKDIST}/sigscheme
 SUBST_VARS=	MODQT_PLUGINS
 
-
+WANTLIB=	X11 Xau Xdmcp Xext c m
-WANTLIB=	Xrender X11 fontconfig freetype Xext c stdc++ m Xau Xdmcp
 
 RUN_DEPENDS-main=${RUN_DEPENDS} \
 		:desktop-file-utils-*:devel/desktop-file-utils
 LIB_DEPENDS-main=anthy,anthydic::inputmethods/anthy \
 		${MODLIBICONV_LIB_DEPENDS} \
 		${MODGETTEXT_LIB_DEPENDS}
-WANTLIB-main=	${WANTLIB} curses util Xft expat z
+WANTLIB-main=	${WANTLIB} Xrender fontconfig freetype curses \
+		util Xft expat z stdc++
 
-uim_LIB_DEPENDS=uim,uim-custom,gcroots::inputmethods/uim
+uim_LIB_DEPENDS=uim,uim-custom,gcroots,uim-scm::inputmethods/uim
 
+LIB_DEPENDS-qt=	${MODQT_LIB_DEPENDS} \
+		${uim_LIB_DEPENDS} \
+		${MODLIBICONV_LIB_DEPENDS} \
+		${MODGETTEXT_LIB_DEPENDS}
+WANTLIB-qt=	${WANTLIB} pthread stdc++
 
-LIB_DEPENDS-qt=	${LIB_DEPENDS-main} ${MODQT_LIB_DEPENDS} ${uim_LIB_DEPENDS}
+LIB_DEPENDS-kde=uim,gcroots,uim-scm::inputmethods/uim \
-WANTLIB-qt=	${WANTLIB} pthread
+		${MODLIBICONV_LIB_DEPENDS} \
-
+		${MODGETTEXT_LIB_DEPENDS} \
-
-LIB_DEPENDS-kde=${LIB_DEPENDS-qt} \
 		kdecore.>=7,DCOP,kdefx,kdeui::x11/kde/libs3
-WANTLIB-kde=	${WANTLIB-qt} ICE SM idn jpeg png util z art_lgpl_2
+WANTLIB-kde=	${WANTLIB} Xrender ICE SM idn jpeg png util z \
+		art_lgpl_2 qt-mt
 
 
 LIB_DEPENDS-gtk=${LIB_DEPENDS-main} ${uim_LIB_DEPENDS} \
@@ -69,11 +77,12 @@ WANTLIB-gtk=	${WANTLIB} glib-2.0 gmodule-2.0 pangoft2-1.0 \
 		gobject-2.0 pango-1.0 atk-1.0 \
 		pangocairo-1.0 cairo glitz png z expat \
 		Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr \
-		pcre pixman-1
+		pcre pixman-1 Xrender fontconfig freetype
 
-
+LIB_DEPENDS-gnome=uim,gcroots,uim-scm::inputmethods/uim \
-
+		${MODLIBICONV_LIB_DEPENDS} \
-LIB_DEPENDS-gnome=${LIB_DEPENDS-gtk} \
+		${MODGETTEXT_LIB_DEPENDS} \
+		gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
 		panel-applet-2::x11/gnome/panel
 WANTLIB-gnome=	${WANTLIB-gtk} ICE SM crypto gthread-2.0 jpeg pthread ssl \
 		ORBit-2 ORBitCosNaming-2 art_lgpl_2 audiofile bonobo-2 \
@@ -82,21 +91,18 @@ WANTLIB-gnome=	${WANTLIB-gtk} ICE SM crypto gthread-2.0 jpeg pthread ssl \
 		Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr \
 		dbus-1 dbus-glib-1 gailutil pcre pixman-1 util
 
-
-
 MAKE_FLAGS=	moduledir='${LOCALBASE}/lib/gtk-2.0/2.10.0/immodules' \
 		UIM_QT_LDFLAGS='-pthread -L${X11BASE}/lib -L${MODQT_LIBDIR} -lqt-mt -lXext -lX11' \
 		itlocaledir=${TRUEPREFIX}/share/locale
 
-		
 CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include'
 CONFIGURE_ENV+=	LDFLAGS='-L${MODQT_LIBDIR} -L${LOCALBASE}/lib -L${X11BASE}/lib'
 CONFIGURE_ENV+=	QTDIR=${MODQT_QTDIR} QTPLUGINSDIR=${LOCALBASE}/${MODQT_PLUGINS}
 
-CONFIGURE_ARGS=	--without-canna --with-anthy --without-prime  \
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-gtk2 --without-gnome2 \
+		--without-canna --with-anthy --without-prime  \
-		--with-qt --with-qt-immodule \
+		--with-gtk2 --with-qt --with-qt-immodule \
 		--enable-default-toolkit=gtk --without-m17nlib \
-		--enable-pref --enable-dict 
+		--enable-pref --enable-dict
-		
+
 .include <bsd.port.mk>

inputmethods/uim/distinfo

@@ -1,5 +1,5 @@
-MD5 (uim-1.4.1.tar.gz) = acmIL4jI6uvMm/IjcPs/Gg==
+MD5 (uim-1.5.3.tar.gz) = 5zzLzXVRneqcdfh3Xi538Q==
-RMD160 (uim-1.4.1.tar.gz) = h5aJsPTB3yKls+amJTrcUtR95vc=
+RMD160 (uim-1.5.3.tar.gz) = sJv+fC2w3XyDz2/SYYQkkDlY5/4=
-SHA1 (uim-1.4.1.tar.gz) = dRWr7S2WEeiAWYOtW/r+gIqMk2A=
+SHA1 (uim-1.5.3.tar.gz) = 3hhcVQtVxOOUjtN6zMQSmLxs3Tw=
-SHA256 (uim-1.4.1.tar.gz) = FOXfRvRTakv/+4C80Wi8hkm7JWLwWe3WNpqSrDgOx1I=
+SHA256 (uim-1.5.3.tar.gz) = 4F5LveKN4CEu8UViDUnWv9YlxXAlbU8ACbrQ44T+DKU=
-SIZE (uim-1.4.1.tar.gz) = 3564166
+SIZE (uim-1.5.3.tar.gz) = 4309191

inputmethods/uim/patches/patch-configure_ac

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_ac,v 1.4 2008/06/07 09:58:40 bernd Exp $
+$OpenBSD: patch-configure_ac,v 1.5 2008/10/14 02:16:46 kevlo Exp $
---- configure.ac.orig	Wed Mar 14 18:26:47 2007
+--- configure.ac.orig	Sun Sep  7 16:47:35 2008
-+++ configure.ac	Sat Jun  7 11:37:24 2008
++++ configure.ac	Fri Oct  3 16:09:47 2008
-@@ -794,15 +794,10 @@ if test x$use_qt = xyes ; then
+@@ -1101,15 +1101,10 @@ if test x$use_qt = xyes ; then
      fi
      UIC=$HOST_UIC
  
@@ -21,7 +21,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2008/06/07 09:58:40 bernd Exp $
  
      # Process for compiler & linker flags
      QT_CXXFLAGS="-I${QTINCDIR} -DQT_GENUINE_STR -DQT_NO_STL"
-@@ -814,13 +809,10 @@ if test x$use_qt = xyes ; then
+@@ -1121,13 +1116,10 @@ if test x$use_qt = xyes ; then
      LDFLAGS="$LDFLAGS $QT_LDFLAGS"
      AC_LANG_SAVE
      AC_LANG_CPLUSPLUS

inputmethods/uim/patches/patch-qt_Makefile_in

@@ -1,12 +1,12 @@
-$OpenBSD: patch-qt_Makefile_in,v 1.1 2007/04/08 14:58:04 espie Exp $
+$OpenBSD: patch-qt_Makefile_in,v 1.2 2008/10/14 02:16:46 kevlo Exp $
---- qt/Makefile.in.orig	Wed Mar 14 21:37:40 2007
+--- qt/Makefile.in.orig	Sun Sep  7 16:59:50 2008
-+++ qt/Makefile.in	Sun Apr  8 13:15:24 2007
++++ qt/Makefile.in	Fri Oct  3 16:12:40 2008
-@@ -564,7 +564,7 @@ EXTRA_DIST = pref-keyeditformbase.ui  pref-olisteditfo
+@@ -613,7 +613,7 @@ EXTRA_DIST = pref-keyeditformbase.ui  pref-olisteditfo
- 
- @APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_CXXFLAGS = -I@KDE_INCLUDE_DIR@ $(QT_CXXFLAGS)
  @APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
--@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim.la libtoolbarcommon.la  -lkdeui -lkdecore 
+ @APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
-+@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim.la libtoolbarcommon.la  -lkdeui -lkdecore -Wl,-lc
+ @APPLET_KDE_TRUE@@QT_TRUE@			      $(top_builddir)/uim/libuim.la \
+-@APPLET_KDE_TRUE@@QT_TRUE@			      libtoolbarcommon.la  -lkdeui -lkdecore 
++@APPLET_KDE_TRUE@@QT_TRUE@			      libtoolbarcommon.la  -lkdeui -lkdecore -Wl,-lc
+ 
  
  # Candidate Window
- @QT_TRUE@uim_candwin_qt_SOURCES = candwin-qt.cpp candwin-qt.h qtgettext.h

inputmethods/uim/patches/patch-sigscheme_libgcroots_include_private_gcconfig_h

@@ -1,25 +0,0 @@
-$OpenBSD: patch-sigscheme_libgcroots_include_private_gcconfig_h,v 1.2 2007/05/29 05:37:35 pvalchev Exp $
---- sigscheme/libgcroots/include/private/gcconfig.h.orig	Fri Jan  5 20:00:59 2007
-+++ sigscheme/libgcroots/include/private/gcconfig.h	Mon May 28 23:36:16 2007
-@@ -83,6 +83,10 @@
- #    define SPARC
- #    define mach_type_known
- # endif
-+# if defined(OPENBSD) && defined(__powerpc__)
-+#    define POWERPC
-+#    define mach_type_known
-+# endif
- # if defined(NETBSD) && (defined(m68k) || defined(__m68k__))
- #    define M68K
- #    define mach_type_known
-@@ -314,6 +318,10 @@
- # if defined(__OpenBSD__) && (defined(i386) || defined(__i386__))
- #   define I386
- #   define OPENBSD
-+#   define mach_type_known
-+# endif
-+# if defined(__OpenBSD__) && defined(__x86_64__)
-+#   define X86_64
- #   define mach_type_known
- # endif
- # if defined(FREEBSD) && (defined(i386) || defined(__i386__))

inputmethods/uim/patches/patch-sigscheme_m4_ax_feature_configurator_m4

@@ -1,12 +0,0 @@
-$OpenBSD: patch-sigscheme_m4_ax_feature_configurator_m4,v 1.1 2007/04/08 14:58:04 espie Exp $
---- sigscheme/m4/ax_feature_configurator.m4.orig	Sun Dec 24 08:48:31 2006
-+++ sigscheme/m4/ax_feature_configurator.m4	Sun Apr  8 12:41:37 2007
-@@ -225,7 +225,7 @@ AC_DEFUN([AX_FEATURE_DETECT_CONFLICTS], [
-   _ax_feature_list_expanded=''
-   for feature in $ax_feature_list_all; do
-     _ax_feature_val=AS_VAR_GET(AX_FEATURE_PREFIX_VAR[]$feature)
--    _ax_feature_val=${_ax_feature_val:no}
-+    _ax_feature_val=${_ax_feature_val:-no}
-     if test "x$_ax_feature_val" != xno; then
-       _ax_feature_list_expanded="$_ax_feature_list_expanded $feature"
-     fi

inputmethods/uim/pkg/PLIST-gnome

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PLIST-gnome,v 1.1 2007/04/08 14:58:04 espie Exp $
+@comment $OpenBSD: PLIST-gnome,v 1.2 2008/10/14 02:16:46 kevlo Exp $
-libexec/uim-toolbar-applet
+@bin libexec/uim-toolbar-applet

inputmethods/uim/pkg/PLIST-gtk

@@ -1,19 +1,16 @@
-@comment $OpenBSD: PLIST-gtk,v 1.3 2007/05/14 13:20:12 msf Exp $
+@comment $OpenBSD: PLIST-gtk,v 1.4 2008/10/14 02:16:46 kevlo Exp $
-bin/uim-dict-gtk
+@bin bin/uim-dict-gtk
-bin/uim-im-switcher-gtk
+@bin bin/uim-im-switcher-gtk
-bin/uim-input-pad-ja
+@bin bin/uim-input-pad-ja
-bin/uim-pref-gtk
+@bin bin/uim-pref-gtk
-bin/uim-toolbar-gtk
+@bin bin/uim-toolbar-gtk
-bin/uim-toolbar-gtk-systray
+@bin bin/uim-toolbar-gtk-systray
-@comment lib/gtk-2.0/2.10.0/immodules/im-uim.a
-@comment lib/gtk-2.0/2.10.0/immodules/im-uim.la
 lib/bonobo/
 lib/bonobo/servers/
 lib/bonobo/servers/GNOME_UimApplet.server
-lib/gtk-2.0/
+@comment lib/gtk-2.0/2.10.0/immodules/im-uim.a
-lib/gtk-2.0/2.10.0/
+@comment lib/gtk-2.0/2.10.0/immodules/im-uim.la
-lib/gtk-2.0/2.10.0/immodules/
 lib/gtk-2.0/2.10.0/immodules/im-uim.so
-libexec/uim-candwin-gtk
+@bin libexec/uim-candwin-gtk
 @exec %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules
 @unexec %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules

inputmethods/uim/pkg/PLIST-kde

@@ -1,9 +1,7 @@
-@comment $OpenBSD: PLIST-kde,v 1.1 2007/04/08 14:58:04 espie Exp $
+@comment $OpenBSD: PLIST-kde,v 1.2 2008/10/14 02:16:46 kevlo Exp $
-lib/kde3/
 lib/kde3/uim_panelapplet.a
 lib/kde3/uim_panelapplet.la
 lib/kde3/uim_panelapplet.so
-share/apps/
 share/apps/kicker/
 share/apps/kicker/applets/
 share/apps/kicker/applets/uimapplet.desktop

inputmethods/uim/pkg/PLIST-main

@@ -1,45 +1,49 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2007/12/18 15:56:16 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2008/10/14 02:16:46 kevlo Exp $
 @pkgpath inputmethods/uim
-bin/uim-el-agent
+@bin bin/uim-el-agent
-bin/uim-el-helper-agent
+@bin bin/uim-el-helper-agent
-bin/uim-fep
+@bin bin/uim-fep
-bin/uim-fep-tick
+@bin bin/uim-fep-tick
-bin/uim-module-manager
+@bin bin/uim-module-manager
-bin/uim-sh
+@bin bin/uim-sh
-bin/uim-xim
+@bin bin/uim-xim
 include/gcroots.h
 include/libgcroots/
 include/sigscheme/
-include/sigscheme/config-old.h
-include/sigscheme/config.h
-include/sigscheme/encoding-dummy.h
-include/sigscheme/global.h
-include/sigscheme/scmint.h
-include/sigscheme/sigscheme.h
-include/sigscheme/storage-common.h
-include/sigscheme/storage-compact.h
 include/uim/
 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-notify.h
+include/uim/uim-posix.h
+include/uim/uim-scm-abbrev.h
 include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
+lib/gtk-2.0/
+lib/gtk-2.0/2.10.0/
+lib/gtk-2.0/2.10.0/immodules/
+lib/kde3/
 lib/libgcroots.a
 lib/libgcroots.la
 @lib lib/libgcroots.so.${LIBgcroots_VERSION}
 lib/libuim-custom.a
 lib/libuim-custom.la
 @lib lib/libuim-custom.so.${LIBuim-custom_VERSION}
+lib/libuim-scm.a
+lib/libuim-scm.la
+@lib lib/libuim-scm.so.${LIBuim-scm_VERSION}
 lib/libuim.a
 lib/libuim.la
 @lib lib/libuim.so.${LIBuim_VERSION}
 lib/pkgconfig/gcroots.pc
-lib/pkgconfig/sigscheme.pc
 lib/pkgconfig/uim.pc
+lib/qt3/
+${MODQT_PLUGINS}/
+${MODQT_PLUGINS}/inputmethods/
 lib/uim/
+lib/uim/notify/
 lib/uim/plugin/
 lib/uim/plugin/libuim-anthy.a
 lib/uim/plugin/libuim-anthy.la
@@ -47,30 +51,17 @@ lib/uim/plugin/libuim-anthy.so
 lib/uim/plugin/libuim-custom-enabler.a
 lib/uim/plugin/libuim-custom-enabler.la
 lib/uim/plugin/libuim-custom-enabler.so
+lib/uim/plugin/libuim-look.a
+lib/uim/plugin/libuim-look.la
+lib/uim/plugin/libuim-look.so
 lib/uim/plugin/libuim-skk.a
 lib/uim/plugin/libuim-skk.la
 lib/uim/plugin/libuim-skk.so
-libexec/uim-helper-server
+@bin libexec/uim-helper-server
 @man man/man1/uim-xim.1
-share/applications/
 share/applications/uim.desktop
+share/apps/
 share/doc/sigscheme/
-share/doc/sigscheme/design.html
-share/doc/sigscheme/design.txt
-share/doc/sigscheme/gc-protection.html
-share/doc/sigscheme/gc-protection.txt
-share/doc/sigscheme/global-obj.html
-share/doc/sigscheme/global-obj.txt
-share/doc/sigscheme/index.html
-share/doc/sigscheme/index.txt
-share/doc/sigscheme/release.html
-share/doc/sigscheme/release.txt
-share/doc/sigscheme/spec.html
-share/doc/sigscheme/spec.txt
-share/doc/sigscheme/style.html
-share/doc/sigscheme/style.txt
-share/doc/sigscheme/test-c.html
-share/doc/sigscheme/test-c.txt
 share/emacs/site-lisp/uim-el/
 share/emacs/site-lisp/uim-el/uim-candidate.el
 share/emacs/site-lisp/uim-el/uim-debug.el
@@ -81,6 +72,7 @@ share/emacs/site-lisp/uim-el/uim-leim.el
 share/emacs/site-lisp/uim-el/uim-preedit.el
 share/emacs/site-lisp/uim-el/uim-util.el
 share/emacs/site-lisp/uim-el/uim-var.el
+share/emacs/site-lisp/uim-el/uim-version.el
 share/emacs/site-lisp/uim-el/uim.el
 share/locale/fr/LC_MESSAGES/uim.mo
 share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
@@ -90,6 +82,8 @@ share/uim/
 share/uim/action.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/byeoru-custom.scm
 share/uim/byeoru-dic.scm
@@ -102,7 +96,12 @@ share/uim/canna.scm
 share/uim/custom-rt.scm
 share/uim/custom.scm
 share/uim/default.scm
+share/uim/deprecated-util.scm
 share/uim/direct.scm
+share/uim/editline.scm
+share/uim/elatin-custom.scm
+share/uim/elatin-rules.scm
+share/uim/elatin.scm
 share/uim/generic-custom.scm
 share/uim/generic-key-custom.scm
 share/uim/generic.scm
@@ -113,20 +112,34 @@ share/uim/helperdata/
 share/uim/helperdata/bushu.t
 share/uim/helperdata/uim-dict-ui.xml
 share/uim/i18n.scm
+share/uim/ichar.scm
 share/uim/im-custom.scm
 share/uim/im-switcher.scm
 share/uim/im.scm
 share/uim/init.scm
 share/uim/installed-modules.scm
 share/uim/ipa-x-sampa.scm
+share/uim/iso-639-1.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/lib/
+share/uim/lib/sigscheme-init.scm
+share/uim/lib/srfi-0.scm
+share/uim/lib/srfi-1.scm
+share/uim/lib/srfi-43.scm
+share/uim/lib/srfi-55.scm
+share/uim/lib/srfi-69.scm
+share/uim/lib/srfi-9.scm
+share/uim/lib/srfi-95.scm
+share/uim/lib/unittest.scm
 share/uim/load-action.scm
 share/uim/loader.scm
+share/uim/look-custom.scm
+share/uim/look.scm
 share/uim/m17nlib.scm
 share/uim/mana-custom.scm
 share/uim/mana-key-custom.scm
@@ -141,6 +154,8 @@ share/uim/pixmaps/direct.png
 share/uim/pixmaps/direct.svg
 share/uim/pixmaps/direct_input.png
 share/uim/pixmaps/direct_input.svg
+share/uim/pixmaps/elatin.png
+share/uim/pixmaps/elatin.svg
 share/uim/pixmaps/hangul2.png
 share/uim/pixmaps/hangul2.svg
 share/uim/pixmaps/hangul3.png
@@ -180,6 +195,8 @@ share/uim/pixmaps/ko_hangulword.png
 share/uim/pixmaps/ko_hangulword.svg
 share/uim/pixmaps/latin.png
 share/uim/pixmaps/latin.svg
+share/uim/pixmaps/look.png
+share/uim/pixmaps/look.svg
 share/uim/pixmaps/mana.png
 share/uim/pixmaps/mana.svg
 share/uim/pixmaps/null.png
@@ -200,6 +217,8 @@ share/uim/pixmaps/romaja.png
 share/uim/pixmaps/romaja.svg
 share/uim/pixmaps/scim.png
 share/uim/pixmaps/scim.svg
+share/uim/pixmaps/sj3.png
+share/uim/pixmaps/sj3.svg
 share/uim/pixmaps/skk.png
 share/uim/pixmaps/skk.svg
 share/uim/pixmaps/tcode.png
@@ -218,6 +237,8 @@ share/uim/pixmaps/unknown.png
 share/uim/pixmaps/unknown.svg
 share/uim/pixmaps/viqr.png
 share/uim/pixmaps/viqr.svg
+share/uim/pixmaps/wnn.png
+share/uim/pixmaps/wnn.svg
 share/uim/plugin.scm
 share/uim/prime-custom.scm
 share/uim/prime-key-custom.scm
@@ -228,23 +249,29 @@ share/uim/pyunihan.scm
 share/uim/rk.scm
 share/uim/romaja.scm
 share/uim/scim.scm
+share/uim/sj3-custom.scm
+share/uim/sj3-key-custom.scm
+share/uim/sj3.scm
 share/uim/skk-custom.scm
 share/uim/skk-dialog.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/tcode.scm
 share/uim/trycode.scm
+share/uim/tutcode-bushudic.scm
+share/uim/tutcode-custom.scm
 share/uim/tutcode-key-custom.scm
+share/uim/tutcode-rule.scm
 share/uim/tutcode.scm
-share/uim/uim-db.scm
 share/uim/uim-module-manager.scm
 share/uim/uim-sh.scm
 share/uim/ustr.scm
 share/uim/util.scm
 share/uim/viqr.scm
+share/uim/wnn-custom.scm
+share/uim/wnn-key-custom.scm
+share/uim/wnn.scm
 share/uim/zaurus.scm
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database

inputmethods/uim/pkg/PLIST-qt

@@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST-qt,v 1.1 2006/10/19 09:35:16 espie Exp $
+@comment $OpenBSD: PLIST-qt,v 1.2 2008/10/14 02:16:46 kevlo Exp $
-bin/uim-chardict-qt
+@bin bin/uim-chardict-qt
-bin/uim-im-switcher-qt
+@bin bin/uim-im-switcher-qt
-bin/uim-pref-qt
+@bin bin/uim-pref-qt
-bin/uim-toolbar-qt
+@bin bin/uim-toolbar-qt
 @comment ${MODQT_PLUGINS}/inputmethods/libquiminputcontextplugin.a
 @comment ${MODQT_PLUGINS}/inputmethods/libquiminputcontextplugin.la
 ${MODQT_PLUGINS}/inputmethods/libquiminputcontextplugin.so
-libexec/uim-candwin-qt
+@bin libexec/uim-candwin-qt