Hi ports@,

Here is a diff to update mruby to 2.0.1.

Notable changes:

- Switch to using GH_ directives to fetch the distfile
- Point HOMEPAGE to https://mruby.org/
- Upstream now enable setting MRB_ENDIAN_BIG on big endian architectures,
  so we only need to add the missing <endian.h> header

Tested on amd64, test suite passes without errors.

Comments? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/mruby/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile    12 Jul 2019 20:47:20 -0000      1.13
+++ Makefile    10 Nov 2019 15:24:49 -0000
@@ -2,19 +2,17 @@
 
 COMMENT =              lightweight, embeddable implementation of ruby
 
-VERSION =              2.0.0
-DISTNAME =             mruby-${VERSION}
-REVISION =             1
+GH_ACCOUNT =           mruby
+GH_PROJECT =           mruby
+GH_TAGNAME =           2.0.1
+
 CATEGORIES =           lang
-HOMEPAGE =             https://github.com/mruby/mruby
+HOMEPAGE =             https://mruby.org/
 
 # MIT
 PERMIT_PACKAGE =       Yes
 
 WANTLIB += c curses m readline
-
-MASTER_SITES =         https://github.com/mruby/mruby/archive/
-DISTFILES =            ${DISTNAME}-${VERSION}.tar.gz{${VERSION}.tar.gz}
 
 MODULES =              lang/ruby
 BUILD_DEPENDS =                devel/bison \
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/mruby/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo    17 Dec 2018 20:28:27 -0000      1.4
+++ distinfo    10 Nov 2019 15:24:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (mruby-2.0.0-2.0.0.tar.gz) = 
+klYmNURMMaUgKE+kN9dwYyxqdmjGDYmiolZidkCBI8=
-SIZE (mruby-2.0.0-2.0.0.tar.gz) = 512866
+SHA256 (mruby-2.0.1.tar.gz) = /gxQoltNx2kv1/an38HVi6c/U/7dpXYoRbhTaSz6yBA=
+SIZE (mruby-2.0.1.tar.gz) = 517932
Index: patches/patch-include_mrbconf_h
===================================================================
RCS file: /cvs/ports/lang/mruby/patches/patch-include_mrbconf_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-include_mrbconf_h
--- patches/patch-include_mrbconf_h     20 Dec 2018 18:41:45 -0000      1.1
+++ patches/patch-include_mrbconf_h     10 Nov 2019 15:24:49 -0000
@@ -11,14 +11,3 @@ Index: include/mrbconf.h
  #include <limits.h>
  #include <stdint.h>
  
-@@ -62,7 +63,9 @@
- //#define MRB_NAN_BOXING
- 
- /* define on big endian machines; used by MRB_NAN_BOXING */
--//#define MRB_ENDIAN_BIG
-+#if (BYTE_ORDER == BIG_ENDIAN)
-+#define MRB_ENDIAN_BIG
-+#endif
- 
- /* represent mrb_value as a word (natural unit of data for the processor) */
- //#define MRB_WORD_BOXING
Index: patches/patch-lib_mruby_build_rb
===================================================================
RCS file: /cvs/ports/lang/mruby/patches/patch-lib_mruby_build_rb,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_mruby_build_rb
--- patches/patch-lib_mruby_build_rb    17 Dec 2018 20:28:27 -0000      1.2
+++ patches/patch-lib_mruby_build_rb    10 Nov 2019 15:24:49 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-lib_mruby_build_rb,v 1.2
 Index: lib/mruby/build.rb
 --- lib/mruby/build.rb.orig
 +++ lib/mruby/build.rb
-@@ -315,7 +315,7 @@ EOS
-     def run_bintest
+@@ -317,7 +317,7 @@ EOS
+       puts ">>> Bintest #{name} <<<"
        targets = @gems.select { |v| File.directory? "#{v.dir}/bintest" }.map { 
|v| filename v.dir }
        targets << filename(".") if File.directory? "./bintest"
 -      sh "ruby test/bintest.rb#{verbose_flag} #{targets.join ' '}"
Index: patches/patch-tasks_toolchains_gcc_rake
===================================================================
RCS file: /cvs/ports/lang/mruby/patches/patch-tasks_toolchains_gcc_rake,v
retrieving revision 1.2
diff -u -p -r1.2 patch-tasks_toolchains_gcc_rake
--- patches/patch-tasks_toolchains_gcc_rake     1 Nov 2017 21:44:44 -0000       
1.2
+++ patches/patch-tasks_toolchains_gcc_rake     10 Nov 2019 15:24:49 -0000
@@ -1,4 +1,5 @@
 $OpenBSD: patch-tasks_toolchains_gcc_rake,v 1.2 2017/11/01 21:44:44 jeremy Exp 
$
+
 Index: tasks/toolchains/gcc.rake
 --- tasks/toolchains/gcc.rake.orig
 +++ tasks/toolchains/gcc.rake
@@ -6,8 +7,8 @@ Index: tasks/toolchains/gcc.rake
  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)]
-+    cc.flags = [ENV['CFLAGS'] || '-g -O3'] + %w(-std=gnu99 -Wall 
-Werror-implicit-function-declaration -Wdeclaration-after-statement 
-Wwrite-strings)
-     cc.defines = %w(DISABLE_GEMS)
+-    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}'
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/mruby/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   17 Dec 2018 20:28:28 -0000      1.5
+++ pkg/PLIST   10 Nov 2019 15:24:49 -0000
@@ -47,6 +47,10 @@ lib/mruby/mrbgems/mruby-array-ext/src/
 lib/mruby/mrbgems/mruby-array-ext/src/array.c
 lib/mruby/mrbgems/mruby-array-ext/test/
 lib/mruby/mrbgems/mruby-array-ext/test/array.rb
+lib/mruby/mrbgems/mruby-bin-config/
+lib/mruby/mrbgems/mruby-bin-config/mrbgem.rake
+lib/mruby/mrbgems/mruby-bin-config/mruby-config
+lib/mruby/mrbgems/mruby-bin-config/mruby-config.bat
 lib/mruby/mrbgems/mruby-bin-debugger/
 lib/mruby/mrbgems/mruby-bin-debugger/bintest/
 lib/mruby/mrbgems/mruby-bin-debugger/bintest/mrdb.rb
@@ -81,10 +85,6 @@ lib/mruby/mrbgems/mruby-bin-mrbc/tools/
 lib/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/
 lib/mruby/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c
 lib/mruby/mrbgems/mruby-bin-mruby/
-lib/mruby/mrbgems/mruby-bin-mruby-config/
-lib/mruby/mrbgems/mruby-bin-mruby-config/mrbgem.rake
-lib/mruby/mrbgems/mruby-bin-mruby-config/mruby-config
-lib/mruby/mrbgems/mruby-bin-mruby-config/mruby-config.bat
 lib/mruby/mrbgems/mruby-bin-mruby/bintest/
 lib/mruby/mrbgems/mruby-bin-mruby/bintest/mruby.rb
 lib/mruby/mrbgems/mruby-bin-mruby/mrbgem.rake
@@ -100,6 +100,8 @@ lib/mruby/mrbgems/mruby-bin-strip/tools/
 lib/mruby/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c
 lib/mruby/mrbgems/mruby-class-ext/
 lib/mruby/mrbgems/mruby-class-ext/mrbgem.rake
+lib/mruby/mrbgems/mruby-class-ext/mrblib/
+lib/mruby/mrbgems/mruby-class-ext/mrblib/module.rb
 lib/mruby/mrbgems/mruby-class-ext/src/
 lib/mruby/mrbgems/mruby-class-ext/src/class.c
 lib/mruby/mrbgems/mruby-class-ext/test/
@@ -118,6 +120,12 @@ lib/mruby/mrbgems/mruby-compiler/core/le
 lib/mruby/mrbgems/mruby-compiler/core/node.h
 lib/mruby/mrbgems/mruby-compiler/core/parse.y
 lib/mruby/mrbgems/mruby-compiler/mrbgem.rake
+lib/mruby/mrbgems/mruby-enum-chain/
+lib/mruby/mrbgems/mruby-enum-chain/mrbgem.rake
+lib/mruby/mrbgems/mruby-enum-chain/mrblib/
+lib/mruby/mrbgems/mruby-enum-chain/mrblib/chain.rb
+lib/mruby/mrbgems/mruby-enum-chain/test/
+lib/mruby/mrbgems/mruby-enum-chain/test/enum_chain.rb
 lib/mruby/mrbgems/mruby-enum-ext/
 lib/mruby/mrbgems/mruby-enum-ext/mrbgem.rake
 lib/mruby/mrbgems/mruby-enum-ext/mrblib/
@@ -195,7 +203,6 @@ lib/mruby/mrbgems/mruby-io/src/mruby_io_
 lib/mruby/mrbgems/mruby-io/test/
 lib/mruby/mrbgems/mruby-io/test/file.rb
 lib/mruby/mrbgems/mruby-io/test/file_test.rb
-lib/mruby/mrbgems/mruby-io/test/gc_filedes.sh
 lib/mruby/mrbgems/mruby-io/test/io.rb
 lib/mruby/mrbgems/mruby-io/test/mruby_io_test.c
 lib/mruby/mrbgems/mruby-kernel-ext/
@@ -365,9 +372,11 @@ lib/mruby/mrbgems/mruby-symbol-ext/test/
 lib/mruby/mrbgems/mruby-test/
 lib/mruby/mrbgems/mruby-test/README.md
 lib/mruby/mrbgems/mruby-test/driver.c
-lib/mruby/mrbgems/mruby-test/init_mrbtest.c
 lib/mruby/mrbgems/mruby-test/mrbgem.rake
 lib/mruby/mrbgems/mruby-time/
+lib/mruby/mrbgems/mruby-time/include/
+lib/mruby/mrbgems/mruby-time/include/mruby/
+lib/mruby/mrbgems/mruby-time/include/mruby/time.h
 lib/mruby/mrbgems/mruby-time/mrbgem.rake
 lib/mruby/mrbgems/mruby-time/mrblib/
 lib/mruby/mrbgems/mruby-time/mrblib/time.rb
@@ -387,7 +396,6 @@ lib/mruby/mrblib/10error.rb
 lib/mruby/mrblib/array.rb
 lib/mruby/mrblib/compar.rb
 lib/mruby/mrblib/enum.rb
-lib/mruby/mrblib/float.rb
 lib/mruby/mrblib/hash.rb
 lib/mruby/mrblib/init_mrblib.c
 lib/mruby/mrblib/kernel.rb

Reply via email to