upgrade to 1.5.18.

Release notes at
https://github.com/ibus/ibus/releases/tag/1.5.18

PR:		229053
Approved by:	maintainer

6 files changed, 38 insertions, 14 deletions

diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 2b9264195ae1..21fbcaa7fcb5 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ibus
-DISTVERSION=	1.5.17
-PORTREVISION=	4
+PORTVERSION=	1.5.18
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/:DEFAULT
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:DEFAULT
@@ -16,20 +15,23 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 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
 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 libtool localbase pathfix pkgconfig python:2.7
+USES=		compiler cpe gmake gnome libtool localbase pathfix pkgconfig python
 USE_GNOME=	glib20 intltool librsvg2 pygobject3
 USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 OPTIONS_SUB=	yes
 INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--disable-tests --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc	\
+		--with-ucd-dir=${LOCALBASE}/share/unicode/ucd
 
 OPTIONS_DEFINE=	NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOCS XIM ENGINE EMOJI
 OPTIONS_RADIO=	CONFIG
@@ -113,4 +115,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart
 	${INSTALL_DATA} ${PATCHDIR}/ibus.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart
 
+do-test:
+	${MAKE} -C ${WRKSRC}/src/tests check
+
 .include <bsd.port.post.mk>
diff --git a/textproc/ibus/distinfo b/textproc/ibus/distinfo
index e3ffa7f58863..2f337a586e4b 100644
--- a/textproc/ibus/distinfo
+++ b/textproc/ibus/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1510188391
-SHA256 (ibus-1.5.17.tar.gz) = 0347a8055977ca458e8add750af5f9b76e1a524844cc3b0e2fad70ce153dd219
-SIZE (ibus-1.5.17.tar.gz) = 2522960
-SHA256 (emoji.json) = 3e4792d6dc13f95b8e72b4cc5eb7d6088f64fc625682add33a6bbcc08bf76c4b
-SIZE (emoji.json) = 448953
+TIMESTAMP = 1529005317
+SHA256 (ibus-1.5.18.tar.gz) = 8551f7d027fb65d48225642fc8f3b232412ea75a4eb375244dd72a4d73c2639e
+SIZE (ibus-1.5.18.tar.gz) = 2760121
diff --git a/textproc/ibus/files/patch-configure b/textproc/ibus/files/patch-configure
new file mode 100644
index 000000000000..01cd0b107839
--- /dev/null
+++ b/textproc/ibus/files/patch-configure
@@ -0,0 +1,11 @@
+--- 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"
+ 
diff --git a/textproc/ibus/pkg-descr b/textproc/ibus/pkg-descr
index ce6f47baebf3..93465f589989 100644
--- a/textproc/ibus/pkg-descr
+++ b/textproc/ibus/pkg-descr
@@ -4,4 +4,4 @@ function, and much more.
 
 This is the base port, you need input methods such as pinyin to input text.
 
-WWW: http://code.google.com/p/ibus
+WWW: https://github.com/ibus/ibus
diff --git a/textproc/ibus/pkg-message b/textproc/ibus/pkg-message
index 690800fd6396..f45ca826db7f 100644
--- a/textproc/ibus/pkg-message
+++ b/textproc/ibus/pkg-message
@@ -40,6 +40,7 @@ japanese/ibus-mozc		Mozc engine for IBus
 japanese/ibus-skk		SKK engine for IBus
 korean/ibus-hangul		Hangul engine for IBus
 textproc/ibus-kmfl		KMFL IMEngine for IBus framework
+textproc/ibus-m17n		m17n IM engine for IBus framework
 textproc/ibus-table		Table based IM framework for IBus
 textproc/ibus-typing-booster    Faster typing by context sensitive completion
 
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index 90a30756acac..b60de2f164f8 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -1,12 +1,13 @@
+bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
-bin/ibus
 etc/xdg/autostart/ibus.desktop
 %%DCONF%%etc/dconf/db/ibus.d/00-upstream-settings
 %%DCONF%%@postunexec rm -f %D/etc/dconf/db/ibus
 %%DCONF%%@postexec dconf update
 %%DCONF%%etc/dconf/profile/ibus
 include/ibus-1.0/ibus.h
+include/ibus-1.0/ibusaccelgroup.h
 include/ibus-1.0/ibusattribute.h
 include/ibus-1.0/ibusattrlist.h
 include/ibus-1.0/ibusbus.h
@@ -17,6 +18,7 @@ include/ibus-1.0/ibusdebug.h
 include/ibus-1.0/ibusemoji.h
 include/ibus-1.0/ibusengine.h
 include/ibus-1.0/ibusenginedesc.h
+include/ibus-1.0/ibusenginesimple.h
 include/ibus-1.0/ibusenumtypes.h
 include/ibus-1.0/ibuserror.h
 include/ibus-1.0/ibusfactory.h
@@ -24,6 +26,7 @@ include/ibus-1.0/ibushotkey.h
 include/ibus-1.0/ibusinputcontext.h
 include/ibus-1.0/ibuskeymap.h
 include/ibus-1.0/ibuskeys.h
+include/ibus-1.0/ibuskeysyms-compat.h
 include/ibus-1.0/ibuskeysyms.h
 include/ibus-1.0/ibuslookuptable.h
 include/ibus-1.0/ibusobject.h
@@ -38,11 +41,11 @@ include/ibus-1.0/ibusservice.h
 include/ibus-1.0/ibusshare.h
 include/ibus-1.0/ibustext.h
 include/ibus-1.0/ibustypes.h
+include/ibus-1.0/ibusunicode.h
 include/ibus-1.0/ibusutil.h
 include/ibus-1.0/ibusversion.h
+include/ibus-1.0/ibusxevent.h
 include/ibus-1.0/ibusxml.h
-include/ibus-1.0/ibuskeysyms-compat.h
-include/ibus-1.0/ibusenginesimple.h
 %%GTK2%%lib/gtk-2.0/2.10.0/immodules/im-ibus.so
 %%GINTRO%%lib/girepository-1.0/IBus-1.0.typelib
 %%GINTRO%%share/gir-1.0/IBus-1.0.gir
@@ -52,7 +55,7 @@ include/ibus-1.0/ibusenginesimple.h
 %%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.517
+lib/libibus-1.0.so.5.0.518
 %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.py
 %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyc
 %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyo
@@ -159,6 +162,7 @@ lib/libibus-1.0.so.5.0.517
 %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/utility.pyc
 %%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/utility.pyo
 libdata/pkgconfig/ibus-1.0.pc
+%%GTK3%%libexec/ibus-extension-gtk3
 %%GTK3%%libexec/ibus-ui-gtk3
 %%XIM%%libexec/ibus-x11
 %%GCONF%%libexec/ibus-gconf
@@ -171,6 +175,8 @@ man/man1/ibus-setup.1.gz
 man/man1/ibus.1.gz
 %%EMOJI%%man/man7/ibus-emoji.7.gz
 share/applications/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
@@ -225,6 +231,7 @@ share/dbus-1/services/org.freedesktop.portal.IBus.service
 %%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
 %%DCONF%%%%DATADIR%%/component/dconf.xml
@@ -334,6 +341,8 @@ share/dbus-1/services/org.freedesktop.portal.IBus.service
 %%EMOJI%%%%DATADIR%%/dicts/emoji-zh_Hant.dict
 %%EMOJI%%%%DATADIR%%/dicts/emoji-zh_Hant_HK.dict
 %%EMOJI%%%%DATADIR%%/dicts/emoji-zu.dict
+%%DATADIR%%/dicts/unicode-blocks.dict
+%%DATADIR%%/dicts/unicode-names.dict
 %%DATADIR%%/keymaps/common
 %%DATADIR%%/keymaps/in
 %%DATADIR%%/keymaps/jp