Update Chinese Pinyin related ports:

chinese/ibus-libpinyin: 1.10.0 -> 1.11.1, enable OpenCC
chinese/libpinyin: 2.2.0 -> 2.3.0
textproc/ibus: 1.5.18 -> 1.5.20, while there also fix pkg-message for Qt

Reviewed:	Zhihao Yuan <lichray gmail com>, Henry Hu <henry.hu.sh gmail com>
Differential Revision:	https://reviews.freebsd.org/D21177

5 files changed, 30 insertions, 10 deletions

diff --git a/chinese/ibus-libpinyin/Makefile b/chinese/ibus-libpinyin/Makefile
index df1fc0bdaf6f..8e7c01e98cf7 100644
--- a/chinese/ibus-libpinyin/Makefile
+++ b/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 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
 		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 @@ CONFIGURE_ARGS=	--disable-dependency-tracking --disable-boost \
 				--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 @@ OPENCC_DESC=		Use opencc for simplified and traditional Chinese conversion
 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
 
diff --git a/chinese/ibus-libpinyin/distinfo b/chinese/ibus-libpinyin/distinfo
index 1cb238410d8f..2fba6c6d46eb 100644
--- a/chinese/ibus-libpinyin/distinfo
+++ b/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
diff --git a/chinese/ibus-libpinyin/files/patch-data_Makefile.am b/chinese/ibus-libpinyin/files/patch-data_Makefile.am
new file mode 100644
index 000000000000..f67763c2a0cc
--- /dev/null
+++ b/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
diff --git a/chinese/ibus-libpinyin/files/patch-data_Makefile.in b/chinese/ibus-libpinyin/files/patch-data_Makefile.in
new file mode 100644
index 000000000000..8fd45e396c14
--- /dev/null
+++ b/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.
diff --git a/chinese/ibus-libpinyin/pkg-plist b/chinese/ibus-libpinyin/pkg-plist
index 7419ecbdcc6c..5359465b77f3 100644
--- a/chinese/ibus-libpinyin/pkg-plist
+++ b/chinese/ibus-libpinyin/pkg-plist
@@ -9,7 +9,6 @@ libexec/ibus-setup-libpinyin
 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