diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 1f575a8fcc9e..027ba40e2df8 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	mozc
 PORTVERSION=	2.23.2815.102.01
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION?=	3
 CATEGORIES=	japanese
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 006e9b934bbd..81f07bc585d6 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	scim-uim
 PORTVERSION=	0.2.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	japanese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://freedesktop.org/~suzhe/sources/
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index 62576cc491f9..46aceff818d4 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-anthy
 COMMENT=	Uim plugin using Anthy input method
 
 .if !defined(WITHOUT_X11)
-USE_GNOME=	cairo gdkpixbuf2 gtk20
+USE_GNOME=	cairo gdkpixbuf2 gtk30
 .endif
 
 LIB_DEPENDS=	libanthy.so:japanese/anthy \
@@ -23,19 +23,16 @@ PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-anthy --with-anthy-utf8
 
 .if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--with-gtk2 --enable-dict
+CONFIGURE_ARGS+=	--with-gtk3 --enable-dict
 .endif
 
 UIM_SLAVE=	yes
 
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-uim_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk2_dict_Makefile.in
-
 do-build:
 	(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy.la)
 	(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy-utf8.la)
 .if !defined(WITHOUT_X11)
-	(cd ${WRKSRC}/gtk2/dict && ${MAKE_CMD} uim-dict-gtk)
+	(cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} uim-dict-gtk3)
 .endif
 
 do-install:
@@ -43,7 +40,7 @@ do-install:
 	${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \
 	${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES)
 .if !defined(WITHOUT_X11)
-	(cd ${WRKSRC}/gtk2/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA)
+	(cd ${WRKSRC}/gtk3/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk3 install-binPROGRAMS install-uim_dict_uiDATA)
 .endif
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/uim-anthy/pkg-plist b/japanese/uim-anthy/pkg-plist
index 054958c35ec7..83c1562f00a6 100644
--- a/japanese/uim-anthy/pkg-plist
+++ b/japanese/uim-anthy/pkg-plist
@@ -1,4 +1,4 @@
-%%X11%%bin/uim-dict-gtk
+%%X11%%bin/uim-dict-gtk3
 lib/uim/plugin/libuim-anthy.so
 lib/uim/plugin/libuim-anthy-utf8.so
 %%X11%%%%DATADIR%%/helperdata/uim-dict-ui.xml
diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile
index 0f71293def29..b22d0302ecea 100644
--- a/japanese/uim-mozc/Makefile
+++ b/japanese/uim-mozc/Makefile
@@ -1,5 +1,6 @@
 # Created by: Koichiro IWAO <meta+ports@vmeta.jp>
 
+PORTREVISION=	4
 PKGNAMEPREFIX=	ja-uim-
 
 COMMENT=	Mozc engine for uim
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index d3e33f1bf72e..75f279f3bb47 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	uim-tomoe-gtk
 PORTVERSION=	0.6.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	japanese
 MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 4ad739078e0c..7c70ab0909fe 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -1,12 +1,10 @@
 # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
 
 PORTNAME=	uim-el
-PORTVERSION=	1.8.8
-PORTREVISION=	6
+PORTVERSION=	1.8.9.b.20210104
 CATEGORIES=	textproc
-MASTER_SITES=	https://github.com/uim/uim/releases/download/${PORTVERSION}/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
-DISTNAME=	uim-${PORTVERSION}
+#DISTNAME=	uim-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	Emacs lisp for uim input method library
@@ -17,16 +15,22 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	uim-el-agent:textproc/uim
 
-USES=		emacs gettext-tools gmake gnome iconv perl5 tar:bzip2
+USES=		autoreconf:build emacs gettext gmake gnome iconv libtool pathfix perl5 pkgconfig
 USE_GNOME=	intltool
 USE_PERL5=	build
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	uim
+GH_PROJECT=	uim
+GH_TAGNAME=	d1ac9d9
+
 GNU_CONFIGURE=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/emacs
 INSTALL_WRKSRC=	${WRKSRC}/emacs
 
-CONFIGURE_ARGS?=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
+CONFIGURE_ARGS?=--enable-maintainer-mode --enable-emacs \
+		--with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
@@ -36,6 +40,9 @@ PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
 
 OPTIONS_DEFINE=	DOCS
 
+pre-configure:
+	cd ${WRKSRC} && ./autogen.sh
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index c2fd4a7cefdb..51504dd1929c 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530281548
-SHA256 (uim-1.8.8.tar.bz2) = 34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
-SIZE (uim-1.8.8.tar.bz2) = 6228743
+TIMESTAMP = 1619703401
+SHA256 (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = e187667560eb920201c93a6af104868c7c86b0d61364f6f7a20b33416c15a935
+SIZE (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = 4052581
diff --git a/textproc/uim-el/files/patch-emacs_Makefile.am b/textproc/uim-el/files/patch-emacs_Makefile.am
new file mode 100644
index 000000000000..9edaeaaa6f40
--- /dev/null
+++ b/textproc/uim-el/files/patch-emacs_Makefile.am
@@ -0,0 +1,21 @@
+--- emacs/Makefile.am.orig	2021-04-29 12:52:58 UTC
++++ emacs/Makefile.am
+@@ -1,13 +1,11 @@
+ EXTRA_DIST = README.ja uim-version.el.in
+ 
+-if UIM_EL
+ 
+ uimel_lispdir = $(UIMEL_LISP_DIR)
+ dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \
+  uim-key.el uim-util.el \
+  uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el uim-helper.el
+ 
+-bin_PROGRAMS = uim-el-agent uim-el-helper-agent
+ 
+ uim_el_agent_SOURCES = uim-el-agent.c debug.c output.c context.c preedit.c \
+  key.c candidate.c encoding.c im.c callback.c commit.c \
+@@ -27,4 +25,3 @@ uim_el_helper_agent_CPPFLAGS = -I$(top_srcdir)
+ uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \
+ 			    $(top_builddir)/uim/libuim.la
+ 
+-endif
diff --git a/textproc/uim-el/files/patch-emacs_Makefile.in b/textproc/uim-el/files/patch-emacs_Makefile.in
deleted file mode 100644
index d26865a485b9..000000000000
--- a/textproc/uim-el/files/patch-emacs_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- emacs/Makefile.in.orig	2018-05-11 21:27:46 UTC
-+++ emacs/Makefile.in
-@@ -89,8 +89,6 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@UIM_EL_TRUE@bin_PROGRAMS = uim-el-agent$(EXEEXT) \
--@UIM_EL_TRUE@	uim-el-helper-agent$(EXEEXT)
- subdir = emacs
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_have_stl.m4 \
-@@ -1087,7 +1085,7 @@ distdir: $(DISTFILES)
- 	done
- check-am: all-am
- check: check-am
--all-am: Makefile $(PROGRAMS) $(DATA)
-+all-am: Makefile $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(uimel_lispdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
diff --git a/textproc/uim-el/files/patch-emacs_uim-helper.el b/textproc/uim-el/files/patch-emacs_uim-helper.el
deleted file mode 100644
index 0bb4dc000d24..000000000000
--- a/textproc/uim-el/files/patch-emacs_uim-helper.el
+++ /dev/null
@@ -1,11 +0,0 @@
---- emacs/uim-helper.el.orig	2017-08-14 00:07:26 UTC
-+++ emacs/uim-helper.el
-@@ -106,7 +106,7 @@
-     (if (not proc)
- 	(error "uim.el: Couldn't invoke uim-el-helper-agent."))
- 
--    (process-kill-without-query proc)
-+    (set-process-query-on-exit-flag proc nil)
- 
-     ;; wait "OK"
-     (let ((patience uim-startup-timeout) (ok nil))
diff --git a/textproc/uim-el/files/patch-emacs_uim.el b/textproc/uim-el/files/patch-emacs_uim.el
deleted file mode 100644
index 5992936bb854..000000000000
--- a/textproc/uim-el/files/patch-emacs_uim.el
+++ /dev/null
@@ -1,11 +0,0 @@
---- emacs/uim.el.orig	2018-05-08 04:53:27 UTC
-+++ emacs/uim.el
-@@ -488,7 +488,7 @@
- 	(error "uim.el: Couldn't invoke uim-el-agent."))
-     
-     ;; don't ask kill
--    (process-kill-without-query proc)
-+    (set-process-query-on-exit-flag proc nil)
- 
-     ;; wait "OK"
-     (let ((patience uim-startup-timeout) (ok nil))
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index f1db6ba907b5..1e4b8c10dc1a 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -15,29 +15,15 @@ CONFIGURE_ARGS=	--with-gtk2 --enable-pref
 
 UIM_SLAVE=	yes
 
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-gtk2_immodule_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk2_pad_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk2_pref_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk2_switcher_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk2_toolbar_Makefile.in
-
 .if defined(WITHOUT_X11)
 IGNORE=		requires X11
 .endif
 
 do-build:
 	(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la)
-	(cd ${WRKSRC}/gtk2/immodule && ${MAKE_CMD})
-	(cd ${WRKSRC}/gtk2/pad && ${MAKE_CMD})
-	(cd ${WRKSRC}/gtk2/pref && ${MAKE_CMD})
-	(cd ${WRKSRC}/gtk2/switcher && ${MAKE_CMD})
-	(cd ${WRKSRC}/gtk2/toolbar && ${MAKE_CMD})
+	(cd ${WRKSRC}/gtk2 && ${MAKE_CMD})
 
 do-install:
-	(cd ${WRKSRC}/gtk2/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
-	(cd ${WRKSRC}/gtk2/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
-	(cd ${WRKSRC}/gtk2/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
-	(cd ${WRKSRC}/gtk2/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
-	(cd ${WRKSRC}/gtk2/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+	(cd ${WRKSRC}/gtk2 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-gtk/pkg-plist b/textproc/uim-gtk/pkg-plist
index 8336f64cefac..1a2e1d2daee2 100644
--- a/textproc/uim-gtk/pkg-plist
+++ b/textproc/uim-gtk/pkg-plist
@@ -4,5 +4,8 @@ bin/uim-pref-gtk
 bin/uim-toolbar-gtk
 bin/uim-toolbar-gtk-systray
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.so
+libexec/uim-candwin-gtk
+libexec/uim-candwin-horizontal-gtk
+libexec/uim-candwin-tbl-gtk
 @postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
 @postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
diff --git a/textproc/uim-gtk3/Makefile b/textproc/uim-gtk3/Makefile
index 2322c6d5cb2f..80bbb0cab30f 100644
--- a/textproc/uim-gtk3/Makefile
+++ b/textproc/uim-gtk3/Makefile
@@ -13,23 +13,23 @@ CONFIGURE_ARGS=	--with-gtk3 --enable-pref --enable-default-toolkit=gtk3
 
 UIM_SLAVE=	yes
 
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-gtk3_candwin_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk3_dict_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk3_immodule_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk3_pad_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk3_pref_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk3_switcher_Makefile.in \
-		${PATCHDIR}/extra-patch-gtk3_toolbar_Makefile.in
-
 .if defined(WITHOUT_X11)
 IGNORE=		requires X11
 .endif
 
 do-build:
 	(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la)
-	(cd ${WRKSRC}/gtk3 && ${MAKE_CMD})
+	(cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD})
+	(cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD})
+	(cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD})
+	(cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD})
+	(cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD})
 
 do-install:
-	(cd ${WRKSRC}/gtk3 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+	(cd ${WRKSRC}/gtk3/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+	(cd ${WRKSRC}/gtk3/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+	(cd ${WRKSRC}/gtk3/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+	(cd ${WRKSRC}/gtk3/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
+	(cd ${WRKSRC}/gtk3/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-gtk3/pkg-plist b/textproc/uim-gtk3/pkg-plist
index 0805c90bb413..8643ff2531f1 100644
--- a/textproc/uim-gtk3/pkg-plist
+++ b/textproc/uim-gtk3/pkg-plist
@@ -4,8 +4,5 @@ bin/uim-pref-gtk3
 bin/uim-toolbar-gtk3
 bin/uim-toolbar-gtk3-systray
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-uim.so
-libexec/uim-candwin-gtk3
-libexec/uim-candwin-horizontal-gtk3
-libexec/uim-candwin-tbl-gtk3
 @postexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true
 @postunexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index 2a4778c90b17..6be918defd9f 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -23,8 +23,6 @@ CONFIGURE_ARGS=	--with-m17nlib
 
 UIM_SLAVE=	yes
 
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-uim_Makefile.in
-
 do-build:
 	(cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-m17nlib.la)
 
diff --git a/textproc/uim-qt5/Makefile b/textproc/uim-qt5/Makefile
index 9b4426c1d2e9..76d4dad0df2f 100644
--- a/textproc/uim-qt5/Makefile
+++ b/textproc/uim-qt5/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	2
 PKGNAMESUFFIX=	-qt5
 
 COMMENT=	Qt5 modules of uim input method
@@ -7,11 +6,13 @@ LICENSE=	BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	cmake:devel/cmake
 LIB_DEPENDS=	libuim.so:textproc/uim
 
-USES=		compiler:c++11-lang gl iconv libtool qt:5
+USES=		compiler:c++11-lang gl iconv kde:5 libtool qt:5
 USE_GL=		gl
-USE_QT=		buildtools_build core gui qmake_build widgets x11extras
+USE_KDE=	plasma-framework
+USE_QT=		buildtools_build core declarative gui network qmake_build widgets x11extras
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim-qt5/pkg-plist b/textproc/uim-qt5/pkg-plist
index fbf8ad2d02c5..a3630246057c 100644
--- a/textproc/uim-qt5/pkg-plist
+++ b/textproc/uim-qt5/pkg-plist
@@ -2,5 +2,13 @@ bin/uim-chardict-qt5
 bin/uim-im-switcher-qt5
 bin/uim-pref-qt5
 bin/uim-toolbar-qt5
+%%QT_QMLDIR%%/com/github/uim/libuim-qtquick-plugin.so
+%%QT_QMLDIR%%/com/github/uim/qmldir
 %%QT_PLUGINDIR%%/platforminputcontexts/libuimplatforminputcontextplugin.so
 libexec/uim-candwin-qt5
+share/kservices5/plasma-applet-com.github.uim.status.desktop
+share/metainfo/com.github.uim.status.appdata.xml
+share/plasma/plasmoids/com.github.uim.status/contents/ui/main.qml
+share/plasma/plasmoids/com.github.uim.status/contents/ui/messageProcessor.js
+share/plasma/plasmoids/com.github.uim.status/metadata.desktop
+share/plasma/plasmoids/com.github.uim.status/metadata.json
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 4025f8d86b68..1a9d054f1c80 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -1,10 +1,8 @@
 # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
 
 PORTNAME=	uim
-PORTVERSION=	1.8.8
-PORTREVISION?=	2
+PORTVERSION=	1.8.9.b.20210104
 CATEGORIES?=	textproc
-MASTER_SITES=	https://github.com/uim/uim/releases/download/${PORTVERSION}/
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 .endif
@@ -18,11 +16,17 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to configure: ./include/private/gcconfig.h:492:5: The collector has not been ported to this machine/OS combination
 
-USES+=		gettext gmake gnome iconv libedit libtool pathfix pkgconfig perl5 sqlite tar:bzip2
+USES+=		autoreconf:build gettext gmake gnome iconv libedit libtool pathfix pkgconfig sqlite
 USE_LDCONFIG=	yes
 USE_GNOME+=	glib20 intltool
-USE_PERL5=	build
+
+USE_GITHUB=	yes
+GH_TAGNAME=	d1ac9d9
+GH_TUPLE=	uim:sigscheme:beb8fbd:sigscheme \
+		uim:libgcroots:d362356:libgcroots
+
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--enable-maintainer-mode
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_DEFAULT=	X11
@@ -37,11 +41,15 @@ CONFIGURE_ARGS+=	--with-x --with-xft
 .endif
 
 .if !defined(UIM_SLAVE)
+USES+=		perl5
+USE_GNOME+=	librsvg2:build
+USE_PERL5=	build
+USE_RUBY=	build
 .if ${PORT_OPTIONS:MX11}
-USE_GNOME+=	cairo gdkpixbuf2 gtk20
+USE_GNOME+=	cairo gdkpixbuf2 gtk30
 LIB_DEPENDS+=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
-CONFIGURE_ARGS+=	--with-gtk2
+CONFIGURE_ARGS+=	--with-gtk3
 .endif
 CONFIGURE_ARGS+=	--enable-emacs --with-sj3 --with-canna --with-prime
 .endif
@@ -69,7 +77,7 @@ PLIST_SUB+=	X11=""
 CONFIGURE_ARGS+=	--enable-storage=fatty
 .endif
 
-.for _x in x xft gtk2 qt anthy canna m17nlib prime scim dict
+.for _x in x xft gtk2 gtk3 qt5 anthy canna m17nlib prime scim dict
 .if ${CONFIGURE_ARGS:M--with-${_x}} == ""
 CONFIGURE_ARGS+=--without-${_x}
 .endif
@@ -80,16 +88,24 @@ CONFIGURE_ARGS+=--disable-${_x}
 .endif
 .endfor
 
+post-extract:
+	${CP} -R ${WRKSRC_sigscheme}/* ${WRKSRC}/sigscheme
+	${MKDIR} ${WRKSRC}/sigscheme/libgcroots
+	${CP} -R ${WRKSRC_libgcroots}/* ${WRKSRC}/sigscheme/libgcroots
+
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm
 
+pre-configure:
+	cd ${WRKSRC} && ./autogen.sh
+
 do-build:
 .if !defined(UIM_SLAVE)
 .for d in replace sigscheme uim scm xim po fep emacs pixmaps tables
 	cd ${WRKSRC}/${d} && ${MAKE_CMD}
 .endfor
 .if ${PORT_OPTIONS:MX11}
-	cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD}
+	cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD}
 .endif
 .endif
 
@@ -100,7 +116,7 @@ do-install:
 	cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
 .endfor
 .if ${PORT_OPTIONS:MX11}
-	cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
+	cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
 .endif
 .endif
 
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 581f6727f397..eb5a5de6cce3 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1530280332
-SHA256 (uim-1.8.8.tar.bz2) = 34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
-SIZE (uim-1.8.8.tar.bz2) = 6228743
+TIMESTAMP = 1619679684
+SHA256 (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = e187667560eb920201c93a6af104868c7c86b0d61364f6f7a20b33416c15a935
+SIZE (uim-uim-1.8.9.b.20210104-d1ac9d9_GH0.tar.gz) = 4052581
+SHA256 (uim-sigscheme-beb8fbd_GH0.tar.gz) = c3ad5cbec2ff32bb97aed4273e7a61ee74b2a0da301490349798e475c894a25c
+SIZE (uim-sigscheme-beb8fbd_GH0.tar.gz) = 570745
+SHA256 (uim-libgcroots-d362356_GH0.tar.gz) = ae01589f5a7b49cf78418aca8679a7cd46a177a37d7776a4353b517d88cef451
+SIZE (uim-libgcroots-d362356_GH0.tar.gz) = 88740
diff --git a/textproc/uim/files/extra-patch-gtk2_dict_Makefile.in b/textproc/uim/files/extra-patch-gtk2_dict_Makefile.in
deleted file mode 100644
index a2a7d0e97fce..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_dict_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- gtk2/dict/Makefile.in.orig	2012-04-01 03:16:41.000000000 +0900
-+++ gtk2/dict/Makefile.in	2012-04-01 03:18:52.000000000 +0900
-@@ -94,8 +94,6 @@
- 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)
-@@ -419,8 +417,8 @@
- @DICT_TRUE@@GTK2_TRUE@	cclass-dialog.h $(am__append_1) \
- @DICT_TRUE@@GTK2_TRUE@	$(am__append_4) $(am__append_7)
- @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@	-luim-scm \
-+@DICT_TRUE@@GTK2_TRUE@	-luim \
- @DICT_TRUE@@GTK2_TRUE@	$(am__append_2) $(am__append_5) \
- @DICT_TRUE@@GTK2_TRUE@	$(am__append_8)
- @DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CPPFLAGS = $(helper_defs) \
diff --git a/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in b/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
deleted file mode 100644
index 26ed309a17b3..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- gtk2/immodule/Makefile.in.orig	2018-06-30 00:34:14.035453000 +0900
-+++ gtk2/immodule/Makefile.in	2018-06-30 00:35:43.223656000 +0900
-@@ -156,8 +156,7 @@
-   }
- am__installdirs = "$(DESTDIR)$(moduledir)"
- LTLIBRARIES = $(module_LTLIBRARIES)
--@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@	$(top_builddir)/uim/libuim.la \
-+@GTK2_TRUE@im_uim_la_DEPENDENCIES = \
- @GTK2_TRUE@	$(top_builddir)/uim/libuim-counted-init.la \
- @GTK2_TRUE@	$(am__append_1)
- am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
-@@ -547,8 +546,8 @@
- @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_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@	$(top_builddir)/uim/libuim.la \
-+@GTK2_TRUE@im_uim_la_LIBADD = -luim-scm \
-+@GTK2_TRUE@	-luim \
- @GTK2_TRUE@	$(top_builddir)/uim/libuim-counted-init.la \
- @GTK2_TRUE@	$(am__append_1) -lm @GTK2_LIBS@
- @GTK2_TRUE@IM_UIM_SOURCES = \
diff --git a/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in b/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
deleted file mode 100644
index 2610f6d0d479..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk2/pad/Makefile.in.orig	2018-06-29 23:22:27.240949000 +0900
-+++ gtk2/pad/Makefile.in	2018-06-29 23:26:29.433490000 +0900
-@@ -131,9 +131,7 @@
- @GTK2_TRUE@am_uim_input_pad_ja_OBJECTS =  \
- @GTK2_TRUE@	uim_input_pad_ja-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
-+@GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES = 
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -484,8 +482,8 @@
- top_srcdir = @top_srcdir@
- uim_pixmapsdir = @uim_pixmapsdir@
- @GTK2_TRUE@uim_input_pad_ja_SOURCES = ja.c
--@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@
diff --git a/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in b/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
deleted file mode 100644
index b73282d6a8cb..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_pref_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- gtk2/pref/Makefile.in.orig	2016-10-14 09:57:35 UTC
-+++ gtk2/pref/Makefile.in
-@@ -86,9 +86,6 @@ am__uim_pref_gtk_SOURCES_DIST = gtk.c gt
- @GTK2_4_TRUE@@PREF_TRUE@	uim_pref_gtk-key-util-gtk.$(OBJEXT)
- uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS)
- @GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_DEPENDENCIES =  \
--@GTK2_4_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-custom.la \
--@GTK2_4_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK2_4_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim.la \
- @GTK2_4_TRUE@@PREF_TRUE@	$(am__append_1)
- uim_pref_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk_CFLAGS) \
-@@ -392,9 +389,9 @@ helper_defs = -DUIM_DATADIR=\""$(datadir
- @GTK2_4_TRUE@@PREF_TRUE@			../immodule/key-util-gtk.h
- 
- @GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ \
--@GTK2_4_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-custom.la \
--@GTK2_4_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK2_4_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim.la \
-+@GTK2_4_TRUE@@PREF_TRUE@	-luim-custom \
-+@GTK2_4_TRUE@@PREF_TRUE@	-luim-scm \
-+@GTK2_4_TRUE@@PREF_TRUE@	-luim \
- @GTK2_4_TRUE@@PREF_TRUE@	$(am__append_1)
- @GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
- @GTK2_4_TRUE@@PREF_TRUE@uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in b/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
deleted file mode 100644
index 875fabd7d20a..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- gtk2/switcher/Makefile.in.orig	2018-06-29 23:31:04.197505000 +0900
-+++ gtk2/switcher/Makefile.in	2018-06-30 00:27:43.554671000 +0900
-@@ -131,11 +131,7 @@
- @GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS =  \
- @GTK2_TRUE@	uim_im_switcher_gtk-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-custom.la \
--@GTK2_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@	$(top_builddir)/uim/libuim.la
-+@GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES = 
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -486,10 +482,9 @@
- top_srcdir = @top_srcdir@
- uim_pixmapsdir = @uim_pixmapsdir@
- @GTK2_TRUE@uim_im_switcher_gtk_SOURCES = gtk.c
--@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@			       $(top_builddir)/uim/libuim-custom.la \
--@GTK2_TRUE@			       $(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-custom \
-+@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@
diff --git a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in b/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
deleted file mode 100644
index e5b2413b11e7..000000000000
--- a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in
+++ /dev/null
@@ -1,76 +0,0 @@
---- gtk2/toolbar/Makefile.in.orig	2018-06-30 00:28:37.045910000 +0900
-+++ gtk2/toolbar/Makefile.in	2018-06-30 00:33:13.062351000 +0900
-@@ -139,10 +139,7 @@
- @GNOME_APPLET_TRUE@	uim_toolbar_applet-applet-gnome.$(OBJEXT) \
- @GNOME_APPLET_TRUE@	uim_toolbar_applet-common-gtk.$(OBJEXT)
- uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS)
--@GNOME_APPLET_TRUE@uim_toolbar_applet_DEPENDENCIES =  \
--@GNOME_APPLET_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GNOME_APPLET_TRUE@	$(top_builddir)/uim/libuim.la \
--@GNOME_APPLET_TRUE@	$(top_builddir)/uim/libuim-custom.la
-+@GNOME_APPLET_TRUE@uim_toolbar_applet_DEPENDENCIES = 
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -154,9 +151,7 @@
- am_uim_toolbar_gtk_OBJECTS = uim_toolbar_gtk-standalone-gtk.$(OBJEXT) \
- 	uim_toolbar_gtk-common-gtk.$(OBJEXT)
- uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS)
--uim_toolbar_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
--	$(top_builddir)/uim/libuim.la \
--	$(top_builddir)/uim/libuim-custom.la
-+uim_toolbar_gtk_DEPENDENCIES = 
- uim_toolbar_gtk_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(uim_toolbar_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-@@ -167,10 +162,7 @@
- 	uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT)
- uim_toolbar_gtk_systray_OBJECTS =  \
- 	$(am_uim_toolbar_gtk_systray_OBJECTS)
--uim_toolbar_gtk_systray_DEPENDENCIES =  \
--	$(top_builddir)/uim/libuim-scm.la \
--	$(top_builddir)/uim/libuim.la \
--	$(top_builddir)/uim/libuim-custom.la
-+uim_toolbar_gtk_systray_DEPENDENCIES = 
- uim_toolbar_gtk_systray_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -549,9 +541,9 @@
- EXTRA_DIST = GNOME_UimApplet.server.in.in
- helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
- @GNOME_APPLET_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_LIBS@ \
--@GNOME_APPLET_TRUE@			   $(top_builddir)/uim/libuim-scm.la \
--@GNOME_APPLET_TRUE@			   $(top_builddir)/uim/libuim.la \
--@GNOME_APPLET_TRUE@			   $(top_builddir)/uim/libuim-custom.la
-+@GNOME_APPLET_TRUE@			   -luim-scm \
-+@GNOME_APPLET_TRUE@			   -luim \
-+@GNOME_APPLET_TRUE@			   -luim-custom
- 
- @GNOME_APPLET_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
- @GNOME_APPLET_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@
-@@ -566,9 +558,9 @@
- @GNOME_APPLET_TRUE@		 GNOME_UimApplet.server.in.tmp
- 
- uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c
--uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--			   $(top_builddir)/uim/libuim.la \
--			   $(top_builddir)/uim/libuim-custom.la
-+uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
-+			   -luim \
-+			   -luim-custom
- 
- uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@
-@@ -577,9 +569,9 @@
- 
- uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
- 				   @X11_LIBS@ \
--				   $(top_builddir)/uim/libuim-scm.la \
--				   $(top_builddir)/uim/libuim.la \
--				   $(top_builddir)/uim/libuim-custom.la
-+				   -luim-scm \
-+				   -luim \
-+				   -luim-custom
- 
- uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in b/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in
deleted file mode 100644
index e594e98df1d0..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in
+++ /dev/null
@@ -1,68 +0,0 @@
---- gtk3/candwin/Makefile.in.orig	2018-06-30 03:38:40.172272000 +0900
-+++ gtk3/candwin/Makefile.in	2018-06-30 03:41:06.825966000 +0900
-@@ -136,9 +136,7 @@
- @GTK3_TRUE@	uim_candwin_gtk3-gtk.$(OBJEXT) \
- @GTK3_TRUE@	uim_candwin_gtk3-caret-state-indicator.$(OBJEXT)
- uim_candwin_gtk3_OBJECTS = $(am_uim_candwin_gtk3_OBJECTS)
--@GTK3_TRUE@uim_candwin_gtk3_DEPENDENCIES =  \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_candwin_gtk3_DEPENDENCIES = 
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -155,9 +153,7 @@
- @GTK3_TRUE@	uim_candwin_horizontal_gtk3-caret-state-indicator.$(OBJEXT)
- uim_candwin_horizontal_gtk3_OBJECTS =  \
- 	$(am_uim_candwin_horizontal_gtk3_OBJECTS)
--@GTK3_TRUE@uim_candwin_horizontal_gtk3_DEPENDENCIES =  \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_candwin_horizontal_gtk3_DEPENDENCIES = 
- uim_candwin_horizontal_gtk3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(uim_candwin_horizontal_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -169,9 +165,7 @@
- @GTK3_TRUE@	uim_candwin_tbl_gtk3-tbl-gtk.$(OBJEXT) \
- @GTK3_TRUE@	uim_candwin_tbl_gtk3-caret-state-indicator.$(OBJEXT)
- uim_candwin_tbl_gtk3_OBJECTS = $(am_uim_candwin_tbl_gtk3_OBJECTS)
--@GTK3_TRUE@uim_candwin_tbl_gtk3_DEPENDENCIES =  \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_candwin_tbl_gtk3_DEPENDENCIES = 
- uim_candwin_tbl_gtk3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(uim_candwin_tbl_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -525,8 +519,8 @@
- @GTK3_TRUE@			   ../../gtk2/immodule/caret-state-indicator.c \
- @GTK3_TRUE@			   ../../gtk2/immodule/caret-state-indicator.h
- 
--@GTK3_TRUE@uim_candwin_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@			   $(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_candwin_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
-+@GTK3_TRUE@			   -luim
- 
- @GTK3_TRUE@uim_candwin_gtk3_CPPFLAGS = -I$(top_srcdir)
- @GTK3_TRUE@uim_candwin_gtk3_CFLAGS = @GTK3_CFLAGS@
-@@ -534,8 +528,8 @@
- @GTK3_TRUE@			   ../../gtk2/immodule/caret-state-indicator.c \
- @GTK3_TRUE@			   ../../gtk2/immodule/caret-state-indicator.h
- 
--@GTK3_TRUE@uim_candwin_tbl_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@			   $(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_candwin_tbl_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
-+@GTK3_TRUE@			   -luim
- 
- @GTK3_TRUE@uim_candwin_tbl_gtk3_CPPFLAGS = -I$(top_srcdir)
- @GTK3_TRUE@uim_candwin_tbl_gtk3_CFLAGS = @GTK3_CFLAGS@
-@@ -543,8 +537,8 @@
- @GTK3_TRUE@			   ../../gtk2/immodule/caret-state-indicator.c \
- @GTK3_TRUE@			   ../../gtk2/immodule/caret-state-indicator.h
- 
--@GTK3_TRUE@uim_candwin_horizontal_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@			   $(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_candwin_horizontal_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
-+@GTK3_TRUE@			   -luim
- 
- @GTK3_TRUE@uim_candwin_horizontal_gtk3_CPPFLAGS = -I$(top_srcdir)
- @GTK3_TRUE@uim_candwin_horizontal_gtk3_CFLAGS = @GTK3_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk3_dict_Makefile.in b/textproc/uim/files/extra-patch-gtk3_dict_Makefile.in
deleted file mode 100644
index f3d8a7375c31..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_dict_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- gtk3/dict/Makefile.in.orig	2011-08-06 17:59:45.000000000 +0900
-+++ gtk3/dict/Makefile.in	2011-08-06 18:03:03.000000000 +0900
-@@ -103,8 +103,6 @@
- uim_dict_gtk3_OBJECTS = $(am_uim_dict_gtk3_OBJECTS)
- am__DEPENDENCIES_1 =
- @DICT_TRUE@@GTK3_TRUE@uim_dict_gtk3_DEPENDENCIES =  \
--@DICT_TRUE@@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@DICT_TRUE@@GTK3_TRUE@	$(top_builddir)/uim/libuim.la \
- @DICT_TRUE@@GTK3_TRUE@	$(am__DEPENDENCIES_1) \
- @DICT_TRUE@@GTK3_TRUE@	$(am__DEPENDENCIES_1) \
- @DICT_TRUE@@GTK3_TRUE@	$(am__DEPENDENCIES_1)
-@@ -435,8 +433,8 @@
- @DICT_TRUE@@GTK3_TRUE@	$(am__append_1) $(am__append_4) \
- @DICT_TRUE@@GTK3_TRUE@	$(am__append_7)
- @DICT_TRUE@@GTK3_TRUE@uim_dict_gtk3_LDADD = @GTK3_LIBS@ \
--@DICT_TRUE@@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@DICT_TRUE@@GTK3_TRUE@	$(top_builddir)/uim/libuim.la \
-+@DICT_TRUE@@GTK3_TRUE@	-luim-scm \
-+@DICT_TRUE@@GTK3_TRUE@	-luim \
- @DICT_TRUE@@GTK3_TRUE@	$(am__append_2) $(am__append_5) \
- @DICT_TRUE@@GTK3_TRUE@	$(am__append_8)
- @DICT_TRUE@@GTK3_TRUE@uim_dict_gtk3_CPPFLAGS = $(helper_defs) \
diff --git a/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in b/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in
deleted file mode 100644
index b4038716130a..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk3/immodule/Makefile.in.orig	2018-06-30 03:42:36.499824000 +0900
-+++ gtk3/immodule/Makefile.in	2018-06-30 03:44:30.252814000 +0900
-@@ -154,9 +154,7 @@
-   }
- am__installdirs = "$(DESTDIR)$(moduledir)"
- LTLIBRARIES = $(module_LTLIBRARIES)
--@GTK3_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-counted-init.la \
-+@GTK3_TRUE@im_uim_la_DEPENDENCIES = \
- @GTK3_TRUE@	$(am__append_1)
- am__im_uim_la_SOURCES_DIST = ../../gtk2/immodule/gtk-im-uim.c \
- 	../../gtk2/immodule/gtk-im-uim.h \
-@@ -542,8 +540,8 @@
- @GTK3_TRUE@module_LTLIBRARIES = $(im_uim_la)
- @GTK3_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES)
- @GTK3_TRUE@im_uim_la_LDFLAGS = -module -avoid-version
--@GTK3_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim.la \
-+@GTK3_TRUE@im_uim_la_LIBADD = -luim-scm \
-+@GTK3_TRUE@	-luim \
- @GTK3_TRUE@	$(top_builddir)/uim/libuim-counted-init.la \
- @GTK3_TRUE@	$(am__append_1) @GTK3_LIBS@ -lm
- @GTK3_TRUE@IM_UIM_SOURCES = \
diff --git a/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in b/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in
deleted file mode 100644
index 8da43727fc57..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk3/pad/Makefile.in.orig	2018-06-30 03:46:16.677802000 +0900
-+++ gtk3/pad/Makefile.in	2018-06-30 03:49:07.172912000 +0900
-@@ -131,9 +131,7 @@
- @GTK3_TRUE@am_uim_input_pad_ja_gtk3_OBJECTS =  \
- @GTK3_TRUE@	uim_input_pad_ja_gtk3-ja.$(OBJEXT)
- uim_input_pad_ja_gtk3_OBJECTS = $(am_uim_input_pad_ja_gtk3_OBJECTS)
--@GTK3_TRUE@uim_input_pad_ja_gtk3_DEPENDENCIES =  \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_input_pad_ja_gtk3_DEPENDENCIES = 
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -484,8 +482,8 @@
- top_srcdir = @top_srcdir@
- uim_pixmapsdir = @uim_pixmapsdir@
- @GTK3_TRUE@uim_input_pad_ja_gtk3_SOURCES = ../../gtk2/pad/ja.c
--@GTK3_TRUE@uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@			    $(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
-+@GTK3_TRUE@			    -luim
- 
- @GTK3_TRUE@uim_input_pad_ja_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK3_TRUE@uim_input_pad_ja_gtk3_CFLAGS = @GTK3_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk3_pref_Makefile.in b/textproc/uim/files/extra-patch-gtk3_pref_Makefile.in
deleted file mode 100644
index db46f400e5ba..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_pref_Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- gtk3/pref/Makefile.in.orig	2011-08-06 18:13:29.000000000 +0900
-+++ gtk3/pref/Makefile.in	2011-08-06 18:15:19.000000000 +0900
-@@ -71,9 +71,9 @@
- @GTK3_TRUE@@PREF_TRUE@	uim_pref_gtk3-key-util-gtk.$(OBJEXT)
- uim_pref_gtk3_OBJECTS = $(am_uim_pref_gtk3_OBJECTS)
- @GTK3_TRUE@@PREF_TRUE@uim_pref_gtk3_DEPENDENCIES =  \
--@GTK3_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-custom.la \
--@GTK3_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim.la \
-+@GTK3_TRUE@@PREF_TRUE@	-luim-custom \
-+@GTK3_TRUE@@PREF_TRUE@	-luim-scm \
-+@GTK3_TRUE@@PREF_TRUE@	-luim \
- @GTK3_TRUE@@PREF_TRUE@	$(am__append_1)
- uim_pref_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk3_CFLAGS) \
-@@ -366,9 +366,9 @@
- @GTK3_TRUE@@PREF_TRUE@			../../gtk/key-util-gtk.c ../../gtk/key-util-gtk.h
- 
- @GTK3_TRUE@@PREF_TRUE@uim_pref_gtk3_LDADD = @GTK3_LIBS@ \
--@GTK3_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-custom.la \
--@GTK3_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@@PREF_TRUE@	$(top_builddir)/uim/libuim.la \
-+@GTK3_TRUE@@PREF_TRUE@	-luim-custom \
-+@GTK3_TRUE@@PREF_TRUE@	-luim-scm \
-+@GTK3_TRUE@@PREF_TRUE@	-luim \
- @GTK3_TRUE@@PREF_TRUE@	$(am__append_1)
- @GTK3_TRUE@@PREF_TRUE@uim_pref_gtk3_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) \
- @GTK3_TRUE@@PREF_TRUE@			-I$(top_srcdir)/helper
diff --git a/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in b/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in
deleted file mode 100644
index 468775bda5f2..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- gtk3/switcher/Makefile.in.orig	2018-06-30 03:52:43.790439000 +0900
-+++ gtk3/switcher/Makefile.in	2018-06-30 03:55:37.760210000 +0900
-@@ -131,11 +131,7 @@
- @GTK3_TRUE@am_uim_im_switcher_gtk3_OBJECTS =  \
- @GTK3_TRUE@	uim_im_switcher_gtk3-gtk.$(OBJEXT)
- uim_im_switcher_gtk3_OBJECTS = $(am_uim_im_switcher_gtk3_OBJECTS)
--@GTK3_TRUE@uim_im_switcher_gtk3_DEPENDENCIES =  \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-custom.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_im_switcher_gtk3_DEPENDENCIES = 
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -486,10 +482,10 @@
- top_srcdir = @top_srcdir@
- uim_pixmapsdir = @uim_pixmapsdir@
- @GTK3_TRUE@uim_im_switcher_gtk3_SOURCES = ../../gtk2/switcher/gtk.c
--@GTK3_TRUE@uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@			       $(top_builddir)/uim/libuim-custom.la \
--@GTK3_TRUE@			       $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@			       $(top_builddir)/uim/libuim.la
-+@GTK3_TRUE@uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ \
-+@GTK3_TRUE@			       -luim-custom \
-+@GTK3_TRUE@			       -luim-scm \
-+@GTK3_TRUE@			       -luim
- 
- @GTK3_TRUE@uim_im_switcher_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK3_TRUE@uim_im_switcher_gtk3_CFLAGS = @GTK3_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in b/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in
deleted file mode 100644
index d910df6a34e9..000000000000
--- a/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
---- gtk3/toolbar/Makefile.in.orig	2018-06-30 03:56:56.334825000 +0900
-+++ gtk3/toolbar/Makefile.in	2018-06-30 03:59:45.771851000 +0900
-@@ -187,10 +187,7 @@
- @GTK3_TRUE@	uim_toolbar_gtk3-standalone-gtk.$(OBJEXT) \
- @GTK3_TRUE@	uim_toolbar_gtk3-common-gtk.$(OBJEXT)
- uim_toolbar_gtk3_OBJECTS = $(am_uim_toolbar_gtk3_OBJECTS)
--@GTK3_TRUE@uim_toolbar_gtk3_DEPENDENCIES =  \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-custom.la
-+@GTK3_TRUE@uim_toolbar_gtk3_DEPENDENCIES = 
- uim_toolbar_gtk3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(uim_toolbar_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-@@ -206,10 +203,7 @@
- @GTK3_TRUE@	uim_toolbar_gtk3_systray-eggtrayicon.$(OBJEXT)
- uim_toolbar_gtk3_systray_OBJECTS =  \
- 	$(am_uim_toolbar_gtk3_systray_OBJECTS)
--@GTK3_TRUE@uim_toolbar_gtk3_systray_DEPENDENCIES =  \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim.la \
--@GTK3_TRUE@	$(top_builddir)/uim/libuim-custom.la
-+@GTK3_TRUE@uim_toolbar_gtk3_systray_DEPENDENCIES = 
- uim_toolbar_gtk3_systray_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(uim_toolbar_gtk3_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -596,9 +590,9 @@
- @GTK3_TRUE@uim_toolbar_gtk3_SOURCES = ../../gtk2/toolbar/standalone-gtk.c \
- @GTK3_TRUE@			       ../../gtk2/toolbar/common-gtk.c
- 
--@GTK3_TRUE@uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@			   $(top_builddir)/uim/libuim.la \
--@GTK3_TRUE@			   $(top_builddir)/uim/libuim-custom.la
-+@GTK3_TRUE@uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \
-+@GTK3_TRUE@			   -luim \
-+@GTK3_TRUE@			   -luim-custom
- 
- @GTK3_TRUE@uim_toolbar_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK3_TRUE@uim_toolbar_gtk3_CFLAGS = @GTK3_CFLAGS@
-@@ -609,9 +603,9 @@
- 
- @GTK3_TRUE@uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \
- @GTK3_TRUE@				   @X11_LIBS@ \
--@GTK3_TRUE@				   $(top_builddir)/uim/libuim-scm.la \
--@GTK3_TRUE@				   $(top_builddir)/uim/libuim.la \
--@GTK3_TRUE@				   $(top_builddir)/uim/libuim-custom.la
-+@GTK3_TRUE@				   -luim-scm \
-+@GTK3_TRUE@				   -luim \
-+@GTK3_TRUE@				   -luim-custom
- 
- @GTK3_TRUE@uim_toolbar_gtk3_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK3_TRUE@uim_toolbar_gtk3_systray_CFLAGS = @GTK3_CFLAGS@
diff --git a/textproc/uim/files/extra-patch-qt3_candwin_Makefile.in b/textproc/uim/files/extra-patch-qt3_candwin_Makefile.in
deleted file mode 100644
index 5a6a0b1492dd..000000000000
--- a/textproc/uim/files/extra-patch-qt3_candwin_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- qt3/candwin/Makefile.in.orig	2012-03-30 22:02:19.000000000 +0900
-+++ qt3/candwin/Makefile.in	2012-04-01 05:53:45.000000000 +0900
-@@ -63,9 +63,7 @@
- am__uim_candwin_qt_SOURCES_DIST = qt.cpp qt.h ../qtgettext.h
- @QT_TRUE@am_uim_candwin_qt_OBJECTS = uim_candwin_qt-qt.$(OBJEXT)
- uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS)
--@QT_TRUE@uim_candwin_qt_DEPENDENCIES =  \
--@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@QT_TRUE@	$(top_builddir)/uim/libuim.la
-+@QT_TRUE@uim_candwin_qt_DEPENDENCIES = 
- uim_candwin_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- 	$(uim_candwin_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -369,8 +367,8 @@
- @QT_TRUE@uim_candwin_qt_SOURCES = qt.cpp qt.h ../qtgettext.h
- @QT_TRUE@uim_candwin_qt_CXXFLAGS = $(UIM_QT_CXXFLAGS)
- @QT_TRUE@uim_candwin_qt_LDFLAGS = $(UIM_QT_LDFLAGS)
--@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
- 
- @QT_TRUE@CLEANFILES = \
- @QT_TRUE@	$(MOC_FILES) \
diff --git a/textproc/uim/files/extra-patch-qt3_immodule_Makefile.in b/textproc/uim/files/extra-patch-qt3_immodule_Makefile.in
deleted file mode 100644
index 315046c9ccf4..000000000000
--- a/textproc/uim/files/extra-patch-qt3_immodule_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- qt3/immodule/Makefile.in.orig	2012-04-01 05:20:05.000000000 +0900
-+++ qt3/immodule/Makefile.in	2012-04-01 05:21:12.000000000 +0900
-@@ -87,8 +87,6 @@
- am__installdirs = "$(DESTDIR)$(extradir)"
- LTLIBRARIES = $(extra_LTLIBRARIES)
- @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.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_3)
- am__libquiminputcontextplugin_la_SOURCES_DIST = candidatewindow.cpp \
- 	qhelpermanager.cpp plugin.cpp plugin.h candidatewindow.h \
-@@ -444,8 +442,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-counted-init.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@	-luim-scm \
-+@QT_IMMODULE_TRUE@@QT_TRUE@	-luim \
- @QT_IMMODULE_TRUE@@QT_TRUE@	$(am__append_3)
- @QT_TRUE@CLEANFILES = \
- @QT_TRUE@	$(MOC_FILES) \
diff --git a/textproc/uim/files/extra-patch-qt3_pref_Makefile.in b/textproc/uim/files/extra-patch-qt3_pref_Makefile.in
deleted file mode 100644
index 21c9bc715ac0..000000000000
--- a/textproc/uim/files/extra-patch-qt3_pref_Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- qt3/pref/Makefile.in.orig	2012-03-30 22:02:19.000000000 +0900
-+++ qt3/pref/Makefile.in	2012-04-01 05:56:43.000000000 +0900
-@@ -72,10 +72,7 @@
- @PREF_TRUE@@QT_TRUE@	uim_pref_qt-keyeditformbase.$(OBJEXT)
- uim_pref_qt_OBJECTS = $(am_uim_pref_qt_OBJECTS) \
- 	$(nodist_uim_pref_qt_OBJECTS)
--@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
--@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
-+@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.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 $@
-@@ -407,9 +404,9 @@
- @PREF_TRUE@@QT_TRUE@uim_pref_qt_CXXFLAGS = $(UIM_QT_CXXFLAGS)
- @PREF_TRUE@@QT_TRUE@uim_pref_qt_LDFLAGS = $(UIM_QT_LDFLAGS)
- @PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-counted-init.la \
--@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
-+@PREF_TRUE@@QT_TRUE@		       -luim-custom \
-+@PREF_TRUE@@QT_TRUE@		       -luim-scm \
-+@PREF_TRUE@@QT_TRUE@		       -luim
- 
- @QT_TRUE@CLEANFILES = \
- @QT_TRUE@	$(MOC_FILES) \
diff --git a/textproc/uim/files/extra-patch-qt3_switcher_Makefile.in b/textproc/uim/files/extra-patch-qt3_switcher_Makefile.in
deleted file mode 100644
index dc99f12b1c8c..000000000000
--- a/textproc/uim/files/extra-patch-qt3_switcher_Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- qt3/switcher/Makefile.in.orig	2012-04-01 05:24:28.000000000 +0900
-+++ qt3/switcher/Makefile.in	2012-04-01 05:25:16.000000000 +0900
-@@ -66,10 +66,7 @@
- @QT_TRUE@am_uim_im_switcher_qt_OBJECTS =  \
- @QT_TRUE@	uim_im_switcher_qt-qt.$(OBJEXT)
- uim_im_switcher_qt_OBJECTS = $(am_uim_im_switcher_qt_OBJECTS)
--@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES =  \
--@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@QT_TRUE@	$(top_builddir)/uim/libuim.la \
--@QT_TRUE@	$(top_builddir)/uim/libuim-custom.la
-+@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES = 
- uim_im_switcher_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- 	$(uim_im_switcher_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -376,9 +373,9 @@
- @QT_TRUE@uim_im_switcher_qt_SOURCES = qt.cpp qt.h ../qtgettext.h
- @QT_TRUE@uim_im_switcher_qt_CXXFLAGS = $(UIM_QT_CXXFLAGS)
- @QT_TRUE@uim_im_switcher_qt_LDFLAGS = $(UIM_QT_LDFLAGS)
--@QT_TRUE@uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
--@QT_TRUE@			      $(top_builddir)/uim/libuim.la \
--@QT_TRUE@			      $(top_builddir)/uim/libuim-custom.la
-+@QT_TRUE@uim_im_switcher_qt_LDADD = -luim-scm \
-+@QT_TRUE@			      -luim \
-+@QT_TRUE@			      -luim-custom
- 
- @QT_TRUE@CLEANFILES = \
- @QT_TRUE@	$(MOC_FILES) \
diff --git a/textproc/uim/files/extra-patch-qt3_toolbar_Makefile.in b/textproc/uim/files/extra-patch-qt3_toolbar_Makefile.in
deleted file mode 100644
index 48c90d53ea37..000000000000
--- a/textproc/uim/files/extra-patch-qt3_toolbar_Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
---- qt3/toolbar/Makefile.in.orig	2012-04-01 05:26:40.000000000 +0900
-+++ qt3/toolbar/Makefile.in	2012-04-01 05:29:33.000000000 +0900
-@@ -92,9 +92,7 @@
- am__installdirs = "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(bindir)" \
- 	"$(DESTDIR)$(lnkdir)"
- LTLIBRARIES = $(applet_LTLIBRARIES) $(noinst_LTLIBRARIES)
--@QT_TRUE@libtoolbarcommon_la_DEPENDENCIES =  \
--@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@QT_TRUE@	$(top_builddir)/uim/libuim.la
-+@QT_TRUE@libtoolbarcommon_la_DEPENDENCIES = 
- am__libtoolbarcommon_la_SOURCES_DIST = common-quimhelpertoolbar.cpp \
- 	common-uimstateindicator.cpp ../qtgettext.h \
- 	common-quimhelpertoolbar.h common-uimstateindicator.h
-@@ -108,8 +106,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@	$(top_builddir)/uim/libuim-scm.la \
--@APPLET_KDE_TRUE@@QT_TRUE@	$(top_builddir)/uim/libuim.la \
- @APPLET_KDE_TRUE@@QT_TRUE@	libtoolbarcommon.la
- am__uim_panelapplet_la_SOURCES_DIST = applet-kde.cpp applet-kde.h \
- 	../qtgettext.h common-quimhelpertoolbar.h \
-@@ -131,8 +127,7 @@
- @QT_TRUE@	uim_toolbar_qt-standalone-qt.$(OBJEXT)
- uim_toolbar_qt_OBJECTS = $(am_uim_toolbar_qt_OBJECTS)
- @QT_TRUE@uim_toolbar_qt_DEPENDENCIES =  \
--@QT_TRUE@	$(top_builddir)/uim/libuim-scm.la \
--@QT_TRUE@	$(top_builddir)/uim/libuim.la ./libtoolbarcommon.la
-+@QT_TRUE@	./libtoolbarcommon.la
- uim_toolbar_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- 	$(uim_toolbar_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -458,8 +453,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-scm.la \
--@QT_TRUE@			       $(top_builddir)/uim/libuim.la
-+@QT_TRUE@libtoolbarcommon_la_LIBADD = -luim-scm \
-+@QT_TRUE@			       -luim
- 
- 
- # Toolbar Standalone
-@@ -468,8 +463,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-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
-@@ -478,8 +473,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-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 
- 
- @QT_TRUE@CLEANFILES = \
diff --git a/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt b/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt
deleted file mode 100644
index 29436386c833..000000000000
--- a/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt4/toolbar/CMakeLists.txt.orig	2011-05-11 02:45:18.000000000 +0900
-+++ qt4/toolbar/CMakeLists.txt	2011-05-29 03:23:18.000000000 +0900
-@@ -16,8 +16,6 @@
-  
- kde4_add_plugin(plasma_applet_uim ${uim_SRCS})
- target_link_libraries(plasma_applet_uim ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}
--        ${CMAKE_BINARY_DIR}/../../../uim/.libs/libuim.so
--        ${CMAKE_BINARY_DIR}/../../../uim/.libs/libuim-scm.so
-         -luim -luim-scm)
-  
- install(TARGETS plasma_applet_uim DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/textproc/uim/files/extra-patch-qt_chardict_po_Makefile.in.in b/textproc/uim/files/extra-patch-qt_chardict_po_Makefile.in.in
deleted file mode 100644
index 13fae90e8b5a..000000000000
--- a/textproc/uim/files/extra-patch-qt_chardict_po_Makefile.in.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- qt/chardict/po/Makefile.in.in.orig	2009-06-23 19:59:29.000000000 +0900
-+++ qt/chardict/po/Makefile.in.in	2009-09-23 19:23:31.000000000 +0900
-@@ -17,7 +17,7 @@
- # We have the following line for use by intltoolize:
- # INTLTOOL_MAKEFILE
- 
--GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GETTEXT_PACKAGE = uim-chardict-qt
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
- 
-@@ -33,7 +33,7 @@
- datadir = @datadir@
- datarootdir = @datarootdir@
- libdir = @libdir@
--DATADIRNAME = @DATADIRNAME@
-+DATADIRNAME = share
- itlocaledir = $(prefix)/$(DATADIRNAME)/locale
- subdir = po
- install_sh = @install_sh@
diff --git a/textproc/uim/files/extra-patch-uim_Makefile.in b/textproc/uim/files/extra-patch-uim_Makefile.in
deleted file mode 100644
index 8be3696a3e65..000000000000
--- a/textproc/uim/files/extra-patch-uim_Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- uim/Makefile.in.orig	2018-06-30 04:48:47.658121000 +0900
-+++ uim/Makefile.in	2018-06-30 04:52:15.362107000 +0900
-@@ -190,8 +190,7 @@
- 	"$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"
- 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
-+@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_DEPENDENCIES = 
- 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)
-@@ -206,8 +205,7 @@
- @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-scm.la libuim.la
-+@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_DEPENDENCIES = 
- 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)
-@@ -309,7 +307,7 @@
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(AM_CFLAGS) $(CFLAGS) $(libuim_look_la_LDFLAGS) $(LDFLAGS) -o \
- 	$@
--@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES = libuim-scm.la libuim.la
-+@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES = 
- am__libuim_m17nlib_la_SOURCES_DIST = m17nlib.c
- @M17NLIB_TRUE@am_libuim_m17nlib_la_OBJECTS =  \
- @M17NLIB_TRUE@	libuim_m17nlib_la-m17nlib.lo
-@@ -925,7 +923,7 @@
- libuim_process_la_CPPFLAGS = -I$(top_srcdir)
- libuim_custom_la_SOURCES = uim-custom.c
- @M17NLIB_TRUE@libuim_m17nlib_la_SOURCES = m17nlib.c
--@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@
- @WNN_TRUE@libuim_wnn_la_SOURCES = wnnlib.h wnnlib.c
-@@ -933,11 +931,11 @@
- @WNN_TRUE@libuim_wnn_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
- @WNN_TRUE@libuim_wnn_la_CPPFLAGS = -I$(top_srcdir) $(WNN_CPPFLAGS)
- @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-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
diff --git a/textproc/uim/files/extra-patch-uim_editline.c b/textproc/uim/files/extra-patch-uim_editline.c
deleted file mode 100644
index 15f3936183fa..000000000000
--- a/textproc/uim/files/extra-patch-uim_editline.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- uim/editline.c.orig	Wed Dec  7 21:39:32 2005
-+++ uim/editline.c	Tue Jan 31 01:48:45 2006
-@@ -52,6 +52,10 @@
- 
- #include "editline.h"
- 
-+#ifndef H_SETSIZE
-+#define H_SETSIZE	1
-+#endif
-+
- static EditLine *el;
- static History *hist;
- static HistEvent hev;
-@@ -65,7 +69,7 @@
- void
- editline_init(void)
- {
--  el = el_init("uim", stdin, stdout, stderr);
-+  el = el_init("uim", stdin, stdout);
-   el_set(el, EL_PROMPT, &prompt);
-   el_set(el, EL_EDITOR, "emacs");
- 
diff --git a/textproc/uim/files/patch-configure b/textproc/uim/files/patch-configure
deleted file mode 100644
index f3b59ae057e1..000000000000
--- a/textproc/uim/files/patch-configure
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.orig	2018-05-11 21:27:48 UTC
-+++ configure
-@@ -20052,8 +20052,8 @@ if test "x$with_anthy" = xyes; then
-   ANTHY_LIBS="-lanthy -lanthydic"
-   ANTHY_CFLAGS=""
-   if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"anthy >= 8622\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "anthy >= 8622") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"anthy >= 0.4\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "anthy >= 0.4") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-@@ -20095,12 +20095,12 @@ if test -n "$ANTHY_UTF8_CFLAGS"; then
-     pkg_cv_ANTHY_UTF8_CFLAGS="$ANTHY_UTF8_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"anthy >= 8622\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "anthy >= 8622") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"anthy >= 0.4\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "anthy >= 0.4") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_ANTHY_UTF8_CFLAGS=`$PKG_CONFIG --cflags "anthy >= 8622" 2>/dev/null`
-+  pkg_cv_ANTHY_UTF8_CFLAGS=`$PKG_CONFIG --cflags "anthy >= 0.4" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -20112,12 +20112,12 @@ if test -n "$ANTHY_UTF8_LIBS"; then
-     pkg_cv_ANTHY_UTF8_LIBS="$ANTHY_UTF8_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"anthy >= 8622\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "anthy >= 8622") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"anthy >= 0.4\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "anthy >= 0.4") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_ANTHY_UTF8_LIBS=`$PKG_CONFIG --libs "anthy >= 8622" 2>/dev/null`
-+  pkg_cv_ANTHY_UTF8_LIBS=`$PKG_CONFIG --libs "anthy >= 0.4" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -20138,9 +20138,9 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        ANTHY_UTF8_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "anthy >= 8622" 2>&1`
-+	        ANTHY_UTF8_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "anthy >= 0.4" 2>&1`
-         else
--	        ANTHY_UTF8_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "anthy >= 8622" 2>&1`
-+	        ANTHY_UTF8_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "anthy >= 0.4" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$ANTHY_UTF8_PKG_ERRORS" >&5
diff --git a/textproc/uim/files/patch-configure.ac b/textproc/uim/files/patch-configure.ac
new file mode 100644
index 000000000000..5bc71c1d0b02
--- /dev/null
+++ b/textproc/uim/files/patch-configure.ac
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2021-01-03 20:53:29 UTC
++++ configure.ac
+@@ -124,7 +124,7 @@ fi
+ if test "x$with_anthy" = xyes; then
+   ANTHY_LIBS="-lanthy -lanthydic"
+   ANTHY_CFLAGS=""
+-  PKG_CHECK_EXISTS(anthy >= 8622,
++  PKG_CHECK_EXISTS(anthy >= 0.4,
+                    [AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
+                     "libanthy can handle UTF-8")])
+ fi
+@@ -142,7 +142,7 @@ AC_ARG_WITH(anthy-utf8,
+   [with_anthy_utf8=no])
+ 
+ if test "x$with_anthy_utf8" != xno; then
+-  PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622,
++  PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4,
+                     [with_anthy_utf8=yes
+                      AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
+                      [libanthy can handle UTF-8])],
diff --git a/textproc/uim/files/patch-emacs_Makefile.am b/textproc/uim/files/patch-emacs_Makefile.am
new file mode 100644
index 000000000000..5f49dcd48461
--- /dev/null
+++ b/textproc/uim/files/patch-emacs_Makefile.am
@@ -0,0 +1,12 @@
+--- emacs/Makefile.am.orig	2021-04-29 07:41:09 UTC
++++ emacs/Makefile.am
+@@ -3,9 +3,6 @@ EXTRA_DIST = README.ja uim-version.el.in
+ if UIM_EL
+ 
+ uimel_lispdir = $(UIMEL_LISP_DIR)
+-dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \
+- uim-key.el uim-util.el \
+- uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el uim-helper.el
+ 
+ bin_PROGRAMS = uim-el-agent uim-el-helper-agent
+ 
diff --git a/textproc/uim/files/patch-emacs_Makefile.in b/textproc/uim/files/patch-emacs_Makefile.in
deleted file mode 100644
index 5acabeedf144..000000000000
--- a/textproc/uim/files/patch-emacs_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- emacs/Makefile.in.orig	2018-07-12 14:16:06 UTC
-+++ emacs/Makefile.in
-@@ -981,21 +981,6 @@ mostlyclean-libtool:
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--install-dist_uimel_lispDATA: $(dist_uimel_lisp_DATA)
--	@$(NORMAL_INSTALL)
--	@list='$(dist_uimel_lisp_DATA)'; test -n "$(uimel_lispdir)" || list=; \
--	if test -n "$$list"; then \
--	  echo " $(MKDIR_P) '$(DESTDIR)$(uimel_lispdir)'"; \
--	  $(MKDIR_P) "$(DESTDIR)$(uimel_lispdir)" || exit 1; \
--	fi; \
--	for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uimel_lispdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(uimel_lispdir)" || exit $$?; \
--	done
- 
- uninstall-dist_uimel_lispDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/textproc/uim/files/patch-gtk2_candwin_Makefile.am b/textproc/uim/files/patch-gtk2_candwin_Makefile.am
new file mode 100644
index 000000000000..ad5f2e9a3ee3
--- /dev/null
+++ b/textproc/uim/files/patch-gtk2_candwin_Makefile.am
@@ -0,0 +1,30 @@
+--- gtk2/candwin/Makefile.am.orig	2021-04-30 14:25:14 UTC
++++ gtk2/candwin/Makefile.am
+@@ -4,24 +4,21 @@ libexec_PROGRAMS = uim-candwin-gtk uim-candwin-tbl-gtk
+ uim_candwin_gtk_SOURCES  = gtk.c \
+ 			   ../immodule/caret-state-indicator.c \
+ 			   ../immodule/caret-state-indicator.h
+-uim_candwin_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			   $(top_builddir)/uim/libuim.la
++uim_candwin_gtk_LDADD    = @GTK2_LIBS@ -luim-scm -luim
+ uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir)
+ uim_candwin_gtk_CFLAGS   = @GTK2_CFLAGS@
+ 
+ uim_candwin_tbl_gtk_SOURCES  = tbl-gtk.c \
+ 			   ../immodule/caret-state-indicator.c \
+ 			   ../immodule/caret-state-indicator.h
+-uim_candwin_tbl_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			   $(top_builddir)/uim/libuim.la
++uim_candwin_tbl_gtk_LDADD    = @GTK2_LIBS@ -luim-scm -luim
+ uim_candwin_tbl_gtk_CPPFLAGS = -I$(top_srcdir)
+ uim_candwin_tbl_gtk_CFLAGS   = @GTK2_CFLAGS@
+ 
+ uim_candwin_horizontal_gtk_SOURCES  = horizontal-gtk.c \
+ 			   ../immodule/caret-state-indicator.c \
+ 			   ../immodule/caret-state-indicator.h
+-uim_candwin_horizontal_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			   $(top_builddir)/uim/libuim.la -lm
++uim_candwin_horizontal_gtk_LDADD    = @GTK2_LIBS@ -luim-scm -luim -lm
+ uim_candwin_horizontal_gtk_CPPFLAGS = -I$(top_srcdir)
+ uim_candwin_horizontal_gtk_CFLAGS   = @GTK2_CFLAGS@
+ endif
diff --git a/textproc/uim/files/patch-gtk2_immodule_Makefile.am b/textproc/uim/files/patch-gtk2_immodule_Makefile.am
new file mode 100644
index 000000000000..ef57c8f1640d
--- /dev/null
+++ b/textproc/uim/files/patch-gtk2_immodule_Makefile.am
@@ -0,0 +1,13 @@
+--- gtk2/immodule/Makefile.am.orig	2021-04-29 16:18:54 UTC
++++ gtk2/immodule/Makefile.am
+@@ -12,9 +12,7 @@ module_LTLIBRARIES = $(im_uim_la)
+ 
+ im_uim_la_SOURCES = $(IM_UIM_SOURCES)
+ im_uim_la_LDFLAGS = -module -avoid-version
+-im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
+-		   $(top_builddir)/uim/libuim.la \
+-		   $(top_builddir)/uim/libuim-counted-init.la
++im_uim_la_LIBADD = -luim-scm -luim $(top_builddir)/uim/libuim-counted-init.la
+ if LIBUIM_X_UTIL
+ im_uim_la_LIBADD += $(top_builddir)/uim/libuim-x-util.la
+ endif
diff --git a/textproc/uim/files/patch-gtk2_pad_Makefile.am b/textproc/uim/files/patch-gtk2_pad_Makefile.am
new file mode 100644
index 000000000000..bc1e8cd65c93
--- /dev/null
+++ b/textproc/uim/files/patch-gtk2_pad_Makefile.am
@@ -0,0 +1,12 @@
+--- gtk2/pad/Makefile.am.orig	2021-04-29 15:53:36 UTC
++++ gtk2/pad/Makefile.am
+@@ -2,8 +2,7 @@ if GTK2
+ bin_PROGRAMS = uim-input-pad-ja
+ 
+ uim_input_pad_ja_SOURCES  = ja.c
+-uim_input_pad_ja_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			    $(top_builddir)/uim/libuim.la
++uim_input_pad_ja_LDADD    = @GTK2_LIBS@ -luim-scm -luim
+ uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ uim_input_pad_ja_CFLAGS   = @GTK2_CFLAGS@
+ endif
diff --git a/textproc/uim/files/patch-gtk2_pref_Makefile.am b/textproc/uim/files/patch-gtk2_pref_Makefile.am
new file mode 100644
index 000000000000..30164eaf459b
--- /dev/null
+++ b/textproc/uim/files/patch-gtk2_pref_Makefile.am
@@ -0,0 +1,13 @@
+--- gtk2/pref/Makefile.am.orig	2021-04-29 15:56:45 UTC
++++ gtk2/pref/Makefile.am
+@@ -9,9 +9,7 @@ uim_pref_gtk_SOURCES  = gtk.c \
+ 			gtk-keytab.h \
+ 			../immodule/key-util-gtk.c \
+ 			../immodule/key-util-gtk.h
+-uim_pref_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \
+-			$(top_builddir)/uim/libuim-scm.la \
+-			$(top_builddir)/uim/libuim.la
++uim_pref_gtk_LDADD    = @GTK2_LIBS@ -luim-custom -luim-scm -luim
+ if LIBUIM_X_UTIL
+ uim_pref_gtk_LDADD += $(top_builddir)/uim/libuim-x-util.la
+ endif
diff --git a/textproc/uim/files/patch-gtk2_switcher_Makefile.am b/textproc/uim/files/patch-gtk2_switcher_Makefile.am
new file mode 100644
index 000000000000..f4915bbaa3b5
--- /dev/null
+++ b/textproc/uim/files/patch-gtk2_switcher_Makefile.am
@@ -0,0 +1,14 @@
+--- gtk2/switcher/Makefile.am.orig	2021-04-29 15:59:54 UTC
++++ gtk2/switcher/Makefile.am
+@@ -2,10 +2,7 @@ if GTK2
+ bin_PROGRAMS = uim-im-switcher-gtk
+ 
+ uim_im_switcher_gtk_SOURCES  = gtk.c
+-uim_im_switcher_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			       $(top_builddir)/uim/libuim-custom.la \
+-			       $(top_builddir)/uim/libuim-scm.la \
+-			       $(top_builddir)/uim/libuim.la
++uim_im_switcher_gtk_LDADD    = @GTK2_LIBS@ -luim-scm -luim-custom -luim
+ uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ uim_im_switcher_gtk_CFLAGS   = @GTK2_CFLAGS@
+ endif
diff --git a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am
new file mode 100644
index 000000000000..a633ad34dd85
--- /dev/null
+++ b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am
@@ -0,0 +1,34 @@
+--- gtk2/toolbar/Makefile.am.orig	2021-04-29 16:11:47 UTC
++++ gtk2/toolbar/Makefile.am
+@@ -6,9 +6,7 @@ if GNOME_APPLET
+ libexec_PROGRAMS =  uim-toolbar-applet
+ 
+ uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_LIBS@ \
+-			   $(top_builddir)/uim/libuim-scm.la \
+-			   $(top_builddir)/uim/libuim.la \
+-			   $(top_builddir)/uim/libuim-custom.la
++			   -luim-scm -luim -luim-custom
+ uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
+ uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@
+ if GCC
+@@ -41,9 +39,7 @@ bin_PROGRAMS = uim-toolbar-gtk uim-toolbar-gtk-systray
+ endif
+ 
+ uim_toolbar_gtk_SOURCES  = standalone-gtk.c common-gtk.c
+-uim_toolbar_gtk_LDADD    = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			   $(top_builddir)/uim/libuim.la \
+-			   $(top_builddir)/uim/libuim-custom.la
++uim_toolbar_gtk_LDADD    = @GTK2_LIBS@ -luim-scm -luim -luim-custom
+ uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ uim_toolbar_gtk_CFLAGS   = @GTK2_CFLAGS@
+ 
+@@ -51,8 +47,6 @@ uim_toolbar_gtk_systray_SOURCES  = systray-gtk.c commo
+ 				   eggtrayicon.c eggtrayicon.h
+ uim_toolbar_gtk_systray_LDADD    = @GTK2_LIBS@ \
+ 				   @X11_LIBS@ \
+-				   $(top_builddir)/uim/libuim-scm.la \
+-				   $(top_builddir)/uim/libuim.la \
+-				   $(top_builddir)/uim/libuim-custom.la
++				   -luim-scm -luim -luim-custom
+ uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ uim_toolbar_gtk_systray_CFLAGS   = @GTK2_CFLAGS@
diff --git a/textproc/uim/files/patch-gtk3_dict_Makefile.am b/textproc/uim/files/patch-gtk3_dict_Makefile.am
new file mode 100644
index 000000000000..2069d023d223
--- /dev/null
+++ b/textproc/uim/files/patch-gtk3_dict_Makefile.am
@@ -0,0 +1,12 @@
+--- gtk3/dict/Makefile.am.orig	2021-04-29 13:55:45 UTC
++++ gtk3/dict/Makefile.am
+@@ -19,8 +19,7 @@ uim_dict_gtk3_SOURCES  = ../../gtk2/dict/main-gtk.c \
+ 			../../gtk2/dict/cclass-dialog.c \
+ 			../../gtk2/dict/cclass-dialog.h
+ 						 
+-uim_dict_gtk3_LDADD    = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			$(top_builddir)/uim/libuim.la
++uim_dict_gtk3_LDADD    = @GTK3_LIBS@ -luim-scm -luim
+ uim_dict_gtk3_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
+ uim_dict_gtk3_CFLAGS   = @GTK3_CFLAGS@
+ uim_dict_uidir = $(datadir)/uim/helperdata
diff --git a/textproc/uim/files/patch-gtk3_immodule_Makefile.am b/textproc/uim/files/patch-gtk3_immodule_Makefile.am
new file mode 100644
index 000000000000..e9db25d1594f
--- /dev/null
+++ b/textproc/uim/files/patch-gtk3_immodule_Makefile.am
@@ -0,0 +1,13 @@
+--- gtk3/immodule/Makefile.am.orig	2021-04-30 14:45:56 UTC
++++ gtk3/immodule/Makefile.am
+@@ -11,9 +11,7 @@ module_LTLIBRARIES = $(im_uim_la)
+ 
+ im_uim_la_SOURCES = $(IM_UIM_SOURCES)
+ im_uim_la_LDFLAGS = -module -avoid-version
+-im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
+-		   $(top_builddir)/uim/libuim.la \
+-		   $(top_builddir)/uim/libuim-counted-init.la
++im_uim_la_LIBADD = -luim-scm -luim $(top_builddir)/uim/libuim-counted-init.la
+ if LIBUIM_X_UTIL
+ im_uim_la_LIBADD += $(top_builddir)/uim/libuim-x-util.la
+ endif
diff --git a/textproc/uim/files/patch-gtk3_pad_Makefile.am b/textproc/uim/files/patch-gtk3_pad_Makefile.am
new file mode 100644
index 000000000000..eb73f0a1e568
--- /dev/null
+++ b/textproc/uim/files/patch-gtk3_pad_Makefile.am
@@ -0,0 +1,12 @@
+--- gtk3/pad/Makefile.am.orig	2021-04-30 14:51:47 UTC
++++ gtk3/pad/Makefile.am
+@@ -1,8 +1,7 @@
+ if GTK3
+ bin_PROGRAMS = uim-input-pad-ja-gtk3
+ uim_input_pad_ja_gtk3_SOURCES  = ../../gtk2/pad/ja.c
+-uim_input_pad_ja_gtk3_LDADD    = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			    $(top_builddir)/uim/libuim.la
++uim_input_pad_ja_gtk3_LDADD    = @GTK3_LIBS@ -luim-scm -luim
+ uim_input_pad_ja_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ uim_input_pad_ja_gtk3_CFLAGS   = @GTK3_CFLAGS@
+ 
diff --git a/textproc/uim/files/patch-gtk3_pref_Makefile.am b/textproc/uim/files/patch-gtk3_pref_Makefile.am
new file mode 100644
index 000000000000..9203590f85ab
--- /dev/null
+++ b/textproc/uim/files/patch-gtk3_pref_Makefile.am
@@ -0,0 +1,13 @@
+--- gtk3/pref/Makefile.am.orig	2021-04-30 14:54:42 UTC
++++ gtk3/pref/Makefile.am
+@@ -10,9 +10,7 @@ uim_pref_gtk3_SOURCES  = ../../gtk2/pref/gtk.c \
+ 			../../gtk2/pref/gtk-keytab.h \
+ 			../../gtk2/immodule/key-util-gtk.c \
+ 			../../gtk2/immodule/key-util-gtk.h
+-uim_pref_gtk3_LDADD    = @GTK3_LIBS@ $(top_builddir)/uim/libuim-custom.la \
+-			$(top_builddir)/uim/libuim-scm.la \
+-			$(top_builddir)/uim/libuim.la
++uim_pref_gtk3_LDADD    = @GTK3_LIBS@ -luim-custom -luim-scm -luim
+ if LIBUIM_X_UTIL
+ uim_pref_gtk3_LDADD += $(top_builddir)/uim/libuim-x-util.la
+ endif
diff --git a/textproc/uim/files/patch-gtk3_switcher_Makefile.am b/textproc/uim/files/patch-gtk3_switcher_Makefile.am
new file mode 100644
index 000000000000..fcab2c96bd00
--- /dev/null
+++ b/textproc/uim/files/patch-gtk3_switcher_Makefile.am
@@ -0,0 +1,14 @@
+--- gtk3/switcher/Makefile.am.orig	2021-04-30 14:58:08 UTC
++++ gtk3/switcher/Makefile.am
+@@ -1,10 +1,7 @@
+ if GTK3
+ bin_PROGRAMS = uim-im-switcher-gtk3
+ uim_im_switcher_gtk3_SOURCES  = ../../gtk2/switcher/gtk.c
+-uim_im_switcher_gtk3_LDADD    = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			       $(top_builddir)/uim/libuim-custom.la \
+-			       $(top_builddir)/uim/libuim-scm.la \
+-			       $(top_builddir)/uim/libuim.la
++uim_im_switcher_gtk3_LDADD    = @GTK3_LIBS@ -luim-scm -luim-custom -luim-scm -luim
+ uim_im_switcher_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ uim_im_switcher_gtk3_CFLAGS   = @GTK3_CFLAGS@
+ 
diff --git a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am
new file mode 100644
index 000000000000..895afd6eb302
--- /dev/null
+++ b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am
@@ -0,0 +1,35 @@
+--- gtk3/toolbar/Makefile.am.orig	2021-04-30 15:03:44 UTC
++++ gtk3/toolbar/Makefile.am
+@@ -11,9 +11,7 @@ xmluidir = $(pkgdatadir)/ui
+ xmlui_DATA = uim-applet-menu.xml
+ 
+ libuim_toolbar_applet_gnome3_la_LIBADD = @GTK3_LIBS@ @GNOME3_APPLET_LIBS@ \
+-			   $(top_builddir)/uim/libuim-scm.la \
+-			   $(top_builddir)/uim/libuim.la \
+-			   $(top_builddir)/uim/libuim-custom.la
++			   -luim-scm -luim -luim-custom
+ libuim_toolbar_applet_gnome3_la_CPPFLAGS = \
+ 			   -DUIM_UIDATADIR="\"${xmluidir}\"" \
+ 			   $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
+@@ -48,9 +46,7 @@ if GTK3
+ bin_PROGRAMS = uim-toolbar-gtk3 uim-toolbar-gtk3-systray
+ uim_toolbar_gtk3_SOURCES  = ../../gtk2/toolbar/standalone-gtk.c \
+ 			       ../../gtk2/toolbar/common-gtk.c
+-uim_toolbar_gtk3_LDADD    = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-			   $(top_builddir)/uim/libuim.la \
+-			   $(top_builddir)/uim/libuim-custom.la
++uim_toolbar_gtk3_LDADD    = @GTK3_LIBS@ -luim-scm -luim -luim-custom
+ uim_toolbar_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ uim_toolbar_gtk3_CFLAGS   = @GTK3_CFLAGS@
+ 
+@@ -60,9 +56,7 @@ uim_toolbar_gtk3_systray_SOURCES  = ../../gtk2/toolbar
+ 				   ../../gtk2/toolbar/eggtrayicon.h
+ uim_toolbar_gtk3_systray_LDADD    = @GTK3_LIBS@ \
+ 				   @X11_LIBS@ \
+-				   $(top_builddir)/uim/libuim-scm.la \
+-				   $(top_builddir)/uim/libuim.la \
+-				   $(top_builddir)/uim/libuim-custom.la
++				   -luim-scm -luim -luim-custom
+ uim_toolbar_gtk3_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ uim_toolbar_gtk3_systray_CFLAGS   = @GTK3_CFLAGS@
+ endif
diff --git a/textproc/uim/files/patch-qt4_immodule_plugin.cpp b/textproc/uim/files/patch-qt4_immodule_plugin.cpp
deleted file mode 100644
index d07f28ea39ce..000000000000
--- a/textproc/uim/files/patch-qt4_immodule_plugin.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 5900b14a2bf367203f6d417bc51b59ab5ecc2129
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Sun Mar 2 13:26:18 2014 +0200
-
-    qt4 immodule: Add missing <clocale> include.
-    
-    * qt4/immodule/plugin.cpp
-      - Stop relying on implicit includes that may not always work and
-        explicitly include <clocale> for the setlocale(3) call.
-
---- qt4/immodule/plugin.cpp.orig	2017-08-14 00:07:27 UTC
-+++ qt4/immodule/plugin.cpp
-@@ -36,6 +36,8 @@
- 
- #include <clocale>
- 
-+#include <clocale>
-+
- #include <QtCore/QStringList>
- #if QT_VERSION < 0x050000
- # ifdef Q_WS_X11
diff --git a/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt b/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt
new file mode 100644
index 000000000000..03283e10d33e
--- /dev/null
+++ b/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- qt5/applet/qtquick-plugin/CMakeLists.txt.orig	2021-04-30 17:45:18 UTC
++++ qt5/applet/qtquick-plugin/CMakeLists.txt
+@@ -40,8 +40,8 @@ target_compile_options(
+ target_link_libraries(
+   uim-qtquick-plugin
+   PRIVATE
+-  ${CMAKE_BINARY_DIR}/../../uim/.libs/libuim.so
+-  ${CMAKE_BINARY_DIR}/../../uim/.libs/libuim-scm.so
++  -luim
++  -luim-scm
+   Qt5::Core
+   Qt5::Quick
+   Qt5::Qml
diff --git a/textproc/uim/files/patch-scm_Makefile.in b/textproc/uim/files/patch-scm_Makefile.am
similarity index 50%
rename from textproc/uim/files/patch-scm_Makefile.in
rename to textproc/uim/files/patch-scm_Makefile.am
index cda7890e8f2d..04e3b642c2b2 100644
--- a/textproc/uim/files/patch-scm_Makefile.in
+++ b/textproc/uim/files/patch-scm_Makefile.am
@@ -1,12 +1,9 @@
---- scm/Makefile.in.orig	2018-07-12 14:16:06 UTC
-+++ scm/Makefile.in
-@@ -869,9 +869,6 @@ installed-modules.scm: $(SCM_FILES)
+--- scm/Makefile.am.orig	2021-04-29 07:47:29 UTC
++++ scm/Makefile.am
+@@ -130,6 +130,3 @@ installed-modules.scm: $(SCM_FILES)
  	    --path $(top_builddir)/scm --register $(module_names)
  
  json-parser-expanded.scm: macro-expander.scm json-parser-expander.scm packrat.scm.in
 -	if test -n "$(CSI)"; then \
 -	    $(CSI) -R syntax-case -q json-parser-expander.scm > json-parser-expanded.scm; \
 -	fi
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/textproc/uim/files/patch-sigscheme_doc_Makefile.am b/textproc/uim/files/patch-sigscheme_doc_Makefile.am
new file mode 100644
index 000000000000..34dcdce32e32
--- /dev/null
+++ b/textproc/uim/files/patch-sigscheme_doc_Makefile.am
@@ -0,0 +1,8 @@
+--- sigscheme/doc/Makefile.am.orig	2021-04-29 07:54:51 UTC
++++ sigscheme/doc/Makefile.am
+@@ -1,3 +1,5 @@
++docdir = $(prefix)/share/doc/uim/sigscheme
++
+ TXTS = index.txt design.txt spec.txt multibyte.txt style.txt \
+         global-obj.txt release.txt
+ ASCIIDOC_HTMLS = \
diff --git a/textproc/uim/files/patch-sigscheme_doc_Makefile.in b/textproc/uim/files/patch-sigscheme_doc_Makefile.in
deleted file mode 100644
index 7fd92b046fab..000000000000
--- a/textproc/uim/files/patch-sigscheme_doc_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sigscheme/doc/Makefile.in.orig	2018-07-12 14:16:06 UTC
-+++ sigscheme/doc/Makefile.in
-@@ -266,7 +266,7 @@ build_vendor = @build_vendor@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = @docdir@
-+docdir = $(prefix)/share/doc/uim/sigscheme
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
diff --git a/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gc_priv.h b/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gc_priv.h
deleted file mode 100644
index d62331d5f718..000000000000
--- a/textproc/uim/files/patch-sigscheme_libgcroots_include_private_gc_priv.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- sigscheme/libgcroots/include/private/gc_priv.h.orig	2020-08-25 09:13:47 UTC
-+++ sigscheme/libgcroots/include/private/gc_priv.h
-@@ -1979,7 +1979,7 @@ void GC_err_puts(const char *s);
-   /* the signal mask.						*/
- # define SETJMP(env) sigsetjmp(env, 1)
- # define LONGJMP(env, val) siglongjmp(env, val)
--# define JMP_BUF sigjmp_buf
-+# define JMP_BUF extern sigjmp_buf
- #else
- # ifdef ECOS
- #   define SETJMP(env)  hal_setjmp(env)
diff --git a/textproc/uim/files/patch-uim_Makefile.am b/textproc/uim/files/patch-uim_Makefile.am
new file mode 100644
index 000000000000..16bbd52e6da2
--- /dev/null
+++ b/textproc/uim/files/patch-uim_Makefile.am
@@ -0,0 +1,29 @@
+--- uim/Makefile.am.orig	2021-04-29 13:46:21 UTC
++++ uim/Makefile.am
+@@ -81,7 +81,7 @@ libuim_custom_la_SOURCES = uim-custom.c
+ if M17NLIB
+   uim_plugin_LTLIBRARIES += libuim-m17nlib.la
+   libuim_m17nlib_la_SOURCES = m17nlib.c
+-  libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim-scm.la libuim.la
++  libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ -luim-scm -luim
+   libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+   libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir) @M17NLIB_CFLAGS@
+ endif
+@@ -100,7 +100,7 @@ if ENABLE_ANTHY_STATIC
+ else
+   uim_plugin_LTLIBRARIES += libuim-anthy.la
+   libuim_anthy_la_SOURCES = anthy.c
+-  libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim-scm.la libuim.la
++  libuim_anthy_la_LIBADD = @ANTHY_LIBS@ -luim-scm -luim
+   libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+   libuim_anthy_la_CPPFLAGS = -I$(top_srcdir)
+ endif
+@@ -112,7 +112,7 @@ if ENABLE_ANTHY_UTF8_STATIC
+ else
+   uim_plugin_LTLIBRARIES += libuim-anthy-utf8.la
+   libuim_anthy_utf8_la_SOURCES = anthy-utf8.c
+-  libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ libuim-scm.la libuim.la
++  libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ -luim-scm -luim
+   libuim_anthy_utf8_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+   libuim_anthy_utf8_la_CPPFLAGS = -I$(top_srcdir) @ANTHY_UTF8_CFLAGS@
+ endif
diff --git a/textproc/uim/files/patch-xim_main.cpp b/textproc/uim/files/patch-xim_main.cpp
deleted file mode 100644
index 9ac7dab80b4e..000000000000
--- a/textproc/uim/files/patch-xim_main.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-error: invalid suffix on literal; C++11 requires a space between literal and identifier 
-   [-Wreserved-user-defined-literal]
-   #define VERSION_NAME "uim-xim under the way! Version "PACKAGE_VERSION"\n"
-
---- xim/main.cpp.orig	2018-01-17 10:10:47 UTC
-+++ xim/main.cpp
-@@ -65,7 +65,7 @@ int g_option_mask;
- int scr_width, scr_height;
- int host_byte_order;
- 
--#define VERSION_NAME "uim-xim under the way! Version "PACKAGE_VERSION"\n"
-+#define VERSION_NAME "uim-xim under the way! Version " PACKAGE_VERSION "\n"
- const char *version_name=VERSION_NAME;
- const char *usage=
- "--help , --version :Show usage or version\n"
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index d1d753934e4d..e1350c8875bb 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -43,9 +43,9 @@ lib/uim/plugin/libuim-sqlite3.so
 lib/uim/plugin/libuim-xkb.so
 libdata/pkgconfig/gcroots.pc
 libdata/pkgconfig/uim.pc
-%%X11%%libexec/uim-candwin-gtk
-%%X11%%libexec/uim-candwin-horizontal-gtk
-%%X11%%libexec/uim-candwin-tbl-gtk
+%%X11%%libexec/uim-candwin-gtk3
+%%X11%%libexec/uim-candwin-horizontal-gtk3
+%%X11%%libexec/uim-candwin-tbl-gtk3
 libexec/uim-helper-server
 %%X11%%man/man1/uim-xim.1.gz
 share/applications/uim.desktop