Friday, August 27, 2021

Update: lang/mruby 3.0.0

This updates mruby to 3.0.0. Release notes available at:

https://u22788749.ct.sendgrid.net/ls/click?upn=yGPgKxLt0dQzFpcLvHl2PPhK3N-2FLVZTiDzy5GreoSYyxB5XtNmZ56IyvgOD5F0fB7RrALRMkzE3dK2a5lyHxVdpPN1U10A7vZfmPwd9pln4-3DQhJj_7a8z5HXKglTa4iEppNBl7pmmyiLmNe-2BkBcvOJjbwgwSewIYonLntRuoN4GwM7WjPvc-2FXMqASZb04MiyaLnVHylaO4EcWA7oZInCQ-2FzqsvrtCeoCImCCHD2bnubMrEApg46D3lZhO9D1mhb4InQ8q86xmft7sRvJwRzF39EIjWDV-2F6BKUE45BZGD-2FmQ2U8It0D7-2FiFkQYgjxnaXjFc-2FgW-2FQ-3D-3D

Tested on amd64. I'd like to commit it when I commit the default
Ruby version change to 3.0.

There is a comment about keeping the version in sync with www/h2o,
but otto@ (h2o maintainer) doesn't know why, and fcambus@ (who added the
comment) hasn't responded yet. mruby is embedded, not linked, so I'm
not sure why the mruby version should need to be in sync.

Thanks,
Jeremy

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/mruby/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 17 Nov 2020 03:19:37 -0000 1.18
+++ Makefile 13 Aug 2021 15:32:19 -0000
@@ -7,8 +7,7 @@ COMMENT = lightweight, embeddable imple
# Keep in sync with the version bundled in www/h2o
GH_ACCOUNT = mruby
GH_PROJECT = mruby
-GH_TAGNAME = 2.0.1
-REVISION = 1
+GH_TAGNAME = 3.0.0

CATEGORIES = lang
HOMEPAGE = https://u22788749.ct.sendgrid.net/ls/click?upn=yGPgKxLt0dQzFpcLvHl2PGAfC22xVKe29SU9ZLF5-2Bww-3DZfhT_7a8z5HXKglTa4iEppNBl7pmmyiLmNe-2BkBcvOJjbwgwSewIYonLntRuoN4GwM7WjPJgYFJlxQ1KStBVDKpdTGO07ypOQVRID4VYY02WGFzQbLba0Ct14l4m66LgRkscBO5xx6KC0I9-2BdNPdYvFMND9AcocfnclYMzpThcHTDdeXlelT7ZQMg5IoTtw4VM6lP3zZaBMzHk5LK-2FRUWmjm0f-2Bg-3D-3D
@@ -29,7 +28,7 @@ NO_CONFIGURE = Yes
SUBST_VARS = RUBY

do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RUBY} ./minirake --verbose
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RAKE} --verbose

do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
@@ -39,6 +38,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/doc/guides/* ${PREFIX}/share/doc/mruby/

do-test:
- cd ${WRKSRC} && RUBY=${RUBY} ${RUBY} ./minirake test
+ cd ${WRKSRC} && RUBY=${RUBY} ${RAKE} test

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/mruby/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 11 Nov 2019 11:42:36 -0000 1.5
+++ distinfo 13 Aug 2021 15:32:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (mruby-2.0.1.tar.gz) = /gxQoltNx2kv1/an38HVi6c/U/7dpXYoRbhTaSz6yBA=
-SIZE (mruby-2.0.1.tar.gz) = 517932
+SHA256 (mruby-3.0.0.tar.gz) = lbeYzdkx7ynTiOKwsmfLpNxGnociw31O+O5SSLyQdbA=
+SIZE (mruby-3.0.0.tar.gz) = 701142
Index: patches/patch-build_config_rb
===================================================================
RCS file: patches/patch-build_config_rb
diff -N patches/patch-build_config_rb
--- patches/patch-build_config_rb 12 Nov 2019 09:25:28 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-build_config_rb,v 1.4 2019/11/12 09:25:28 fcambus Exp $
-
-Avoid adding "-g3 -O0" to CFLAGS.
-
-Index: build_config.rb
---- build_config.rb.orig
-+++ build_config.rb
-@@ -95,7 +95,7 @@ MRuby::Build.new('host-debug') do |conf|
- toolchain :gcc
- end
-
-- enable_debug
-+ # enable_debug
-
- # include the default GEMs
- conf.gembox 'default'
-@@ -118,7 +118,7 @@ MRuby::Build.new('test') do |conf|
- toolchain :gcc
- end
-
-- enable_debug
-+ # enable_debug
- conf.enable_bintest
- conf.enable_test
-
Index: patches/patch-lib_mruby_build_rb
===================================================================
RCS file: /cvs/ports/lang/mruby/patches/patch-lib_mruby_build_rb,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_mruby_build_rb
--- patches/patch-lib_mruby_build_rb 11 Nov 2019 11:42:36 -0000 1.3
+++ patches/patch-lib_mruby_build_rb 13 Aug 2021 15:32:19 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-lib_mruby_build_rb,v 1.3
Index: lib/mruby/build.rb
--- lib/mruby/build.rb.orig
+++ lib/mruby/build.rb
-@@ -317,7 +317,7 @@ EOS
- puts ">>> Bintest #{name} <<<"
- targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map { |v| filename v.dir }
+@@ -432,7 +432,7 @@ EOS
targets << filename(".") if File.directory? "./bintest"
-- sh "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
-+ sh "${RUBY} test/bintest.rb#{verbose_flag} #{targets.join ' '}"
+ mrbc = @gems["mruby-bin-mrbc"] ? exefile("#{@build_dir}/bin/mrbc") : mrbcfile
+ env = {"BUILD_DIR" => @build_dir, "MRBCFILE" => mrbc}
+- sh env, "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
++ sh env, "${RUBY} test/bintest.rb#{verbose_flag} #{targets.join ' '}"
end

def print_build_summary
Index: patches/patch-tasks_toolchains_gcc_rake
===================================================================
RCS file: /cvs/ports/lang/mruby/patches/patch-tasks_toolchains_gcc_rake,v
retrieving revision 1.3
diff -u -p -r1.3 patch-tasks_toolchains_gcc_rake
--- patches/patch-tasks_toolchains_gcc_rake 11 Nov 2019 11:42:36 -0000 1.3
+++ patches/patch-tasks_toolchains_gcc_rake 13 Aug 2021 15:32:19 -0000
@@ -1,14 +1,15 @@
$OpenBSD: patch-tasks_toolchains_gcc_rake,v 1.3 2019/11/11 11:42:36 fcambus Exp $

+Don't hardcode -g -O3 (CFLAGS will be respected).
+
Index: tasks/toolchains/gcc.rake
--- tasks/toolchains/gcc.rake.orig
+++ tasks/toolchains/gcc.rake
-@@ -1,7 +1,7 @@
- MRuby::Toolchain.new(:gcc) do |conf, _params|
- [conf.cc, conf.objc, conf.asm].each do |cc|
- cc.command = ENV['CC'] || 'gcc'
-- cc.flags = [ENV['CFLAGS'] || %w(-g -std=gnu99 -O3 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings -Wundef)]
-+ cc.flags = [ENV['CFLAGS'] || '-g -O3'] + %w(-std=gnu99 -Wall -Werror-implicit-function-declaration -Wdeclaration-after-statement -Wwrite-strings -Wundef)
- cc.option_include_path = '-I%s'
- cc.option_define = '-D%s'
- cc.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}'
+@@ -1,6 +1,6 @@
+ MRuby::Toolchain.new(:gcc) do |conf, params|
+ default_command = params[:default_command] || 'gcc'
+- compiler_flags = %w(-g -O3 -Wall -Wundef)
++ compiler_flags = %w(-Wall -Wundef)
+ c_mandatory_flags = %w(-std=gnu99)
+ cxx_invalid_flags = %w(-Werror-implicit-function-declaration)
+ compile_opt = '%{flags} -o "%{outfile}" "%{infile}"'
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/mruby/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 11 Nov 2019 11:42:36 -0000 1.6
+++ pkg/PLIST 13 Aug 2021 15:32:19 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.6 2019/11/11 11:42:36 fcambus Exp $
@bin bin/mirb
@bin bin/mrbc
-@bin bin/mrdb
@bin bin/mruby
+bin/mruby-config
@bin bin/mruby-strip
include/mrbconf.h
include/mruby/
@@ -17,6 +17,7 @@ include/mruby/compile.h
include/mruby/data.h
include/mruby/debug.h
include/mruby/dump.h
+include/mruby/endian.h
include/mruby/error.h
include/mruby/gc.h
include/mruby/hash.h
@@ -27,6 +28,11 @@ include/mruby/numeric.h
include/mruby/object.h
include/mruby/opcode.h
include/mruby/ops.h
+include/mruby/presym/
+include/mruby/presym.h
+include/mruby/presym/disable.h
+include/mruby/presym/enable.h
+include/mruby/presym/scanning.h
include/mruby/proc.h
include/mruby/range.h
include/mruby/re.h
@@ -37,8 +43,12 @@ include/mruby/variable.h
include/mruby/version.h
lib/mruby/
lib/mruby/mrbgems/
+lib/mruby/mrbgems/default-no-fpu.gembox
+lib/mruby/mrbgems/default-no-stdio.gembox
lib/mruby/mrbgems/default.gembox
lib/mruby/mrbgems/full-core.gembox
+lib/mruby/mrbgems/math.gembox
+lib/mruby/mrbgems/metaprog.gembox
lib/mruby/mrbgems/mruby-array-ext/
lib/mruby/mrbgems/mruby-array-ext/mrbgem.rake
lib/mruby/mrbgems/mruby-array-ext/mrblib/
@@ -80,6 +90,8 @@ lib/mruby/mrbgems/mruby-bin-mirb/tools/
lib/mruby/mrbgems/mruby-bin-mirb/tools/mirb/
lib/mruby/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
lib/mruby/mrbgems/mruby-bin-mrbc/
+lib/mruby/mrbgems/mruby-bin-mrbc/bintest/
+lib/mruby/mrbgems/mruby-bin-mrbc/bintest/mrbc.rb
lib/mruby/mrbgems/mruby-bin-mrbc/mrbgem.rake
lib/mruby/mrbgems/mruby-bin-mrbc/tools/
lib/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/
@@ -98,6 +110,10 @@ lib/mruby/mrbgems/mruby-bin-strip/mrbgem
lib/mruby/mrbgems/mruby-bin-strip/tools/
lib/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/
lib/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c
+lib/mruby/mrbgems/mruby-catch/
+lib/mruby/mrbgems/mruby-catch/mrbgem.rake
+lib/mruby/mrbgems/mruby-catch/mrblib/
+lib/mruby/mrbgems/mruby-catch/mrblib/catch.rb
lib/mruby/mrbgems/mruby-class-ext/
lib/mruby/mrbgems/mruby-class-ext/mrbgem.rake
lib/mruby/mrbgems/mruby-class-ext/mrblib/
@@ -111,15 +127,22 @@ lib/mruby/mrbgems/mruby-compar-ext/mrbge
lib/mruby/mrbgems/mruby-compar-ext/mrblib/
lib/mruby/mrbgems/mruby-compar-ext/mrblib/compar.rb
lib/mruby/mrbgems/mruby-compiler/
-lib/mruby/mrbgems/mruby-compiler/bintest/
-lib/mruby/mrbgems/mruby-compiler/bintest/mrbc.rb
lib/mruby/mrbgems/mruby-compiler/core/
lib/mruby/mrbgems/mruby-compiler/core/codegen.c
lib/mruby/mrbgems/mruby-compiler/core/keywords
lib/mruby/mrbgems/mruby-compiler/core/lex.def
lib/mruby/mrbgems/mruby-compiler/core/node.h
lib/mruby/mrbgems/mruby-compiler/core/parse.y
+lib/mruby/mrbgems/mruby-compiler/core/y.tab.c
lib/mruby/mrbgems/mruby-compiler/mrbgem.rake
+lib/mruby/mrbgems/mruby-complex/
+lib/mruby/mrbgems/mruby-complex/mrbgem.rake
+lib/mruby/mrbgems/mruby-complex/mrblib/
+lib/mruby/mrbgems/mruby-complex/mrblib/complex.rb
+lib/mruby/mrbgems/mruby-complex/src/
+lib/mruby/mrbgems/mruby-complex/src/complex.c
+lib/mruby/mrbgems/mruby-complex/test/
+lib/mruby/mrbgems/mruby-complex/test/complex.rb
lib/mruby/mrbgems/mruby-enum-chain/
lib/mruby/mrbgems/mruby-enum-chain/mrbgem.rake
lib/mruby/mrbgems/mruby-enum-chain/mrblib/
@@ -181,8 +204,6 @@ lib/mruby/mrbgems/mruby-inline-struct/te
lib/mruby/mrbgems/mruby-inline-struct/test/inline.c
lib/mruby/mrbgems/mruby-inline-struct/test/inline.rb
lib/mruby/mrbgems/mruby-io/
-lib/mruby/mrbgems/mruby-io/.gitignore
-lib/mruby/mrbgems/mruby-io/.travis.yml
lib/mruby/mrbgems/mruby-io/README.md
lib/mruby/mrbgems/mruby-io/include/
lib/mruby/mrbgems/mruby-io/include/mruby/
@@ -194,7 +215,6 @@ lib/mruby/mrbgems/mruby-io/mrblib/file.r
lib/mruby/mrbgems/mruby-io/mrblib/file_constants.rb
lib/mruby/mrbgems/mruby-io/mrblib/io.rb
lib/mruby/mrbgems/mruby-io/mrblib/kernel.rb
-lib/mruby/mrbgems/mruby-io/run_test.rb
lib/mruby/mrbgems/mruby-io/src/
lib/mruby/mrbgems/mruby-io/src/file.c
lib/mruby/mrbgems/mruby-io/src/file_test.c
@@ -207,8 +227,6 @@ lib/mruby/mrbgems/mruby-io/test/io.rb
lib/mruby/mrbgems/mruby-io/test/mruby_io_test.c
lib/mruby/mrbgems/mruby-kernel-ext/
lib/mruby/mrbgems/mruby-kernel-ext/mrbgem.rake
-lib/mruby/mrbgems/mruby-kernel-ext/mrblib/
-lib/mruby/mrbgems/mruby-kernel-ext/mrblib/kernel.rb
lib/mruby/mrbgems/mruby-kernel-ext/src/
lib/mruby/mrbgems/mruby-kernel-ext/src/kernel.c
lib/mruby/mrbgems/mruby-kernel-ext/test/
@@ -231,7 +249,6 @@ lib/mruby/mrbgems/mruby-method/mrbgem.ra
lib/mruby/mrbgems/mruby-method/mrblib/
lib/mruby/mrbgems/mruby-method/mrblib/kernel.rb
lib/mruby/mrbgems/mruby-method/mrblib/method.rb
-lib/mruby/mrbgems/mruby-method/mrblib/unbound_method.rb
lib/mruby/mrbgems/mruby-method/src/
lib/mruby/mrbgems/mruby-method/src/method.c
lib/mruby/mrbgems/mruby-method/test/
@@ -259,13 +276,15 @@ lib/mruby/mrbgems/mruby-objectspace/src/
lib/mruby/mrbgems/mruby-objectspace/src/mruby_objectspace.c
lib/mruby/mrbgems/mruby-objectspace/test/
lib/mruby/mrbgems/mruby-objectspace/test/objectspace.rb
+lib/mruby/mrbgems/mruby-os-memsize/
+lib/mruby/mrbgems/mruby-os-memsize/mrbgem.rake
+lib/mruby/mrbgems/mruby-os-memsize/src/
+lib/mruby/mrbgems/mruby-os-memsize/src/memsize.c
+lib/mruby/mrbgems/mruby-os-memsize/test/
+lib/mruby/mrbgems/mruby-os-memsize/test/memsize.rb
lib/mruby/mrbgems/mruby-pack/
-lib/mruby/mrbgems/mruby-pack/.gitignore
-lib/mruby/mrbgems/mruby-pack/.travis.yml
lib/mruby/mrbgems/mruby-pack/README.md
lib/mruby/mrbgems/mruby-pack/mrbgem.rake
-lib/mruby/mrbgems/mruby-pack/packtest.rb
-lib/mruby/mrbgems/mruby-pack/run_test.rb
lib/mruby/mrbgems/mruby-pack/src/
lib/mruby/mrbgems/mruby-pack/src/pack.c
lib/mruby/mrbgems/mruby-pack/test/
@@ -288,10 +307,7 @@ lib/mruby/mrbgems/mruby-proc-ext/test/pr
lib/mruby/mrbgems/mruby-random/
lib/mruby/mrbgems/mruby-random/mrbgem.rake
lib/mruby/mrbgems/mruby-random/src/
-lib/mruby/mrbgems/mruby-random/src/mt19937ar.c
-lib/mruby/mrbgems/mruby-random/src/mt19937ar.h
lib/mruby/mrbgems/mruby-random/src/random.c
-lib/mruby/mrbgems/mruby-random/src/random.h
lib/mruby/mrbgems/mruby-random/test/
lib/mruby/mrbgems/mruby-random/test/random.rb
lib/mruby/mrbgems/mruby-range-ext/
@@ -302,12 +318,16 @@ lib/mruby/mrbgems/mruby-range-ext/src/
lib/mruby/mrbgems/mruby-range-ext/src/range.c
lib/mruby/mrbgems/mruby-range-ext/test/
lib/mruby/mrbgems/mruby-range-ext/test/range.rb
+lib/mruby/mrbgems/mruby-rational/
+lib/mruby/mrbgems/mruby-rational/mrbgem.rake
+lib/mruby/mrbgems/mruby-rational/mrblib/
+lib/mruby/mrbgems/mruby-rational/mrblib/rational.rb
+lib/mruby/mrbgems/mruby-rational/src/
+lib/mruby/mrbgems/mruby-rational/src/rational.c
+lib/mruby/mrbgems/mruby-rational/test/
+lib/mruby/mrbgems/mruby-rational/test/rational.rb
lib/mruby/mrbgems/mruby-sleep/
-lib/mruby/mrbgems/mruby-sleep/.gitignore
-lib/mruby/mrbgems/mruby-sleep/.travis.yml
-lib/mruby/mrbgems/mruby-sleep/.travis_build_config.rb
lib/mruby/mrbgems/mruby-sleep/README.md
-lib/mruby/mrbgems/mruby-sleep/Rakefile
lib/mruby/mrbgems/mruby-sleep/example/
lib/mruby/mrbgems/mruby-sleep/example/sleep.rb
lib/mruby/mrbgems/mruby-sleep/mrbgem.rake
@@ -316,12 +336,10 @@ lib/mruby/mrbgems/mruby-sleep/src/mrb_sl
lib/mruby/mrbgems/mruby-sleep/test/
lib/mruby/mrbgems/mruby-sleep/test/sleep_test.rb
lib/mruby/mrbgems/mruby-socket/
-lib/mruby/mrbgems/mruby-socket/.travis.yml
lib/mruby/mrbgems/mruby-socket/README.md
lib/mruby/mrbgems/mruby-socket/mrbgem.rake
lib/mruby/mrbgems/mruby-socket/mrblib/
lib/mruby/mrbgems/mruby-socket/mrblib/socket.rb
-lib/mruby/mrbgems/mruby-socket/run_test.rb
lib/mruby/mrbgems/mruby-socket/src/
lib/mruby/mrbgems/mruby-socket/src/const.cstub
lib/mruby/mrbgems/mruby-socket/src/const.def
@@ -341,7 +359,6 @@ lib/mruby/mrbgems/mruby-sprintf/mrbgem.r
lib/mruby/mrbgems/mruby-sprintf/mrblib/
lib/mruby/mrbgems/mruby-sprintf/mrblib/string.rb
lib/mruby/mrbgems/mruby-sprintf/src/
-lib/mruby/mrbgems/mruby-sprintf/src/kernel.c
lib/mruby/mrbgems/mruby-sprintf/src/sprintf.c
lib/mruby/mrbgems/mruby-sprintf/test/
lib/mruby/mrbgems/mruby-sprintf/test/sprintf.rb
@@ -352,6 +369,8 @@ lib/mruby/mrbgems/mruby-string-ext/mrbli
lib/mruby/mrbgems/mruby-string-ext/src/
lib/mruby/mrbgems/mruby-string-ext/src/string.c
lib/mruby/mrbgems/mruby-string-ext/test/
+lib/mruby/mrbgems/mruby-string-ext/test/numeric.rb
+lib/mruby/mrbgems/mruby-string-ext/test/range.rb
lib/mruby/mrbgems/mruby-string-ext/test/string.rb
lib/mruby/mrbgems/mruby-struct/
lib/mruby/mrbgems/mruby-struct/mrbgem.rake
@@ -373,6 +392,7 @@ lib/mruby/mrbgems/mruby-test/
lib/mruby/mrbgems/mruby-test/README.md
lib/mruby/mrbgems/mruby-test/driver.c
lib/mruby/mrbgems/mruby-test/mrbgem.rake
+lib/mruby/mrbgems/mruby-test/vformat.c
lib/mruby/mrbgems/mruby-time/
lib/mruby/mrbgems/mruby-time/include/
lib/mruby/mrbgems/mruby-time/include/mruby/
@@ -390,6 +410,9 @@ lib/mruby/mrbgems/mruby-toplevel-ext/mrb
lib/mruby/mrbgems/mruby-toplevel-ext/mrblib/toplevel.rb
lib/mruby/mrbgems/mruby-toplevel-ext/test/
lib/mruby/mrbgems/mruby-toplevel-ext/test/toplevel.rb
+lib/mruby/mrbgems/stdlib-ext.gembox
+lib/mruby/mrbgems/stdlib-io.gembox
+lib/mruby/mrbgems/stdlib.gembox
lib/mruby/mrblib/
lib/mruby/mrblib/00class.rb
lib/mruby/mrblib/10error.rb
@@ -399,7 +422,6 @@ lib/mruby/mrblib/enum.rb
lib/mruby/mrblib/hash.rb
lib/mruby/mrblib/init_mrblib.c
lib/mruby/mrblib/kernel.rb
-lib/mruby/mrblib/mrblib.rake
lib/mruby/mrblib/numeric.rb
lib/mruby/mrblib/range.rb
lib/mruby/mrblib/string.rb
@@ -410,3 +432,4 @@ share/doc/mruby/debugger.md
share/doc/mruby/gc-arena-howto.md
share/doc/mruby/mrbconf.md
share/doc/mruby/mrbgems.md
+share/doc/mruby/symbol.md

No comments:

Post a Comment

Subscribe to: Post Comments (Atom)