Date: Fri, 28 Apr 2017 02:31:58 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439593 - in head: Mk lang/ruby22 lang/ruby22/files lang/ruby23 lang/ruby23/files Message-ID: <201704280231.v3S2VwpL002003@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Fri Apr 28 02:31:58 2017 New Revision: 439593 URL: https://svnweb.freebsd.org/changeset/ports/439593 Log: - Update ruby lang/ruby22 -> 2.2.7 lang/ruby23 -> 2.3.4 PR: 218864 Reviewed by: swills Exp-Run: antoine Approved by: portmgr (swills,antoine) Differential Revision: https://reviews.freebsd.org/D10506 Deleted: head/lang/ruby22/files/patch-eval.c head/lang/ruby22/files/patch-eval_error.c head/lang/ruby22/files/patch-vm_eval.c head/lang/ruby22/files/patch-vm_trace.c head/lang/ruby23/files/patch-eval.c head/lang/ruby23/files/patch-eval_error.c head/lang/ruby23/files/patch-thread.c head/lang/ruby23/files/patch-vm_eval.c head/lang/ruby23/files/patch-vm_trace.c Modified: head/Mk/bsd.ruby.mk head/lang/ruby22/distinfo head/lang/ruby22/pkg-plist head/lang/ruby23/distinfo head/lang/ruby23/files/patch-Makefile.in head/lang/ruby23/files/patch-configure.in head/lang/ruby23/files/patch-lib_mkmf.rb head/lang/ruby23/files/patch-tool_rbinstall.rb head/lang/ruby23/pkg-plist Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Fri Apr 28 02:18:54 2017 (r439592) +++ head/Mk/bsd.ruby.mk Fri Apr 28 02:31:58 2017 (r439593) @@ -164,8 +164,8 @@ RUBY21= "" # PLIST_SUB helpers # # Ruby 2.2 # -RUBY_RELVERSION= 2.2.6 -RUBY_PORTREVISION= 1 +RUBY_RELVERSION= 2.2.7 +RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY22= "" # PLIST_SUB helpers @@ -174,8 +174,8 @@ RUBY22= "" # PLIST_SUB helpers # # Ruby 2.3 # -RUBY_RELVERSION= 2.3.3 -RUBY_PORTREVISION= 2 +RUBY_RELVERSION= 2.3.4 +RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY23= "" # PLIST_SUB helpers Modified: head/lang/ruby22/distinfo ============================================================================== --- head/lang/ruby22/distinfo Fri Apr 28 02:18:54 2017 (r439592) +++ head/lang/ruby22/distinfo Fri Apr 28 02:31:58 2017 (r439593) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479231900 -SHA256 (ruby/ruby-2.2.6.tar.xz) = 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -SIZE (ruby/ruby-2.2.6.tar.xz) = 10487776 +TIMESTAMP = 1493101494 +SHA256 (ruby/ruby-2.2.7.tar.xz) = 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 +SIZE (ruby/ruby-2.2.7.tar.xz) = 10507528 Modified: head/lang/ruby22/pkg-plist ============================================================================== --- head/lang/ruby22/pkg-plist Fri Apr 28 02:18:54 2017 (r439592) +++ head/lang/ruby22/pkg-plist Fri Apr 28 02:31:58 2017 (r439593) @@ -6725,6 +6725,7 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/Float/truncate-i.ri %%RDOC%%%%RUBY_RIDIR%%/Float/zero%3f-i.ri %%RDOC%%%%RUBY_RIDIR%%/FloatDomainError/cdesc-FloatDomainError.ri +%%RDOC%%%%RUBY_RIDIR%%/Forwardable/_delegator_method-c.ri %%RDOC%%%%RUBY_RIDIR%%/Forwardable/cdesc-Forwardable.ri %%RDOC%%%%RUBY_RIDIR%%/Forwardable/debug-c.ri %%RDOC%%%%RUBY_RIDIR%%/Forwardable/def_delegator-i.ri @@ -10976,7 +10977,6 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/each_pair-i.ri %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/eql%3f-i.ri %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/hash-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OpenStruct/initialize_copy-i.ri %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/inspect-i.ri %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/json_create-c.ri %%RDOC%%%%RUBY_RIDIR%%/OpenStruct/marshal_dump-i.ri @@ -11006,69 +11006,6 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/OpenURI/OpenRead/open-i.ri %%RDOC%%%%RUBY_RIDIR%%/OpenURI/OpenRead/read-i.ri %%RDOC%%%%RUBY_RIDIR%%/OpenURI/cdesc-OpenURI.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/abort-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/accept-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/accept-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/banner-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/base-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/candidate-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/cdesc-OptParse.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/complete-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/def_head_option-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/def_option-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/def_tail_option-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/default_argv-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/define-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/define_head-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/define_tail-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/each_const-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/environment-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/getopts-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/getopts-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/help-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/inc-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/inc-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/load-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/make_switch-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/new-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/new-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/notwice-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/on-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/on_head-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/on_tail-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/order%21-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/order-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/parse%21-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/parse-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/permute%21-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/permute-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/program_name-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/reject-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/reject-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/release-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/remove-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/search-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/search_const-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/separator-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/set_banner-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/set_program_name-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/set_summary_indent-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/set_summary_width-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/show_version-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/summarize-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/summary_indent-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/summary_width-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/terminate-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/terminate-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/to_a-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/to_s-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/top-c.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/top-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/ver-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/version-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/visit-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/warn-i.ri -%%RDOC%%%%RUBY_RIDIR%%/OptParse/with-c.ri %%RDOC%%%%RUBY_RIDIR%%/OptionParser/AC/_ac_arg_enable-i.ri %%RDOC%%%%RUBY_RIDIR%%/OptionParser/AC/_check_ac_args-i.ri %%RDOC%%%%RUBY_RIDIR%%/OptionParser/AC/ac_arg_disable-i.ri @@ -16033,13 +15970,6 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/__getobj__-i.ri %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/__setobj__-i.ri %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/cdesc-SimpleDelegator.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/cdesc-SingleForwardable.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_delegator-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_delegators-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_single_delegator-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_single_delegators-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/delegate-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/single_delegate-i.ri %%RDOC%%%%RUBY_RIDIR%%/Singleton/_dump-i.ri %%RDOC%%%%RUBY_RIDIR%%/Singleton/_load-c.ri %%RDOC%%%%RUBY_RIDIR%%/Singleton/append_features-c.ri Modified: head/lang/ruby23/distinfo ============================================================================== --- head/lang/ruby23/distinfo Fri Apr 28 02:18:54 2017 (r439592) +++ head/lang/ruby23/distinfo Fri Apr 28 02:31:58 2017 (r439593) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479773431 -SHA256 (ruby/ruby-2.3.3.tar.xz) = 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -SIZE (ruby/ruby-2.3.3.tar.xz) = 11444164 +TIMESTAMP = 1493101646 +SHA256 (ruby/ruby-2.3.4.tar.xz) = 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c +SIZE (ruby/ruby-2.3.4.tar.xz) = 11450108 Modified: head/lang/ruby23/files/patch-Makefile.in ============================================================================== --- head/lang/ruby23/files/patch-Makefile.in Fri Apr 28 02:18:54 2017 (r439592) +++ head/lang/ruby23/files/patch-Makefile.in Fri Apr 28 02:31:58 2017 (r439593) @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2015-12-20 01:15:12 UTC +--- Makefile.in.orig 2016-01-21 07:41:11 UTC +++ Makefile.in @@ -388,7 +388,7 @@ enc/jis/props.h: enc/jis/props.kwd Modified: head/lang/ruby23/files/patch-configure.in ============================================================================== --- head/lang/ruby23/files/patch-configure.in Fri Apr 28 02:18:54 2017 (r439592) +++ head/lang/ruby23/files/patch-configure.in Fri Apr 28 02:31:58 2017 (r439593) @@ -1,6 +1,6 @@ ---- configure.in.orig 2015-12-23 05:29:36 UTC +--- configure.in.orig 2017-03-27 17:59:49 UTC +++ configure.in -@@ -620,7 +620,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE], +@@ -621,7 +621,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE], [AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available, [ echo "provider conftest{ probe fire(); };" > conftest_provider.d @@ -9,7 +9,7 @@ AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [ # DTrace is available on the system rb_cv_dtrace_available=yes -@@ -644,13 +644,13 @@ AC_DEFUN([RUBY_DTRACE_POSTPROCESS], +@@ -645,13 +645,13 @@ AC_DEFUN([RUBY_DTRACE_POSTPROCESS], probe fire(); }; _PROBES @@ -25,7 +25,7 @@ : }; then if cmp -s conftest.o conftest.${ac_objext}.save; then -@@ -1222,10 +1222,10 @@ main() +@@ -1260,10 +1260,10 @@ main() ], [ LIBS="-lm $LIBS"]) @@ -40,7 +40,7 @@ dnl Checks for header files. AC_HEADER_DIRENT -@@ -2440,7 +2440,7 @@ AS_IF([test "x$rb_cv_atan2_inf_c99" = xy +@@ -2513,7 +2513,7 @@ main(int argc, char **argv) if test x"$ac_cv_func_clock_gettime" != xyes; then # glibc 2.17 moves clock_* functions from librt to the main C library. # http://sourceware.org/ml/libc-announce/2012/msg00001.html @@ -49,7 +49,7 @@ if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then AC_DEFINE(HAVE_CLOCK_GETTIME, 1) fi -@@ -2847,7 +2847,7 @@ else +@@ -2920,7 +2920,7 @@ else fi if test x"$enable_pthread" = xyes; then @@ -58,7 +58,7 @@ AC_CHECK_LIB($pthread_lib, pthread_kill, rb_with_pthread=yes, rb_with_pthread=no) if test "$rb_with_pthread" = "yes"; then break; fi -@@ -2861,6 +2861,7 @@ if test x"$enable_pthread" = xyes; then +@@ -2934,6 +2934,7 @@ if test x"$enable_pthread" = xyes; then [c], [], [root], [], [c_r], [MAINLIBS="-pthread $MAINLIBS"], @@ -66,7 +66,7 @@ [AS_CASE(["$target_os"], [openbsd*|mirbsd*], [LIBS="-pthread $LIBS"], [LIBS="-l$pthread_lib $LIBS"])]) -@@ -3173,7 +3174,6 @@ if test "$with_dln_a_out" != yes; then +@@ -3246,7 +3247,6 @@ if test "$with_dln_a_out" != yes; then : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" @@ -74,7 +74,7 @@ else test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' fi -@@ -3657,6 +3657,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -3730,6 +3730,7 @@ AS_CASE("$enable_shared", [yes], [ [freebsd*|dragonfly*], [ SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' Modified: head/lang/ruby23/files/patch-lib_mkmf.rb ============================================================================== --- head/lang/ruby23/files/patch-lib_mkmf.rb Fri Apr 28 02:18:54 2017 (r439592) +++ head/lang/ruby23/files/patch-lib_mkmf.rb Fri Apr 28 02:31:58 2017 (r439593) @@ -1,4 +1,4 @@ ---- lib/mkmf.rb.orig 2015-12-16 09:25:48 UTC +--- lib/mkmf.rb.orig 2016-05-14 17:46:54 UTC +++ lib/mkmf.rb @@ -235,7 +235,7 @@ module MakeMakefile end Modified: head/lang/ruby23/files/patch-tool_rbinstall.rb ============================================================================== --- head/lang/ruby23/files/patch-tool_rbinstall.rb Fri Apr 28 02:18:54 2017 (r439592) +++ head/lang/ruby23/files/patch-tool_rbinstall.rb Fri Apr 28 02:31:58 2017 (r439593) @@ -1,4 +1,4 @@ ---- tool/rbinstall.rb.orig 2015-11-16 06:33:17 UTC +--- tool/rbinstall.rb.orig 2017-03-27 15:18:38 UTC +++ tool/rbinstall.rb @@ -322,6 +322,7 @@ bindir = CONFIG["bindir", true] libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true] @@ -17,7 +17,7 @@ install pc, pkgconfigdir, :mode => $data_mode end end -@@ -695,88 +696,6 @@ end +@@ -695,93 +696,6 @@ end # :startdoc: @@ -89,7 +89,12 @@ - if defined?(Zlib) - Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) - gems.each do |gem| -- Gem.install(gem, Gem::Requirement.default, options) +- begin +- File.umask(022) +- Gem.install(gem, Gem::Requirement.default, options) +- ensure +- File.umask(0222) +- end - gemname = File.basename(gem) - puts "#{" "*30}#{gemname}" - end Modified: head/lang/ruby23/pkg-plist ============================================================================== --- head/lang/ruby23/pkg-plist Fri Apr 28 02:18:54 2017 (r439592) +++ head/lang/ruby23/pkg-plist Fri Apr 28 02:31:58 2017 (r439593) @@ -6816,6 +6816,7 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/Float/zero%3f-i.ri %%RDOC%%%%RUBY_RIDIR%%/FloatDomainError/cdesc-FloatDomainError.ri %%RDOC%%%%RUBY_RIDIR%%/Forwardable/cdesc-Forwardable.ri +%%RDOC%%%%RUBY_RIDIR%%/Forwardable/_delegator_method-c.ri %%RDOC%%%%RUBY_RIDIR%%/Forwardable/debug-c.ri %%RDOC%%%%RUBY_RIDIR%%/Forwardable/def_delegator-i.ri %%RDOC%%%%RUBY_RIDIR%%/Forwardable/def_delegators-i.ri @@ -16359,13 +16360,6 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/__getobj__-i.ri %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/__setobj__-i.ri %%RDOC%%%%RUBY_RIDIR%%/SimpleDelegator/cdesc-SimpleDelegator.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/cdesc-SingleForwardable.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_delegator-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_delegators-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_single_delegator-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/def_single_delegators-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/delegate-i.ri -%%RDOC%%%%RUBY_RIDIR%%/SingleForwardable/single_delegate-i.ri %%RDOC%%%%RUBY_RIDIR%%/Singleton/_dump-i.ri %%RDOC%%%%RUBY_RIDIR%%/Singleton/_load-c.ri %%RDOC%%%%RUBY_RIDIR%%/Singleton/append_features-c.ri
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704280231.v3S2VwpL002003>