Per our standard Ruby support policy, now that Ruby 2.5 is out of the
normal maintenance phase, remove the building of Ruby 2.5 ports by
default. You can still build the ports manually if you need to.
The only other change here is the removal of the explicit ruby
version for devel/ruby-puppet_forge. We only use explicit Ruby versions
for ruby ports with native code, not for pure-Ruby ports.
I plan on committing this in a couple days unless I hear objections.
Thanks,
Jeremy
Index: audio/Makefile
===================================================================
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.430
diff -u -p -r1.430 Makefile
--- audio/Makefile 15 Apr 2020 15:50:15 -0000 1.430
+++ audio/Makefile 17 May 2020 19:45:26 -0000
@@ -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
Index: databases/Makefile
===================================================================
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.393
diff -u -p -r1.393 Makefile
--- databases/Makefile 15 May 2020 10:23:59 -0000 1.393
+++ databases/Makefile 17 May 2020 19:45:36 -0000
@@ -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
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1970
diff -u -p -r1.1970 Makefile
--- devel/Makefile 17 May 2020 18:44:09 -0000 1.1970
+++ devel/Makefile 17 May 2020 19:46:19 -0000
@@ -1807,7 +1807,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
@@ -1823,10 +1822,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
@@ -1834,13 +1831,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
@@ -1848,17 +1842,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
@@ -1873,12 +1863,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
@@ -1889,7 +1877,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
Index: graphics/Makefile
===================================================================
RCS file: /cvs/ports/graphics/Makefile,v
retrieving revision 1.506
diff -u -p -r1.506 Makefile
--- graphics/Makefile 15 May 2020 08:19:21 -0000 1.506
+++ graphics/Makefile 17 May 2020 19:46:30 -0000
@@ -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
Index: net/Makefile
===================================================================
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1201
diff -u -p -r1.1201 Makefile
--- net/Makefile 17 May 2020 18:48:47 -0000 1.1201
+++ net/Makefile 17 May 2020 19:46:38 -0000
@@ -658,12 +658,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
Index: security/Makefile
===================================================================
RCS file: /cvs/ports/security/Makefile,v
retrieving revision 1.577
diff -u -p -r1.577 Makefile
--- security/Makefile 17 May 2020 10:36:17 -0000 1.577
+++ security/Makefile 17 May 2020 19:46:45 -0000
@@ -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
Index: sysutils/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/Makefile,v
retrieving revision 1.566
diff -u -p -r1.566 Makefile
--- sysutils/Makefile 14 May 2020 18:39:31 -0000 1.566
+++ sysutils/Makefile 17 May 2020 19:46:51 -0000
@@ -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
Index: textproc/Makefile
===================================================================
RCS file: /cvs/ports/textproc/Makefile,v
retrieving revision 1.630
diff -u -p -r1.630 Makefile
--- textproc/Makefile 14 May 2020 20:36:21 -0000 1.630
+++ textproc/Makefile 17 May 2020 19:47:01 -0000
@@ -498,17 +498,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
@@ -516,17 +512,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
Index: www/Makefile
===================================================================
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.960
diff -u -p -r1.960 Makefile
--- www/Makefile 17 May 2020 18:47:22 -0000 1.960
+++ www/Makefile 17 May 2020 19:47:14 -0000
@@ -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
Index: x11/Makefile
===================================================================
RCS file: /cvs/ports/x11/Makefile,v
retrieving revision 1.656
diff -u -p -r1.656 Makefile
--- x11/Makefile 20 Mar 2020 07:20:57 -0000 1.656
+++ x11/Makefile 17 May 2020 19:47:18 -0000
@@ -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
