Index: head/chinese/ibus-libpinyin/Makefile
===================================================================
--- head/chinese/ibus-libpinyin/Makefile
+++ head/chinese/ibus-libpinyin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ibus-libpinyin
-PORTVERSION=	1.10.0
-PORTREVISION=	3
+PORTVERSION=	1.11.1
 CATEGORIES=	chinese
 MASTER_SITES=	SF/libpinyin/${PORTNAME}
 
@@ -16,9 +15,10 @@
 		libibus-1.0.so:textproc/ibus \
 		libpinyin.so:chinese/libpinyin
 
-USES=		compiler:c++11-lib gmake python pkgconfig gettext
-USE_GNOME=	glib20
+USES=		compiler:c++11-lib gmake gnome python pkgconfig gettext
 USE_PYTHON=	py3kplist
+USE_GNOME=	glib20
+GLIB_SCHEMAS=	com.github.libpinyin.ibus-libpinyin.gschema.xml
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
 
@@ -27,7 +27,7 @@
 				--disable-lua-extension
 
 OPTIONS_DEFINE=		ENGLISH STROKE OPENCC NLS
-OPTIONS_DEFAULT=	ENGLISH STROKE
+OPTIONS_DEFAULT=	ENGLISH STROKE OPENCC
 OPTIONS_SUB=		yes
 ENGLISH_DESC=		Enable English input mode
 STROKE_DESC=		Enable stroke input mode
@@ -36,7 +36,6 @@
 ENGLISH_CONFIGURE_ENABLE=	english-input-mode
 STROKE_CONFIGURE_ENABLE=	stroke-input-mode
 
-OPENCC_BROKEN=			Requires newer OpenCC
 OPENCC_CONFIGURE_ENABLE=	opencc
 OPENCC_LIB_DEPENDS=		libopencc.so:chinese/opencc
 
Index: head/chinese/ibus-libpinyin/distinfo
===================================================================
--- head/chinese/ibus-libpinyin/distinfo
+++ head/chinese/ibus-libpinyin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539584534
-SHA256 (ibus-libpinyin-1.10.0.tar.gz) = 6cc4f80d2348f93ed408d52fb33b45736f51ae33335a869e8a3bb6460957087b
-SIZE (ibus-libpinyin-1.10.0.tar.gz) = 1081199
+TIMESTAMP = 1565071977
+SHA256 (ibus-libpinyin-1.11.1.tar.gz) = 80f530ccb88d44c51cfbb20d1191d50b0d4240c2a087de4e3aae89c6e26381ae
+SIZE (ibus-libpinyin-1.11.1.tar.gz) = 1177679
Index: head/chinese/ibus-libpinyin/files/patch-data_Makefile.am
===================================================================
--- head/chinese/ibus-libpinyin/files/patch-data_Makefile.am
+++ head/chinese/ibus-libpinyin/files/patch-data_Makefile.am
@@ -0,0 +1,11 @@
+--- data/Makefile.am.orig	2019-05-09 06:57:21 UTC
++++ data/Makefile.am
+@@ -67,7 +67,7 @@ desktop_files = $(desktop_in_files:.desktop.in=.deskto
+ 
+ $(desktop_files): $(desktop_in_files) Makefile
+ 	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+-	sed -i -e 's|@libexecdir[@]|$(libexecdir)|g' \
++	sed -i '' -e 's|@libexecdir[@]|$(libexecdir)|g' \
+ 	-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@
+ 
+ desktopdir=$(datadir)/applications
Index: head/chinese/ibus-libpinyin/files/patch-data_Makefile.in
===================================================================
--- head/chinese/ibus-libpinyin/files/patch-data_Makefile.in
+++ head/chinese/ibus-libpinyin/files/patch-data_Makefile.in
@@ -0,0 +1,11 @@
+--- data/Makefile.in.orig	2019-05-09 06:57:27 UTC
++++ data/Makefile.in
+@@ -863,7 +863,7 @@ $(STROKES_DB): $(STROKES) $(STROKES_AWK)
+ 
+ $(desktop_files): $(desktop_in_files) Makefile
+ 	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+-	sed -i -e 's|@libexecdir[@]|$(libexecdir)|g' \
++	sed -i '' -e 's|@libexecdir[@]|$(libexecdir)|g' \
+ 	-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: head/chinese/ibus-libpinyin/pkg-plist
===================================================================
--- head/chinese/ibus-libpinyin/pkg-plist
+++ head/chinese/ibus-libpinyin/pkg-plist
@@ -9,7 +9,6 @@
 share/appdata/libpinyin.appdata.xml
 share/applications/ibus-setup-libbopomofo.desktop
 share/applications/ibus-setup-libpinyin.desktop
-share/glib-2.0/schemas/com.github.libpinyin.ibus-libpinyin.gschema.xml
 %%ENGLISH%%%%DATADIR%%/db/english.db
 %%STROKE%%%%DATADIR%%/db/strokes.db
 %%DATADIR%%/icons/chinese.svg
Index: head/chinese/libpinyin/Makefile
===================================================================
--- head/chinese/libpinyin/Makefile
+++ head/chinese/libpinyin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libpinyin
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	2.3.0
 CATEGORIES=	chinese textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -12,8 +11,9 @@
 
 LICENSE=	GPLv2
 
-USES=		bdb compiler:c++11-lang gettext gmake libtool pathfix pkgconfig
+USES=		bdb compiler:c++11-lang gmake gnome libtool pathfix pkgconfig
 USE_GNOME=	glib20
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -21,6 +21,10 @@
 		-I${BDB_INCLUDE_DIR} -D_WITH_GETLINE" \
 		LDFLAGS="-L${LOCALBASE}/lib -l${BDB_LIB_NAME}"
 INSTALL_TARGET=install-strip
+
+OPTIONS_DEFINE=	NLS
+
+NLS_USES=	gettext
 
 PLIST_SUB+=	VER=${PORTVERSION}
 
Index: head/chinese/libpinyin/distinfo
===================================================================
--- head/chinese/libpinyin/distinfo
+++ head/chinese/libpinyin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539587914
-SHA256 (libpinyin-2.2.0.tar.gz) = f22144418031f48784ea4b417927e935424bb6767a63ceea107377b9d9ee9cb0
-SIZE (libpinyin-2.2.0.tar.gz) = 19602224
+TIMESTAMP = 1564885156
+SHA256 (libpinyin-2.3.0.tar.gz) = b3dc9c6a1af55e9427f9d462ff176fbab6a3793368080a2f8e2a58c4cd4e2691
+SIZE (libpinyin-2.3.0.tar.gz) = 20465096
Index: head/chinese/libpinyin/files/patch-data_Makefile.in
===================================================================
--- head/chinese/libpinyin/files/patch-data_Makefile.in
+++ head/chinese/libpinyin/files/patch-data_Makefile.in
@@ -1,6 +1,6 @@
---- data/Makefile.in.orig	2014-06-05 14:21:55.000000000 +0800
-+++ data/Makefile.in	2014-06-05 14:22:17.000000000 +0800
-@@ -288,7 +288,7 @@
+--- data/Makefile.in.orig	2019-08-07 02:01:59 UTC
++++ data/Makefile.in
+@@ -307,7 +307,7 @@ EXTRA_DIST = $(textual_model_data) \
  libpinyin_db_DATA = $(binary_model_data) \
                            table.conf
  
Index: head/chinese/libpinyin/files/patch-libpinyin.pc.in
===================================================================
--- head/chinese/libpinyin/files/patch-libpinyin.pc.in
+++ head/chinese/libpinyin/files/patch-libpinyin.pc.in
@@ -1,6 +1,6 @@
---- libpinyin.pc.in.orig	2014-06-05 14:28:26.000000000 +0800
-+++ libpinyin.pc.in	2014-06-05 14:28:35.000000000 +0800
-@@ -2,7 +2,7 @@
+--- libpinyin.pc.in.orig	2018-05-28 08:15:28 UTC
++++ libpinyin.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
  includedir=@includedir@
Index: head/textproc/ibus/Makefile
===================================================================
--- head/textproc/ibus/Makefile
+++ head/textproc/ibus/Makefile
@@ -2,12 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	ibus
-PORTVERSION=	1.5.18
-PORTREVISION=	4
+PORTVERSION=	1.5.20
 CATEGORIES=	textproc
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	henry.hu.sh@gmail.com
 COMMENT=	Intelligent Input Bus for Linux / Unix OS
@@ -17,16 +13,21 @@
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
 		${LOCALBASE}/share/unicode/ucd/NamesList.txt:textproc/UCD \
-		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
+		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
+		gtkdocize:textproc/gtk-doc
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify@${PY_FLAVOR} \
 		${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \
 		setxkbmap:x11/setxkbmap
 
-USES=		compiler cpe gmake gnome libtool localbase pathfix pkgconfig python:2.7
+USES=		autoreconf compiler cpe gmake gnome libtool localbase pathfix pkgconfig python:2.7 shebangfix
 USE_GNOME=	glib20 intltool librsvg2 pygobject3
 USE_LDCONFIG=	yes
 
+SHEBANG_GLOB=	*.sh
+
+USE_GITHUB=	yes
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 OPTIONS_SUB=	yes
@@ -111,6 +112,9 @@
 .else
 PLIST_SUB+=	COMPDIR="@comment "
 .endif
+
+pre-configure:
+	cd ${CONFIGURE_WRKSRC} && gtkdocize --copy --flavour no-tmpl
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart
Index: head/textproc/ibus/distinfo
===================================================================
--- head/textproc/ibus/distinfo
+++ head/textproc/ibus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529005317
-SHA256 (ibus-1.5.18.tar.gz) = 8551f7d027fb65d48225642fc8f3b232412ea75a4eb375244dd72a4d73c2639e
-SIZE (ibus-1.5.18.tar.gz) = 2760121
+TIMESTAMP = 1565144028
+SHA256 (ibus-ibus-1.5.20_GH0.tar.gz) = 3a417af0d652ad4cef899f96acde74b67e07382cc45c16bd9feb2d347da7cb62
+SIZE (ibus-ibus-1.5.20_GH0.tar.gz) = 1228060
Index: head/textproc/ibus/files/patch-configure
===================================================================
--- head/textproc/ibus/files/patch-configure
+++ head/textproc/ibus/files/patch-configure
@@ -1,11 +0,0 @@
---- configure.orig	2018-03-02 08:24:44 UTC
-+++ configure
-@@ -20218,7 +20218,7 @@ fi
- 
- # Check whether --with-ucd-dir was given.
- if test "${with_ucd_dir+set}" = set; then :
--  withval=$with_ucd_dir; UCD_DIR=$with_emoji_annotation_dir
-+  withval=$with_ucd_dir; UCD_DIR=$with_ucd_dir
- else
-   UCD_DIR="/usr/share/unicode/ucd"
- 
Index: head/textproc/ibus/files/patch-data_dconf_make-dconf-override-db.sh
===================================================================
--- head/textproc/ibus/files/patch-data_dconf_make-dconf-override-db.sh
+++ head/textproc/ibus/files/patch-data_dconf_make-dconf-override-db.sh
@@ -0,0 +1,11 @@
+--- data/dconf/make-dconf-override-db.sh.orig	2019-08-07 03:33:23 UTC
++++ data/dconf/make-dconf-override-db.sh
+@@ -6,7 +6,7 @@ set -e
+ # breaks dbus-launch.  There's dbus-run-session which is
+ # better, but not everyone has it yet.
+ export DBUS_FATAL_WARNINGS=0
+-export TMPDIR=$(mktemp -d --tmpdir="$PWD")
++export TMPDIR=$(TMPDIR="${PWD}" mktemp -d)
+ export XDG_CONFIG_HOME="$TMPDIR/config"
+ export XDG_CACHE_HOME="$TMPDIR/cache"
+ export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
Index: head/textproc/ibus/pkg-message
===================================================================
--- head/textproc/ibus/pkg-message
+++ head/textproc/ibus/pkg-message
@@ -7,7 +7,7 @@
 
 export XIM=ibus
 export GTK_IM_MODULE=ibus
-export QT_IM_MODULE=xim
+export QT_IM_MODULE=ibus
 export XMODIFIERS=@im=ibus
 export XIM_PROGRAM="ibus-daemon"
 export XIM_ARGS="--daemonize --xim"
@@ -16,7 +16,7 @@
 
 setenv XIM ibus
 setenv GTK_IM_MODULE ibus
-setenv QT_IM_MODULE xim
+setenv QT_IM_MODULE ibus
 setenv XMODIFIERS @im=ibus
 setenv XIM_PROGRAM ibus-daemon
 setenv XIM_ARGS "--daemonize --xim"
@@ -27,7 +27,7 @@
 #!/bin/sh
 export XIM=ibus
 export GTK_IM_MODULE=ibus
-export QT_IM_MODULE=xim
+export QT_IM_MODULE=ibus
 export XMODIFIERS=@im=ibus
 export XIM_PROGRAM="ibus-daemon"
 export XIM_ARGS="--daemonize --xim"
Index: head/textproc/ibus/pkg-plist
===================================================================
--- head/textproc/ibus/pkg-plist
+++ head/textproc/ibus/pkg-plist
@@ -3,6 +3,7 @@
 bin/ibus-setup
 etc/xdg/autostart/ibus.desktop
 %%DCONF%%etc/dconf/db/ibus.d/00-upstream-settings
+%%DCONF%%man/man5/00-upstream-settings.5.gz
 %%DCONF%%@postunexec rm -f %D/etc/dconf/db/ibus
 %%DCONF%%@postexec dconf update
 %%DCONF%%etc/dconf/profile/ibus
@@ -55,7 +56,7 @@
 %%GTK3%%lib/gtk-3.0/3.0.0/immodules/im-ibus.so
 lib/libibus-1.0.so
 lib/libibus-1.0.so.5
-lib/libibus-1.0.so.5.0.518
+lib/libibus-1.0.so.5.0.520
 %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.py
 %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyc
 %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyo
@@ -173,64 +174,13 @@
 man/man1/ibus-daemon.1.gz
 man/man1/ibus-setup.1.gz
 man/man1/ibus.1.gz
+man/man5/ibus.5.gz
 %%EMOJI%%man/man7/ibus-emoji.7.gz
-share/applications/ibus-setup.desktop
+share/applications/org.freedesktop.IBus.Setup.desktop
 %%EMOJI%%share/applications/org.freedesktop.IBus.Panel.Emojier.desktop
 %%GTK3%%share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
 share/dbus-1/services/org.freedesktop.IBus.service
 share/dbus-1/services/org.freedesktop.portal.IBus.service
-%%PORTDOCS%%%%DOCSDIR%%/IBusAttrList.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusAttribute.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusBus.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusComponent.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusConfig.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusConfigService.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusEngine.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusEngineDesc.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusEngineSimple.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusHotkeyProfile.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusInputContext.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusKeymap.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusLookupTable.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusObject.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusObservedPath.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusPanelService.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusPropList.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusProperty.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusProxy.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusRegistry.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusSerializable.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusService.html
-%%PORTDOCS%%%%DOCSDIR%%/IBusText.html
-%%PORTDOCS%%%%DOCSDIR%%/ch01.html
-%%PORTDOCS%%%%DOCSDIR%%/ch02.html
-%%PORTDOCS%%%%DOCSDIR%%/ch03.html
-%%PORTDOCS%%%%DOCSDIR%%/ch04.html
-%%PORTDOCS%%%%DOCSDIR%%/ch05.html
-%%PORTDOCS%%%%DOCSDIR%%/ch06.html
-%%PORTDOCS%%%%DOCSDIR%%/home.png
-%%PORTDOCS%%%%DOCSDIR%%/ibus-IBusKeysyms.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusdebug.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus-ibuserror.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusshare.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus-ibustypes.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusversion.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusxml.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus-ibuskeys.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus-ibuskeysyms-compat.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusutil.html
-%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
-%%PORTDOCS%%%%DOCSDIR%%/ibus.devhelp2
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/left.png
-%%PORTDOCS%%%%DOCSDIR%%/right.png
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/up.png
-%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
 %%GTK3%%%%DATADIR%%/component/gtkextension.xml
 %%GTK3%%%%DATADIR%%/component/gtkpanel.xml
 %%GCONF%%%%DATADIR%%/component/gconf.xml
@@ -452,7 +402,6 @@
 @dir %%DATADIR%%/engine
 %%COMPDIR%%@dir %%DATADIR%%/component
 @dir %%DATADIR%%
-%%PORTDOCS%%@dir %%DOCSDIR%%
 %%PYTHON_LIB%%@dir %%PYTHON_SITELIBDIR%%/ibus/interface
 %%PYTHON_LIB%%@dir %%PYTHON_SITELIBDIR%%/ibus
 @dir include/ibus-1.0