diff options
author | ryoon <ryoon@pkgsrc.org> | 2021-04-03 05:13:07 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2021-04-03 05:13:07 +0000 |
commit | b3a4b88f4f0a157132300193599c63c63356938d (patch) | |
tree | 73228a155c4765dea34fd3acee17d524c70f1fde | |
parent | 6c35e8deea052cd6752aee1937e0487e64d0e485 (diff) | |
download | pkgsrc-b3a4b88f4f0a157132300193599c63c63356938d.tar.gz |
uim: Depend on ruby explicitly to fix build
And use build linked ruby command.
Reported by isaki@. Thank you.
-rw-r--r-- | inputmethod/uim/Makefile | 10 | ||||
-rw-r--r-- | inputmethod/uim/distinfo | 4 | ||||
-rw-r--r-- | inputmethod/uim/patches/patch-sigscheme_configure.ac | 12 |
3 files changed, 6 insertions, 20 deletions
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index 77d5afb3996..cb82199ba26 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.166 2021/03/30 17:01:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.167 2021/04/03 05:13:07 ryoon Exp $ .include "../../inputmethod/uim/Makefile.common" @@ -69,12 +69,6 @@ post-install: .include "options.mk" -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" .include "../../databases/sqlite3/buildlink3.mk" @@ -84,5 +78,7 @@ BUILDLINK_API_DEPENDS.libgcroots+= libgcroots>=0.2.3 .include "../../devel/libgcroots/buildlink3.mk" .include "../../inputmethod/anthy/buildlink3.mk" .include "../../lang/ruby/rubyversion.mk" +BUILDLINK_DEPMETHOD.${RUBY_BASE}= build +.include "../../lang/ruby/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo index be06a1760e4..eb8c6de5191 100644 --- a/inputmethod/uim/distinfo +++ b/inputmethod/uim/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2021/03/30 17:01:49 ryoon Exp $ +$NetBSD: distinfo,v 1.34 2021/04/03 05:13:07 ryoon Exp $ SHA1 (uim-1.8.9pre20210104-d1ac9d9315ff8c57c713b502544fef9b3a83b3e5.tar.gz) = 9b211ed03fb0d02c501f5203e1dfb11abab0effa RMD160 (uim-1.8.9pre20210104-d1ac9d9315ff8c57c713b502544fef9b3a83b3e5.tar.gz) = 444d6d120b7cff6dd5f5c8c540f0441964511080 @@ -13,7 +13,7 @@ RMD160 (uim-sigscheme-beb8fbdc69b523d14fc202a4d17375555a74c772.tar.gz) = 3b87b16 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) = 2e8a7c863be864c2132577a556788c78c8ca57cb +SHA1 (patch-sigscheme_configure.ac) = 836d034e2eb1a60619eaac70f22387a1805dda5c SHA1 (patch-sigscheme_doc_Makefile.am) = e21e33d7eb078819ab34f9d7fdc10d7f4401a2c4 SHA1 (patch-sigscheme_include_sigscheme_Makefile.am) = d54b38982c199b321c6ac0d8700bfe9c29084eee SHA1 (patch-uim_Makefile.am) = e3a9e4dc99965c271fd6e783d42a6a136bf904b2 diff --git a/inputmethod/uim/patches/patch-sigscheme_configure.ac b/inputmethod/uim/patches/patch-sigscheme_configure.ac index 838b3132a09..e1868521231 100644 --- a/inputmethod/uim/patches/patch-sigscheme_configure.ac +++ b/inputmethod/uim/patches/patch-sigscheme_configure.ac @@ -1,19 +1,9 @@ -$NetBSD: patch-sigscheme_configure.ac,v 1.2 2021/03/30 17:01:49 ryoon Exp $ +$NetBSD: patch-sigscheme_configure.ac,v 1.3 2021/04/03 05:13:07 ryoon Exp $ -Find ruby command for pkgsrc. Correct _XOPEN_SOURCE. --- 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, [ |