Index: head/textproc/ibus/Makefile
===================================================================
--- head/textproc/ibus/Makefile	(revision 564237)
+++ head/textproc/ibus/Makefile	(revision 564238)
@@ -1,128 +1,128 @@
 # Created by: Henry Hu <henry.hu.sh@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	ibus
 PORTVERSION=	1.5.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	henry.hu.sh@gmail.com
 COMMENT=	Intelligent Input Bus for Linux / Unix OS
 
 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 \
 		gtkdocize:textproc/gtk-doc \
 		bash:shells/bash
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
 		${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \
 		setxkbmap:x11/setxkbmap
 
 USES=		autoreconf compiler cpe gmake gnome libtool localbase pathfix pkgconfig python:3.5+ shebangfix
 USE_GNOME=	glib20 intltool librsvg2 pygobject3
 USE_LDCONFIG=	yes
 USE_PYTHON=	py3kplist
 
 MAKE_JOBS_UNSAFE=yes
 
 SHEBANG_GLOB=	*.sh
 
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 OPTIONS_SUB=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc	\
 		--with-ucd-dir=${LOCALBASE}/share/unicode/ucd \
 		--disable-python2 --disable-python-library
 
 OPTIONS_DEFINE=	NLS GTK2 GTK3 VALA GINTRO DOCS XIM ENGINE EMOJI
 OPTIONS_RADIO=	CONFIG
 OPTIONS_RADIO_CONFIG=	GCONF DCONF
 OPTIONS_DEFAULT=	GTK2 GTK3 VALA GINTRO DCONF XIM ENGINE EMOJI
 
 GTK2_DESC=	Install GTK2 client
 GTK3_DESC=	Install GTK3 client and panel
 VALA_DESC=	Install vala binding
 GINTRO_DESC=	Install GObject Introspection data
 GCONF_DESC=	Use GConf for configuration
 DCONF_DESC=	Use dconf for configuration
 XIM_DESC=	Install XIM server
 ENGINE_DESC=	Install ibus simple engine
 EMOJI_DESC=	Install emoji dictionary
 CPE_VENDOR=	ibus_project
 
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-tools
 NLS_CONFIGURE_ENABLE=	nls
 
 GTK2_USE=		GNOME=cairo,gtk20
 GTK2_CONFIGURE_ENABLE=	gtk2
 GTK2_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 
 GTK3_USES=		xorg
 GTK3_USE=		GNOME=cairo,gtk30 XORG=x11,xi
 GTK3_CONFIGURE_ENABLE=	gtk3 libnotify
 GTK3_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libnotify.so:devel/libnotify
 GTK3_LIBS=		-lX11
 
 VALA_BUILD_DEPENDS=	vala>=0.20:lang/vala
 VALA_CONFIGURE_ENABLE=	vala
 VALA_IMPLIES=		GINTRO
 
 GINTRO_BUILD_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
 GINTRO_RUN_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
 GINTRO_CONFIGURE_ENABLE=	introspection
 
 GCONF_USE=		GNOME=gconf2
 GCONF_CONFIGURE_ENABLE=	gconf
 GCONF_VARS=		GCONF_SCHEMAS=ibus.schemas
 
-DCONF_USE=		GNOME=dconf,gconf2
+DCONF_USE=		GNOME=dconf
 DCONF_CONFIGURE_ENABLE=	dconf
 DCONF_VARS=		GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml
 
 DOCS_CONFIGURE_ENABLE=	gtk-doc-html
 
 XIM_CONFIGURE_ENABLE=	xim
 
 ENGINE_CONFIGURE_ENABLE=	engine
 
 EMOJIONE_TAG=		ba845a7e24aac26cf3cf22abc19bea215d94fbf3 # 2.2.7
 EMOJI_CONFIGURE_ON=	--with-unicode-emoji-dir=${LOCALBASE}/share/unicode/emoji \
 			--with-emoji-annotation-dir=${LOCALBASE}/share/unicode/cldr/common/annotations
 EMOJI_CONFIGURE_ENABLE=	emoji-dict
 EMOJI_BUILD_DEPENDS=	json-glib>=0:devel/json-glib \
 			unicode-emoji>0:misc/unicode-emoji \
 			cldr-emoji-annotation>0:misc/cldr-emoji-annotation
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46
 USE_GCC=	yes
 .endif
 
 .if ${PORT_OPTIONS:MENGINE} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MGCONF} || ${PORT_OPTIONS:MDCONF}
 PLIST_SUB+=	COMPDIR=""
 .else
 PLIST_SUB+=	COMPDIR="@comment "
 .endif
 
 pre-configure:
 	cd ${CONFIGURE_WRKSRC} && gtkdocize --copy --flavour no-tmpl
 
 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>