CVS commit: pkgsrc/inputmethod/uim

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Mar 30 17:01:49 UTC 2021

Modified Files:
        pkgsrc/inputmethod/uim: Makefile Makefile.common PLIST distinfo
        pkgsrc/inputmethod/uim/patches: patch-sigscheme_configure.ac
Removed Files:
        pkgsrc/inputmethod/uim/patches: patch-configure.ac patch-fep_escseq.c
            patch-fep_uim-fep.c

Log Message:
uim: Update to 1.8.9pre20210104

* Enable uim-fep, input method for console.

Changelog:
* Many improvements.
* Support more modern compilers.
* Improve NetBSD support.
and so on.


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 pkgsrc/inputmethod/uim/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/uim/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/inputmethod/uim/PLIST
cvs rdiff -u -r1.32 -r1.33 pkgsrc/inputmethod/uim/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/inputmethod/uim/patches/patch-configure.ac \
    pkgsrc/inputmethod/uim/patches/patch-fep_escseq.c \
    pkgsrc/inputmethod/uim/patches/patch-fep_uim-fep.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac

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.165 pkgsrc/inputmethod/uim/Makefile:1.166
--- pkgsrc/inputmethod/uim/Makefile:1.165       Thu Nov  5 09:08:32 2020
+++ pkgsrc/inputmethod/uim/Makefile     Tue Mar 30 17:01:49 2021
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.165 2020/11/05 09:08:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.166 2021/03/30 17:01:49 ryoon Exp $
 
-PKGREVISION= 7
 .include "../../inputmethod/uim/Makefile.common"
 
 COMMENT=       Multilingual input method library
@@ -8,6 +7,8 @@ LICENSE=        modified-bsd
 
 CONFLICTS+=    uim-qt4-immodule-[0-9]*
 
+.include "../../graphics/librsvg/tool.mk"
+
 GNU_CONFIGURE= YES
 USE_LIBTOOL=   YES
 
@@ -32,10 +33,10 @@ UIM_MODULES=        anthy-utf8 skk tutcode byeo
 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+=       --enable-maintainer-mode # for source code from Git
 CONFIGURE_ARGS+=       --with-libgcroots=installed
 CONFIGURE_ARGS+=       --with-anthy-utf8
 CONFIGURE_ARGS+=       --with-sqlite3
@@ -68,11 +69,11 @@ post-install:
 
 .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"
+SUBST_CLASSES+=                ruby
+SUBST_STAGE.ruby=      pre-configure
+SUBST_MESSAGE.ruby=    Find ruby command
+SUBST_FILES.ruby+=     sigscheme/configure.ac
+SUBST_VARS.ruby+=      RUBY_NAME
 
 .include "modules.mk"
 .include "../../converters/libiconv/buildlink3.mk"
@@ -82,4 +83,6 @@ SUBST_SED.gtk+=               -e "s,uim-pref-gtk,${UI
 BUILDLINK_API_DEPENDS.libgcroots+=     libgcroots>=0.2.3
 .include "../../devel/libgcroots/buildlink3.mk"
 .include "../../inputmethod/anthy/buildlink3.mk"
+.include "../../lang/ruby/rubyversion.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/uim/Makefile.common
diff -u pkgsrc/inputmethod/uim/Makefile.common:1.16 pkgsrc/inputmethod/uim/Makefile.common:1.17
--- pkgsrc/inputmethod/uim/Makefile.common:1.16 Thu Nov  7 03:01:35 2019
+++ pkgsrc/inputmethod/uim/Makefile.common      Tue Mar 30 17:01:49 2021
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile.common,v 1.16 2019/11/07 03:01:35 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.17 2021/03/30 17:01:49 ryoon Exp $
 #
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-DISTNAME=      uim-1.8.8
+DISTNAME=      uim-1.8.9pre20210104
 CATEGORIES=    inputmethod
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=uim/}
-GITHUB_RELEASE=        ${DISTNAME:S/^uim-//1}
-EXTRACT_SUFX=  .tar.bz2
+GITHUB_TAG=    d1ac9d9315ff8c57c713b502544fef9b3a83b3e5
 
 MAINTAINER=    VEG03617%nifty.com@localhost
 HOMEPAGE=      https://github.com/uim/uim/wiki
 
+GITHUB_SUBMODULES+=    uim sigscheme beb8fbdc69b523d14fc202a4d17375555a74c772 sigscheme
+GITHUB_SUBMODULES+=    uim libgcroots d362356cc4c5f591695d2fbda7746918250c9e99 sigscheme/libgcroots
+
 DISTINFO_FILE= ${.CURDIR}/../../inputmethod/uim/distinfo
 PATCHDIR=      ${.CURDIR}/../../inputmethod/uim/patches
 

Index: pkgsrc/inputmethod/uim/PLIST
diff -u pkgsrc/inputmethod/uim/PLIST:1.27 pkgsrc/inputmethod/uim/PLIST:1.28
--- pkgsrc/inputmethod/uim/PLIST:1.27   Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/PLIST        Tue Mar 30 17:01:49 2021
@@ -1,7 +1,19 @@
-@comment $NetBSD: PLIST,v 1.27 2019/11/01 16:21:11 nia Exp $
+@comment $NetBSD: PLIST,v 1.28 2021/03/30 17:01:49 ryoon Exp $
+bin/uim-fep
+bin/uim-fep-tick
 bin/uim-help
+bin/uim-im-switcher-gtk
+bin/uim-im-switcher-gtk3
+bin/uim-input-pad-ja
+bin/uim-input-pad-ja-gtk3
 bin/uim-module-manager
+bin/uim-pref-gtk
+bin/uim-pref-gtk3
 bin/uim-sh
+bin/uim-toolbar-gtk
+bin/uim-toolbar-gtk-systray
+bin/uim-toolbar-gtk3
+bin/uim-toolbar-gtk3-systray
 bin/uim-xim
 include/uim/dynlib.h
 include/uim/uim-custom.h
@@ -14,6 +26,8 @@ include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
 include/uim/version.h
+lib/gtk-2.0/2.10.0/immodules/im-uim.la
+lib/gtk-3.0/3.0.0/immodules/im-uim.la
 lib/libuim-custom.la
 lib/libuim-scm.la
 lib/libuim.la
@@ -21,6 +35,7 @@ lib/pkgconfig/uim.pc
 lib/uim/plugin/libuim-anthy-utf8.la
 lib/uim/plugin/libuim-anthy.la
 lib/uim/plugin/libuim-custom-enabler.la
+lib/uim/plugin/libuim-editline.la
 lib/uim/plugin/libuim-fileio.la
 lib/uim/plugin/libuim-lolevel.la
 lib/uim/plugin/libuim-look.la
@@ -29,8 +44,15 @@ lib/uim/plugin/libuim-skk.la
 lib/uim/plugin/libuim-socket.la
 lib/uim/plugin/libuim-sqlite3.la
 lib/uim/plugin/libuim-xkb.la
+libexec/uim-candwin-gtk
+libexec/uim-candwin-gtk3
+libexec/uim-candwin-horizontal-gtk
+libexec/uim-candwin-horizontal-gtk3
+libexec/uim-candwin-tbl-gtk
+libexec/uim-candwin-tbl-gtk3
 libexec/uim-helper-server
 man/man1/uim-xim.1
+qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.${RUBY_DLEXT}
 share/applications/uim.desktop
 share/doc/uim/COMPATIBILITY
 share/doc/uim/CUSTOM
@@ -308,6 +330,22 @@ share/uim/pixmaps/zm.png
 share/uim/pixmaps/zm.svg
 share/uim/pixmaps/zm_dark_background.png
 share/uim/pixmaps/zm_dark_background.svg
+share/uim/pkgsrc/ajax-ime
+share/uim/pkgsrc/anthy-utf8
+share/uim/pkgsrc/baidu-olime-jp
+share/uim/pkgsrc/byeoru
+share/uim/pkgsrc/elatin
+share/uim/pkgsrc/google-cgiapi-jp
+share/uim/pkgsrc/ipa-x-sampa
+share/uim/pkgsrc/latin
+share/uim/pkgsrc/look
+share/uim/pkgsrc/py
+share/uim/pkgsrc/pyload
+share/uim/pkgsrc/pyunihan
+share/uim/pkgsrc/skk
+share/uim/pkgsrc/tutcode
+share/uim/pkgsrc/viqr
+share/uim/pkgsrc/xmload
 share/uim/plugin.scm
 share/uim/predict-custom.scm
 share/uim/predict-google-suggest.scm

Index: pkgsrc/inputmethod/uim/distinfo
diff -u pkgsrc/inputmethod/uim/distinfo:1.32 pkgsrc/inputmethod/uim/distinfo:1.33
--- pkgsrc/inputmethod/uim/distinfo:1.32        Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/distinfo     Tue Mar 30 17:01:49 2021
@@ -1,14 +1,19 @@
-$NetBSD: distinfo,v 1.32 2019/11/01 16:21:11 nia Exp $
+$NetBSD: distinfo,v 1.33 2021/03/30 17:01:49 ryoon Exp $
 
-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-fep_uim-fep.c) = 734bccf97a1f0a2ba709c0841a46fe9c9f448e92
+SHA1 (uim-1.8.9pre20210104-d1ac9d9315ff8c57c713b502544fef9b3a83b3e5.tar.gz) = 9b211ed03fb0d02c501f5203e1dfb11abab0effa
+RMD160 (uim-1.8.9pre20210104-d1ac9d9315ff8c57c713b502544fef9b3a83b3e5.tar.gz) = 444d6d120b7cff6dd5f5c8c540f0441964511080
+SHA512 (uim-1.8.9pre20210104-d1ac9d9315ff8c57c713b502544fef9b3a83b3e5.tar.gz) = 
39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
+Size (uim-1.8.9pre20210104-d1ac9d9315ff8c57c713b502544fef9b3a83b3e5.tar.gz) = 4054622 bytes
+SHA1 (uim-libgcroots-d362356cc4c5f591695d2fbda7746918250c9e99.tar.gz) = f08e37c3df01e6db69f024b97ad9943ebf44646b
+RMD160 (uim-libgcroots-d362356cc4c5f591695d2fbda7746918250c9e99.tar.gz) = e7eb58e4fa56dea6eef0bda31ed3efd3ed26c364
+SHA512 (uim-libgcroots-d362356cc4c5f591695d2fbda7746918250c9e99.tar.gz) = 
b47e94b2aae208fe568a75d2f2d75043939b3c865ec90f9f1219c77ecd9c8649572eb609745886c1a018a1c6c6bdc3c235a8247e7240b2713f2320c57051b6c6
+Size (uim-libgcroots-d362356cc4c5f591695d2fbda7746918250c9e99.tar.gz) = 88827 bytes
+SHA1 (uim-sigscheme-beb8fbdc69b523d14fc202a4d17375555a74c772.tar.gz) = 3623bb2a7974129472e57558a1a44530c595f024
+RMD160 (uim-sigscheme-beb8fbdc69b523d14fc202a4d17375555a74c772.tar.gz) = 3b87b167a3bb741417cd74c9f3bd487d90cdd7b8
+SHA512 (uim-sigscheme-beb8fbdc69b523d14fc202a4d17375555a74c772.tar.gz) = 
3151d849c6a56f8438a8676b646dabe5abac317b77e834c6ab29b0282e83d21e4e72171f1353f15b19a5d7b51b5ab4f287cf01b9a11e4785d18e4fa0cce2966c
+Size (uim-sigscheme-beb8fbdc69b523d14fc202a4d17375555a74c772.tar.gz) = 571469 bytes
 SHA1 (patch-scm_Makefile.am) = b4a23a7d507d8d7fe6122f3d2f50fed40589947f
-SHA1 (patch-sigscheme_configure.ac) = 221077809cfaa80cee2e52e3eaebf39b13ae5799
+SHA1 (patch-sigscheme_configure.ac) = 2e8a7c863be864c2132577a556788c78c8ca57cb
 SHA1 (patch-sigscheme_doc_Makefile.am) = e21e33d7eb078819ab34f9d7fdc10d7f4401a2c4
 SHA1 (patch-sigscheme_include_sigscheme_Makefile.am) = d54b38982c199b321c6ac0d8700bfe9c29084eee
 SHA1 (patch-uim_Makefile.am) = e3a9e4dc99965c271fd6e783d42a6a136bf904b2

Index: pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac
diff -u pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac:1.1 pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac:1.2
--- pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac:1.1     Fri Nov  1 16:21:11 2019
+++ pkgsrc/inputmethod/uim/patches/patch-sigscheme_configure.ac Tue Mar 30 17:01:49 2021
@@ -1,9 +1,19 @@
-$NetBSD: patch-sigscheme_configure.ac,v 1.1 2019/11/01 16:21:11 nia Exp $
+$NetBSD: patch-sigscheme_configure.ac,v 1.2 2021/03/30 17:01:49 ryoon Exp $
 
-Correct _XOPEN_SOURCE
+Find ruby command for pkgsrc.
+Correct _XOPEN_SOURCE.
 
---- sigscheme/configure.ac.orig        2018-05-10 01:48:39.000000000 +0000
+--- sigscheme/configure.ac.orig        2020-08-24 21:28:26.000000000 +0000
 +++ sigscheme/configure.ac
+@@ -26,7 +26,7 @@ AC_PROG_EGREP
+ AC_PROG_SED
+ 
+ # These programs are only needed on make dist
+-AC_PATH_PROGS(RUBY, ruby18 ruby)
++AC_PATH_PROGS(RUBY, ruby18 ruby @RUBY_NAME@)
+ AC_PATH_PROGS(PERL, perl5 perl)
+ AC_PATH_PROG(ASCIIDOC, asciidoc)
+ AC_PATH_PROG(SH, sh)
 @@ -227,7 +227,7 @@ AC_CHECK_FUNCS(memalign)
  AC_CHECK_FUNCS(strdup,
    [