textproc/ibus: the port had been improved (+)

- Do not needlessly mention L-word in COMMENT and pkg-descr
- GConf support had been removed upstream since version 1.5.20
- Unbreak packaging when DCONF option is deselected
- Convert hand-rolled `do-test' target into TEST_* knobs

Reference:	https://github.com/ibus/ibus/commit/a8e8b69

3 files changed, 9 insertions, 22 deletions

diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 86aae0463cbc..6462c103abb8 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	1.5.24
 CATEGORIES=	textproc
 
 MAINTAINER=	henry.hu.sh@gmail.com
-COMMENT=	Intelligent Input Bus for Linux / Unix OS
+COMMENT=	Intelligent Input Bus for Unix-like systems
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -27,11 +27,7 @@ USE_GNOME=	glib20 intltool librsvg2 pygobject3
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	py3kplist
-
-
 SHEBANG_GLOB=	*.sh
-
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc	\
 		--with-ucd-dir=${LOCALBASE}/share/unicode/ucd \
@@ -40,18 +36,17 @@ CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc	\
 
 MAKE_JOBS_UNSAFE=yes
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
+TEST_WRKSRC=	${WRKSRC}/src/tests
 
-OPTIONS_DEFINE=	ENGINE VALA GTK2 GTK3 GINTRO XIM EMOJI DOCS NLS WAYLAND
+OPTIONS_DEFINE=	ENGINE VALA GTK2 GTK3 GINTRO DCONF XIM EMOJI DOCS NLS WAYLAND
 OPTIONS_DEFAULT=	GTK2 GTK3 VALA GINTRO DCONF XIM ENGINE EMOJI
-OPTIONS_RADIO=	CONFIG
-OPTIONS_RADIO_CONFIG=	GCONF DCONF
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=	yes
 
 DCONF_DESC=	Use dconf for configuration
 EMOJI_DESC=	Install emoji dictionary
 ENGINE_DESC=	Install ibus simple engine
-GCONF_DESC=	Use GConf for configuration
 GINTRO_DESC=	Install GObject Introspection data
 GTK2_DESC=	Install GTK2 client
 GTK3_DESC=	Install GTK3 client and panel
@@ -70,9 +65,6 @@ 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
 ENGINE_CONFIGURE_ENABLE=	engine
-GCONF_USE=		GNOME=gconf2
-GCONF_CONFIGURE_ENABLE=	gconf
-GCONF_VARS=		GCONF_SCHEMAS=ibus.schemas
 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
@@ -107,7 +99,7 @@ EMOJIONE_TAG=		ba845a7e24aac26cf3cf22abc19bea215d94fbf3 # 2.2.7
 USE_GCC=	yes
 .endif
 
-.if ${PORT_OPTIONS:MENGINE} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MGCONF} || ${PORT_OPTIONS:MDCONF}
+.if ${PORT_OPTIONS:MENGINE} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MDCONF}
 PLIST_SUB+=	COMPDIR=""
 .else
 PLIST_SUB+=	COMPDIR="@comment "
@@ -120,7 +112,4 @@ 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/pkg-descr b/textproc/ibus/pkg-descr
index 93465f589989..c1287b131fd2 100644
--- a/textproc/ibus/pkg-descr
+++ b/textproc/ibus/pkg-descr
@@ -1,6 +1,6 @@
-Intelligent Input Bus for Linux / Unix OS, iBus, is the next generation input
-framework, developed by the developer of scim-python, includes all its
-function, and much more.
+Intelligent Input Bus for Unix-like systems, iBus, is the next generation
+input framework, developed by the developer of scim-python, includes all
+its function, and much more.
 
 This is the base port, you need input methods such as pinyin to input text.
 
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index 1c30cf051845..a4eae9a85024 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -61,7 +61,6 @@ libdata/pkgconfig/ibus-1.0.pc
 %%GTK3%%libexec/ibus-extension-gtk3
 %%GTK3%%libexec/ibus-ui-gtk3
 %%XIM%%libexec/ibus-x11
-%%GCONF%%libexec/ibus-gconf
 %%DCONF%%libexec/ibus-dconf
 %%ENGINE%%libexec/ibus-engine-simple
 libexec/ibus-portal
@@ -70,7 +69,7 @@ libexec/ibus-portal
 man/man1/ibus-daemon.1.gz
 man/man1/ibus-setup.1.gz
 man/man1/ibus.1.gz
-man/man5/ibus.5.gz
+%%DCONF%%man/man5/ibus.5.gz
 %%EMOJI%%man/man7/ibus-emoji.7.gz
 share/applications/org.freedesktop.IBus.Setup.desktop
 %%EMOJI%%share/applications/org.freedesktop.IBus.Panel.Emojier.desktop
@@ -79,7 +78,6 @@ share/dbus-1/services/org.freedesktop.IBus.service
 share/dbus-1/services/org.freedesktop.portal.IBus.service
 %%GTK3%%%%DATADIR%%/component/gtkextension.xml
 %%GTK3%%%%DATADIR%%/component/gtkpanel.xml
-%%GCONF%%%%DATADIR%%/component/gconf.xml
 %%DCONF%%%%DATADIR%%/component/dconf.xml
 %%ENGINE%%%%DATADIR%%/component/simple.xml
 %%EMOJI%%%%DATADIR%%/dicts/emoji-af.dict