CVS commit: pkgsrc/inputmethod/uim

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/inputmethod/uim
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Fri, 1 Nov 2019 16:21:11 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov  1 16:21:11 UTC 2019

Modified Files:
        pkgsrc/inputmethod/uim: Makefile Makefile.common PLIST distinfo
            modules.mk options.mk
        pkgsrc/inputmethod/uim/patches: patch-scm_Makefile.am
            patch-sigscheme_doc_Makefile.am patch-uim_Makefile.am
            patch-uim_uim-module-manager.c
Added Files:
        pkgsrc/inputmethod/uim: DEINSTALL INSTALL PLIST.gtk2 PLIST.gtk3
            PLIST.qt5
        pkgsrc/inputmethod/uim/patches: patch-configure.ac patch-fep_uim-fep.c
            patch-sigscheme_configure.ac
Removed Files:
        pkgsrc/inputmethod/uim: DEINSTALL.m17nlib INSTALL.m17nlib
        pkgsrc/inputmethod/uim/patches: patch-af patch-sigscheme_configure.in

Log Message:
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]


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 pkgsrc/inputmethod/uim/DEINSTALL \
    pkgsrc/inputmethod/uim/INSTALL pkgsrc/inputmethod/uim/PLIST.gtk2
cvs rdiff -u -r1.1 -r0 pkgsrc/inputmethod/uim/DEINSTALL.m17nlib \
    pkgsrc/inputmethod/uim/INSTALL.m17nlib
cvs rdiff -u -r1.153 -r1.154 pkgsrc/inputmethod/uim/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/inputmethod/uim/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/inputmethod/uim/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/inputmethod/uim/PLIST.gtk3 \
    pkgsrc/inputmethod/uim/PLIST.qt5
cvs rdiff -u -r1.31 -r1.32 pkgsrc/inputmethod/uim/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/uim/modules.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/inputmethod/uim/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/inputmethod/uim/patches/patch-af
cvs rdiff -u -r0 -r1.1 pkgsrc/inputmethod/uim/patches/patch-configure.ac \
    pkgsrc/inputmethod/uim/patches/patch-fep_uim-fep.c \
    pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac
cvs rdiff -u -r1.1 -r1.2 pkgsrc/inputmethod/uim/patches/patch-scm_Makefile.am \
    pkgsrc/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am \
    pkgsrc/inputmethod/uim/patches/patch-uim_uim-module-manager.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/uim/Makefile
diff -u pkgsrc/inputmethod/uim/Makefile:1.153 pkgsrc/inputmethod/uim/Makefile:1.154
--- pkgsrc/inputmethod/uim/Makefile:1.153       Sun Oct 27 17:31:35 2019
+++ pkgsrc/inputmethod/uim/Makefile     Fri Nov  1 16:21:11 2019
@@ -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
-
-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}
+COMMENT=       Multilingual input method library
+LICENSE=       modified-bsd
+
+CONFLICTS+=    uim-qt4-immodule-[0-9]*
+
+GNU_CONFIGURE= YES
+USE_LIBTOOL=   YES
 
-BUILDLINK_TRANSFORM+=  rm:-O2
+USE_TOOLS+=    gmake pkg-config
+USE_TOOLS+=    intltool msgfmt msgmerge xgettext
+USE_LANGUAGES= c99 c++03
+
+# 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"

Index: pkgsrc/inputmethod/uim/Makefile.common
diff -u pkgsrc/inputmethod/uim/Makefile.common:1.13 pkgsrc/inputmethod/uim/Makefile.common:1.14
--- pkgsrc/inputmethod/uim/Makefile.common:1.13 Sat Dec 26 02:13:46 2015
+++ pkgsrc/inputmethod/uim/Makefile.common      Fri Nov  1 16:21:11 2019
@@ -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@localhost
-HOMEPAGE=              https://github.com/uim/uim/wiki
+MAINTAINER=    VEG03617%nifty.com@localhost
+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

Index: pkgsrc/inputmethod/uim/PLIST
diff -u pkgsrc/inputmethod/uim/PLIST:1.26 pkgsrc/inputmethod/uim/PLIST:1.27
--- pkgsrc/inputmethod/uim/PLIST:1.26   Sun Oct 27 17:31:35 2019
+++ pkgsrc/inputmethod/uim/PLIST        Fri Nov  1 16:21:11 2019
@@ -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

Index: pkgsrc/inputmethod/uim/distinfo
diff -u pkgsrc/inputmethod/uim/distinfo:1.31 pkgsrc/inputmethod/uim/distinfo:1.32
--- pkgsrc/inputmethod/uim/distinfo:1.31        Tue Nov  3 22:13:41 2015
+++ pkgsrc/inputmethod/uim/distinfo     Fri Nov  1 16:21:11 2019
@@ -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

Index: pkgsrc/inputmethod/uim/modules.mk
diff -u pkgsrc/inputmethod/uim/modules.mk:1.2 pkgsrc/inputmethod/uim/modules.mk:1.3
--- pkgsrc/inputmethod/uim/modules.mk:1.2       Wed Nov 25 12:50:58 2015
+++ pkgsrc/inputmethod/uim/modules.mk   Fri Nov  1 16:21:11 2019
@@ -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/ui
 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                     \

Index: pkgsrc/inputmethod/uim/options.mk
diff -u pkgsrc/inputmethod/uim/options.mk:1.35 pkgsrc/inputmethod/uim/options.mk:1.36
--- pkgsrc/inputmethod/uim/options.mk:1.35      Sun Oct 27 17:31:35 2019
+++ pkgsrc/inputmethod/uim/options.mk   Fri Nov  1 16:21:11 2019
@@ -1,206 +1,55 @@
-# $NetBSD: options.mk,v 1.35 2019/10/27 17:31:35 kamil Exp $
+# $NetBSD: options.mk,v 1.36 2019/11/01 16:21:11 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.uim
-PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn4 xim
-PKG_SUPPORTED_OPTIONS+=        editline
-PKG_SUGGESTED_OPTIONS= anthy expat gtk gtk3 prime uim-fep xim
-
-# Store installed modules
-UIM_MODULES=           skk tutcode byeoru latin elatin xmload pyload \
-                       viqr ipa-x-sampa look ajax-ime social-ime \
-                       google-cgiapi-jp baidu-olime-jp
-
-CHECK_BUILTIN.editline:=       yes
-.include "../../devel/editline/builtin.mk"
-CHECK_BUILTIN.editline:=       no
-.if !empty(USE_BUILTIN.editline:M[Yy][Ee][Ss])
-PKG_SUGGESTED_OPTIONS+=        editline
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=           helperdata uim-dict-gtk uim-dict-gtk3 uim-dict-helperdata fep
-PLIST_VARS+=           anthy curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl qt sqlite wnn xim
-PLIST_VARS+=           canna prime sj3
-PLIST_VARS+=           editline
-
-.if !empty(PKG_OPTIONS:Meditline)
-PLIST.editline=                yes
-.include "../../devel/editline/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-libedit=${BUILDLINK_PREFIX.editline}
-.else
-CONFIGURE_ARGS+=       --with-libedit=no
-.endif
+PKG_SUPPORTED_OPTIONS= gtk2 gtk3 qt5 xim
+PKG_SUGGESTED_OPTIONS= gtk2 gtk3 qt5 xim
 
+PKG_OPTIONS_LEGACY_OPTS+=      gtk:gtk2
 
-.if !empty(PKG_OPTIONS:Mxim)
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-x
-PLIST.xim=             yes
-.else
-SUBST_CLASSES+=                xim
-SUBST_STAGE.xim=       pre-configure
-SUBST_FILES.xim=       configure
-SUBST_SED.xim=         -e 's;use_xim="yes";use_xim="no";g'
-.endif
-
-.if !empty(PKG_OPTIONS:Muim-fep)
-USE_NCURSES=           YES     # setupterm, clear_screen, clr_eos
-.include "../../devel/ncurses/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-fep
-PLIST.fep=             yes
-INSTALLATION_DIRS+=    share/doc/uim/uim-fep
-
-post-install: install-fep-doc
-
-.PHONY: install-fep-doc
-install-fep-doc:
-       ${INSTALL_DATA} ${WRKSRC}/fep/README ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep
-       ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep
-.else
-CONFIGURE_ARGS+=       --disable-fep
-.endif
-
-.if !empty(PKG_OPTIONS:Manthy)
-.  include "../../inputmethod/anthy/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-anthy-utf8
-PLIST.anthy=           yes
-UIM_MODULES+=          anthy anthy-utf8
-.else
-CONFIGURE_ARGS+=       --without-anthy
-.endif
-
-.if !empty(PKG_OPTIONS:Mcanna)
-CONFIGURE_ARGS+=       --with-canna
-UIM_MODULES+=          canna
-.endif
-
-.if !empty(PKG_OPTIONS:Mcurl)
-.  include "../../www/curl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-curl
-PLIST.curl=            yes
-.endif
-
-.if !empty(PKG_OPTIONS:Meb)
-.include "../../textproc/eb/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-eb
-CONFIGURE_ARGS+=       --with-eb-conf=${PKG_SYSCONFBASE}/eb.conf
-PLIST.eb=              yes
-.endif
-
-# For uim-yahoo-jp
-.if !empty(PKG_OPTIONS:Mexpat)
-.  include "../../textproc/expat/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-expat=${BUILDLINK_PREFIX.expat}
-PLIST.expat=           yes
-UIM_MODULES+=          yahoo-jp
-.endif
-
-.if !empty(PKG_OPTIONS:Mffi)
-.  include "../../devel/libffi/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-ffi
-PLIST.ffi=             yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnome)
-.  include "../../x11/gnome-panel/buildlink3.mk"
-.  include "../../devel/libgnomeui/buildlink3.mk"
-PLIST.gnome=           yes
-.else
-CONFIGURE_ARGS+=       --disable-gnome-applet
-.endif
+.include "../../mk/bsd.options.mk"
 
-# No gnome3 packages
-#.if !empty(PKG_OPTIONS:Mgnome3)
-#.  include "../../x11/gnome-panel/buildlink3.mk"
-#.  include "../../devel/libgnomeui/buildlink3.mk"
-#CONFIGURE_ARGS+=      --enable-gnome3-applet
-#PLIST.gnome3=         yes
-#.endif
+PLIST_SRC+=            PLIST
 
-.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
+.if !empty(PKG_OPTIONS:Mgtk2)
+PLIST_SRC+=            PLIST.gtk2
 GTK2_IMMODULES=                YES
 .include "../../x11/gtk2/modules.mk"
-PLIST.gtk=             yes
-.  if !empty(PKG_OPTIONS:Manthy) || !empty(PKG_OPTIONS:Mcanna)
-.    if !empty(PKG_OPTIONS:Mcanna)
-.      include "../../inputmethod/canna-lib/buildlink3.mk"
-.    endif
-CONFIGURE_ARGS+=       --enable-dict
-PLIST.uim-dict-gtk=    yes
-PLIST.uim-dict-helperdata=     yes
-.  endif
 .else
 CONFIGURE_ARGS+=       --without-gtk2
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3)
+.if !empty(PKG_OPTIONS:Mgtk3)
+PLIST_SRC+=            PLIST.gtk3
 GTK3_IMMODULES=                YES
 .include "../../x11/gtk3/modules.mk"
-PLIST.gtk3=            yes
-.  if !empty(PKG_OPTIONS:Manthy) || !empty(PKG_OPTIONS:Mcanna)
-.    if !empty(PKG_OPTIONS:Mcanna)
-.      include "../../inputmethod/canna-lib/buildlink3.mk"
-.    endif
-CONFIGURE_ARGS+=       --enable-dict
-PLIST.uim-dict-gtk3=   yes
-PLIST.uim-dict-helperdata=     yes
-.  endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mm17nlib)
-.  include "../../devel/m17n-lib/buildlink3.mk"
-DEPENDS+=              {m17n-db>=1.6.5,m17n-contrib-[0-9]*}:../../misc/m17n-db
-PLIST.m17nlib=         yes
-INSTALL_TEMPLATES+=    INSTALL.m17nlib
-DEINSTALL_TEMPLATES+=  DEINSTALL.m17nlib
-CHECK_FILES_SKIP+=     ${PREFIX}/share/uim/pixmaps/m17n-.*\.png
-UIM_MODULES+=          m17nlib
 .else
-CONFIGURE_ARGS+=       --without-m17nlib
+CONFIGURE_ARGS+=       --without-gtk3
 .endif
 
-.if !empty(PKG_OPTIONS:Mopenssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-openssl
-# XXX: https://bugs.freedesktop.org/show_bug.cgi?id=30249
-#CONFIGURE_ARGS+=      --with-openssl-dir=${SSLBASE:Q}
-PLIST.openssl=         yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mprime)
-CONFIGURE_ARGS+=       --with-prime
-PLIST.prime=           yes
-UIM_MODULES+=          prime
-.endif
-
-.if !empty(PKG_OPTIONS:Msj3)
-CONFIGURE_ARGS+=       --with-sj3
-PLIST.sj3=             yes
-UIM_MODULES+=          sj3
-.endif
-
-# For input prediction
-.if !empty(PKG_OPTIONS:Msqlite)
-.  include "../../databases/sqlite3/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-sqlite3
-PLIST.sqlite=          yes
+.if !empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+=       --enable-default-toolkit=gtk3
+UIM_PREF_PROGRAM=      uim-pref-gtk3
+.else
+CONFIGURE_ARGS+=       --enable-default-toolkit=gtk
+UIM_PREF_PROGRAM=      uim-pref-gtk
 .endif
 
-.if !empty(PKG_OPTIONS:Mwnn4)
-.  include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-wnn
-CONFIGURE_ARGS+=       --with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn
-CONFIGURE_ARGS+=       --with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
-CPPFLAGS+=             -DWNNENVDIR=\"${BUILDLINK_PREFIX.ja-FreeWnn-lib}/share/wnn\"
-PLIST.wnn=             yes
-UIM_MODULES+=          wnn
+.if !empty(PKG_OPTIONS:Mqt5)
+PLIST_SRC+=            PLIST.qt5
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-qt5-immodule
+.else
+CONFIGURE_ARGS+=       --without-gtk3
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
-CONFIGURE_ARGS+=       --enable-default-toolkit=gtk
-.elif !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3)
-CONFIGURE_ARGS+=       --enable-default-toolkit=gtk3
+.if !empty(PKG_OPTIONS:Mxim)
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-x
+.else
+SUBST_CLASSES+=                xim
+SUBST_STAGE.xim=       pre-configure
+SUBST_FILES.xim=       configure
+SUBST_SED.xim=         -e 's;use_xim="yes";use_xim="no";g'
 .endif

Index: pkgsrc/inputmethod/uim/patches/patch-scm_Makefile.am
diff -u pkgsrc/inputmethod/uim/patches/patch-scm_Makefile.am:1.1 pkgsrc/inputmethod/uim/patches/patch-scm_Makefile.am:1.2
--- pkgsrc/inputmethod/uim/patches/patch-scm_Makefile.am:1.1    Sun Apr 20 06:40:00 2014
+++ pkgsrc/inputmethod/uim/patches/patch-scm_Makefile.am        Fri Nov  1 16:21:11 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-scm_Makefile.am,v 1.1 2014/04/20 06:40:00 ryoon Exp $
+$NetBSD: patch-scm_Makefile.am,v 1.2 2019/11/01 16:21:11 nia Exp $
 
 https://github.com/uim/uim/pull/41
 
---- scm/Makefile.am.orig       2013-06-30 04:26:20.000000000 +0000
+--- scm/Makefile.am.orig       2018-01-06 06:55:20.000000000 +0000
 +++ scm/Makefile.am
 @@ -1,8 +1,9 @@
  scmdir = $(pkgdatadir)
Index: pkgsrc/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am
diff -u pkgsrc/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am:1.1 pkgsrc/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am:1.2
--- pkgsrc/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am:1.1  Sun Apr 20 06:40:00 2014
+++ pkgsrc/inputmethod/uim/patches/patch-sigscheme_doc_Makefile.am      Fri Nov  1 16:21:11 2019
@@ -1,21 +1,19 @@
-$NetBSD: patch-sigscheme_doc_Makefile.am,v 1.1 2014/04/20 06:40:00 ryoon Exp $
+$NetBSD: patch-sigscheme_doc_Makefile.am,v 1.2 2019/11/01 16:21:11 nia Exp $
 
 Avoid to install of document files of sigscheme, conflict with lang/sigscheme.
 
---- sigscheme/doc/Makefile.am.orig     2013-06-30 04:26:48.000000000 +0000
+--- sigscheme/doc/Makefile.am.orig     2015-05-30 13:08:55.000000000 +0000
 +++ sigscheme/doc/Makefile.am
-@@ -11,10 +11,10 @@ ASCIIDOC_HTMLS = \
+@@ -10,12 +10,6 @@ ASCIIDOC_HTMLS = \
+ 
  EXTRA_DIST =
  
- # Suppress installing documents on combined-source configuration
+-# Suppress installing documents on combined-source configuration
 -if USE_LIBSSCM
 -dist_doc_DATA  = $(TXTS)
 -dist_html_DATA = $(ASCIIDOC_HTMLS)
 -endif
-+#if USE_LIBSSCM
-+#dist_doc_DATA  = $(TXTS)
-+#dist_html_DATA = $(ASCIIDOC_HTMLS)
-+#endif
- 
+-
  MAINTAINERCLEANFILES = $(ASCIIDOC_HTMLS)
  
+ .PHONY: clean-html
Index: pkgsrc/inputmethod/uim/patches/patch-uim_uim-module-manager.c
diff -u pkgsrc/inputmethod/uim/patches/patch-uim_uim-module-manager.c:1.1 pkgsrc/inputmethod/uim/patches/patch-uim_uim-module-manager.c:1.2
--- pkgsrc/inputmethod/uim/patches/patch-uim_uim-module-manager.c:1.1   Sun Apr 20 06:40:00 2014
+++ pkgsrc/inputmethod/uim/patches/patch-uim_uim-module-manager.c       Fri Nov  1 16:21:11 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-uim_uim-module-manager.c,v 1.1 2014/04/20 06:40:00 ryoon Exp $
+$NetBSD: patch-uim_uim-module-manager.c,v 1.2 2019/11/01 16:21:11 nia Exp $
 
 https://github.com/uim/uim/pull/41
 
---- uim/uim-module-manager.c.orig      2013-06-30 04:26:09.000000000 +0000
+--- uim/uim-module-manager.c.orig      2017-08-14 00:07:27.000000000 +0000
 +++ uim/uim-module-manager.c
 @@ -47,8 +47,8 @@
  #include "uim-internal.h"

Index: pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am
diff -u pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am:1.2 pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am:1.3
--- pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am:1.2    Sat May 31 22:41:32 2014
+++ pkgsrc/inputmethod/uim/patches/patch-uim_Makefile.am        Fri Nov  1 16:21:11 2019
@@ -1,19 +1,20 @@
-$NetBSD: patch-uim_Makefile.am,v 1.2 2014/05/31 22:41:32 ryoon Exp $
+$NetBSD: patch-uim_Makefile.am,v 1.3 2019/11/01 16:21:11 nia Exp $
 
 https://github.com/uim/uim/pull/41
 
---- uim/Makefile.am.orig       2013-06-30 04:26:20.000000000 +0000
+--- uim/Makefile.am.orig       2018-05-11 21:26:06.000000000 +0000
 +++ uim/Makefile.am
-@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign
+@@ -8,7 +8,8 @@ AUTOMAKE_OPTIONS = foreign
  
  EXTRA_DIST = encoding-table.c test-gc.c version.h.in
  
 -uim_defs = -DSCM_FILES=\"$(datadir)/uim\"
 +uim_defs = -DSCM_FILES=\"$(sysconfdir)/uim:$(datadir)/uim\"
++
  # FIXME: $(UIM_SCM_CFLAGS) should only affect on uim-scm.c
  CFLAGS = @CFLAGS@ $(UIM_SCM_CFLAGS)
- # FIXME: $(SCIM_CFLAGS) should only affect on scim.cpp
-@@ -320,7 +320,7 @@ if LIBEDIT
+ CXXFLAGS = @CXXFLAGS@
+@@ -321,7 +322,7 @@ if LIBEDIT
  endif
  
  uim_module_manager_LIBS =

Added files:

Index: pkgsrc/inputmethod/uim/DEINSTALL
diff -u /dev/null pkgsrc/inputmethod/uim/DEINSTALL:1.3
--- /dev/null   Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/DEINSTALL    Fri Nov  1 16:21:11 2019
@@ -0,0 +1,8 @@
+# $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
+               ${TEST} ! -h ${icon} || ${RM} -f ${icon}
+       done
+       ;;
+esac
Index: pkgsrc/inputmethod/uim/INSTALL
diff -u /dev/null pkgsrc/inputmethod/uim/INSTALL:1.3
--- /dev/null   Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/INSTALL      Fri Nov  1 16:21:11 2019
@@ -0,0 +1,8 @@
+# $NetBSD: INSTALL,v 1.3 2019/11/01 16:21:11 nia Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+       ${TEST} ! -x ${PREFIX}/bin/uim-m17nlib-relink-icons ||
+               ${PREFIX}/bin/uim-m17nlib-relink-icons
+       ;;
+esac
Index: pkgsrc/inputmethod/uim/PLIST.gtk2
diff -u /dev/null pkgsrc/inputmethod/uim/PLIST.gtk2:1.3
--- /dev/null   Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/PLIST.gtk2   Fri Nov  1 16:21:11 2019
@@ -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

Index: pkgsrc/inputmethod/uim/PLIST.gtk3
diff -u /dev/null pkgsrc/inputmethod/uim/PLIST.gtk3:1.1
--- /dev/null   Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/PLIST.gtk3   Fri Nov  1 16:21:11 2019
@@ -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
Index: pkgsrc/inputmethod/uim/PLIST.qt5
diff -u /dev/null pkgsrc/inputmethod/uim/PLIST.qt5:1.1
--- /dev/null   Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/PLIST.qt5    Fri Nov  1 16:21:11 2019
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.qt5,v 1.1 2019/11/01 16:21:11 nia Exp $
+qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.so

Index: pkgsrc/inputmethod/uim/patches/patch-configure.ac
diff -u /dev/null pkgsrc/inputmethod/uim/patches/patch-configure.ac:1.1
--- /dev/null   Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/patches/patch-configure.ac   Fri Nov  1 16:21:11 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2019/11/01 16:21:11 nia Exp $
+
+Shell portability.
+
+--- configure.ac.orig  2018-05-11 21:26:13.000000000 +0000
++++ configure.ac
+@@ -864,7 +864,7 @@ AM_CONDITIONAL(GNOME3_APPLET, test "x$en
+ 
+ if test "x$enable_gnome3_applet" = xyes; then
+   AC_ARG_WITH([libpanel-applet-dir], [], [LIBPANEL_APPLET_DIR=$withval], [LIBPANEL_APPLET_DIR=""])
+-  if test "$LIBPANEL_APPLET_DIR" == ""; then
++  if test "$LIBPANEL_APPLET_DIR" = ""; then
+     LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet`
+   fi
+   AC_SUBST(LIBPANEL_APPLET_DIR)
Index: pkgsrc/inputmethod/uim/patches/patch-fep_uim-fep.c
diff -u /dev/null pkgsrc/inputmethod/uim/patches/patch-fep_uim-fep.c:1.1
--- /dev/null   Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/patches/patch-fep_uim-fep.c  Fri Nov  1 16:21:11 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-fep_uim-fep.c,v 1.1 2019/11/01 16:21:11 nia Exp $
+
+Include missing header for tcgetattr
+
+--- fep/uim-fep.c.orig 2017-08-14 00:07:26.000000000 +0000
++++ fep/uim-fep.c
+@@ -109,6 +109,8 @@
+ #include <libutil.h>
+ #endif
+ 
++#include <termios.h>
++
+ #include <uim/uim.h>
+ 
+ #include "udsock.h"
Index: pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac
diff -u /dev/null pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac:1.1
--- /dev/null   Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac Fri Nov  1 16:21:11 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-sigscheme_configure.ac,v 1.1 2019/11/01 16:21:11 nia Exp $
+
+Correct _XOPEN_SOURCE
+
+--- sigscheme/configure.ac.orig        2018-05-10 01:48:39.000000000 +0000
++++ sigscheme/configure.ac
+@@ -227,7 +227,7 @@ AC_CHECK_FUNCS(memalign)
+ AC_CHECK_FUNCS(strdup,
+   [
+     # Overrides _POSIX_C_SOURCE
+-    AC_DEFINE(_XOPEN_SOURCE, 500)
++    AC_DEFINE(_XOPEN_SOURCE, 600)
+   ])
+ AH_VERBATIM(_XOPEN_SOURCE,
+ [/* Define to 500 to enable strdup(3). */

Prev by Date: CVS commit: pkgsrc/www/c-icap-modules
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/www/c-icap-modules
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index