diff --git a/audio/Makefile b/audio/Makefile
index d43313a2ac5..b6b06c7d94a 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.430 2020/04/15 15:50:15 bket Exp $
+# $OpenBSD: Makefile,v 1.431 2020/05/19 15:34:55 jeremy Exp $
 
      SUBDIR =
      SUBDIR += abcde
@@ -214,10 +214,8 @@
      SUBDIR += rhythmbox
      SUBDIR += rtunes
      SUBDIR += rubberband
-     SUBDIR += ruby-taglib,ruby25
      SUBDIR += ruby-taglib,ruby26
      SUBDIR += ruby-taglib,ruby27
-     SUBDIR += ruby-vorbis_comment,ruby25
      SUBDIR += ruby-vorbis_comment,ruby26
      SUBDIR += ruby-vorbis_comment,ruby27
      SUBDIR += schismtracker
diff --git a/databases/Makefile b/databases/Makefile
index c367184a79b..857b3d756c5 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.393 2020/05/15 10:23:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.394 2020/05/19 15:34:55 jeremy Exp $
 
      SUBDIR =
      SUBDIR += architect
@@ -203,7 +203,6 @@
      SUBDIR += redis
      SUBDIR += repmgr
      SUBDIR += riak
-     SUBDIR += ruby-amalgalite,ruby25
      SUBDIR += ruby-amalgalite,ruby26
      SUBDIR += ruby-amalgalite,ruby27
      SUBDIR += ruby-hiera3
@@ -211,29 +210,22 @@
      SUBDIR += ruby-hiera-eyaml-gpg
      SUBDIR += ruby-hiera-file
      SUBDIR += ruby-kirbybase
-     SUBDIR += ruby-ldap,ruby25
      SUBDIR += ruby-ldap,ruby26
      SUBDIR += ruby-ldap,ruby27
-     SUBDIR += ruby-mysql,ruby25
      SUBDIR += ruby-mysql,ruby26
      SUBDIR += ruby-mysql,ruby27
-     SUBDIR += ruby-mysql2,ruby25
      SUBDIR += ruby-mysql2,ruby26
      SUBDIR += ruby-mysql2,ruby27
-     SUBDIR += ruby-pg,ruby25
      SUBDIR += ruby-pg,ruby26
      SUBDIR += ruby-pg,ruby27
      SUBDIR += ruby-redis
      SUBDIR += ruby-redis-namespace
      SUBDIR += ruby-resque
      SUBDIR += ruby-sequel
-     SUBDIR += ruby-sequel_pg,ruby25
      SUBDIR += ruby-sequel_pg,ruby26
      SUBDIR += ruby-sequel_pg,ruby27
-     SUBDIR += ruby-sqlite3,ruby25
      SUBDIR += ruby-sqlite3,ruby26
      SUBDIR += ruby-sqlite3,ruby27
-     SUBDIR += ruby-tiny_tds,ruby25
      SUBDIR += ruby-tiny_tds,ruby26
      SUBDIR += ruby-tiny_tds,ruby27
      SUBDIR += sharedance
diff --git a/devel/Makefile b/devel/Makefile
index c579ca8b018..930ab076437 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1972 2020/05/18 12:29:17 espie Exp $
+# $OpenBSD: Makefile,v 1.1973 2020/05/19 15:34:55 jeremy Exp $
 
      SUBDIR =
      SUBDIR += 64tass
@@ -1808,7 +1808,6 @@
      SUBDIR += ruby-diff-lcs
      SUBDIR += ruby-extlib
      SUBDIR += ruby-fast_gettext
-     SUBDIR += ruby-ffi,ruby25
      SUBDIR += ruby-ffi,ruby26
      SUBDIR += ruby-ffi,ruby27
      SUBDIR += ruby-flexmock
@@ -1824,10 +1823,8 @@
      SUBDIR += ruby-isolate
      SUBDIR += ruby-jeweler
      SUBDIR += ruby-json_pure
-     SUBDIR += ruby-kgio,ruby25
      SUBDIR += ruby-kgio,ruby26
      SUBDIR += ruby-kgio,ruby27
-     SUBDIR += ruby-libv8,ruby25
      SUBDIR += ruby-libv8,ruby26
      SUBDIR += ruby-libv8,ruby27
      SUBDIR += ruby-locale
@@ -1835,13 +1832,10 @@
      SUBDIR += ruby-metaclass
      SUBDIR += ruby-minitest
      SUBDIR += ruby-mocha
-     SUBDIR += ruby-narray,ruby25
      SUBDIR += ruby-narray,ruby26
      SUBDIR += ruby-narray,ruby27
-     SUBDIR += ruby-ncurses,ruby25
      SUBDIR += ruby-ncurses,ruby26
      SUBDIR += ruby-ncurses,ruby27
-     SUBDIR += ruby-nio4r,ruby25
      SUBDIR += ruby-nio4r,ruby26
      SUBDIR += ruby-nio4r,ruby27
      SUBDIR += ruby-ole
@@ -1849,17 +1843,13 @@
      SUBDIR += ruby-opt_parse_validator
      SUBDIR += ruby-optimist
      SUBDIR += ruby-polyglot
-     SUBDIR += ruby-prof,ruby25
      SUBDIR += ruby-prof,ruby26
      SUBDIR += ruby-prof,ruby27
-     SUBDIR += ruby-puppet_forge,ruby25
-     SUBDIR += ruby-puppet_forge,ruby26
-     SUBDIR += ruby-racc,ruby25
+     SUBDIR += ruby-puppet_forge
      SUBDIR += ruby-racc,ruby26
      SUBDIR += ruby-racc,ruby27
      SUBDIR += ruby-rake-compiler
      SUBDIR += ruby-rake-remote_task
-     SUBDIR += ruby-rb-gsl,ruby25
      SUBDIR += ruby-rb-gsl,ruby26
      SUBDIR += ruby-rb-gsl,ruby27
      SUBDIR += ruby-ref
@@ -1874,12 +1864,10 @@
      SUBDIR += ruby-semantic_puppet
      SUBDIR += ruby-sexp_processor
      SUBDIR += ruby-shims
-     SUBDIR += ruby-subset_sum,ruby25
      SUBDIR += ruby-subset_sum,ruby26
      SUBDIR += ruby-subset_sum,ruby27
      SUBDIR += ruby-systemu
      SUBDIR += ruby-sys-proctable
-     SUBDIR += ruby-therubyracer,ruby25
      SUBDIR += ruby-therubyracer,ruby26
      SUBDIR += ruby-therubyracer,ruby27
      SUBDIR += ruby-thor
@@ -1890,7 +1878,6 @@
      SUBDIR += ruby-uuid
      SUBDIR += ruby-uuidtools
      SUBDIR += ruby-xdg
-     SUBDIR += ruby-yajl,ruby25
      SUBDIR += ruby-yajl,ruby26
      SUBDIR += ruby-yajl,ruby27
      SUBDIR += ruby-zeitwerk
diff --git a/graphics/Makefile b/graphics/Makefile
index 7f45a5e7552..688a8da449a 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.506 2020/05/15 08:19:21 denis Exp $
+# $OpenBSD: Makefile,v 1.507 2020/05/19 15:34:55 jeremy Exp $
 
      SUBDIR =
      SUBDIR += DevIL
@@ -266,7 +266,6 @@
      SUBDIR += rawtherapee
      SUBDIR += ruby-color
      SUBDIR += ruby-gruff
-     SUBDIR += ruby-rmagick,ruby25
      SUBDIR += ruby-rmagick,ruby26
      SUBDIR += ruby-rmagick,ruby27
      SUBDIR += s10sh
diff --git a/net/Makefile b/net/Makefile
index a471cb898c8..7f6e2794b32 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1202 2020/05/18 11:20:35 denis Exp $
+# $OpenBSD: Makefile,v 1.1203 2020/05/19 15:34:55 jeremy Exp $
 
      SUBDIR =
      SUBDIR += adns
@@ -659,12 +659,10 @@
      SUBDIR += rtmpdump
      SUBDIR += rtorrent
      SUBDIR += ruby-agcaldav
-     SUBDIR += ruby-eventmachine,ruby25
      SUBDIR += ruby-eventmachine,ruby26
      SUBDIR += ruby-eventmachine,ruby27
      SUBDIR += ruby-macaddr
      SUBDIR += ruby-mfi
-     SUBDIR += ruby-msgpack,ruby25
      SUBDIR += ruby-msgpack,ruby26
      SUBDIR += ruby-msgpack,ruby27
      SUBDIR += ruby-net-dns
diff --git a/security/Makefile b/security/Makefile
index 83a4292124a..21d06e7a635 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.577 2020/05/17 10:36:17 kn Exp $
+# $OpenBSD: Makefile,v 1.578 2020/05/19 15:34:56 jeremy Exp $
 
      SUBDIR =
      SUBDIR += ADMsnmp
@@ -354,14 +354,11 @@
      SUBDIR += reop
      SUBDIR += rhash
      SUBDIR += routersploit
-     SUBDIR += ruby-bcrypt,ruby25
      SUBDIR += ruby-bcrypt,ruby26
      SUBDIR += ruby-bcrypt,ruby27
      SUBDIR += ruby-cms_scanner
-     SUBDIR += ruby-gpgme,ruby25
      SUBDIR += ruby-gpgme,ruby26
      SUBDIR += ruby-gpgme,ruby27
-     SUBDIR += ruby-pledge,ruby25
      SUBDIR += ruby-pledge,ruby26
      SUBDIR += ruby-pledge,ruby27
      SUBDIR += ruby-hmac
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 7ac741c41c0..314c6ba31ce 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.566 2020/05/14 18:39:31 jasper Exp $
+# $OpenBSD: Makefile,v 1.567 2020/05/19 15:34:56 jeremy Exp $
 
      SUBDIR =
      SUBDIR += accountsservice
@@ -301,22 +301,18 @@
      SUBDIR += rpl
      SUBDIR += rsyslog
      SUBDIR += rtty
-     SUBDIR += ruby-augeas,ruby25
      SUBDIR += ruby-augeas,ruby26
      SUBDIR += ruby-augeas,ruby27
      SUBDIR += ruby-capistrano
      SUBDIR += ruby-directory_watcher
-     SUBDIR += ruby-libvirt,ruby25
      SUBDIR += ruby-libvirt,ruby26
      SUBDIR += ruby-libvirt,ruby27
-     SUBDIR += ruby-posix-spawn,ruby25
      SUBDIR += ruby-posix-spawn,ruby26
      SUBDIR += ruby-posix-spawn,ruby27
      SUBDIR += ruby-puppet
      SUBDIR += ruby-puppet-lint
      SUBDIR += ruby-puppet-syntax
      SUBDIR += ruby-r10k
-     SUBDIR += ruby-shadow,ruby25
      SUBDIR += ruby-shadow,ruby26
      SUBDIR += ruby-shadow,ruby27
      SUBDIR += ruby-tzinfo
diff --git a/textproc/Makefile b/textproc/Makefile
index ca2aab84292..78aac81a81a 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.631 2020/05/17 23:21:26 afresh1 Exp $
+# $OpenBSD: Makefile,v 1.632 2020/05/19 15:34:56 jeremy Exp $
 
      SUBDIR =
      SUBDIR += TclXML
@@ -499,17 +499,13 @@
      SUBDIR += rubber
      SUBDIR += ruby-builder
      SUBDIR += ruby-erubis
-     SUBDIR += ruby-fast-stemmer,ruby25
      SUBDIR += ruby-fast-stemmer,ruby26
      SUBDIR += ruby-fast-stemmer,ruby27
-     SUBDIR += ruby-fast_xs,ruby25
      SUBDIR += ruby-fast_xs,ruby26
      SUBDIR += ruby-fast_xs,ruby27
      SUBDIR += ruby-haml
-     SUBDIR += ruby-hpricot,ruby25
      SUBDIR += ruby-hpricot,ruby26
      SUBDIR += ruby-hpricot,ruby27
-     SUBDIR += ruby-hyperestraier,ruby25
      SUBDIR += ruby-hyperestraier,ruby26
      SUBDIR += ruby-hyperestraier,ruby27
      SUBDIR += ruby-icalendar
@@ -517,17 +513,13 @@
      SUBDIR += ruby-liquid
      SUBDIR += ruby-maruku
      SUBDIR += ruby-mustache
-     SUBDIR += ruby-nokogiri,ruby25
      SUBDIR += ruby-nokogiri,ruby26
      SUBDIR += ruby-nokogiri,ruby27
      SUBDIR += ruby-pygments.rb
-     SUBDIR += ruby-rdiscount,ruby25
      SUBDIR += ruby-rdiscount,ruby26
      SUBDIR += ruby-rdiscount,ruby27
-     SUBDIR += ruby-redcarpet,ruby25
      SUBDIR += ruby-redcarpet,ruby26
      SUBDIR += ruby-redcarpet,ruby27
-     SUBDIR += ruby-redcloth,ruby25
      SUBDIR += ruby-redcloth,ruby26
      SUBDIR += ruby-redcloth,ruby27
      SUBDIR += ruby-rexical
diff --git a/www/Makefile b/www/Makefile
index 609067383a3..050c7d214fc 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.960 2020/05/17 18:47:22 afresh1 Exp $
+# $OpenBSD: Makefile,v 1.961 2020/05/19 15:34:56 jeremy Exp $
 
      SUBDIR =
      SUBDIR += ajaxterm
@@ -528,49 +528,39 @@
      SUBDIR += rt
      SUBDIR += ruby-addressable
      SUBDIR += ruby-capybara
-     SUBDIR += ruby-capybara-webkit,ruby25
      SUBDIR += ruby-capybara-webkit,ruby26
      SUBDIR += ruby-capybara-webkit,ruby27
      SUBDIR += ruby-ethon
      SUBDIR += ruby-faraday
      SUBDIR += ruby-faraday_middleware
      SUBDIR += ruby-faraday_middleware-multi_json
-     SUBDIR += ruby-fcgi,ruby25
      SUBDIR += ruby-fcgi,ruby26
      SUBDIR += ruby-fcgi,ruby27
      SUBDIR += ruby-mechanize
      SUBDIR += ruby-multipart-post
      SUBDIR += ruby-mustermann
-     SUBDIR += ruby-ntlm,ruby25
      SUBDIR += ruby-ntlm,ruby26
      SUBDIR += ruby-ntlm,ruby27
-     SUBDIR += ruby-passenger,ruby25
      SUBDIR += ruby-passenger,ruby26
      SUBDIR += ruby-passenger,ruby27
-     SUBDIR += ruby-puma,ruby25
      SUBDIR += ruby-puma,ruby26
      SUBDIR += ruby-puma,ruby27
      SUBDIR += ruby-rack
      SUBDIR += ruby-rack-protection
      SUBDIR += ruby-rack-test
      SUBDIR += ruby-rainbows
-     SUBDIR += ruby-raindrops,ruby25
      SUBDIR += ruby-raindrops,ruby26
      SUBDIR += ruby-raindrops,ruby27
      SUBDIR += ruby-sanitize
-     SUBDIR += ruby-sassc,ruby25
      SUBDIR += ruby-sassc,ruby26
      SUBDIR += ruby-sassc,ruby27
      SUBDIR += ruby-sinatra
-     SUBDIR += ruby-thin,ruby25
      SUBDIR += ruby-thin,ruby26
      SUBDIR += ruby-thin,ruby27
      SUBDIR += ruby-typhoeus
-     SUBDIR += ruby-unicorn,ruby25
      SUBDIR += ruby-unicorn,ruby26
      SUBDIR += ruby-unicorn,ruby27
      SUBDIR += ruby-vegas
-     SUBDIR += ruby-websocket-driver,ruby25
      SUBDIR += ruby-websocket-driver,ruby26
      SUBDIR += ruby-websocket-driver,ruby27
      SUBDIR += ruby-websocket-extensions
diff --git a/x11/Makefile b/x11/Makefile
index 3945c31e37d..1912731f5cb 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.656 2020/03/20 07:20:57 landry Exp $
+# $OpenBSD: Makefile,v 1.657 2020/05/19 15:34:56 jeremy Exp $
 
      SUBDIR =
      SUBDIR += 2bwm
@@ -267,7 +267,6 @@
      SUBDIR += rox-filer
      SUBDIR += roxterm
      SUBDIR += ruby-dbus
-     SUBDIR += ruby-tk,ruby25
      SUBDIR += ruby-tk,ruby26
      SUBDIR += ruby-tk,ruby27
      SUBDIR += rxvt-unicode