Ruby 2.1 will be completely unsupported upstream before the release of
OpenBSD 6.1 (date not yet announced, but likely to be this Christmas).

Per our standard support policy for ruby ports, we will stop building
ruby 2.1 ports by default.  You will still be able to build them
manually using FLAVOR=ruby21.

At some point soon, we will also be removing ruby 2.0 from the ports
tree and the ruby20 FLAVOR from ruby.port.mk. I'll probably do that
at the same time I make ruby 2.3 the default ruby version in ports
(which isn't ready yet).

This patch removes ruby21 ports.  The only other change is that it
builds ruby22 and ruby23 versions of devel/ruby-ffi, which weren't
being built previously.  OKs for this patch?

Thanks,
Jeremy

Index: audio/Makefile
===================================================================
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.371
diff -u -p -r1.371 Makefile
--- audio/Makefile      10 Jul 2016 11:05:02 -0000      1.371
+++ audio/Makefile      1 Aug 2016 19:46:41 -0000
@@ -212,14 +212,11 @@
      SUBDIR += rhythmbox
      SUBDIR += rsynth
      SUBDIR += rtunes
-     SUBDIR += ruby-id3lib,ruby21
      SUBDIR += ruby-id3lib,ruby22
      SUBDIR += ruby-id3lib,ruby23
      SUBDIR += ruby-sonos
-     SUBDIR += ruby-taglib,ruby21
      SUBDIR += ruby-taglib,ruby22
      SUBDIR += ruby-taglib,ruby23
-     SUBDIR += ruby-vorbis_comment,ruby21
      SUBDIR += ruby-vorbis_comment,ruby22
      SUBDIR += ruby-vorbis_comment,ruby23
      SUBDIR += schismtracker
Index: converters/Makefile
===================================================================
RCS file: /cvs/ports/converters/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- converters/Makefile 28 Apr 2016 08:38:26 -0000      1.80
+++ converters/Makefile 1 Aug 2016 19:46:45 -0000
@@ -65,7 +65,6 @@
     SUBDIR += recode
     SUBDIR += ripmime
     SUBDIR += rpm2cpio
-    SUBDIR += ruby-json,ruby21
     SUBDIR += ruby-json,ruby22
     SUBDIR += ruby-json,ruby23
     SUBDIR += ruby-multi_json
Index: databases/Makefile
===================================================================
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.314
diff -u -p -r1.314 Makefile
--- databases/Makefile  20 Jun 2016 09:50:24 -0000      1.314
+++ databases/Makefile  1 Aug 2016 19:48:10 -0000
@@ -201,18 +201,14 @@
      SUBDIR += redis
      SUBDIR += repmgr
      SUBDIR += riak
-     SUBDIR += ruby-amalgalite,ruby21
      SUBDIR += ruby-amalgalite,ruby22
      SUBDIR += ruby-amalgalite,ruby23
      SUBDIR += ruby-bdb,ruby18
      SUBDIR += ruby-data_objects
-     SUBDIR += ruby-do_mysql,ruby21
      SUBDIR += ruby-do_mysql,ruby22
      SUBDIR += ruby-do_mysql,ruby23
-     SUBDIR += ruby-do_postgres,ruby21
      SUBDIR += ruby-do_postgres,ruby22
      SUBDIR += ruby-do_postgres,ruby23
-     SUBDIR += ruby-do_sqlite3,ruby21
      SUBDIR += ruby-do_sqlite3,ruby22
      SUBDIR += ruby-do_sqlite3,ruby23
      SUBDIR += ruby-hiera
@@ -224,39 +220,29 @@
      SUBDIR += ruby-jdbc-postgres
      SUBDIR += ruby-jdbc-sqlite3
      SUBDIR += ruby-kirbybase
-     SUBDIR += ruby-ldap,ruby21
      SUBDIR += ruby-ldap,ruby22
      SUBDIR += ruby-ldap,ruby23
-     SUBDIR += ruby-mysql,ruby21
      SUBDIR += ruby-mysql,ruby22
      SUBDIR += ruby-mysql,ruby23
-     SUBDIR += ruby-mysql2,ruby21
      SUBDIR += ruby-mysql2,ruby22
      SUBDIR += ruby-mysql2,ruby23
-     SUBDIR += ruby-pg,ruby21
      SUBDIR += ruby-pg,ruby22
      SUBDIR += ruby-pg,ruby23
      SUBDIR += ruby-redis
      SUBDIR += ruby-redis-namespace
      SUBDIR += ruby-resque
      SUBDIR += ruby-sequel
-     SUBDIR += ruby-sequel_pg,ruby21
      SUBDIR += ruby-sequel_pg,ruby22
      SUBDIR += ruby-sequel_pg,ruby23
-     SUBDIR += ruby-sqlite3,ruby21
      SUBDIR += ruby-sqlite3,ruby22
      SUBDIR += ruby-sqlite3,ruby23
      SUBDIR += ruby-swift
-     SUBDIR += ruby-swift-db-mysql,ruby21
      SUBDIR += ruby-swift-db-mysql,ruby22
      SUBDIR += ruby-swift-db-mysql,ruby23
-     SUBDIR += ruby-swift-db-postgres,ruby21
      SUBDIR += ruby-swift-db-postgres,ruby22
      SUBDIR += ruby-swift-db-postgres,ruby23
-     SUBDIR += ruby-swift-db-sqlite3,ruby21
      SUBDIR += ruby-swift-db-sqlite3,ruby22
      SUBDIR += ruby-swift-db-sqlite3,ruby23
-     SUBDIR += ruby-tiny_tds,ruby21
      SUBDIR += ruby-tiny_tds,ruby22
      SUBDIR += ruby-tiny_tds,ruby23
      SUBDIR += ruby-validatable
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1510
diff -u -p -r1.1510 Makefile
--- devel/Makefile      29 Jun 2016 08:10:49 -0000      1.1510
+++ devel/Makefile      1 Aug 2016 19:51:11 -0000
@@ -1450,7 +1450,6 @@
      SUBDIR += rlog
      SUBDIR += ruby-abstract
      SUBDIR += ruby-arrayfields
-     SUBDIR += ruby-atomic,ruby21
      SUBDIR += ruby-atomic,ruby22
      SUBDIR += ruby-atomic,ruby23
      SUBDIR += ruby-bacon
@@ -1468,7 +1467,8 @@
      SUBDIR += ruby-deep_merge
      SUBDIR += ruby-diff-lcs
      SUBDIR += ruby-extlib
-     SUBDIR += ruby-ffi,ruby21
+     SUBDIR += ruby-ffi,ruby22
+     SUBDIR += ruby-ffi,ruby23
      SUBDIR += ruby-ffi-inliner
      SUBDIR += ruby-flexmock
      SUBDIR += ruby-gem_plugin
@@ -1483,7 +1483,6 @@
      SUBDIR += ruby-isolate
      SUBDIR += ruby-jeweler
      SUBDIR += ruby-json_pure
-     SUBDIR += ruby-kgio,ruby21
      SUBDIR += ruby-kgio,ruby22
      SUBDIR += ruby-kgio,ruby23
      SUBDIR += ruby-locale
@@ -1492,29 +1491,23 @@
      SUBDIR += ruby-minitest
      SUBDIR += ruby-mocha
      SUBDIR += ruby-mspec
-     SUBDIR += ruby-narray,ruby21
      SUBDIR += ruby-narray,ruby22
      SUBDIR += ruby-narray,ruby23
-     SUBDIR += ruby-ncurses,ruby21
      SUBDIR += ruby-ncurses,ruby22
      SUBDIR += ruby-ncurses,ruby23
      SUBDIR += ruby-needle
      SUBDIR += ruby-ole
      SUBDIR += ruby-open4
      SUBDIR += ruby-polyglot
-     SUBDIR += ruby-prof,ruby21
      SUBDIR += ruby-prof,ruby22
      SUBDIR += ruby-prof,ruby23
-     SUBDIR += ruby-puppet_forge,ruby21
      SUBDIR += ruby-puppet_forge,ruby22
      SUBDIR += ruby-puppet_forge,ruby23
-     SUBDIR += ruby-racc,ruby21
      SUBDIR += ruby-racc,ruby22
      SUBDIR += ruby-racc,ruby23
      SUBDIR += ruby-rake
      SUBDIR += ruby-rake-compiler
      SUBDIR += ruby-rake-remote_task
-     SUBDIR += ruby-rb-gsl,ruby21
      SUBDIR += ruby-rb-gsl,ruby22
      SUBDIR += ruby-rb-gsl,ruby23
      SUBDIR += ruby-ref
@@ -1528,11 +1521,9 @@
      SUBDIR += ruby-semantic_puppet
      SUBDIR += ruby-sexp_processor
      SUBDIR += ruby-stringex
-     SUBDIR += ruby-subset_sum,ruby21
      SUBDIR += ruby-subset_sum,ruby22
      SUBDIR += ruby-subset_sum,ruby23
      SUBDIR += ruby-systemu
-     SUBDIR += ruby-therubyracer,ruby21
      SUBDIR += ruby-therubyracer,ruby22
      SUBDIR += ruby-therubyracer,ruby23
      SUBDIR += ruby-thor
@@ -1541,7 +1532,6 @@
      SUBDIR += ruby-trollop
      SUBDIR += ruby-uuid
      SUBDIR += ruby-uuidtools
-     SUBDIR += ruby-yajl,ruby21
      SUBDIR += ruby-yajl,ruby22
      SUBDIR += ruby-yajl,ruby23
      SUBDIR += ruby-zentest
Index: graphics/Makefile
===================================================================
RCS file: /cvs/ports/graphics/Makefile,v
retrieving revision 1.415
diff -u -p -r1.415 Makefile
--- graphics/Makefile   10 Jul 2016 10:39:37 -0000      1.415
+++ graphics/Makefile   1 Aug 2016 19:47:09 -0000
@@ -235,7 +235,6 @@
      SUBDIR += rawtherapee
      SUBDIR += ruby-color
      SUBDIR += ruby-gruff
-     SUBDIR += ruby-rmagick,ruby21
      SUBDIR += ruby-rmagick,ruby22
      SUBDIR += ruby-rmagick,ruby23
      SUBDIR += s10sh
Index: net/Makefile
===================================================================
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.977
diff -u -p -r1.977 Makefile
--- net/Makefile        26 Jun 2016 21:40:36 -0000      1.977
+++ net/Makefile        1 Aug 2016 19:47:14 -0000
@@ -592,12 +592,10 @@
      SUBDIR += rtmpdump
      SUBDIR += rtorrent
      SUBDIR += ruby-agcaldav
-     SUBDIR += ruby-eventmachine,ruby21
      SUBDIR += ruby-eventmachine,ruby22
      SUBDIR += ruby-eventmachine,ruby23
      SUBDIR += ruby-macaddr
      SUBDIR += ruby-mfi
-     SUBDIR += ruby-msgpack,ruby21
      SUBDIR += ruby-msgpack,ruby22
      SUBDIR += ruby-msgpack,ruby23
      SUBDIR += ruby-net-dns
Index: security/Makefile
===================================================================
RCS file: /cvs/ports/security/Makefile,v
retrieving revision 1.430
diff -u -p -r1.430 Makefile
--- security/Makefile   4 Jul 2016 21:04:08 -0000       1.430
+++ security/Makefile   1 Aug 2016 19:47:18 -0000
@@ -289,7 +289,6 @@
      SUBDIR += reop
      SUBDIR += routersploit
      SUBDIR += ruby-akami
-     SUBDIR += ruby-bcrypt,ruby21
      SUBDIR += ruby-bcrypt,ruby22
      SUBDIR += ruby-bcrypt,ruby23
      SUBDIR += ruby-ezcrypto
Index: sysutils/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/Makefile,v
retrieving revision 1.396
diff -u -p -r1.396 Makefile
--- sysutils/Makefile   11 Jul 2016 09:25:18 -0000      1.396
+++ sysutils/Makefile   1 Aug 2016 19:47:23 -0000
@@ -194,21 +194,17 @@
      SUBDIR += rpl
      SUBDIR += rsyslog
      SUBDIR += rtty
-     SUBDIR += ruby-augeas,ruby21
      SUBDIR += ruby-augeas,ruby22
      SUBDIR += ruby-capistrano
      SUBDIR += ruby-directory_watcher
      SUBDIR += ruby-facter
-     SUBDIR += ruby-libvirt,ruby21
      SUBDIR += ruby-libvirt,ruby22
-     SUBDIR += ruby-posix-spawn,ruby21
      SUBDIR += ruby-posix-spawn,ruby22
      SUBDIR += ruby-posix-spawn,ruby23
      SUBDIR += ruby-puppet
      SUBDIR += ruby-puppet-lint
      SUBDIR += ruby-puppet-syntax
      SUBDIR += ruby-r10k
-     SUBDIR += ruby-shadow,ruby21
      SUBDIR += ruby-shadow,ruby22
      SUBDIR += ruby-shadow,ruby23
      SUBDIR += ruby-vlad
Index: textproc/Makefile
===================================================================
RCS file: /cvs/ports/textproc/Makefile,v
retrieving revision 1.502
diff -u -p -r1.502 Makefile
--- textproc/Makefile   10 Jun 2016 13:01:07 -0000      1.502
+++ textproc/Makefile   1 Aug 2016 19:47:32 -0000
@@ -397,19 +397,15 @@
      SUBDIR += ruby-builder
      SUBDIR += ruby-classifier
      SUBDIR += ruby-erubis
-     SUBDIR += ruby-fast-stemmer,ruby21
      SUBDIR += ruby-fast-stemmer,ruby22
      SUBDIR += ruby-fast-stemmer,ruby23
-     SUBDIR += ruby-fast_xs,ruby21
      SUBDIR += ruby-fast_xs,ruby22
      SUBDIR += ruby-fast_xs,ruby23
      SUBDIR += ruby-gyoku
      SUBDIR += ruby-haml
-     SUBDIR += ruby-hpricot,ruby21
      SUBDIR += ruby-hpricot,ruby22
      SUBDIR += ruby-hpricot,ruby23
      SUBDIR += ruby-htmlentities
-     SUBDIR += ruby-hyperestraier,ruby21
      SUBDIR += ruby-hyperestraier,ruby22
      SUBDIR += ruby-hyperestraier,ruby23
      SUBDIR += ruby-icalendar
@@ -418,19 +414,15 @@
      SUBDIR += ruby-markaby
      SUBDIR += ruby-maruku
      SUBDIR += ruby-mustache
-     SUBDIR += ruby-nokogiri,ruby21
      SUBDIR += ruby-nokogiri,ruby22
      SUBDIR += ruby-nokogiri,ruby23
      SUBDIR += ruby-nori
      SUBDIR += ruby-pdf-reader
      SUBDIR += ruby-pygments.rb
-     SUBDIR += ruby-rdiscount,ruby21
      SUBDIR += ruby-rdiscount,ruby22
      SUBDIR += ruby-rdiscount,ruby23
-     SUBDIR += ruby-redcarpet,ruby21
      SUBDIR += ruby-redcarpet,ruby22
      SUBDIR += ruby-redcarpet,ruby23
-     SUBDIR += ruby-redcloth,ruby21
      SUBDIR += ruby-redcloth,ruby22
      SUBDIR += ruby-redcloth,ruby23
      SUBDIR += ruby-rexical
Index: www/Makefile
===================================================================
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.787
diff -u -p -r1.787 Makefile
--- www/Makefile        5 Jun 2016 17:14:56 -0000       1.787
+++ www/Makefile        1 Aug 2016 19:47:46 -0000
@@ -456,48 +456,39 @@
      SUBDIR += rt
      SUBDIR += ruby-addressable
      SUBDIR += ruby-capybara
-     SUBDIR += ruby-capybara-webkit,ruby21
      SUBDIR += ruby-capybara-webkit,ruby22
      SUBDIR += ruby-capybara-webkit,ruby23
      SUBDIR += ruby-faraday
      SUBDIR += ruby-faraday_middleware
      SUBDIR += ruby-faraday_middleware-multi_json
-     SUBDIR += ruby-fcgi,ruby21
      SUBDIR += ruby-fcgi,ruby22
      SUBDIR += ruby-fcgi,ruby23
      SUBDIR += ruby-httpclient
      SUBDIR += ruby-httpi
      SUBDIR += ruby-mechanize
      SUBDIR += ruby-multipart-post
-     SUBDIR += ruby-ntlm,ruby21
      SUBDIR += ruby-ntlm,ruby22
      SUBDIR += ruby-ntlm,ruby23
-     SUBDIR += ruby-passenger,ruby21
      SUBDIR += ruby-passenger,ruby22
      SUBDIR += ruby-passenger,ruby23
-     SUBDIR += ruby-puma,ruby21
      SUBDIR += ruby-puma,ruby22
      SUBDIR += ruby-puma,ruby23
      SUBDIR += ruby-rack
      SUBDIR += ruby-rack-protection
      SUBDIR += ruby-rack-test
      SUBDIR += ruby-rainbows
-     SUBDIR += ruby-raindrops,ruby21
      SUBDIR += ruby-raindrops,ruby22
      SUBDIR += ruby-raindrops,ruby23
      SUBDIR += ruby-sanitize
      SUBDIR += ruby-savon
      SUBDIR += ruby-sinatra
-     SUBDIR += ruby-thin,ruby21
      SUBDIR += ruby-thin,ruby22
      SUBDIR += ruby-thin,ruby23
      SUBDIR += ruby-thin_http
-     SUBDIR += ruby-unicorn,ruby21
      SUBDIR += ruby-unicorn,ruby22
      SUBDIR += ruby-unicorn,ruby23
      SUBDIR += ruby-vegas
      SUBDIR += ruby-wasabi
-     SUBDIR += ruby-websocket-driver,ruby21
      SUBDIR += ruby-websocket-driver,ruby22
      SUBDIR += ruby-websocket-driver,ruby23
      SUBDIR += ruby-websocket-extensions

Reply via email to