uim: Update to 1.8.8

Overview of changes from 1.8.7 to 1.8.8
=======================================
* Fixes
  - build
    * Fix a build error with --with-libgcroots=installed
      [GitHub #130][Reported by HIGUCHI Daisuke]
  - uim-qt5
    * Fix a build error
      [GitHub #129][Reported by HIGUCHI Daisuke]

Overview of changes from 1.8.6 to 1.8.7
=======================================
* Fixes
  - uim-skk
    * Fix a socket clean bug
      [GitHub #32][Reported by HIGUCHI Daisuke]
    * Fix wrong close call
      [GitHub #55][Patch by zephyrus00jp]
  - uim-qt4
    * Add a missing include
      [GitHub #38][Patch by Raphael Kubo da Costa]
  - uim.el
    * Fix a bug that other minor mode key bindings are ignored on Emacs 24
      [GitHub #51][Reported by Araeos]
    * Fix a bug that Shift+Arrow doesn't work
      [GitHub #116][Reported by Vladimir Panteleev]
  - uim-gtk3
    * Fix a bug that the candidate windows isn't shown
      [GitHub #76][Patch by Konosuke Watanab]

* Enhancements
  - all
    * Add "Keywords" to .desktop
      [GitHub #57][Patch by HIGUCHI Daisuke]
  - uim-gtk
    * Improve GTK+ 3 support
      [GitHub #35][Patch by e-kato]
    * Support libpanel-applet 3.14 or later
      [GitHub #48][Patch by Dmitry Shachnev]
    * Support Wayland backend
      [GitHub #71][Reported by Thibaut Girka]
  - uim-fep
    * Use UTF-8 for comment encoding
      [GitHub #46][Patch by Felix Janda]
  - uim-qt5
    * Make workable
  - uim-social-ime
    * Remove because the service was disruption
  - uim.el
    * Support autoload
      [GitHub #121][Patch by Arun Isaac]

inputmethod/uim/DEINSTALL.m17nlib → inputmethod/uim/DEINSTALL

@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL.m17nlib,v 1.1 2009/10/01 12:30:32 obache Exp $
+# $NetBSD: DEINSTALL,v 1.3 2019/11/01 16:21:11 nia Exp $
 case ${STAGE} in
 DEINSTALL)
 	for icon in ${PREFIX}/share/uim/pixmaps/m17n-*.png ; do

inputmethod/uim/INSTALL.m17nlib → inputmethod/uim/INSTALL

@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL.m17nlib,v 1.1 2009/10/01 12:30:32 obache Exp $
+# $NetBSD: INSTALL,v 1.3 2019/11/01 16:21:11 nia Exp $
 
 case ${STAGE} in
 POST-INSTALL)

inputmethod/uim/Makefile

@@ -1,34 +1,42 @@
-# $NetBSD: Makefile,v 1.153 2019/10/27 17:31:35 kamil Exp $
-#
+# $NetBSD: Makefile,v 1.154 2019/11/01 16:21:11 nia Exp $
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=		65
-COMMENT=		Multilingual input method library
-#LICENSE=		See ${WRKSRC}/COPYING
+COMMENT=	Multilingual input method library
+LICENSE=	modified-bsd
 
-CONFLICTS+=		uim-qt4-immodule-[0-9]*
+CONFLICTS+=	uim-qt4-immodule-[0-9]*
 
-USE_LIBTOOL=		YES
-USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake intltool pkg-config msgfmt
-USE_LANGUAGES=		c99 c++03
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/uim.pc.in
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--disable-emacs
-CONFIGURE_ARGS+=	--disable-kde4-applet
-CONFIGURE_ARGS+=	--with-libgcroots=installed
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+GNU_CONFIGURE=	YES
+USE_LIBTOOL=	YES
+
+USE_TOOLS+=	gmake pkg-config
+USE_TOOLS+=	intltool msgfmt msgmerge xgettext
+USE_LANGUAGES=	c99 c++03
 
-BUILDLINK_TRANSFORM+=	rm:-O2
+# Avoid finding mono tool and breaking.
+MAKE_FLAGS+=	CSI=
 
 LDFLAGS.SunOS+=	-mimpure-text
 CFLAGS.SunOS+=	-D__EXTENSIONS__
 
-.include "options.mk"
+UIM_MODULES=	anthy-utf8 skk tutcode byeoru latin elatin xmload \
+		pyload py pyunihan viqr ipa-x-sampa look ajax-ime \
+		google-cgiapi-jp baidu-olime-jp
 
-PKG_SYSCONFSUBDIR=	uim
-INSTALLATION_DIRS+=	share/doc/uim
+BUILD_DEFS+=	PKG_SYSCONFBASE
+
+CONFIGURE_ARGS+=	--disable-emacs
+CONFIGURE_ARGS+=	--disable-fep
+CONFIGURE_ARGS+=	--disable-kde4-applet
+CONFIGURE_ARGS+=	--disable-gnome-applet
+CONFIGURE_ARGS+=	--disable-gnome3-applet
+CONFIGURE_ARGS+=	--with-libgcroots=installed
+CONFIGURE_ARGS+=	--with-anthy-utf8
+CONFIGURE_ARGS+=	--with-sqlite3
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/uim.pc.in
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
 
@@ -38,6 +46,9 @@ CONF_FILES=		${EGDIR}/loader.scm \
 CONF_FILES+=		${EGDIR}/installed-modules.scm \
 			${PKG_SYSCONFDIR}/installed-modules.scm
 
+PKG_SYSCONFSUBDIR=	uim
+INSTALLATION_DIRS+=	share/doc/uim
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim
@@ -49,11 +60,21 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${DESTDIR}${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${DESTDIR}${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${DESTDIR}${PREFIX}/share/doc/uim
-_BUILDING_UIM=	YES
-.include "modules.mk"
 
+.include "options.mk"
+
+SUBST_CLASSES+=		gtk
+SUBST_STAGE.gtk=	post-configure
+SUBST_MESSAGE.gtk=	Correcting executable name in .desktop file
+SUBST_FILES.gtk+=	uim.desktop
+SUBST_SED.gtk+=		-e "s,uim-pref-gtk,${UIM_PREF_PROGRAM},g"
+
+.include "modules.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgcroots+=	libgcroots>=0.2.3
 .include "../../devel/libgcroots/buildlink3.mk"
+.include "../../inputmethod/anthy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

inputmethod/uim/Makefile.common

@@ -1,23 +1,21 @@
-# $NetBSD: Makefile.common,v 1.13 2015/12/26 02:13:46 mef Exp $
+# $NetBSD: Makefile.common,v 1.14 2019/11/01 16:21:11 nia Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=		1.8.6
-DISTNAME=		uim-${UIM_VERSION}
-CATEGORIES=		inputmethod
-MASTER_SITES=		${MASTER_SITE_GITHUB:=uim/}
-GITHUB_RELEASE=		${DISTNAME}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	uim-1.8.8
+CATEGORIES=	inputmethod
+MASTER_SITES=	${MASTER_SITE_GITHUB:=uim/}
+GITHUB_RELEASE=	${DISTNAME:S/^uim-//1}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		VEG03617@nifty.com
-HOMEPAGE=		https://github.com/uim/uim/wiki
+MAINTAINER=	VEG03617@nifty.com
+HOMEPAGE=	https://github.com/uim/uim/wiki
 
-DISTINFO_FILE=		${.CURDIR}/../../inputmethod/uim/distinfo
-PATCHDIR=		${.CURDIR}/../../inputmethod/uim/patches
+DISTINFO_FILE=	${.CURDIR}/../../inputmethod/uim/distinfo
+PATCHDIR=	${.CURDIR}/../../inputmethod/uim/patches
 
-USE_TOOLS+=		automake
+USE_TOOLS+=	autoreconf autoconf automake
 
 pre-configure:
-	set -e; cd ${WRKSRC}; \
-	aclocal -I m4; autoheader; automake -a --foreign -i; autoconf
+	cd ${WRKSRC} && ${SH} autogen.sh

inputmethod/uim/PLIST

@@ -1,23 +1,8 @@
-@comment $NetBSD: PLIST,v 1.26 2019/10/27 17:31:35 kamil Exp $
-${PLIST.uim-dict-gtk}bin/uim-dict-gtk
-${PLIST.uim-dict-gtk3}bin/uim-dict-gtk3
-${PLIST.fep}bin/uim-fep
-${PLIST.fep}bin/uim-fep-tick
+@comment $NetBSD: PLIST,v 1.27 2019/11/01 16:21:11 nia Exp $
 bin/uim-help
-${PLIST.gtk}bin/uim-im-switcher-gtk
-${PLIST.gtk3}bin/uim-im-switcher-gtk3
-${PLIST.gtk}bin/uim-input-pad-ja
-${PLIST.gtk3}bin/uim-input-pad-ja-gtk3
-${PLIST.m17nlib}bin/uim-m17nlib-relink-icons
 bin/uim-module-manager
-${PLIST.gtk}bin/uim-pref-gtk
-${PLIST.gtk3}bin/uim-pref-gtk3
 bin/uim-sh
-${PLIST.gtk}bin/uim-toolbar-gtk
-${PLIST.gtk}bin/uim-toolbar-gtk-systray
-${PLIST.gtk3}bin/uim-toolbar-gtk3
-${PLIST.gtk3}bin/uim-toolbar-gtk3-systray
-${PLIST.xim}bin/uim-xim
+bin/uim-xim
 include/uim/dynlib.h
 include/uim/uim-custom.h
 include/uim/uim-helper.h
@@ -29,41 +14,23 @@ include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
 include/uim/version.h
-${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server
-${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
-${PLIST.gtk3}lib/gtk-3.0/3.0.0/immodules/im-uim.la
 lib/libuim-custom.la
 lib/libuim-scm.la
 lib/libuim.la
 lib/pkgconfig/uim.pc
-${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la
-${PLIST.anthy}lib/uim/plugin/libuim-anthy.la
-${PLIST.curl}lib/uim/plugin/libuim-curl.la
+lib/uim/plugin/libuim-anthy-utf8.la
+lib/uim/plugin/libuim-anthy.la
 lib/uim/plugin/libuim-custom-enabler.la
-${PLIST.eb}lib/uim/plugin/libuim-eb.la
-${PLIST.editline}lib/uim/plugin/libuim-editline.la
-${PLIST.expat}lib/uim/plugin/libuim-expat.la
-${PLIST.ffi}lib/uim/plugin/libuim-ffi.la
 lib/uim/plugin/libuim-fileio.la
 lib/uim/plugin/libuim-lolevel.la
 lib/uim/plugin/libuim-look.la
-${PLIST.m17nlib}lib/uim/plugin/libuim-m17nlib.la
-${PLIST.openssl}lib/uim/plugin/libuim-openssl.la
 lib/uim/plugin/libuim-process.la
 lib/uim/plugin/libuim-skk.la
 lib/uim/plugin/libuim-socket.la
-${PLIST.sqlite}lib/uim/plugin/libuim-sqlite3.la
-${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
-${PLIST.gtk}libexec/uim-candwin-gtk
-${PLIST.gtk3}libexec/uim-candwin-gtk3
-${PLIST.gtk}libexec/uim-candwin-horizontal-gtk
-${PLIST.gtk3}libexec/uim-candwin-horizontal-gtk3
-${PLIST.gtk}libexec/uim-candwin-tbl-gtk
-${PLIST.gtk3}libexec/uim-candwin-tbl-gtk3
+lib/uim/plugin/libuim-sqlite3.la
+lib/uim/plugin/libuim-xkb.la
 libexec/uim-helper-server
-${PLIST.gnome}libexec/uim-toolbar-applet
-${PLIST.gnome3}libexec/uim-toolbar-applet-gnome3
-${PLIST.xim}man/man1/uim-xim.1
+man/man1/uim-xim.1
 share/applications/uim.desktop
 share/doc/uim/COMPATIBILITY
 share/doc/uim/CUSTOM
@@ -75,8 +42,6 @@ share/doc/uim/PLUGIN
 share/doc/uim/README
 share/doc/uim/UIM-SCM
 share/doc/uim/UIM-SH
-${PLIST.fep}share/doc/uim/uim-fep/README
-${PLIST.fep}share/doc/uim/uim-fep/README.ja
 share/examples/uim/installed-modules.scm
 share/examples/uim/loader.scm
 share/locale/fr/LC_MESSAGES/uim.mo
@@ -134,8 +99,6 @@ share/uim/google-cgiapi-jp.scm
 share/uim/hangul.scm
 share/uim/hangul2.scm
 share/uim/hangul3.scm
-${PLIST.helperdata}share/uim/helperdata/bushu.t
-${PLIST.uim-dict-helperdata}share/uim/helperdata/uim-dict-ui.xml
 share/uim/http-client.scm
 share/uim/http-server.scm
 share/uim/i18n.scm
@@ -185,7 +148,7 @@ share/uim/packrat.scm
 share/uim/pinyin-big5.scm
 share/uim/pixmaps/ajax-ime.png
 share/uim/pixmaps/ajax-ime.svg
-${PLIST.anthy}share/uim/pixmaps/anthy-utf8.png
+share/uim/pixmaps/anthy-utf8.png
 share/uim/pixmaps/anthy.png
 share/uim/pixmaps/baidu-olime-jp.png
 share/uim/pixmaps/baidu-olime-jp.svg
@@ -309,8 +272,6 @@ share/uim/pixmaps/skk.png
 share/uim/pixmaps/skk.svg
 share/uim/pixmaps/skk_dark_background.png
 share/uim/pixmaps/skk_dark_background.svg
-share/uim/pixmaps/social-ime.png
-share/uim/pixmaps/social-ime.svg
 share/uim/pixmaps/tcode.png
 share/uim/pixmaps/tcode.svg
 share/uim/pixmaps/tcode_dark_background.png
@@ -363,7 +324,6 @@ share/uim/pyload.scm
 share/uim/pyunihan.scm
 share/uim/rk.scm
 share/uim/romaja.scm
-share/uim/scim.scm
 share/uim/sj3-custom.scm
 share/uim/sj3-key-custom.scm
 share/uim/sj3.scm
@@ -373,9 +333,6 @@ share/uim/skk-dialog.scm
 share/uim/skk-editor.scm
 share/uim/skk-key-custom.scm
 share/uim/skk.scm
-share/uim/social-ime-custom.scm
-share/uim/social-ime-key-custom.scm
-share/uim/social-ime.scm
 share/uim/socket.scm
 share/uim/sqlite3.scm
 share/uim/sxml-tools.scm
@@ -406,9 +363,9 @@ share/uim/wlos.scm
 share/uim/wnn-custom.scm
 share/uim/wnn-key-custom.scm
 share/uim/wnn.scm
+share/uim/xkb.scm
 share/uim/xmload.scm
 share/uim/yahoo-jp-custom.scm
 share/uim/yahoo-jp-key-custom.scm
 share/uim/yahoo-jp.scm
 share/uim/zaurus.scm
-@pkgdir lib/uim/notify

inputmethod/uim/PLIST.gtk2

@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.gtk2,v 1.3 2019/11/01 16:21:11 nia Exp $
+bin/uim-im-switcher-gtk
+bin/uim-input-pad-ja
+bin/uim-pref-gtk
+bin/uim-toolbar-gtk
+bin/uim-toolbar-gtk-systray
+lib/gtk-2.0/2.10.0/immodules/im-uim.la
+libexec/uim-candwin-gtk
+libexec/uim-candwin-horizontal-gtk
+libexec/uim-candwin-tbl-gtk

inputmethod/uim/PLIST.gtk3

@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.gtk3,v 1.1 2019/11/01 16:21:11 nia Exp $
+bin/uim-im-switcher-gtk3
+bin/uim-input-pad-ja-gtk3
+bin/uim-pref-gtk3
+bin/uim-toolbar-gtk3
+bin/uim-toolbar-gtk3-systray
+lib/gtk-3.0/3.0.0/immodules/im-uim.la
+libexec/uim-candwin-gtk3
+libexec/uim-candwin-horizontal-gtk3
+libexec/uim-candwin-tbl-gtk3

inputmethod/uim/PLIST.qt5

@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.qt5,v 1.1 2019/11/01 16:21:11 nia Exp $
+qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.so

inputmethod/uim/distinfo

@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.31 2015/11/03 22:13:41 agc Exp $
+$NetBSD: distinfo,v 1.32 2019/11/01 16:21:11 nia Exp $
 
-SHA1 (uim-1.8.6.tar.bz2) = 43b9dbdead6797880e6cfc9c032ecb2d37d42777
-RMD160 (uim-1.8.6.tar.bz2) = 5f94218d82475ac463534ec681769f34547e5707
-SHA512 (uim-1.8.6.tar.bz2) = 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
-Size (uim-1.8.6.tar.bz2) = 6500739 bytes
-SHA1 (patch-af) = 9f543b90bfefc5f560e1eaac97d60af70ffed5cc
+SHA1 (uim-1.8.8.tar.bz2) = 369e0c10927d4ede8ed5434631b57ab42ca98406
+RMD160 (uim-1.8.8.tar.bz2) = 80eb077b2a53997f13f036da7cd565696441482e
+SHA512 (uim-1.8.8.tar.bz2) = 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
+Size (uim-1.8.8.tar.bz2) = 6228743 bytes
+SHA1 (patch-configure.ac) = 741c0f4ee905218cebe0f0b86aeb1e1923a82b40
 SHA1 (patch-fep_escseq.c) = 6c25c344e5b694542a3c5bc137ae1a1d36a8c835
-SHA1 (patch-scm_Makefile.am) = c3af52e2d9d06736911c0efd9a25e0aee2c62219
-SHA1 (patch-sigscheme_configure) = 2af99374a3af542d25124737bf8cd3b67f191c03
-SHA1 (patch-sigscheme_configure.in) = 9c5c48a477ea03263488e15565e4a568ba55a125
-SHA1 (patch-sigscheme_doc_Makefile.am) = 998b9a0844853c7996f333155dfe38a183c266f4
+SHA1 (patch-fep_uim-fep.c) = 734bccf97a1f0a2ba709c0841a46fe9c9f448e92
+SHA1 (patch-scm_Makefile.am) = b4a23a7d507d8d7fe6122f3d2f50fed40589947f
+SHA1 (patch-sigscheme_configure.ac) = 221077809cfaa80cee2e52e3eaebf39b13ae5799
+SHA1 (patch-sigscheme_doc_Makefile.am) = e21e33d7eb078819ab34f9d7fdc10d7f4401a2c4
 SHA1 (patch-sigscheme_include_sigscheme_Makefile.am) = d54b38982c199b321c6ac0d8700bfe9c29084eee
-SHA1 (patch-uim_Makefile.am) = 6e3a37ee3ed2a68354b59e6dd7816017a95f15fd
-SHA1 (patch-uim_uim-module-manager.c) = 8c81edd3af3de7a2f7b7158d8c66e2082327b931
+SHA1 (patch-uim_Makefile.am) = e3a9e4dc99965c271fd6e783d42a6a136bf904b2
+SHA1 (patch-uim_uim-module-manager.c) = 345b09a209fc1ccc9ba96aa50a5adac1f2ef35ee

inputmethod/uim/modules.mk

@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.2 2015/11/25 12:50:58 jperkin Exp $
+# $NetBSD: modules.mk,v 1.3 2019/11/01 16:21:11 nia Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # UIM modules.  It takes care of update the corresponding databases
@@ -10,14 +10,14 @@
 .if !defined(UIM_MODULES_MK)
 UIM_MODULES_MK=	# defined
 
-.if (defined(UIM_MODULES) && !empty(UIM_MODULES)) || defined(_BUILDING_UIM)
+.if (defined(UIM_MODULES) && !empty(UIM_MODULES))
 
-.  if !defined(_BUILDING_UIM)
+.  if !empty(PKGPATH) && ${PKGPATH} != "inputmethod/uim"
 DEPENDS+=		uim-[0-9]*:../../inputmethod/uim
 .  endif
 
-UIM_MODULE_MANAGER=	${LOCALBASE}/bin/uim-module-manager
-UIM_MODULE_LIST_DIR=	${LOCALBASE}/share/uim/pkgsrc
+UIM_MODULE_MANAGER=	${PREFIX}/bin/uim-module-manager
+UIM_MODULE_LIST_DIR=	${PREFIX}/share/uim/pkgsrc
 
 FILES_SUBST+=		UIM_MODULE_MANAGER=${UIM_MODULE_MANAGER:Q}
 FILES_SUBST+=		UIM_MODULE_LIST_DIR=${UIM_MODULE_LIST_DIR:Q}
@@ -26,11 +26,11 @@ INSTALL_TEMPLATES+=	../../inputmethod/uim/files/modules.tmpl
 DEINSTALL_TEMPLATES+=	../../inputmethod/uim/files/modules.tmpl
 
 GENERATE_PLIST+=	for m in ${UIM_MODULES}; do \
-			echo ${UIM_MODULE_LIST_DIR:S,^${LOCALBASE}/,,}/$${m}; \
-			done
+			${ECHO} ${UIM_MODULE_LIST_DIR:S,^${PREFIX}/,,}/$${m}; \
+			done ;
 
 post-install: uim-add-module-names
-uim-add-module-names: .PHONY 
+uim-add-module-names: .PHONY
 	${INSTALL_DATA_DIR} ${DESTDIR}${UIM_MODULE_LIST_DIR}
 	${RUN}cd ${DESTDIR}${UIM_MODULE_LIST_DIR};		\
 		for m in ${UIM_MODULES}; do			\