Here's an update to ruby 2.6.1. This allows us to drop a local patch, 3
dist patches, and the build dependency on gtar.
Tested on amd64. Will be committing in a couple days unless I hear
objections.
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/2.6/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 14 Jan 2019 16:13:05 -0000 1.1.1.1
+++ Makefile 30 Jan 2019 15:10:56 -0000
@@ -1,16 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2019/01/14 16:13:05 jeremy Exp $
-VERSION = 2.6.0
+VERSION = 2.6.1
DISTNAME = ruby-${VERSION}
SHARED_LIBS = ruby26 0.0
NEXTVER = 2.7
-MASTER_SITES0 =
https://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_2_6/
-PATCHFILES =
ruby26-lib-net-protocol.patch{lib/net/protocol.rb?r1=66799\&r2=66798\&pathrev=66799\&view=patch}:0
\
-
ruby26-addr2line.patch{addr2line.c?r1=66800\&r2=66799\&pathrev=66800\&view=patch}:0
\
-
ruby26-random.patch{random.c?r1=66729\&r2=66728\&pathrev=66729\&view=patch}:0
-PATCH_DIST_STRIP = -p2
-
PSEUDO_FLAVORS= no_ri_docs bootstrap
# Do not build the RI docs on slow arches
.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Marm} || ${MACHINE_ARCH:Mhppa}
@@ -26,10 +20,6 @@ MULTI_PACKAGES = -main -gdbm -ri_docs
ALL_TARGET += rdoc
INSTALL_TARGET += install-doc
.endif
-
-# Remove after 2.6.1
-BUILD_DEPENDS = archivers/gtar
-TAR = gtar
# Fix path for JIT compiler to not use shims in ports obj bin dir
CONFIGURE_ENV += ac_cv_path_MJIT_CC=`which ${CC}`
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/2.6/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 14 Jan 2019 16:13:05 -0000 1.1.1.1
+++ distinfo 30 Jan 2019 15:08:22 -0000
@@ -1,8 +1,2 @@
-SHA256 (ruby-2.6.0.tar.gz) = 88NbkkoRyI/xEfCVbe083BLJDAS3KyZqxhB202l/wHI=
-SHA256 (ruby26-addr2line.patch) = Mh+FE3xqikouUeP/p15Y1PWkRHFdjo6vmY53t3aQ1JQ=
-SHA256 (ruby26-lib-net-protocol.patch) =
Udpc2M+2y5+2qH+sxU/o0z38rAsMwS+Q8bos61fLu70=
-SHA256 (ruby26-random.patch) = 5rsyVbei7Dl0XDEn95l5YXb9NNvPu8LRRMGN+u07jhE=
-SIZE (ruby-2.6.0.tar.gz) = 16687800
-SIZE (ruby26-addr2line.patch) = 1498
-SIZE (ruby26-lib-net-protocol.patch) = 390
-SIZE (ruby26-random.patch) = 372
+SHA256 (ruby-2.6.1.tar.gz) = FwJPt7sgPZz3paQseP9s53FA+dCDZ2BEp9tn8eUZHLg=
+SIZE (ruby-2.6.1.tar.gz) = 16742207
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/2.6/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 14 Jan 2019 16:13:05 -0000 1.1.1.1
+++ patches/patch-configure 30 Jan 2019 15:09:16 -0000
@@ -8,7 +8,7 @@ so ports don't have to be bumped when Op
Index: configure
--- configure.orig
+++ configure
-@@ -28025,7 +28025,7 @@ fi
+@@ -28027,7 +28027,7 @@ fi
;; #(
openbsd*|mirbsd*) :
@@ -17,7 +17,7 @@ Index: configure
;; #(
solaris*) :
-@@ -29566,7 +29566,7 @@ _ACEOF
+@@ -29568,7 +29568,7 @@ _ACEOF
else
Index: patches/patch-mjit_worker_c
===================================================================
RCS file: patches/patch-mjit_worker_c
diff -N patches/patch-mjit_worker_c
--- patches/patch-mjit_worker_c 14 Jan 2019 16:13:05 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-mjit_worker_c,v 1.1.1.1 2019/01/14 16:13:05 jeremy Exp $
-
-Fix JIT compilation when using base gcc.
-
-Index: mjit_worker.c
---- mjit_worker.c.orig
-+++ mjit_worker.c
-@@ -258,7 +258,7 @@ static const char *const CC_OPTIMIZE_ARGS[] = {MJIT_OP
- static const char *const CC_LDSHARED_ARGS[] = {MJIT_LDSHARED GCC_PIC_FLAGS
NULL};
- static const char *const CC_DLDFLAGS_ARGS[] = {
- MJIT_DLDFLAGS
--#if defined __GNUC__ && !defined __clang__
-+#if defined __GNUC__ && !defined __clang__ && !defined(__OpenBSD__)
- "-nostartfiles",
- # if !defined(_WIN32) && !defined(__CYGWIN__) && !defined(_AIX)
- "-nodefaultlibs", "-nostdlib",
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ruby/2.6/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 14 Jan 2019 16:13:05 -0000 1.1.1.1
+++ pkg/PLIST-main 30 Jan 2019 16:04:31 -0000
@@ -42,7 +42,7 @@ include/ruby-${REV}/ruby/util.h
include/ruby-${REV}/ruby/version.h
include/ruby-${REV}/ruby/vm.h
include/ruby-${REV}/${SUB}/
-include/ruby-${REV}/${SUB}/rb_mjit_min_header-2.6.0.h
+include/ruby-${REV}/${SUB}/rb_mjit_min_header-2.6.1.h
include/ruby-${REV}/${SUB}/ruby/
include/ruby-${REV}/${SUB}/ruby/config.h
lib/libruby26.so
@@ -1674,8 +1674,8 @@ lib/ruby/gems/${REV}/specifications/defa
lib/ruby/gems/${REV}/specifications/default/bigdecimal-1.4.1.gemspec
lib/ruby/gems/${REV}/specifications/default/bundler-1.17.2.gemspec
lib/ruby/gems/${REV}/specifications/default/cmath-1.0.0.gemspec
-lib/ruby/gems/${REV}/specifications/default/csv-3.0.2.gemspec
-lib/ruby/gems/${REV}/specifications/default/date-1.0.0.gemspec
+lib/ruby/gems/${REV}/specifications/default/csv-3.0.4.gemspec
+lib/ruby/gems/${REV}/specifications/default/date-2.0.0.gemspec
lib/ruby/gems/${REV}/specifications/default/dbm-1.0.0.gemspec
lib/ruby/gems/${REV}/specifications/default/e2mmap-0.1.0.gemspec
lib/ruby/gems/${REV}/specifications/default/etc-1.0.1.gemspec
Index: pkg/PLIST-ri_docs
===================================================================
RCS file: /cvs/ports/lang/ruby/2.6/pkg/PLIST-ri_docs,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-ri_docs
--- pkg/PLIST-ri_docs 14 Jan 2019 16:13:06 -0000 1.1.1.1
+++ pkg/PLIST-ri_docs 30 Jan 2019 16:05:22 -0000
@@ -3396,6 +3396,7 @@ share/ri/${REV}/system/CSV/Parser/skip_l
share/ri/${REV}/system/CSV/Parser/skip_needless_lines-i.ri
share/ri/${REV}/system/CSV/Parser/start_row-i.ri
share/ri/${REV}/system/CSV/Parser/unconverted_fields%3f-i.ri
+share/ri/${REV}/system/CSV/Parser/use_headers%3f-i.ri
share/ri/${REV}/system/CSV/Row/
share/ri/${REV}/system/CSV/Row/%3c%3c-i.ri
share/ri/${REV}/system/CSV/Row/%3d%3d-i.ri
@@ -3466,6 +3467,8 @@ share/ri/${REV}/system/CSV/Writer/prepar
share/ri/${REV}/system/CSV/Writer/prepare_format-i.ri
share/ri/${REV}/system/CSV/Writer/prepare_header-i.ri
share/ri/${REV}/system/CSV/Writer/prepare_output-i.ri
+share/ri/${REV}/system/CSV/Writer/quote-i.ri
+share/ri/${REV}/system/CSV/Writer/quote_field-i.ri
share/ri/${REV}/system/CSV/Writer/rewind-i.ri
share/ri/${REV}/system/CSV/add_row-i.ri
share/ri/${REV}/system/CSV/build_fields_converter-i.ri
