Update to 4.2.9.6

Changelog:
Bug fixes and improvements

11 files changed, 638 insertions, 55 deletions

diff --git a/inputmethod/fcitx/Makefile b/inputmethod/fcitx/Makefile
index ba6ddafee8f..9cd59b49bfa 100644
--- a/inputmethod/fcitx/Makefile
+++ b/inputmethod/fcitx/Makefile
@@ -1,25 +1,85 @@
-# $NetBSD: Makefile,v 1.14 2018/03/12 11:16:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/08/18 01:11:16 ryoon Exp $
 #
 
-DISTNAME=		fcitx-3.1.1
-PKGREVISION=		7
+DISTNAME=		fcitx-4.2.9.6
 CATEGORIES=		inputmethod
-MASTER_SITES=		http://www.fcitx.org/download/
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		https://download.fcitx-im.org/fcitx/
+EXTRACT_SUFX=		.tar.xz
+
+DISTFILES=		${DEFAULT_DISTFILES}
+
+DATAFILES=		en_dict-20121020.tar.gz
+DATAFILES+=		pinyin.tar.gz
+DATAFILES+=		py_stroke-20121124.tar.gz
+DATAFILES+=		py_table-20121124.tar.gz
+DATAFILES+=		table.tar.gz
+
+EXTRACT_ONLY=		${DEFAULT_DISTFILES}
+
+.for f in ${DATAFILES}
+SITES.${f}=		https://download.fcitx-im.org/data/
+DISTFILES+=		${f}
+.endfor
 
 MAINTAINER=		rxg@NetBSD.org
-#HOMEPAGE=		http://www.fcitx.org/main/
+HOMEPAGE=		https://www.fcitx-im.org/
 COMMENT=		Free Chinese Input Toy of X
 
-USE_TOOLS+=		pkg-config
+BUILD_DEPENDS+=		extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
+BUILD_DEPENDS+=		automoc4-[0-9]*:../../devel/automoc4
+
+USE_LANGUAGES+=		c c++
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-xft
+USE_TOOLS+=		bash:run gmake pkg-config
+USE_CMAKE=		yes
+
+REPLACE_BASH+=		data/script/*sh
+REPLACE_BASH+=		cmake/*sh
+
+CMAKE_ARGS+=		-DENABLE_PRESAGE=OFF
+CMAKE_ARGS+=		-DENABLE_GIR=OFF
+CMAKE_ARGS+=		-DENABLE_GTK2_IM_MODULE=ON
+CMAKE_ARGS+=		-DENABLE_GTK3_IM_MODULE=ON
+CMAKE_ARGS+=		-DENABLE_QT_IM_MODULE=ON
+CMAKE_ARGS+=		-DENABLE_QT_GUI=ON
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
+PTHREAD_AUTO_VARS=	yes
+LDFLAGS.NetBSD+=	-lexecinfo -lintl
+BUILDLINK_TRANSFORM+=	rm:-Wl,--as-needed
+
+post-extract:
+	${CP} ${DISTDIR}/en_dict-20121020.tar.gz \
+		${WRKSRC}/src/module/spell/dict/
+	${CP} ${DISTDIR}/pinyin.tar.gz \
+		${WRKSRC}/src/im/pinyin/data/
+	${CP} ${DISTDIR}/py_stroke-20121124.tar.gz \
+		${WRKSRC}/src/module/pinyin-enhance/data/
+	${CP} ${DISTDIR}/py_table-20121124.tar.gz \
+		${WRKSRC}/src/module/pinyin-enhance/data/
+	${CP} ${DISTDIR}/table.tar.gz \
+		${WRKSRC}/src/im/table/data/
+
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../devel/gettext-tools/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-qdbus/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/xkeyboard-config/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/fcitx/PLIST b/inputmethod/fcitx/PLIST
index ffbf1c7a3f4..9254abba7e6 100644
--- a/inputmethod/fcitx/PLIST
+++ b/inputmethod/fcitx/PLIST
@@ -1,17 +1,447 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:01:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/08/18 01:11:16 ryoon Exp $
 bin/createPYMB
 bin/fcitx
+bin/fcitx-autostart
+bin/fcitx-configtool
+bin/fcitx-dbus-watcher
+bin/fcitx-diagnose
+bin/fcitx-remote
+bin/fcitx-skin-installer
+bin/fcitx4-config
+bin/mb2org
 bin/mb2txt
+bin/readPYBase
+bin/readPYMB
+bin/scel2org
 bin/txt2mb
-share/fcitx/data/cj.mb
-share/fcitx/data/erbi.mb
-share/fcitx/data/punc.mb
-share/fcitx/data/pySym.mb
-share/fcitx/data/pybase.mb
-share/fcitx/data/pyphrase.mb
-share/fcitx/data/sp.dat
-share/fcitx/data/tables.conf
-share/fcitx/data/wbx.mb
-share/fcitx/doc/cjkvinput.txt
-share/fcitx/doc/fcitx3.pdf
-share/fcitx/doc/wb_fh.htm
+etc/xdg/autostart/fcitx-autostart.desktop
+include/fcitx-config/fcitx-config.h
+include/fcitx-config/hotkey.h
+include/fcitx-config/xdg.h
+include/fcitx-gclient/fcitxclient.h
+include/fcitx-gclient/fcitxconnection.h
+include/fcitx-gclient/fcitxinputmethod.h
+include/fcitx-gclient/fcitxkbd.h
+include/fcitx-qt/fcitxqt_export.h
+include/fcitx-qt/fcitxqtconfiguifactory.h
+include/fcitx-qt/fcitxqtconfiguiplugin.h
+include/fcitx-qt/fcitxqtconfiguiwidget.h
+include/fcitx-qt/fcitxqtconnection.h
+include/fcitx-qt/fcitxqtformattedpreedit.h
+include/fcitx-qt/fcitxqtinputcontextproxy.h
+include/fcitx-qt/fcitxqtinputmethoditem.h
+include/fcitx-qt/fcitxqtinputmethodproxy.h
+include/fcitx-qt/fcitxqtkeyboardlayout.h
+include/fcitx-qt/fcitxqtkeyboardproxy.h
+include/fcitx-qt/fcitxqtkeysequencewidget.h
+include/fcitx-utils/bitset.h
+include/fcitx-utils/desktop-parse.h
+include/fcitx-utils/handler-table.h
+include/fcitx-utils/keysym.h
+include/fcitx-utils/keysymgen.h
+include/fcitx-utils/log.h
+include/fcitx-utils/memory.h
+include/fcitx-utils/objpool.h
+include/fcitx-utils/stringmap.h
+include/fcitx-utils/utarray.h
+include/fcitx-utils/utf8.h
+include/fcitx-utils/uthash.h
+include/fcitx-utils/utils.h
+include/fcitx/addon.h
+include/fcitx/candidate.h
+include/fcitx/configfile.h
+include/fcitx/context.h
+include/fcitx/fcitx.h
+include/fcitx/frontend.h
+include/fcitx/hook.h
+include/fcitx/ime.h
+include/fcitx/instance.h
+include/fcitx/keys.h
+include/fcitx/module.h
+include/fcitx/module/chttrans/chttrans.h
+include/fcitx/module/chttrans/fcitx-chttrans.h
+include/fcitx/module/classicui/classicuiinterface.h
+include/fcitx/module/classicui/fcitx-classicui.h
+include/fcitx/module/clipboard/clipboard.h
+include/fcitx/module/clipboard/fcitx-clipboard.h
+include/fcitx/module/dbus/dbusstuff.h
+include/fcitx/module/dbus/fcitx-dbus.h
+include/fcitx/module/freedesktop-notify/fcitx-freedesktop-notify.h
+include/fcitx/module/freedesktop-notify/freedesktop-notify.h
+include/fcitx/module/ipc/ipc.h
+include/fcitx/module/notificationitem/fcitx-notificationitem.h
+include/fcitx/module/notificationitem/notificationitem.h
+include/fcitx/module/pinyin-enhance/fcitx-pinyin-enhance.h
+include/fcitx/module/pinyin-enhance/pinyin-enhance.h
+include/fcitx/module/pinyin/fcitx-pinyin.h
+include/fcitx/module/pinyin/pydef.h
+include/fcitx/module/punc/fcitx-punc.h
+include/fcitx/module/punc/punc.h
+include/fcitx/module/quickphrase/fcitx-quickphrase.h
+include/fcitx/module/quickphrase/quickphrase.h
+include/fcitx/module/spell/fcitx-spell.h
+include/fcitx/module/spell/spell.h
+include/fcitx/module/x11/fcitx-x11.h
+include/fcitx/module/x11/x11stuff.h
+include/fcitx/module/xkb/fcitx-xkb.h
+include/fcitx/module/xkb/xkb.h
+include/fcitx/module/xkbdbus/fcitx-xkbdbus.h
+include/fcitx/profile.h
+include/fcitx/ui.h
+lib/fcitx/fcitx-autoeng.so
+lib/fcitx/fcitx-chttrans.so
+lib/fcitx/fcitx-classic-ui.so
+lib/fcitx/fcitx-clipboard.so
+lib/fcitx/fcitx-dbus.so
+lib/fcitx/fcitx-freedesktop-notify.so
+lib/fcitx/fcitx-fullwidth-char.so
+lib/fcitx/fcitx-imselector.so
+lib/fcitx/fcitx-ipc.so
+lib/fcitx/fcitx-ipcportal.so
+lib/fcitx/fcitx-keyboard.so
+lib/fcitx/fcitx-kimpanel-ui.so
+lib/fcitx/fcitx-notificationitem.so
+lib/fcitx/fcitx-pinyin-enhance.so
+lib/fcitx/fcitx-pinyin.so
+lib/fcitx/fcitx-punc.so
+lib/fcitx/fcitx-quickphrase.so
+lib/fcitx/fcitx-qw.so
+lib/fcitx/fcitx-remote-module.so
+lib/fcitx/fcitx-spell.so
+lib/fcitx/fcitx-table.so
+lib/fcitx/fcitx-unicode.so
+lib/fcitx/fcitx-vk.so
+lib/fcitx/fcitx-x11.so
+lib/fcitx/fcitx-xim.so
+lib/fcitx/fcitx-xkb.so
+lib/fcitx/fcitx-xkbdbus.so
+lib/fcitx/libexec/comp-spell-dict
+lib/fcitx/libexec/fcitx-po-parser
+lib/fcitx/libexec/fcitx-qt-gui-wrapper
+lib/fcitx/libexec/fcitx-scanner
+lib/gtk-2.0/2.10.0/immodules/im-fcitx.so
+lib/gtk-3.0/3.0.0/immodules/im-fcitx.so
+lib/libfcitx-config.so
+lib/libfcitx-config.so.4
+lib/libfcitx-config.so.4.1
+lib/libfcitx-core.so
+lib/libfcitx-core.so.0
+lib/libfcitx-core.so.0.3
+lib/libfcitx-gclient.so
+lib/libfcitx-gclient.so.0.2
+lib/libfcitx-gclient.so.1
+lib/libfcitx-qt.so
+lib/libfcitx-qt.so.0
+lib/libfcitx-qt.so.0.1
+lib/libfcitx-utils.so
+lib/libfcitx-utils.so.0
+lib/libfcitx-utils.so.0.1
+lib/pkgconfig/fcitx-config.pc
+lib/pkgconfig/fcitx-gclient.pc
+lib/pkgconfig/fcitx-qt.pc
+lib/pkgconfig/fcitx-utils.pc
+lib/pkgconfig/fcitx.pc
+qt4/plugins/inputmethods/qtim-fcitx.so
+share/applications/fcitx-configtool.desktop
+share/applications/fcitx-skin-installer.desktop
+share/applications/fcitx.desktop
+share/cmake/fcitx/FcitxConfig.cmake
+share/cmake/fcitx/FcitxConfigVersion.cmake
+share/cmake/fcitx/FcitxMacro.cmake
+share/cmake/fcitx/fcitx-cmake-helper.sh
+share/cmake/fcitx/fcitx-extract-confdesc.sh
+share/cmake/fcitx/fcitx-extract-desktop.sh
+share/cmake/fcitx/fcitx-extract-gettext.sh
+share/cmake/fcitx/fcitx-extract-kde.sh
+share/cmake/fcitx/fcitx-extract-po.sh
+share/cmake/fcitx/fcitx-extract-qt.sh
+share/cmake/fcitx/fcitx-merge-config.sh
+share/cmake/fcitx/fcitx-parse-po.sh
+share/cmake/fcitx/fcitx-write-po.sh
+share/cmake/fcitx/getdescpo
+share/dbus-1/services/org.fcitx.Fcitx.service
+share/doc/fcitx/API.txt
+share/doc/fcitx/Develop_Readme
+share/doc/fcitx/cjkvinput.txt
+share/doc/fcitx/pinyin.txt
+share/doc/fcitx/wb_fh.htm
+share/fcitx/addon/fcitx-autoeng.conf
+share/fcitx/addon/fcitx-chttrans.conf
+share/fcitx/addon/fcitx-classic-ui.conf
+share/fcitx/addon/fcitx-clipboard.conf
+share/fcitx/addon/fcitx-dbus.conf
+share/fcitx/addon/fcitx-freedesktop-notify.conf
+share/fcitx/addon/fcitx-fullwidth-char.conf
+share/fcitx/addon/fcitx-imselector.conf
+share/fcitx/addon/fcitx-ipc.conf
+share/fcitx/addon/fcitx-ipcportal.conf
+share/fcitx/addon/fcitx-keyboard.conf
+share/fcitx/addon/fcitx-kimpanel-ui.conf
+share/fcitx/addon/fcitx-notificationitem.conf
+share/fcitx/addon/fcitx-pinyin-enhance.conf
+share/fcitx/addon/fcitx-pinyin.conf
+share/fcitx/addon/fcitx-punc.conf
+share/fcitx/addon/fcitx-quickphrase.conf
+share/fcitx/addon/fcitx-qw.conf
+share/fcitx/addon/fcitx-remote-module.conf
+share/fcitx/addon/fcitx-spell.conf
+share/fcitx/addon/fcitx-table.conf
+share/fcitx/addon/fcitx-unicode.conf
+share/fcitx/addon/fcitx-vk.conf
+share/fcitx/addon/fcitx-x11.conf
+share/fcitx/addon/fcitx-xim.conf
+share/fcitx/addon/fcitx-xkb.conf
+share/fcitx/addon/fcitx-xkbdbus.conf
+share/fcitx/configdesc/addon.desc
+share/fcitx/configdesc/config.desc
+share/fcitx/configdesc/fcitx-autoeng.desc
+share/fcitx/configdesc/fcitx-chttrans.desc
+share/fcitx/configdesc/fcitx-classic-ui.desc
+share/fcitx/configdesc/fcitx-clipboard.desc
+share/fcitx/configdesc/fcitx-imselector.desc
+share/fcitx/configdesc/fcitx-keyboard.desc
+share/fcitx/configdesc/fcitx-pinyin-enhance.desc
+share/fcitx/configdesc/fcitx-pinyin.desc
+share/fcitx/configdesc/fcitx-quickphrase.desc
+share/fcitx/configdesc/fcitx-spell.desc
+share/fcitx/configdesc/fcitx-table.desc
+share/fcitx/configdesc/fcitx-unicode.desc
+share/fcitx/configdesc/fcitx-xim.desc
+share/fcitx/configdesc/fcitx-xkb.desc
+share/fcitx/configdesc/inputmethod.desc
+share/fcitx/configdesc/profile.desc
+share/fcitx/configdesc/skin.desc
+share/fcitx/configdesc/table.desc
+share/fcitx/data/AutoEng.dat
+share/fcitx/data/charselectdata
+share/fcitx/data/env_setup.sh
+share/fcitx/data/gbks2t.tab
+share/fcitx/data/punc.mb.zh_CN
+share/fcitx/data/punc.mb.zh_HK
+share/fcitx/data/punc.mb.zh_TW
+share/fcitx/data/quickphrase.d/emoji-eac.mb
+share/fcitx/data/quickphrase.d/emoji.mb
+share/fcitx/data/quickphrase.d/latex.mb
+share/fcitx/data/vk.conf
+share/fcitx/dbus/daemon.conf
+share/fcitx/imicon/cangjie.png
+share/fcitx/imicon/erbi.png
+share/fcitx/imicon/pinyin.png
+share/fcitx/imicon/shuangpin.png
+share/fcitx/imicon/wbpy.png
+share/fcitx/imicon/wubi.png
+share/fcitx/imicon/ziranma.png
+share/fcitx/inputmethod/pinyin.conf
+share/fcitx/inputmethod/qw.conf
+share/fcitx/inputmethod/shuangpin.conf
+share/fcitx/pinyin/pySym.mb
+share/fcitx/pinyin/pybase.mb
+share/fcitx/pinyin/pyphrase.mb
+share/fcitx/pinyin/sp.dat
+share/fcitx/py-enhance/py_stroke.mb
+share/fcitx/py-enhance/py_table.mb
+share/fcitx/skin/classic/active.png
+share/fcitx/skin/classic/bar.png
+share/fcitx/skin/classic/bingchan.png
+share/fcitx/skin/classic/cangjie.png
+share/fcitx/skin/classic/chttrans_active.png
+share/fcitx/skin/classic/chttrans_inactive.png
+share/fcitx/skin/classic/cn.png
+share/fcitx/skin/classic/dianbaoma.png
+share/fcitx/skin/classic/en.png
+share/fcitx/skin/classic/erbi.png
+share/fcitx/skin/classic/fcitx_skin.conf
+share/fcitx/skin/classic/fullwidth_active.png
+share/fcitx/skin/classic/fullwidth_inactive.png
+share/fcitx/skin/classic/inactive.png
+share/fcitx/skin/classic/input.png
+share/fcitx/skin/classic/logo.png
+share/fcitx/skin/classic/menu.png
+share/fcitx/skin/classic/next.png
+share/fcitx/skin/classic/pinyin.png
+share/fcitx/skin/classic/prev.png
+share/fcitx/skin/classic/punc_active.png
+share/fcitx/skin/classic/punc_inactive.png
+share/fcitx/skin/classic/quwei.png
+share/fcitx/skin/classic/remind_active.png
+share/fcitx/skin/classic/remind_inactive.png
+share/fcitx/skin/classic/shuangpin.png
+share/fcitx/skin/classic/vk_active.png
+share/fcitx/skin/classic/vk_inactive.png
+share/fcitx/skin/classic/wanfeng.png
+share/fcitx/skin/classic/wbpy.png
+share/fcitx/skin/classic/wubi.png
+share/fcitx/skin/classic/ziranma.png
+share/fcitx/skin/dark/active.png
+share/fcitx/skin/dark/bar.png
+share/fcitx/skin/dark/bingchan.png
+share/fcitx/skin/dark/cangjie.png
+share/fcitx/skin/dark/chttrans_active.png
+share/fcitx/skin/dark/chttrans_inactive.png
+share/fcitx/skin/dark/cn.png
+share/fcitx/skin/dark/dianbaoma.png
+share/fcitx/skin/dark/en.png
+share/fcitx/skin/dark/erbi.png
+share/fcitx/skin/dark/fcitx_skin.conf
+share/fcitx/skin/dark/fullwidth_active.png
+share/fcitx/skin/dark/fullwidth_inactive.png
+share/fcitx/skin/dark/inactive.png
+share/fcitx/skin/dark/input.png
+share/fcitx/skin/dark/keyboard.png
+share/fcitx/skin/dark/logo.png
+share/fcitx/skin/dark/menu.png
+share/fcitx/skin/dark/next.png
+share/fcitx/skin/dark/pinyin.png
+share/fcitx/skin/dark/prev.png
+share/fcitx/skin/dark/punc_active.png
+share/fcitx/skin/dark/punc_inactive.png
+share/fcitx/skin/dark/quwei.png
+share/fcitx/skin/dark/remind_active.png
+share/fcitx/skin/dark/remind_inactive.png
+share/fcitx/skin/dark/shuangpin.png
+share/fcitx/skin/dark/vk_active.png
+share/fcitx/skin/dark/vk_inactive.png
+share/fcitx/skin/dark/wanfeng.png
+share/fcitx/skin/dark/wbpy.png
+share/fcitx/skin/dark/wubi.png
+share/fcitx/skin/dark/ziranma.png
+share/fcitx/skin/default/active.png
+share/fcitx/skin/default/anthy.png
+share/fcitx/skin/default/bar.png
+share/fcitx/skin/default/bingchan.png
+share/fcitx/skin/default/bopomofo.png
+share/fcitx/skin/default/boshiamy.png
+share/fcitx/skin/default/cangjie.png
+share/fcitx/skin/default/chttrans_active.png
+share/fcitx/skin/default/chttrans_inactive.png
+share/fcitx/skin/default/cn.png
+share/fcitx/skin/default/dianbaoma.png
+share/fcitx/skin/default/en.png
+share/fcitx/skin/default/erbi.png
+share/fcitx/skin/default/fcitx_skin.conf
+share/fcitx/skin/default/fullwidth_active.png
+share/fcitx/skin/default/fullwidth_inactive.png
+share/fcitx/skin/default/hangul.png
+share/fcitx/skin/default/inactive.png
+share/fcitx/skin/default/input.png
+share/fcitx/skin/default/keyboard.png
+share/fcitx/skin/default/kkc.png
+share/fcitx/skin/default/logo.png
+share/fcitx/skin/default/menu.png
+share/fcitx/skin/default/next.png
+share/fcitx/skin/default/pinyin-libpinyin.png
+share/fcitx/skin/default/pinyin.png
+share/fcitx/skin/default/prev.png
+share/fcitx/skin/default/punc_active.png
+share/fcitx/skin/default/punc_inactive.png
+share/fcitx/skin/default/quwei.png
+share/fcitx/skin/default/remind_active.png
+share/fcitx/skin/default/remind_inactive.png
+share/fcitx/skin/default/shuangpin-libpinyin.png
+share/fcitx/skin/default/shuangpin.png
+share/fcitx/skin/default/sogoupinyin.png
+share/fcitx/skin/default/unikey.png
+share/fcitx/skin/default/vk_active.png
+share/fcitx/skin/default/vk_inactive.png
+share/fcitx/skin/default/wanfeng.png
+share/fcitx/skin/default/wbpy.png
+share/fcitx/skin/default/wubi.png
+share/fcitx/skin/default/ziranma.png
+share/fcitx/spell/en_dict.fscd
+share/fcitx/table/cangjie.conf
+share/fcitx/table/cj.mb
+share/fcitx/table/db.conf
+share/fcitx/table/db.mb
+share/fcitx/table/erbi.conf
+share/fcitx/table/erbi.mb
+share/fcitx/table/qxm.conf
+share/fcitx/table/qxm.mb
+share/fcitx/table/wanfeng.conf
+share/fcitx/table/wanfeng.mb
+share/fcitx/table/wbpy.conf
+share/fcitx/table/wbpy.mb
+share/fcitx/table/wbx.conf
+share/fcitx/table/wbx.mb
+share/fcitx/table/zrm.conf
+share/fcitx/table/zrm.mb
+share/icons/hicolor/128x128/apps/fcitx.png
+share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
+share/icons/hicolor/16x16/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/16x16/apps/fcitx-kbd.png
+share/icons/hicolor/16x16/apps/fcitx-punc-active.png
+share/icons/hicolor/16x16/apps/fcitx-punc-inactive.png
+share/icons/hicolor/16x16/apps/fcitx-vk-active.png
+share/icons/hicolor/16x16/apps/fcitx-vk-inactive.png
+share/icons/hicolor/16x16/apps/fcitx.png
+share/icons/hicolor/22x22/apps/fcitx-fullwidth-active.png
+share/icons/hicolor/22x22/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-kbd.png
+share/icons/hicolor/22x22/apps/fcitx-punc-active.png
+share/icons/hicolor/22x22/apps/fcitx-punc-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-vk-active.png
+share/icons/hicolor/22x22/apps/fcitx-vk-inactive.png
+share/icons/hicolor/22x22/apps/fcitx.png
+share/icons/hicolor/24x24/apps/fcitx-fullwidth-active.png
+share/icons/hicolor/24x24/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-kbd.png
+share/icons/hicolor/24x24/apps/fcitx-punc-active.png
+share/icons/hicolor/24x24/apps/fcitx-punc-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-vk-active.png
+share/icons/hicolor/24x24/apps/fcitx-vk-inactive.png
+share/icons/hicolor/24x24/apps/fcitx.png
+share/icons/hicolor/32x32/apps/fcitx.png
+share/icons/hicolor/48x48/apps/fcitx-cangjie.png
+share/icons/hicolor/48x48/apps/fcitx-chn.png
+share/icons/hicolor/48x48/apps/fcitx-chttrans-active.png
+share/icons/hicolor/48x48/apps/fcitx-chttrans-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-erbi.png
+share/icons/hicolor/48x48/apps/fcitx-fullwidth-active.png
+share/icons/hicolor/48x48/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-kbd.png
+share/icons/hicolor/48x48/apps/fcitx-pinyin.png
+share/icons/hicolor/48x48/apps/fcitx-punc-active.png
+share/icons/hicolor/48x48/apps/fcitx-punc-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-remind-active.png
+share/icons/hicolor/48x48/apps/fcitx-remind-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-shuangpin.png
+share/icons/hicolor/48x48/apps/fcitx-vk-active.png
+share/icons/hicolor/48x48/apps/fcitx-vk-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-wbpy.png
+share/icons/hicolor/48x48/apps/fcitx-wubi.png
+share/icons/hicolor/48x48/apps/fcitx-ziranma.png
+share/icons/hicolor/48x48/apps/fcitx.png
+share/icons/hicolor/scalable/apps/fcitx-fullwidth-active-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-fullwidth-active.svg
+share/icons/hicolor/scalable/apps/fcitx-fullwidth-inactive-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-fullwidth-inactive.svg
+share/icons/hicolor/scalable/apps/fcitx-kbd-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-kbd.svg
+share/icons/hicolor/scalable/apps/fcitx-punc-active-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-punc-active.svg
+share/icons/hicolor/scalable/apps/fcitx-punc-inactive-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-punc-inactive.svg
+share/icons/hicolor/scalable/apps/fcitx-vk-active-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-vk-active.svg
+share/icons/hicolor/scalable/apps/fcitx-vk-inactive-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-vk-inactive.svg
+share/icons/hicolor/scalable/apps/fcitx.svg
+share/locale/ca/LC_MESSAGES/fcitx.mo
+share/locale/da/LC_MESSAGES/fcitx.mo
+share/locale/de/LC_MESSAGES/fcitx.mo
+share/locale/es/LC_MESSAGES/fcitx.mo
+share/locale/fr/LC_MESSAGES/fcitx.mo
+share/locale/ja/LC_MESSAGES/fcitx.mo
+share/locale/ko/LC_MESSAGES/fcitx.mo
+share/locale/ru/LC_MESSAGES/fcitx.mo
+share/locale/zh_CN/LC_MESSAGES/fcitx.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx.mo
+share/man/man1/createPYMB.1
+share/man/man1/fcitx-remote.1
+share/man/man1/fcitx.1
+share/man/man1/mb2org.1
+share/man/man1/mb2txt.1
+share/man/man1/readPYBase.1
+share/man/man1/readPYMB.1
+share/man/man1/scel2org.1
+share/man/man1/txt2mb.1
+share/mime/packages/x-fskin.xml
diff --git a/inputmethod/fcitx/buildlink3.mk b/inputmethod/fcitx/buildlink3.mk
new file mode 100644
index 00000000000..7cbcd44e983
--- /dev/null
+++ b/inputmethod/fcitx/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2018/08/18 01:11:16 ryoon Exp $
+
+BUILDLINK_TREE+=	fcitx
+
+.if !defined(FCITX_BUILDLINK3_MK)
+FCITX_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.fcitx+=	fcitx>=4.2.9.6
+BUILDLINK_PKGSRCDIR.fcitx?=	../../inputmethod/fcitx
+
+.endif	# FCITX_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-fcitx
diff --git a/inputmethod/fcitx/distinfo b/inputmethod/fcitx/distinfo
index 59fa5a0525d..26e2e671c6e 100644
--- a/inputmethod/fcitx/distinfo
+++ b/inputmethod/fcitx/distinfo
@@ -1,8 +1,31 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 22:13:34 agc Exp $
+$NetBSD: distinfo,v 1.3 2018/08/18 01:11:16 ryoon Exp $
 
-SHA1 (fcitx-3.1.1.tar.bz2) = 3d23a0786edd6ff6e69d353692849d9041442038
-RMD160 (fcitx-3.1.1.tar.bz2) = 229155ec71deb189ffc52851ee9a242ba9192a5b
-SHA512 (fcitx-3.1.1.tar.bz2) = 4c97c5a6c5513d695266d3648f33ae8fe00bd92d81734ccc267560e255f893cef78282897eb738b5d5e295aa3710074ab17b2542c0f874b2d4bf1f5f159568cb
-Size (fcitx-3.1.1.tar.bz2) = 2920856 bytes
-SHA1 (patch-aa) = 53bc014f925d326ed76dfd79721b5d49b2fa5222
-SHA1 (patch-ab) = 50cacd5cb281638d3b0e2468a339a21475d536f2
+SHA1 (en_dict-20121020.tar.gz) = 3d6b85cbede261b3703b916e6a1a3303f6cba9a6
+RMD160 (en_dict-20121020.tar.gz) = ae6a1fcf214b9ba1b9d300edeec4d61ad62caf18
+SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
+Size (en_dict-20121020.tar.gz) = 630491 bytes
+SHA1 (fcitx-4.2.9.6.tar.xz) = 8b0eb76356405784290a9b15d20b5882ec9af370
+RMD160 (fcitx-4.2.9.6.tar.xz) = f778d10dc6fd0932d7b433d7735d3b3cc8978b6e
+SHA512 (fcitx-4.2.9.6.tar.xz) = b6c2f0cc54eb8dce0ed7b2d3def499aadc863e12a7fa6cf1e79338dac8dfd48c805dbd293ef749eecbecd5453ea6ec3bc66d945ef16330562b39bf99e6fc9470
+Size (fcitx-4.2.9.6.tar.xz) = 1706336 bytes
+SHA1 (pinyin.tar.gz) = af6f6fceed89a2b533b39a73e277675361298745
+RMD160 (pinyin.tar.gz) = 7d3be5535cb111cc5d8a64ce50150c9767608ec3
+SHA512 (pinyin.tar.gz) = 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
+Size (pinyin.tar.gz) = 1608886 bytes
+SHA1 (py_stroke-20121124.tar.gz) = 80a52eba30f0ab269e6d26cb2813af9da2e84017
+RMD160 (py_stroke-20121124.tar.gz) = ce7cd591a92b0b0440ff5cfe18b1df325e8b9746
+SHA512 (py_stroke-20121124.tar.gz) = d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
+Size (py_stroke-20121124.tar.gz) = 445601 bytes
+SHA1 (py_table-20121124.tar.gz) = e43d2760a607461ae8a4f52e4caf21cf673f6acc
+RMD160 (py_table-20121124.tar.gz) = 58e54cc66f4384e6caa4ac6828ad0786da618b05
+SHA512 (py_table-20121124.tar.gz) = 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
+Size (py_table-20121124.tar.gz) = 186822 bytes
+SHA1 (table.tar.gz) = b7e89f95ce2da991821acd270a1220a4cd4cb65a
+RMD160 (table.tar.gz) = b678c943b232b8aba2c462c7b81b2f99f27ecd07
+SHA512 (table.tar.gz) = 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
+Size (table.tar.gz) = 4144686 bytes
+SHA1 (patch-cmake_FcitxMacro.cmake) = e3dcba315711fc6b96f5620de1e03e096635bab2
+SHA1 (patch-src_im_pinyin_data_CMakeLists.txt) = dd17df37a5b6781a645a4190cb8111811f804189
+SHA1 (patch-src_im_table_data_CMakeLists.txt) = 3ef3d05ee036f9bb845b69c97c50ac76cc11478e
+SHA1 (patch-src_lib_fcitx-utils_utils.c) = d89eccbcc8c1ee330efbcddea152db6d2725959b
+SHA1 (patch-src_module_spell_dict_CMakeLists.txt) = 98372bb2c160e9bb8917ea523465924edab2c1e3
diff --git a/inputmethod/fcitx/patches/patch-aa b/inputmethod/fcitx/patches/patch-aa
deleted file mode 100644
index ff82c8b3180..00000000000
--- a/inputmethod/fcitx/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/01/16 13:04:07 rxg Exp $
-
---- Makefile.in.orig	2005-12-16 23:28:36.000000000 +0800
-+++ Makefile.in	2005-12-16 23:30:08.000000000 +0800
-@@ -164,7 +164,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = doc tools data debian xpm lib src
-+SUBDIRS = doc tools data lib src
- EXTRA_DIST = autogen.sh fcitx.spec
- MAINTAINERCLEANFILES = \
-         aclocal.m4 \
diff --git a/inputmethod/fcitx/patches/patch-ab b/inputmethod/fcitx/patches/patch-ab
deleted file mode 100644
index fd2f143c8ec..00000000000
--- a/inputmethod/fcitx/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/01/16 13:04:07 rxg Exp $
-
---- src/ui.c.orig	2006-01-04 21:11:37.000000000 +0800
-+++ src/ui.c
-@@ -84,7 +84,7 @@ Bool InitX (void)
-     SetMyXErrorHandler ();
-     iScreen = DefaultScreen (dpy);
- 
--    convUTF8 = iconv_open ("UTF-8", "GBK");
-+    convUTF8 = iconv_open ("UTF-8", "GB18030");
- 
-     return True;
- }
diff --git a/inputmethod/fcitx/patches/patch-cmake_FcitxMacro.cmake b/inputmethod/fcitx/patches/patch-cmake_FcitxMacro.cmake
new file mode 100644
index 00000000000..8e2cd70c735
--- /dev/null
+++ b/inputmethod/fcitx/patches/patch-cmake_FcitxMacro.cmake
@@ -0,0 +1,30 @@
+$NetBSD: patch-cmake_FcitxMacro.cmake,v 1.1 2018/08/18 01:11:16 ryoon Exp $
+
+--- cmake/FcitxMacro.cmake.orig	2017-12-22 18:02:24.000000000 +0000
++++ cmake/FcitxMacro.cmake
+@@ -199,6 +199,7 @@ function(__fcitx_cmake_init)
+   set(__FCITX_CMAKE_HELPER_EXPORT
+     "_FCITX_MACRO_CMAKE_DIR=${FCITX_MACRO_CMAKE_DIR}"
+     "_FCITX_PO_PARSER_EXECUTABLE=${FCITX_PO_PARSER_EXECUTABLE}"
++    "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-utils"
+     "FCITX_HELPER_CMAKE_CMD=${CMAKE_COMMAND}"
+     "FCITX_CMAKE_CACHE_BASE=${fcitx_cmake_cache_base}"
+     CACHE INTERNAL "fcitx cmake helper export" FORCE)
+@@ -444,7 +445,7 @@ function(__fcitx_scan_addon name in_file
+   get_filename_component(dir "${out_file}" PATH)
+   add_custom_command(
+     COMMAND "${CMAKE_COMMAND}" -E make_directory "${dir}"
+-    COMMAND "${FCITX_SCANNER_EXECUTABLE}" --api "${in_file}" "${out_file}"
++    COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-utils" "${FCITX_SCANNER_EXECUTABLE}" --api "${in_file}" "${out_file}"
+     OUTPUT "${out_file}" DEPENDS "${in_file}" "${FCITX_SCANNER_EXECUTABLE}"
+     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+   __fcitx_addon_get_unique_name("${name}--scan" target_name)
+@@ -459,7 +460,7 @@ function(__fcitx_scan_addon_priv name in
+   get_filename_component(dir "${out_file}" PATH)
+   add_custom_command(
+     COMMAND "${CMAKE_COMMAND}" -E make_directory "${dir}"
+-    COMMAND "${FCITX_SCANNER_EXECUTABLE}" --private "${in_file}" "${out_file}"
++    COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-utils" "${FCITX_SCANNER_EXECUTABLE}" --private "${in_file}" "${out_file}"
+     OUTPUT "${out_file}" DEPENDS "${in_file}" "${FCITX_SCANNER_EXECUTABLE}"
+     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+   __fcitx_addon_get_unique_name("${name}--scan-priv" target_name)
diff --git a/inputmethod/fcitx/patches/patch-src_im_pinyin_data_CMakeLists.txt b/inputmethod/fcitx/patches/patch-src_im_pinyin_data_CMakeLists.txt
new file mode 100644
index 00000000000..24a3e2b0e4d
--- /dev/null
+++ b/inputmethod/fcitx/patches/patch-src_im_pinyin_data_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_im_pinyin_data_CMakeLists.txt,v 1.1 2018/08/18 01:11:16 ryoon Exp $
+
+--- src/im/pinyin/data/CMakeLists.txt.orig	2017-12-22 18:02:24.000000000 +0000
++++ src/im/pinyin/data/CMakeLists.txt
+@@ -18,7 +18,7 @@ fcitx_extract(py-data-extract "${PY_TAR}
+ set(CREATE_PYMB_BIN "${PROJECT_BINARY_DIR}/tools/cli/createPYMB")
+ add_custom_command(OUTPUT ${PY_DATA}
+   DEPENDS ${PY_ORGDATA} "${CREATE_PYMB_BIN}" py-data-extract
+-  COMMAND "${CREATE_PYMB_BIN}" "${CMAKE_CURRENT_SOURCE_DIR}/gbkpy.org"
++  COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-config:${PROJECT_BINARY_DIR}/src/lib/fcitx-utils" "${CREATE_PYMB_BIN}" "${CMAKE_CURRENT_SOURCE_DIR}/gbkpy.org"
+   "${CMAKE_CURRENT_BINARY_DIR}/${PY_ORGDATA}")
+ 
+ install(FILES ${FCITX_PY_FILES} "${CMAKE_CURRENT_BINARY_DIR}/pybase.mb"
diff --git a/inputmethod/fcitx/patches/patch-src_im_table_data_CMakeLists.txt b/inputmethod/fcitx/patches/patch-src_im_table_data_CMakeLists.txt
new file mode 100644
index 00000000000..1a6f2c2e104
--- /dev/null
+++ b/inputmethod/fcitx/patches/patch-src_im_table_data_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_im_table_data_CMakeLists.txt,v 1.1 2018/08/18 01:11:16 ryoon Exp $
+
+--- src/im/table/data/CMakeLists.txt.orig	2017-12-22 18:02:24.000000000 +0000
++++ src/im/table/data/CMakeLists.txt
+@@ -35,7 +35,7 @@ fcitx_extract(table-data-extract "${TABL
+ foreach(tblname ${TABLE_NAME})
+   add_custom_command(OUTPUT ${tblname}.mb
+     DEPENDS ${tblname}.txt "${TXT2MB_BIN}" table-data-extract
+-    COMMAND "${TXT2MB_BIN}" ${tblname}.txt ${tblname}.mb)
++    COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-config:${PROJECT_BINARY_DIR}/src/lib/fcitx-utils" "${TXT2MB_BIN}" ${tblname}.txt ${tblname}.mb)
+ endforeach()
+ 
+ install(FILES ${TABLE_DATA} DESTINATION ${pkgdatadir}/table )
diff --git a/inputmethod/fcitx/patches/patch-src_lib_fcitx-utils_utils.c b/inputmethod/fcitx/patches/patch-src_lib_fcitx-utils_utils.c
new file mode 100644
index 00000000000..27a273dc1cb
--- /dev/null
+++ b/inputmethod/fcitx/patches/patch-src_lib_fcitx-utils_utils.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_lib_fcitx-utils_utils.c,v 1.1 2018/08/18 01:11:16 ryoon Exp $
+
+--- src/lib/fcitx-utils/utils.c.orig	2017-12-22 18:02:24.000000000 +0000
++++ src/lib/fcitx-utils/utils.c
+@@ -56,7 +56,9 @@
+ #include <fcntl.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
++#  if !defined(__NetBSD__)
+ #include <sys/user.h>
++#  endif
+ #endif
+ 
+ #if defined(__linux__)
diff --git a/inputmethod/fcitx/patches/patch-src_module_spell_dict_CMakeLists.txt b/inputmethod/fcitx/patches/patch-src_module_spell_dict_CMakeLists.txt
new file mode 100644
index 00000000000..50f42664986
--- /dev/null
+++ b/inputmethod/fcitx/patches/patch-src_module_spell_dict_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_module_spell_dict_CMakeLists.txt,v 1.1 2018/08/18 01:11:16 ryoon Exp $
+
+--- src/module/spell/dict/CMakeLists.txt.orig	2017-12-22 18:02:24.000000000 +0000
++++ src/module/spell/dict/CMakeLists.txt
+@@ -24,7 +24,7 @@ set(COMP_SPELL_DICT
+ add_custom_command(
+   OUTPUT "${SPELL_EN_DICT}"
+   DEPENDS "${SPELL_EN_DICT_SRC}" "${COMP_SPELL_DICT}" spell-en-extract
+-  COMMAND "${COMP_SPELL_DICT}" --comp-dict
++  COMMAND "${CMAKE_COMMAND}" -E env "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/lib/fcitx-utils" "${COMP_SPELL_DICT}" --comp-dict
+   "${SPELL_EN_DICT_SRC}" "${SPELL_EN_DICT}")
+ add_custom_target(spell_en_dict ALL DEPENDS "${SPELL_EN_DICT}")
+ install(FILES "${SPELL_EN_DICT}" DESTINATION "${pkgdatadir}/spell")