Update to 1.5.0.

21 files changed, 320 insertions, 232 deletions

diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index 8b49ceaf0a0b..0f16d0139019 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -19,14 +19,14 @@ USE_GNOME=	gtk20
 .endif
 
 LIB_DEPENDS=	anthy.1:${PORTSDIR}/japanese/anthy \
-		uim.5:${PORTSDIR}/textproc/uim
+		uim.6:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-anthy
 
 .if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--with-gtk2 -enable-dict
+CONFIGURE_ARGS+=	--with-gtk2 --enable-dict
 .endif
 
 UIM_SLAVE=	yes
@@ -37,7 +37,7 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-uim_Makefile.in \
 do-build:
 	(cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy.la)
 .if !defined(WITHOUT_X11)
-	(cd ${WRKSRC}/helper && ${GMAKE} LIBS="-luim" uim-dict-gtk)
+	(cd ${WRKSRC}/helper && ${GMAKE} uim-dict-gtk)
 .endif
 
 do-install:
diff --git a/japanese/uim-canna/Makefile b/japanese/uim-canna/Makefile
index 949cb28a4248..0f9a95217c61 100644
--- a/japanese/uim-canna/Makefile
+++ b/japanese/uim-canna/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX=	-canna
 COMMENT=	Uim plugin using Canna input method
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna \
-		uim.5:${PORTSDIR}/textproc/uim
+		uim.6:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/japanese/uim-prime/Makefile b/japanese/uim-prime/Makefile
index 75d8190eac95..9aceb697e2c5 100644
--- a/japanese/uim-prime/Makefile
+++ b/japanese/uim-prime/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX=	-prime
 COMMENT=	Uim plugin using PRIME input method
 
 BUILD_DEPENDS=	prime:${PORTSDIR}/japanese/prime
-LIB_DEPENDS=	uim.5:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.6:${PORTSDIR}/textproc/uim
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 3edf4d5d8d2e..c1609a74f20b 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uim-el
-PORTVERSION=	1.4.2
+PORTVERSION=	1.5.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index 3221b2d0a564..abf188cc9a6b 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-1.4.2.tar.gz) = 7898dd27ace119b63ad490cad46b812e
-SHA256 (uim-1.4.2.tar.gz) = 802cfa81a2b09365a5a633f17e18348278d4316de2b7721372f9a96b958dd6b1
-SIZE (uim-1.4.2.tar.gz) = 3658097
+MD5 (uim-1.5.0.tar.gz) = 6661a0d1ef0a7167c8bc2e336bbbf197
+SHA256 (uim-1.5.0.tar.gz) = 2e7f9942ca2c7deffe35c190e85ef8f8b93215903c452868170e7220d4a4cb13
+SIZE (uim-1.5.0.tar.gz) = 4368685
diff --git a/textproc/uim-el/pkg-plist b/textproc/uim-el/pkg-plist
index 3a4e87d16c97..247ab49b0a13 100644
--- a/textproc/uim-el/pkg-plist
+++ b/textproc/uim-el/pkg-plist
@@ -7,6 +7,7 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-preedit.el
 %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-util.el
 %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-var.el
+%%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-version.el
 %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim.el
 %%PORTDOCS%%%%DOCSDIR_JA%%/README.ja
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/textproc/uim-gnome/Makefile b/textproc/uim-gnome/Makefile
index 6f44a3407318..5aed58507f30 100644
--- a/textproc/uim-gnome/Makefile
+++ b/textproc/uim-gnome/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-gnome
 COMMENT=	GNOME applets of uim input method
 
 USE_GNOME=	gtk20 gnomepanel
-LIB_DEPENDS=	uim.5:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.6:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
@@ -26,7 +26,7 @@ IGNORE=		requires X11
 .endif
 
 do-build:
-	(cd ${WRKSRC}/helper && ${GMAKE} LIBS="-luim -luim-custom")
+	(cd ${WRKSRC}/helper && ${GMAKE})
 
 do-install:
 	(cd ${WRKSRC}/helper && \
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index b68512fa5e27..9cd6bafed3ef 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -10,11 +10,11 @@ PKGNAMESUFFIX=	-gtk
 COMMENT=	GTK+ modules of uim input method
 
 USE_GNOME=	gtk20
-LIB_DEPENDS=	uim.5:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.6:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
-CONFIGURE_ARGS=	--with-gtk2
+CONFIGURE_ARGS=	--with-gtk2 --enable-pref
 
 UIM_SLAVE=	yes
 
@@ -26,8 +26,9 @@ IGNORE=		requires X11
 .endif
 
 do-build:
-	(cd ${WRKSRC}/gtk && ${GMAKE} LIBS="-luim")
-	(cd ${WRKSRC}/helper && ${GMAKE} LIBS="-luim -luim-custom")
+	(cd ${WRKSRC}/uim && ${GMAKE} libuim-x-util.la)
+	(cd ${WRKSRC}/gtk && ${GMAKE})
+	(cd ${WRKSRC}/helper && ${GMAKE})
 
 do-install:
 	(cd ${WRKSRC}/gtk && ${GMAKE} install)
diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile
index 838e8809db38..163e40323e8c 100644
--- a/textproc/uim-kde/Makefile
+++ b/textproc/uim-kde/Makefile
@@ -13,7 +13,7 @@ USE_KDELIBS_VER=3
 USE_QT_VER=	3
 USE_AUTOTOOLS=	libtool:15
 
-LIB_DEPENDS=	uim.5:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.6:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	uim-pref-qt:${PORTSDIR}/textproc/uim-qt
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
@@ -35,7 +35,7 @@ IGNORE=		requires X11
 .endif
 
 do-build:
-	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} LIBTOOL=${WRKSRC}/libtool LIBS="-luim -luim-custom" uim_panelapplet.la)
+	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} uim_panelapplet.la)
 
 do-install:
 	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install-appletLTLIBRARIES install-lnkDATA)
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index a278f34bea8a..60ad048f1b3b 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Uim plugin using m17n library input method
 
 BUILD_DEPENDS=	m17n-db:${PORTSDIR}/devel/m17n-db
 LIB_DEPENDS=	m17n.3:${PORTSDIR}/devel/m17n-lib \
-		uim.5:${PORTSDIR}/textproc/uim
+		uim.6:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	m17n-db:${PORTSDIR}/devel/m17n-db
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
@@ -27,7 +27,7 @@ UIM_SLAVE=	yes
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-uim_Makefile.in
 
 do-build:
-	(cd ${WRKSRC}/uim && ${GMAKE} LIBS="-luim" libuim-m17nlib.la)
+	(cd ${WRKSRC}/uim && ${GMAKE} libuim-m17nlib.la)
 
 do-install:
 	(cd ${WRKSRC}/uim && \
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index 5840a7c0841b..e9d3ecf7a8e5 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	QT modules of uim input method
 USE_QT_VER=	3
 USE_AUTOTOOLS=	libtool:15
 
-LIB_DEPENDS=	uim.5:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.6:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
@@ -33,7 +33,7 @@ IGNORE=		requires X11
 .endif
 
 do-build:
-	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} LIBS="-luim -luim-custom")
+	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE})
 
 do-install:
 	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install)
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index bdd4f5e07956..66fe74ef40c7 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	1.4.2
+PORTVERSION=	1.5.0
 CATEGORIES?=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -66,9 +66,9 @@ PLIST_SUB+=	X11=""
 CONFIGURE_ARGS+=--without-${_x}
 .endif
 .endfor
-.for _x in gnome kde
-.if ${CONFIGURE_ARGS:M--enable-${_x}-applet} == ""
-CONFIGURE_ARGS+=--disable-${_x}-applet
+.for _x in gnome-applet kde-applet emacs pref
+.if ${CONFIGURE_ARGS:M--enable-${_x}} == ""
+CONFIGURE_ARGS+=--disable-${_x}
 .endif
 .endfor
 
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 3221b2d0a564..abf188cc9a6b 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-1.4.2.tar.gz) = 7898dd27ace119b63ad490cad46b812e
-SHA256 (uim-1.4.2.tar.gz) = 802cfa81a2b09365a5a633f17e18348278d4316de2b7721372f9a96b958dd6b1
-SIZE (uim-1.4.2.tar.gz) = 3658097
+MD5 (uim-1.5.0.tar.gz) = 6661a0d1ef0a7167c8bc2e336bbbf197
+SHA256 (uim-1.5.0.tar.gz) = 2e7f9942ca2c7deffe35c190e85ef8f8b93215903c452868170e7220d4a4cb13
+SIZE (uim-1.5.0.tar.gz) = 4368685
diff --git a/textproc/uim/files/extra-patch-gtk_Makefile.in b/textproc/uim/files/extra-patch-gtk_Makefile.in
index fe390c6ded04..4ef68fa4b24c 100644
--- a/textproc/uim/files/extra-patch-gtk_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk_Makefile.in
@@ -1,20 +1,23 @@
---- gtk/Makefile.in.orig	Mon Aug 14 13:28:19 2006
-+++ gtk/Makefile.in	Mon Aug 21 01:05:26 2006
-@@ -64,8 +64,6 @@
+--- gtk/Makefile.in.orig	2008-05-06 14:23:14.000000000 +0900
++++ gtk/Makefile.in	2008-05-06 20:11:03.000000000 +0900
+@@ -65,8 +65,6 @@
+ am__installdirs = "$(DESTDIR)$(moduledir)"
  moduleLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(module_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim.la \
--@GTK2_TRUE@	$(am__DEPENDENCIES_1)
+-@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim.la $(am__append_1)
  am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
  	key-util-gtk.h uim-cand-win-gtk.c uim-cand-win-gtk.h \
  	caret-state-indicator.c caret-state-indicator.h compose.c \
-@@ -361,7 +359,7 @@
- @GTK2_TRUE@module_LTLIBRARIES = $(im_uim_la)
- @GTK2_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES)
- @GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
--@GTK2_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim.la $(EBLIB_LIBS)
-+@GTK2_TRUE@im_uim_la_LIBADD = $(EBLIB_LIBS)
+@@ -378,9 +376,8 @@
+ @GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@ \
+ @GTK2_TRUE@		   @EBCONF_PTHREAD_LDFLAGS@
+ 
+-@GTK2_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim.la @EBCONF_EBLIBS@ \
+-@GTK2_TRUE@	@EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ $(am__append_1)
++@GTK2_TRUE@im_uim_la_LIBADD = -luim-scm -luim @EBCONF_EBLIBS@ \
++@GTK2_TRUE@	@EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ $(am__append_1)
  @GTK2_TRUE@IM_UIM_SOURCES = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
  @GTK2_TRUE@	key-util-gtk.h uim-cand-win-gtk.c \
  @GTK2_TRUE@	uim-cand-win-gtk.h caret-state-indicator.c \
diff --git a/textproc/uim/files/extra-patch-helper_Makefile.in b/textproc/uim/files/extra-patch-helper_Makefile.in
index 89f79d6ccae9..3d72eac18d21 100644
--- a/textproc/uim/files/extra-patch-helper_Makefile.in
+++ b/textproc/uim/files/extra-patch-helper_Makefile.in
@@ -1,135 +1,167 @@
---- helper/Makefile.in.orig	Wed Jan  3 21:22:49 2007
-+++ helper/Makefile.in	Wed Jan  3 21:26:49 2007
-@@ -87,8 +87,6 @@
+--- helper/Makefile.in.orig	2008-05-06 14:23:15.000000000 +0900
++++ helper/Makefile.in	2008-05-06 20:49:16.000000000 +0900
+@@ -94,9 +94,6 @@
  @GTK2_TRUE@	uim_candwin_gtk-candwin-gtk.$(OBJEXT) \
  @GTK2_TRUE@	uim_candwin_gtk-caret-state-indicator.$(OBJEXT)
  uim_candwin_gtk_OBJECTS = $(am_uim_candwin_gtk_OBJECTS)
 -@GTK2_TRUE@uim_candwin_gtk_DEPENDENCIES =  \
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@GTK2_TRUE@	$(top_builddir)/uim/libuim.la
  uim_candwin_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_candwin_gtk_CFLAGS) \
  	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -114,10 +112,6 @@
- @DICT_TRUE@@GTK2_TRUE@	$(am__objects_1) $(am__objects_2)
+@@ -124,12 +121,6 @@
+ @DICT_TRUE@@GTK2_TRUE@	$(am__objects_3)
  uim_dict_gtk_OBJECTS = $(am_uim_dict_gtk_OBJECTS)
  am__DEPENDENCIES_1 =
 -@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_DEPENDENCIES =  \
+-@DICT_TRUE@@GTK2_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@DICT_TRUE@@GTK2_TRUE@	$(top_builddir)/uim/libuim.la \
 -@DICT_TRUE@@GTK2_TRUE@	$(am__DEPENDENCIES_1) \
+-@DICT_TRUE@@GTK2_TRUE@	$(am__DEPENDENCIES_1) \
 -@DICT_TRUE@@GTK2_TRUE@	$(am__DEPENDENCIES_1)
  uim_dict_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_dict_gtk_CFLAGS) \
  	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -125,8 +119,6 @@
+@@ -137,9 +128,6 @@
  @GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS =  \
  @GTK2_TRUE@	uim_im_switcher_gtk-im-switcher-gtk.$(OBJEXT)
  uim_im_switcher_gtk_OBJECTS = $(am_uim_im_switcher_gtk_OBJECTS)
 -@GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES =  \
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@GTK2_TRUE@	$(top_builddir)/uim/libuim.la
  uim_im_switcher_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(uim_im_switcher_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -135,8 +127,6 @@
+@@ -148,9 +136,6 @@
  @GTK2_TRUE@am_uim_input_pad_ja_OBJECTS =  \
  @GTK2_TRUE@	uim_input_pad_ja-input-pad-ja.$(OBJEXT)
  uim_input_pad_ja_OBJECTS = $(am_uim_input_pad_ja_OBJECTS)
 -@GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES =  \
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@GTK2_TRUE@	$(top_builddir)/uim/libuim.la
  uim_input_pad_ja_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_input_pad_ja_CFLAGS) \
  	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -147,8 +137,6 @@
+@@ -161,10 +146,6 @@
  @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	uim_pref_gtk-pref-gtk-custom-widgets.$(OBJEXT) \
  @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	uim_pref_gtk-key-util-gtk.$(OBJEXT)
  uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS)
 -@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim-custom.la \
--@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim.la
+-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-scm.la \
+-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim.la \
+-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	$(am__append_5)
  uim_pref_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk_CFLAGS) \
  	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -157,8 +145,6 @@
+@@ -173,9 +154,6 @@
  @APPLET_GNOME_TRUE@am_uim_toolbar_applet_OBJECTS = uim_toolbar_applet-toolbar-applet-gnome.$(OBJEXT) \
  @APPLET_GNOME_TRUE@	uim_toolbar_applet-toolbar-common-gtk.$(OBJEXT)
  uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS)
 -@APPLET_GNOME_TRUE@uim_toolbar_applet_DEPENDENCIES =  \
+-@APPLET_GNOME_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@APPLET_GNOME_TRUE@	$(top_builddir)/uim/libuim.la
  uim_toolbar_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(uim_toolbar_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -169,8 +155,6 @@
+@@ -186,9 +164,6 @@
  @GTK2_TRUE@	uim_toolbar_gtk-toolbar-standalone-gtk.$(OBJEXT) \
  @GTK2_TRUE@	uim_toolbar_gtk-toolbar-common-gtk.$(OBJEXT)
  uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS)
 -@GTK2_TRUE@uim_toolbar_gtk_DEPENDENCIES =  \
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@GTK2_TRUE@	$(top_builddir)/uim/libuim.la
  uim_toolbar_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk_CFLAGS) \
  	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -181,8 +165,6 @@
+@@ -199,9 +174,6 @@
  @GTK2_TRUE@	uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT)
  uim_toolbar_gtk_systray_OBJECTS =  \
  	$(am_uim_toolbar_gtk_systray_OBJECTS)
 -@GTK2_TRUE@uim_toolbar_gtk_systray_DEPENDENCIES =  \
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@GTK2_TRUE@	$(top_builddir)/uim/libuim.la
  uim_toolbar_gtk_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -434,8 +416,7 @@
- uim_pixmapsdir = @uim_pixmapsdir@
+@@ -484,8 +456,8 @@
  EXTRA_DIST = GNOME_UimApplet.server.in.in uim-dict-ui.xml.in
  helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
--@APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \
+ @APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \
+-@APPLET_GNOME_TRUE@			   $(top_builddir)/uim/libuim-scm.la \
 -@APPLET_GNOME_TRUE@			   $(top_builddir)/uim/libuim.la
-+@APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@
++@APPLET_GNOME_TRUE@			   -luim-scm \
++@APPLET_GNOME_TRUE@			   -luim
  
  @APPLET_GNOME_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
  @APPLET_GNOME_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME_CFLAGS@
-@@ -453,25 +434,25 @@
+@@ -503,14 +475,14 @@
  @GTK2_TRUE@			   ../gtk/caret-state-indicator.c \
  @GTK2_TRUE@			   ../gtk/caret-state-indicator.h
  
--@GTK2_TRUE@uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
-+@GTK2_TRUE@uim_candwin_gtk_LDADD = @GTK2_LIBS@
+-@GTK2_TRUE@uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@			   $(top_builddir)/uim/libuim.la
++@GTK2_TRUE@uim_candwin_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
++@GTK2_TRUE@			   -luim
+ 
  @GTK2_TRUE@uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir)
  @GTK2_TRUE@uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@  -Wall
  @GTK2_TRUE@uim_toolbar_gtk_SOURCES = toolbar-standalone-gtk.c toolbar-common-gtk.c
--@GTK2_TRUE@uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
-+@GTK2_TRUE@uim_toolbar_gtk_LDADD = @GTK2_LIBS@
+-@GTK2_TRUE@uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@			   $(top_builddir)/uim/libuim.la
++@GTK2_TRUE@uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
++@GTK2_TRUE@			   -luim
+ 
  @GTK2_TRUE@uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
  @GTK2_TRUE@uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
- @GTK2_TRUE@uim_toolbar_gtk_systray_SOURCES = toolbar-systray-gtk.c toolbar-common-gtk.c \
+@@ -518,20 +490,20 @@
  @GTK2_TRUE@				   eggtrayicon.c eggtrayicon.h
  
--@GTK2_TRUE@uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
-+@GTK2_TRUE@uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@
+ @GTK2_TRUE@uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
+-@GTK2_TRUE@				   $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@				   $(top_builddir)/uim/libuim.la
++@GTK2_TRUE@				   -luim-scm \
++@GTK2_TRUE@				   -luim
+ 
  @GTK2_TRUE@uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
  @GTK2_TRUE@uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@  -Wall
  @GTK2_TRUE@uim_im_switcher_gtk_SOURCES = im-switcher-gtk.c
--@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
-+@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@
+-@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@			       $(top_builddir)/uim/libuim.la	
++@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
++@GTK2_TRUE@			       -luim
+ 
  @GTK2_TRUE@uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
  @GTK2_TRUE@uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
  @GTK2_TRUE@uim_input_pad_ja_SOURCES = input-pad-ja.c
--@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
-+@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@
+-@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@			    $(top_builddir)/uim/libuim.la
++@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ -luim-scm \
++@GTK2_TRUE@			    -luim
+ 
  @GTK2_TRUE@uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
  @GTK2_TRUE@uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ -Wall
- @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_SOURCES = pref-gtk.c \
-@@ -479,8 +460,7 @@
- @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@			pref-gtk-keytab.h \
+@@ -541,9 +513,9 @@
  @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@			../gtk/key-util-gtk.c ../gtk/key-util-gtk.h
  
--@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \
--@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@			$(top_builddir)/uim/libuim.la
-+@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@
- 
+ @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ \
+-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-custom.la \
+-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-scm.la \
+-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim.la \
++@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	-luim-custom \
++@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	-luim-scm \
++@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	-luim \
+ @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	$(am__append_5)
  @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
  @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
-@@ -496,7 +476,6 @@
- @DICT_TRUE@@GTK2_TRUE@	dict-cclass-dialog.h $(am__append_5) \
- @DICT_TRUE@@GTK2_TRUE@	$(am__append_8)
+@@ -559,8 +531,8 @@
+ @DICT_TRUE@@GTK2_TRUE@	dict-cclass-dialog.h $(am__append_6) \
+ @DICT_TRUE@@GTK2_TRUE@	$(am__append_9) $(am__append_12)
  @DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ \
+-@DICT_TRUE@@GTK2_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@DICT_TRUE@@GTK2_TRUE@	$(top_builddir)/uim/libuim.la \
- @DICT_TRUE@@GTK2_TRUE@	$(am__append_6) $(am__append_9)
++@DICT_TRUE@@GTK2_TRUE@	-luim-scm \
++@DICT_TRUE@@GTK2_TRUE@	-luim \
+ @DICT_TRUE@@GTK2_TRUE@	$(am__append_7) $(am__append_10) \
+ @DICT_TRUE@@GTK2_TRUE@	$(am__append_13)
  @DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CPPFLAGS = $(helper_defs) \
- @DICT_TRUE@@GTK2_TRUE@	-I$(top_srcdir) -I$(top_builddir) \
diff --git a/textproc/uim/files/extra-patch-qt_Makefile.in b/textproc/uim/files/extra-patch-qt_Makefile.in
index b740e6f710dc..c6214de303d0 100644
--- a/textproc/uim/files/extra-patch-qt_Makefile.in
+++ b/textproc/uim/files/extra-patch-qt_Makefile.in
@@ -1,122 +1,153 @@
---- qt/Makefile.in.orig	Wed Jan  3 22:36:52 2007
-+++ qt/Makefile.in	Wed Jan  3 22:43:02 2007
-@@ -103,8 +103,6 @@
+--- qt/Makefile.in.orig	2008-05-06 14:23:16.000000000 +0900
++++ qt/Makefile.in	2008-05-06 23:25:02.000000000 +0900
+@@ -107,10 +107,6 @@
  extraLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(applet_LTLIBRARIES) $(extra_LTLIBRARIES) \
  	$(noinst_LTLIBRARIES)
 -@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES =  \
--@QT_IMMODULE_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim.la
+-@QT_IMMODULE_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
+-@QT_IMMODULE_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim.la \
+-@QT_IMMODULE_TRUE@@QT_TRUE@	$(am__append_10)
  am__libquiminputcontextplugin_la_SOURCES_DIST =  \
  	immodule-candidatewindow.cpp immodule-qhelpermanager.cpp \
  	immodule-plugin.cpp immodule-plugin.h \
-@@ -135,8 +133,6 @@
+@@ -141,9 +137,6 @@
  	$(libquiminputcontextplugin_la_LDFLAGS) $(LDFLAGS) -o $@
  @QT_IMMODULE_TRUE@@QT_TRUE@am_libquiminputcontextplugin_la_rpath =  \
  @QT_IMMODULE_TRUE@@QT_TRUE@	-rpath $(extradir)
 -@QT_TRUE@libtoolbarcommon_la_DEPENDENCIES =  \
+-@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@QT_TRUE@	$(top_builddir)/uim/libuim.la
  am__libtoolbarcommon_la_SOURCES_DIST =  \
  	toolbar-common-quimhelpertoolbar.cpp \
  	toolbar-common-uimstateindicator.cpp qtgettext.h \
-@@ -150,9 +146,7 @@
- 	$(libtoolbarcommon_la_CXXFLAGS) $(CXXFLAGS) \
+@@ -158,8 +151,6 @@
  	$(libtoolbarcommon_la_LDFLAGS) $(LDFLAGS) -o $@
  @QT_TRUE@am_libtoolbarcommon_la_rpath =
--@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_DEPENDENCIES =  \
+ @APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_DEPENDENCIES =  \
+-@APPLET_KDE_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@APPLET_KDE_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim.la \
--@APPLET_KDE_TRUE@@QT_TRUE@	libtoolbarcommon.la
-+@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_DEPENDENCIES = libtoolbarcommon.la
+ @APPLET_KDE_TRUE@@QT_TRUE@	libtoolbarcommon.la
  am__uim_panelapplet_la_SOURCES_DIST = toolbar-applet-kde.cpp \
  	toolbar-applet-kde.h qtgettext.h \
- 	toolbar-common-quimhelpertoolbar.h \
-@@ -174,7 +168,6 @@
- @QT_TRUE@am_uim_candwin_qt_OBJECTS =  \
+@@ -183,8 +174,8 @@
  @QT_TRUE@	uim_candwin_qt-candwin-qt.$(OBJEXT)
  uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS)
--@QT_TRUE@uim_candwin_qt_DEPENDENCIES = $(top_builddir)/uim/libuim.la
+ @QT_TRUE@uim_candwin_qt_DEPENDENCIES =  \
+-@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
+-@QT_TRUE@	$(top_builddir)/uim/libuim.la
++@QT_TRUE@	-luim-scm \
++@QT_TRUE@	-luim
  uim_candwin_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
  	$(uim_candwin_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -184,8 +177,6 @@
- @QT_TRUE@am_uim_im_switcher_qt_OBJECTS =  \
+@@ -195,8 +186,8 @@
  @QT_TRUE@	uim_im_switcher_qt-switcher-qt.$(OBJEXT)
  uim_im_switcher_qt_OBJECTS = $(am_uim_im_switcher_qt_OBJECTS)
--@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES =  \
+ @QT_TRUE@uim_im_switcher_qt_DEPENDENCIES =  \
+-@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@QT_TRUE@	$(top_builddir)/uim/libuim.la
++@QT_TRUE@	-luim-scm \
++@QT_TRUE@	-luim
  uim_im_switcher_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
  	$(uim_im_switcher_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -201,9 +192,6 @@
+@@ -212,10 +203,6 @@
  @PREF_TRUE@@QT_TRUE@	uim_pref_qt-pref-keyeditformbase.$(OBJEXT)
  uim_pref_qt_OBJECTS = $(am_uim_pref_qt_OBJECTS) \
  	$(nodist_uim_pref_qt_OBJECTS)
 -@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES =  \
 -@PREF_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim-custom.la \
+-@PREF_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
 -@PREF_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim.la
  uim_pref_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(uim_pref_qt_CXXFLAGS) \
  	$(CXXFLAGS) $(uim_pref_qt_LDFLAGS) $(LDFLAGS) -o $@
-@@ -214,8 +202,7 @@
+@@ -226,9 +213,6 @@
  @QT_TRUE@am_uim_toolbar_qt_OBJECTS =  \
  @QT_TRUE@	uim_toolbar_qt-toolbar-standalone-qt.$(OBJEXT)
  uim_toolbar_qt_OBJECTS = $(am_uim_toolbar_qt_OBJECTS)
--@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = $(top_builddir)/uim/libuim.la \
--@QT_TRUE@	./libtoolbarcommon.la
-+@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = ./libtoolbarcommon.la
+-@QT_TRUE@uim_toolbar_qt_DEPENDENCIES =  \
+-@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
+-@QT_TRUE@	$(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
  uim_toolbar_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
  	$(uim_toolbar_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -533,7 +520,6 @@
- 
- @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS)
+@@ -577,8 +561,8 @@
+ @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS) @X_CFLAGS@
  @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
--@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD = $(top_builddir)/uim/libuim.la
+ @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD =  \
+-@QT_IMMODULE_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
+-@QT_IMMODULE_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim.la \
++@QT_IMMODULE_TRUE@@QT_TRUE@	-luim-scm \
++@QT_IMMODULE_TRUE@@QT_TRUE@	-luim \
+ @QT_IMMODULE_TRUE@@QT_TRUE@	$(am__append_10)
  
  # Toolbar Common
- @QT_TRUE@noinst_LTLIBRARIES = libtoolbarcommon.la
-@@ -542,7 +528,6 @@
+@@ -588,8 +572,8 @@
  
  @QT_TRUE@libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS)
  @QT_TRUE@libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
--@QT_TRUE@libtoolbarcommon_la_LIBADD = $(top_builddir)/uim/libuim.la
+-@QT_TRUE@libtoolbarcommon_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
+-@QT_TRUE@			       $(top_builddir)/uim/libuim.la
++@QT_TRUE@libtoolbarcommon_la_LIBADD = -luim-scm \
++@QT_TRUE@			      -luim
+ 
  
  # Toolbar Standalone
- @QT_TRUE@uim_toolbar_qt_SOURCES = toolbar-standalone-qt.cpp toolbar-standalone-qt.h qtgettext.h \
-@@ -550,7 +535,7 @@
+@@ -598,8 +582,8 @@
  
  @QT_TRUE@uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS)
  @QT_TRUE@uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS)
--@QT_TRUE@uim_toolbar_qt_LDADD = $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
-+@QT_TRUE@uim_toolbar_qt_LDADD = ./libtoolbarcommon.la
+-@QT_TRUE@uim_toolbar_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
+-@QT_TRUE@			  $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
++@QT_TRUE@uim_toolbar_qt_LDADD = -luim-scm \
++@QT_TRUE@			-luim ./libtoolbarcommon.la
+ 
  
  # Toolbar applet
- @APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_SOURCES = toolbar-applet-kde.cpp toolbar-applet-kde.h qtgettext.h \
-@@ -558,19 +543,17 @@
+@@ -608,8 +592,8 @@
  
  @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 = libtoolbarcommon.la  -lkdeui -lkdecore 
+-@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
+-@APPLET_KDE_TRUE@@QT_TRUE@			      $(top_builddir)/uim/libuim.la \
++@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = -luim-scm \
++@APPLET_KDE_TRUE@@QT_TRUE@			      -luim \
+ @APPLET_KDE_TRUE@@QT_TRUE@			      libtoolbarcommon.la  -lkdeui -lkdecore 
  
- # Candidate Window
+ 
+@@ -617,16 +601,16 @@
  @QT_TRUE@uim_candwin_qt_SOURCES = candwin-qt.cpp candwin-qt.h qtgettext.h
  @QT_TRUE@uim_candwin_qt_CXXFLAGS = $(QT_CXXFLAGS)
  @QT_TRUE@uim_candwin_qt_LDFLAGS = $(QT_LDFLAGS)
--@QT_TRUE@uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim.la
+-@QT_TRUE@uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
+-@QT_TRUE@		       $(top_builddir)/uim/libuim.la
++@QT_TRUE@uim_candwin_qt_LDADD = -luim-scm \
++@QT_TRUE@		        -luim
+ 
  
  # Switcher
  @QT_TRUE@uim_im_switcher_qt_SOURCES = switcher-qt.cpp switcher-qt.h qtgettext.h
  @QT_TRUE@uim_im_switcher_qt_CXXFLAGS = $(QT_CXXFLAGS)
  @QT_TRUE@uim_im_switcher_qt_LDFLAGS = $(QT_LDFLAGS)
--@QT_TRUE@uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim.la
+-@QT_TRUE@uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
+-@QT_TRUE@			      $(top_builddir)/uim/libuim.la
++@QT_TRUE@uim_im_switcher_qt_LDADD = -luim-scm \
++@QT_TRUE@			    -luim
+ 
  
  # Pref
- @PREF_TRUE@@QT_TRUE@nodist_uim_pref_qt_SOURCES = \
-@@ -586,7 +569,6 @@
+@@ -643,9 +627,9 @@
  
  @PREF_TRUE@@QT_TRUE@uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS)
  @PREF_TRUE@@QT_TRUE@uim_pref_qt_LDFLAGS = $(QT_LDFLAGS)
--@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-custom.la $(top_builddir)/uim/libuim.la
+-@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-custom.la \
+-@PREF_TRUE@@QT_TRUE@		       $(top_builddir)/uim/libuim-scm.la \
+-@PREF_TRUE@@QT_TRUE@		       $(top_builddir)/uim/libuim.la
++@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = -luim-custom \
++@PREF_TRUE@@QT_TRUE@		        -luim-scm \
++@PREF_TRUE@@QT_TRUE@		        -luim
+ 
  @QT_TRUE@CLEANFILES = \
  @QT_TRUE@	$(MOC_FILES) \
- @QT_TRUE@	$(UI_TMP_FILES)
diff --git a/textproc/uim/files/extra-patch-uim_Makefile.in b/textproc/uim/files/extra-patch-uim_Makefile.in
index eb419babcd6c..adcbc26f4e74 100644
--- a/textproc/uim/files/extra-patch-uim_Makefile.in
+++ b/textproc/uim/files/extra-patch-uim_Makefile.in
@@ -1,85 +1,125 @@
---- uim/Makefile.in.orig	2007-03-15 05:37:42.000000000 +0900
-+++ uim/Makefile.in	2007-09-25 22:15:09.000000000 +0900
-@@ -86,8 +86,6 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
+--- uim/Makefile.in.orig	2008-05-06 14:23:17.000000000 +0900
++++ uim/Makefile.in	2008-05-06 22:51:59.000000000 +0900
+@@ -95,8 +95,6 @@
  uim_pluginLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES) $(uim_plugin_LTLIBRARIES)
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
+ 	$(uim_plugin_LTLIBRARIES)
+-@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_DEPENDENCIES = libuim-scm.la \
+-@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@	libuim.la
+ am__libuim_anthy_utf8_la_SOURCES_DIST = anthy-utf8.c
+ @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@am_libuim_anthy_utf8_la_OBJECTS = libuim_anthy_utf8_la-anthy-utf8.lo
+ libuim_anthy_utf8_la_OBJECTS = $(am_libuim_anthy_utf8_la_OBJECTS)
+@@ -106,8 +104,6 @@
+ @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@am_libuim_anthy_utf8_la_rpath =  \
+ @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@	-rpath \
+ @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@	$(uim_plugindir)
 -@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_DEPENDENCIES =  \
--@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@	libuim.la
+-@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@	libuim-scm.la libuim.la
  am__libuim_anthy_la_SOURCES_DIST = anthy.c
  @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@am_libuim_anthy_la_OBJECTS = libuim_anthy_la-anthy.lo
  libuim_anthy_la_OBJECTS = $(am_libuim_anthy_la_OBJECTS)
-@@ -96,7 +94,6 @@
- 	$(libuim_anthy_la_LDFLAGS) $(LDFLAGS) -o $@
- @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@am_libuim_anthy_la_rpath =  \
- @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@	-rpath $(uim_plugindir)
--@CANNA_TRUE@libuim_canna_la_DEPENDENCIES = libuim.la
+@@ -119,7 +115,6 @@
+ libuim_bsdlook_la_DEPENDENCIES =
+ am_libuim_bsdlook_la_OBJECTS = libuim_bsdlook_la-bsdlook.lo
+ libuim_bsdlook_la_OBJECTS = $(am_libuim_bsdlook_la_OBJECTS)
+-@CANNA_TRUE@libuim_canna_la_DEPENDENCIES = libuim-scm.la libuim.la
  am__libuim_canna_la_SOURCES_DIST = canna.c
  @CANNA_TRUE@am_libuim_canna_la_OBJECTS = libuim_canna_la-canna.lo
  libuim_canna_la_OBJECTS = $(am_libuim_canna_la_OBJECTS)
-@@ -118,7 +115,6 @@
- libuim_custom_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -159,7 +154,6 @@
+ libuim_look_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libuim_custom_la_LDFLAGS) $(LDFLAGS) -o $@
--@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES = libuim.la
+ 	$(libuim_look_la_LDFLAGS) $(LDFLAGS) -o $@
+-@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES = libuim-scm.la libuim.la
  am__libuim_m17nlib_la_SOURCES_DIST = m17nlib.c
  @M17NLIB_TRUE@am_libuim_m17nlib_la_OBJECTS =  \
  @M17NLIB_TRUE@	libuim_m17nlib_la-m17nlib.lo
-@@ -127,7 +123,6 @@
+@@ -168,7 +162,6 @@
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libuim_m17nlib_la_LDFLAGS) $(LDFLAGS) -o $@
  @M17NLIB_TRUE@am_libuim_m17nlib_la_rpath = -rpath $(uim_plugindir)
--@MANA_TRUE@libuim_mana_la_DEPENDENCIES = libuim.la
+-@MANA_TRUE@libuim_mana_la_DEPENDENCIES = libuim-scm.la libuim.la
  am__libuim_mana_la_SOURCES_DIST = mana.c
  @MANA_TRUE@am_libuim_mana_la_OBJECTS = libuim_mana_la-mana.lo
  libuim_mana_la_OBJECTS = $(am_libuim_mana_la_OBJECTS)
-@@ -135,7 +130,6 @@
+@@ -176,7 +169,6 @@
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libuim_mana_la_LDFLAGS) $(LDFLAGS) -o $@
  @MANA_TRUE@am_libuim_mana_la_rpath = -rpath $(uim_plugindir)
--@PRIME_TRUE@libuim_prime_la_DEPENDENCIES = libuim.la
+-@PRIME_TRUE@libuim_prime_la_DEPENDENCIES = libuim-scm.la libuim.la
  am__libuim_prime_la_SOURCES_DIST = prime.c
  @PRIME_TRUE@am_libuim_prime_la_OBJECTS = libuim_prime_la-prime.lo
  libuim_prime_la_OBJECTS = $(am_libuim_prime_la_OBJECTS)
-@@ -143,7 +137,6 @@
+@@ -184,7 +176,6 @@
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libuim_prime_la_LDFLAGS) $(LDFLAGS) -o $@
  @PRIME_TRUE@am_libuim_prime_la_rpath = -rpath $(uim_plugindir)
--@SCIM_TRUE@libuim_scim_la_DEPENDENCIES = libuim.la
+-@SCIM_TRUE@libuim_scim_la_DEPENDENCIES = libuim-scm.la libuim.la
  am__libuim_scim_la_SOURCES_DIST = scim.cpp
  @SCIM_TRUE@am_libuim_scim_la_OBJECTS = libuim_scim_la-scim.lo
  libuim_scim_la_OBJECTS = $(am_libuim_scim_la_OBJECTS)
-@@ -497,27 +490,27 @@
- 	uim-helper-client.c intl.c uim-ipc.c plugin.c $(am__append_5)
+@@ -199,7 +190,6 @@
+ libuim_scm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libuim_scm_la_LDFLAGS) $(LDFLAGS) -o $@
+-@SJ3_TRUE@libuim_sj3_la_DEPENDENCIES = libuim.la
+ am__libuim_sj3_la_SOURCES_DIST = sj3.c
+ @SJ3_TRUE@am_libuim_sj3_la_OBJECTS = libuim_sj3_la-sj3.lo
+ libuim_sj3_la_OBJECTS = $(am_libuim_sj3_la_OBJECTS)
+@@ -214,7 +204,6 @@
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libuim_skk_la_LDFLAGS) $(LDFLAGS) -o $@
+ am__DEPENDENCIES_1 =
+-@WNN_TRUE@libuim_wnn_la_DEPENDENCIES = libuim.la $(am__DEPENDENCIES_1)
+ am__libuim_wnn_la_SOURCES_DIST = wnnlib.h wnnlib.c
+ @WNN_TRUE@am_libuim_wnn_la_OBJECTS = libuim_wnn_la-wnnlib.lo
+ libuim_wnn_la_OBJECTS = $(am_libuim_wnn_la_OBJECTS)
+@@ -618,39 +607,39 @@
+ 	$(am__append_2) $(am__append_8) $(am__append_10)
  libuim_custom_la_SOURCES = uim-custom.c
  @M17NLIB_TRUE@libuim_m17nlib_la_SOURCES = m17nlib.c
--@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim.la
-+@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ -luim
+-@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim-scm.la libuim.la
++@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ -luim-scm -luim
  @M17NLIB_TRUE@libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
  @M17NLIB_TRUE@libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir) @M17NLIB_CFLAGS@
  @SCIM_TRUE@libuim_scim_la_SOURCES = scim.cpp
--@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ libuim.la
-+@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ -luim
+-@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ libuim-scm.la libuim.la
++@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ -luim-scm -luim
  @SCIM_TRUE@libuim_scim_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
  @SCIM_TRUE@libuim_scim_la_CXXFLAGS = -I$(top_srcdir) @SCIM_CFLAGS@
  @CANNA_TRUE@libuim_canna_la_SOURCES = canna.c
--@CANNA_TRUE@libuim_canna_la_LIBADD = libuim.la -lcanna
-+@CANNA_TRUE@libuim_canna_la_LIBADD = -luim -lcanna
+-@CANNA_TRUE@libuim_canna_la_LIBADD = libuim-scm.la libuim.la -lcanna
++@CANNA_TRUE@libuim_canna_la_LIBADD = -luim-scm -luim -lcanna
  @CANNA_TRUE@libuim_canna_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
  @CANNA_TRUE@libuim_canna_la_CPPFLAGS = -I$(top_srcdir)
+ @WNN_TRUE@libuim_wnn_la_SOURCES = wnnlib.h wnnlib.c
+-@WNN_TRUE@libuim_wnn_la_LIBADD = libuim.la $(WNN_LIBS) -lwnn @WNN_LIBADD@
++@WNN_TRUE@libuim_wnn_la_LIBADD = -luim $(WNN_LIBS) -lwnn @WNN_LIBADD@
+ @WNN_TRUE@libuim_wnn_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+ @WNN_TRUE@libuim_wnn_la_CPPFLAGS = -I$(top_srcdir) $(WNN_CPPFLAGS)
+ @SJ3_TRUE@libuim_sj3_la_SOURCES = sj3.c
+-@SJ3_TRUE@libuim_sj3_la_LIBADD = @SJ3_LIBS@ libuim.la
++@SJ3_TRUE@libuim_sj3_la_LIBADD = @SJ3_LIBS@ -luim
+ @SJ3_TRUE@libuim_sj3_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+ @SJ3_TRUE@libuim_sj3_la_CPPFLAGS = -I$(top_srcdir) @SJ3_CFLAGS@
  @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_SOURCES = anthy.c
--@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim.la
-+@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@ -luim
+-@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim-scm.la libuim.la
++@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@ -luim-scm -luim
  @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
  @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_CPPFLAGS = -I$(top_srcdir)
+ @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_SOURCES = anthy-utf8.c
+-@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ libuim-scm.la libuim.la
++@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ -luim-scm -luim
+ @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+ @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_CPPFLAGS = -I$(top_srcdir) @ANTHY_UTF8_CFLAGS@
  @MANA_TRUE@libuim_mana_la_SOURCES = mana.c
--@MANA_TRUE@libuim_mana_la_LIBADD = libuim.la
-+@MANA_TRUE@libuim_mana_la_LIBADD = -luim
+-@MANA_TRUE@libuim_mana_la_LIBADD = libuim-scm.la libuim.la
++@MANA_TRUE@libuim_mana_la_LIBADD = -luim-scm -luim
  @MANA_TRUE@libuim_mana_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
  @MANA_TRUE@libuim_mana_la_CPPFLAGS = -I$(top_srcdir)
  @PRIME_TRUE@libuim_prime_la_SOURCES = prime.c
--@PRIME_TRUE@libuim_prime_la_LIBADD = libuim.la
-+@PRIME_TRUE@libuim_prime_la_LIBADD = -luim
+-@PRIME_TRUE@libuim_prime_la_LIBADD = libuim-scm.la libuim.la
++@PRIME_TRUE@libuim_prime_la_LIBADD = -luim-scm -luim
  @PRIME_TRUE@libuim_prime_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
  @PRIME_TRUE@libuim_prime_la_CPPFLAGS = -I$(top_srcdir)
- libuim_skk_la_SOURCES = skk.c
+ libuim_skk_la_SOURCES = skk.c bsdlook.h
diff --git a/textproc/uim/files/patch-scm:skk-custom.scm b/textproc/uim/files/patch-scm:skk-custom.scm
deleted file mode 100644
index 895f1ad6738a..000000000000
--- a/textproc/uim/files/patch-scm:skk-custom.scm
+++ /dev/null
@@ -1,12 +0,0 @@
---- scm/skk-custom.scm.orig	Tue Jun 14 05:46:11 2005
-+++ scm/skk-custom.scm	Mon Jun 27 02:29:34 2005
-@@ -338,8 +338,7 @@
- 		 (lambda ()
- 		   skk-use-skkserv?))
- 
--(define-custom 'skk-dic-file-name (string-append (sys-datadir)
--						 "/skk/SKK-JISYO.L")
-+(define-custom 'skk-dic-file-name "%%LOCALBASE%%/share/skk/SKK-JISYO.L"
-   '(skk-dict)
-   '(pathname)
-   (_ "Dictionary file")
diff --git a/textproc/uim/files/patch-sigscheme_Makefile.in b/textproc/uim/files/patch-sigscheme_Makefile.in
deleted file mode 100644
index dac3250269f3..000000000000
--- a/textproc/uim/files/patch-sigscheme_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sigscheme/Makefile.in.orig	2007-09-25 01:30:22.000000000 +0900
-+++ sigscheme/Makefile.in	2007-09-25 01:30:56.000000000 +0900
-@@ -282,7 +282,7 @@
-         compare-scm.sh runbench.sh runtest.sh runtest-tail-rec.sh \
-         make-report.sh make-dist.sh
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = sigscheme.pc
- DISTCLEANFILES = sigscheme.pc tools/gnuify-changelog.pl $(DIST_SUM_LIST)
- all: all-recursive
diff --git a/textproc/uim/files/patch-uim:scim.cpp b/textproc/uim/files/patch-uim:scim.cpp
deleted file mode 100644
index c0176673863d..000000000000
--- a/textproc/uim/files/patch-uim:scim.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- uim/scim.cpp.orig	Wed Dec  7 21:39:32 2005
-+++ uim/scim.cpp	Sat Dec 24 04:13:02 2005
-@@ -43,7 +43,6 @@
- #include "uim.h"
- #include "uim-scm.h"
- #include "uim-compat-scm.h"
--#include "context.h"
- 
- using namespace scim;
- 
-@@ -175,7 +174,7 @@
-             return uim_scm_f();
-         }
- 
--        config = config_module->create_config("scim");
-+        config = config_module->create_config();
-         if ( config.null() )
-         {
-             fprintf(stderr, "create_config failed\n");
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index 0fb0ebc2573b..d6194ee38b1f 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -6,20 +6,14 @@ bin/uim-module-manager
 bin/uim-sh
 %%X11%%bin/uim-xim
 include/gcroots.h
-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/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.h
+include/uim/uim-scm-abbrev.h
 include/uim/uim-util.h
 include/uim/uim.h
 lib/libgcroots.a
@@ -30,18 +24,27 @@ lib/libuim-custom.a
 lib/libuim-custom.la
 lib/libuim-custom.so
 lib/libuim-custom.so.2
+lib/libuim-scm.a
+lib/libuim-scm.la
+lib/libuim-scm.so
+lib/libuim-scm.so.0
 lib/libuim.a
 lib/libuim.la
 lib/libuim.so
-lib/libuim.so.5
+lib/libuim.so.6
 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-editline.a
+lib/uim/plugin/libuim-editline.la
+lib/uim/plugin/libuim-editline.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
 libdata/pkgconfig/gcroots.pc
-libdata/pkgconfig/sigscheme.pc
 libdata/pkgconfig/uim.pc
 %%X11%%libexec/uim-candwin-gtk
 libexec/uim-helper-server
@@ -54,25 +57,11 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%PORTDOCS%%%%DOCSDIR%%/README.fep
 %%PORTDOCS%%%%DOCSDIR%%/README.key
 %%PORTDOCS%%%%DOCSDIR%%/README.xim
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/design.html
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/design.txt
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/gc-protection.html
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/gc-protection.txt
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/global-obj.html
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/global-obj.txt
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/index.html
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/index.txt
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/release.html
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/release.txt
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/spec.html
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/spec.txt
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/style.html
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/style.txt
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/test-c.html
-%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/test-c.txt
 %%DATADIR%%/action.scm
 %%DATADIR%%/anthy-custom.scm
 %%DATADIR%%/anthy-key-custom.scm
+%%DATADIR%%/anthy-utf8-custom.scm
+%%DATADIR%%/anthy-utf8.scm
 %%DATADIR%%/anthy.scm
 %%DATADIR%%/byeoru-custom.scm
 %%DATADIR%%/byeoru-dic.scm
@@ -85,7 +74,12 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/custom-rt.scm
 %%DATADIR%%/custom.scm
 %%DATADIR%%/default.scm
+%%DATADIR%%/deprecated-util.scm
 %%DATADIR%%/direct.scm
+%%DATADIR%%/editline.scm
+%%DATADIR%%/elatin-custom.scm
+%%DATADIR%%/elatin-rules.scm
+%%DATADIR%%/elatin.scm
 %%DATADIR%%/generic-custom.scm
 %%DATADIR%%/generic-key-custom.scm
 %%DATADIR%%/generic.scm
@@ -93,20 +87,33 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/hangul2.scm
 %%DATADIR%%/hangul3.scm
 %%DATADIR%%/i18n.scm
+%%DATADIR%%/ichar.scm
 %%DATADIR%%/im-custom.scm
 %%DATADIR%%/im-switcher.scm
 %%DATADIR%%/im.scm
 %%DATADIR%%/init.scm
 %%DATADIR%%/installed-modules.scm
 %%DATADIR%%/ipa-x-sampa.scm
+%%DATADIR%%/iso-639-1.scm
 %%DATADIR%%/japanese-azik.scm
 %%DATADIR%%/japanese-kana.scm
 %%DATADIR%%/japanese.scm
 %%DATADIR%%/key.scm
 %%DATADIR%%/latin.scm
 %%DATADIR%%/lazy-load.scm
+%%DATADIR%%/lib/sigscheme-init.scm
+%%DATADIR%%/lib/srfi-0.scm
+%%DATADIR%%/lib/srfi-1.scm
+%%DATADIR%%/lib/srfi-43.scm
+%%DATADIR%%/lib/srfi-55.scm
+%%DATADIR%%/lib/srfi-69.scm
+%%DATADIR%%/lib/srfi-9.scm
+%%DATADIR%%/lib/srfi-95.scm
+%%DATADIR%%/lib/unittest.scm
 %%DATADIR%%/load-action.scm
 %%DATADIR%%/loader.scm
+%%DATADIR%%/look-custom.scm
+%%DATADIR%%/look.scm
 %%DATADIR%%/m17nlib.scm
 %%DATADIR%%/mana-custom.scm
 %%DATADIR%%/mana-key-custom.scm
@@ -120,6 +127,8 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/pixmaps/direct.svg
 %%DATADIR%%/pixmaps/direct_input.png
 %%DATADIR%%/pixmaps/direct_input.svg
+%%DATADIR%%/pixmaps/elatin.png
+%%DATADIR%%/pixmaps/elatin.svg
 %%DATADIR%%/pixmaps/hangul2.png
 %%DATADIR%%/pixmaps/hangul2.svg
 %%DATADIR%%/pixmaps/hangul3.png
@@ -159,6 +168,8 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/pixmaps/ko_hangulword.svg
 %%DATADIR%%/pixmaps/latin.png
 %%DATADIR%%/pixmaps/latin.svg
+%%DATADIR%%/pixmaps/look.png
+%%DATADIR%%/pixmaps/look.svg
 %%DATADIR%%/pixmaps/mana.png
 %%DATADIR%%/pixmaps/mana.svg
 %%DATADIR%%/pixmaps/null.png
@@ -179,6 +190,8 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/pixmaps/romaja.svg
 %%DATADIR%%/pixmaps/scim.png
 %%DATADIR%%/pixmaps/scim.svg
+%%DATADIR%%/pixmaps/sj3.png
+%%DATADIR%%/pixmaps/sj3.svg
 %%DATADIR%%/pixmaps/skk.png
 %%DATADIR%%/pixmaps/skk.svg
 %%DATADIR%%/pixmaps/tcode.png
@@ -197,6 +210,8 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/pixmaps/unknown.svg
 %%DATADIR%%/pixmaps/viqr.png
 %%DATADIR%%/pixmaps/viqr.svg
+%%DATADIR%%/pixmaps/wnn.png
+%%DATADIR%%/pixmaps/wnn.svg
 %%DATADIR%%/plugin.scm
 %%DATADIR%%/prime-custom.scm
 %%DATADIR%%/prime-key-custom.scm
@@ -207,23 +222,29 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/rk.scm
 %%DATADIR%%/romaja.scm
 %%DATADIR%%/scim.scm
+%%DATADIR%%/sj3-custom.scm
+%%DATADIR%%/sj3-key-custom.scm
+%%DATADIR%%/sj3.scm
 %%DATADIR%%/skk-custom.scm
 %%DATADIR%%/skk-dialog.scm
 %%DATADIR%%/skk-editor.scm
 %%DATADIR%%/skk-key-custom.scm
 %%DATADIR%%/skk.scm
-%%DATADIR%%/spellcheck-custom.scm
-%%DATADIR%%/spellcheck.scm
 %%DATADIR%%/tcode.scm
 %%DATADIR%%/trycode.scm
+%%DATADIR%%/tutcode-bushudic.scm
+%%DATADIR%%/tutcode-custom.scm
 %%DATADIR%%/tutcode-key-custom.scm
+%%DATADIR%%/tutcode-rule.scm
 %%DATADIR%%/tutcode.scm
-%%DATADIR%%/uim-db.scm
 %%DATADIR%%/uim-module-manager.scm
 %%DATADIR%%/uim-sh.scm
 %%DATADIR%%/ustr.scm
 %%DATADIR%%/util.scm
 %%DATADIR%%/viqr.scm
+%%DATADIR%%/wnn-custom.scm
+%%DATADIR%%/wnn-key-custom.scm
+%%DATADIR%%/wnn.scm
 %%DATADIR%%/zaurus.scm
 @dirrm include/libgcroots
 @dirrm include/sigscheme
@@ -235,5 +256,6 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR_SIGSCHEME%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/helperdata
+@dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%