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]

1 files changed, 43 insertions, 22 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index d1366037c1e..75729bdfde3 100644
--- a/inputmethod/uim/Makefile
+++ b/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"