This modifies the category Makefiles to build ruby 2.2 versions of ruby
gem extension ports by default.
I've tested all of these with ruby 2.2 to various degrees, and all of
them at least compile and don't obviously fail at runtime.
There are 5 ruby gem extension ports that I didn't set to build ruby
2.2 versions by default yet.
databases/ruby-do_mysql: uses removed rb_thread_select
databases/ruby-do_postgres: uses removed rb_thread_select
databases/ruby-tiny_tds: uses removed rb_thread_blocking_region
net/ruby-eventmachine: requires version update
www/ruby-thin: depends on eventmachine
I'll send a diff for eventmachine shortly. The other projects have not
yet released a ruby 2.2 compatible version, though both are working on
it.
I plan to commit this this weekend unless I hear objections.
Thanks,
Jeremy
Index: audio/Makefile
===================================================================
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.345
diff -u -p -r1.345 Makefile
--- audio/Makefile 11 Dec 2014 09:03:12 -0000 1.345
+++ audio/Makefile 8 Jan 2015 20:58:15 -0000
@@ -214,11 +214,14 @@
SUBDIR += rtunes
SUBDIR += ruby-id3lib,ruby20
SUBDIR += ruby-id3lib,ruby21
+ SUBDIR += ruby-id3lib,ruby22
SUBDIR += ruby-sonos
SUBDIR += ruby-taglib,ruby20
SUBDIR += ruby-taglib,ruby21
+ SUBDIR += ruby-taglib,ruby22
SUBDIR += ruby-vorbis_comment,ruby20
SUBDIR += ruby-vorbis_comment,ruby21
+ SUBDIR += ruby-vorbis_comment,ruby22
SUBDIR += schismtracker
SUBDIR += scmpc
SUBDIR += shell-fm
Index: converters/Makefile
===================================================================
RCS file: /cvs/ports/converters/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- converters/Makefile 20 Nov 2014 21:16:29 -0000 1.73
+++ converters/Makefile 8 Jan 2015 20:58:44 -0000
@@ -65,6 +65,7 @@
SUBDIR += rpm2cpio
SUBDIR += ruby-json,ruby20
SUBDIR += ruby-json,ruby21
+ SUBDIR += ruby-json,ruby22
SUBDIR += ruby-multi_json
SUBDIR += trans
SUBDIR += uudeview
Index: databases/Makefile
===================================================================
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.282
diff -u -p -r1.282 Makefile
--- databases/Makefile 30 Nov 2014 20:55:56 -0000 1.282
+++ databases/Makefile 8 Jan 2015 21:00:09 -0000
@@ -196,6 +196,7 @@
SUBDIR += riak
SUBDIR += ruby-amalgalite,ruby20
SUBDIR += ruby-amalgalite,ruby21
+ SUBDIR += ruby-amalgalite,ruby22
SUBDIR += ruby-bdb,ruby20
SUBDIR += ruby-couchrest
SUBDIR += ruby-data_objects
@@ -205,6 +206,7 @@
SUBDIR += ruby-do_postgres,ruby21
SUBDIR += ruby-do_sqlite3,ruby20
SUBDIR += ruby-do_sqlite3,ruby21
+ SUBDIR += ruby-do_sqlite3,ruby22
SUBDIR += ruby-hiera
SUBDIR += ruby-hiera-file
SUBDIR += ruby-jdbc-h2
@@ -214,27 +216,36 @@
SUBDIR += ruby-kirbybase
SUBDIR += ruby-ldap,ruby20
SUBDIR += ruby-ldap,ruby21
+ SUBDIR += ruby-ldap,ruby22
SUBDIR += ruby-mysql,ruby20
SUBDIR += ruby-mysql,ruby21
+ SUBDIR += ruby-mysql,ruby22
SUBDIR += ruby-mysql2,ruby20
SUBDIR += ruby-mysql2,ruby21
+ SUBDIR += ruby-mysql2,ruby22
SUBDIR += ruby-pg,ruby20
SUBDIR += ruby-pg,ruby21
+ SUBDIR += ruby-pg,ruby22
SUBDIR += ruby-redis
SUBDIR += ruby-redis-namespace
SUBDIR += ruby-resque
SUBDIR += ruby-sequel
SUBDIR += ruby-sequel_pg,ruby20
SUBDIR += ruby-sequel_pg,ruby21
+ SUBDIR += ruby-sequel_pg,ruby22
SUBDIR += ruby-sqlite3,ruby20
SUBDIR += ruby-sqlite3,ruby21
+ SUBDIR += ruby-sqlite3,ruby22
SUBDIR += ruby-swift
SUBDIR += ruby-swift-db-mysql,ruby20
SUBDIR += ruby-swift-db-mysql,ruby21
+ SUBDIR += ruby-swift-db-mysql,ruby22
SUBDIR += ruby-swift-db-postgres,ruby20
SUBDIR += ruby-swift-db-postgres,ruby21
+ SUBDIR += ruby-swift-db-postgres,ruby22
SUBDIR += ruby-swift-db-sqlite3,ruby20
SUBDIR += ruby-swift-db-sqlite3,ruby21
+ SUBDIR += ruby-swift-db-sqlite3,ruby22
SUBDIR += ruby-tiny_tds,ruby20
SUBDIR += ruby-tiny_tds,ruby21
SUBDIR += ruby-validatable
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1301
diff -u -p -r1.1301 Makefile
--- devel/Makefile 4 Jan 2015 19:48:02 -0000 1.1301
+++ devel/Makefile 8 Jan 2015 21:01:13 -0000
@@ -1319,6 +1319,7 @@
SUBDIR += ruby-arrayfields
SUBDIR += ruby-atomic,ruby20
SUBDIR += ruby-atomic,ruby21
+ SUBDIR += ruby-atomic,ruby22
SUBDIR += ruby-bacon
SUBDIR += ruby-bundler
SUBDIR += ruby-cicphash
@@ -1350,6 +1351,7 @@
SUBDIR += ruby-json_pure
SUBDIR += ruby-kgio,ruby20
SUBDIR += ruby-kgio,ruby21
+ SUBDIR += ruby-kgio,ruby22
SUBDIR += ruby-locale
SUBDIR += ruby-metaclass
SUBDIR += ruby-minitest
@@ -1357,19 +1359,23 @@
SUBDIR += ruby-mspec
SUBDIR += ruby-narray,ruby20
SUBDIR += ruby-narray,ruby21
+ SUBDIR += ruby-narray,ruby22
SUBDIR += ruby-ncurses,ruby20
SUBDIR += ruby-ncurses,ruby21
+ SUBDIR += ruby-ncurses,ruby22
SUBDIR += ruby-needle
SUBDIR += ruby-ole
SUBDIR += ruby-open4
SUBDIR += ruby-polyglot
SUBDIR += ruby-prof,ruby20
SUBDIR += ruby-prof,ruby21
+ SUBDIR += ruby-prof,ruby22
SUBDIR += ruby-rake
SUBDIR += ruby-rake-compiler
SUBDIR += ruby-rake-remote_task
SUBDIR += ruby-rb-gsl,ruby20
SUBDIR += ruby-rb-gsl,ruby21
+ SUBDIR += ruby-rb-gsl,ruby22
SUBDIR += ruby-ref
SUBDIR += ruby-rgen
SUBDIR += ruby-rr
@@ -1382,10 +1388,12 @@
SUBDIR += ruby-stringex
SUBDIR += ruby-subset_sum,ruby20
SUBDIR += ruby-subset_sum,ruby21
+ SUBDIR += ruby-subset_sum,ruby22
SUBDIR += ruby-systemu
SUBDIR += ruby-term-ansicolor
SUBDIR += ruby-therubyracer,ruby20
SUBDIR += ruby-therubyracer,ruby21
+ SUBDIR += ruby-therubyracer,ruby22
SUBDIR += ruby-thor
SUBDIR += ruby-tilt
SUBDIR += ruby-transaction-simple
@@ -1394,6 +1402,7 @@
SUBDIR += ruby-uuidtools
SUBDIR += ruby-yajl,ruby20
SUBDIR += ruby-yajl,ruby21
+ SUBDIR += ruby-yajl,ruby22
SUBDIR += ruby-zentest
SUBDIR += scons
SUBDIR += sdcc
Index: graphics/Makefile
===================================================================
RCS file: /cvs/ports/graphics/Makefile,v
retrieving revision 1.381
diff -u -p -r1.381 Makefile
--- graphics/Makefile 28 Nov 2014 22:48:43 -0000 1.381
+++ graphics/Makefile 8 Jan 2015 21:01:27 -0000
@@ -239,6 +239,7 @@
SUBDIR += ruby-gruff
SUBDIR += ruby-rmagick,ruby20
SUBDIR += ruby-rmagick,ruby21
+ SUBDIR += ruby-rmagick,ruby22
SUBDIR += s10sh
SUBDIR += sane-backends
SUBDIR += sane-backends,snmp
Index: net/Makefile
===================================================================
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.886
diff -u -p -r1.886 Makefile
--- net/Makefile 5 Jan 2015 22:18:35 -0000 1.886
+++ net/Makefile 8 Jan 2015 21:01:40 -0000
@@ -541,6 +541,7 @@
SUBDIR += ruby-mfi
SUBDIR += ruby-msgpack,ruby20
SUBDIR += ruby-msgpack,ruby21
+ SUBDIR += ruby-msgpack,ruby22
SUBDIR += ruby-net-dns
SUBDIR += ruby-net-http-digest_auth
SUBDIR += ruby-net-scp
Index: security/Makefile
===================================================================
RCS file: /cvs/ports/security/Makefile,v
retrieving revision 1.358
diff -u -p -r1.358 Makefile
--- security/Makefile 19 Dec 2014 17:38:52 -0000 1.358
+++ security/Makefile 8 Jan 2015 21:01:52 -0000
@@ -256,6 +256,7 @@
SUBDIR += ruby-akami
SUBDIR += ruby-bcrypt,ruby20
SUBDIR += ruby-bcrypt,ruby21
+ SUBDIR += ruby-bcrypt,ruby22
SUBDIR += ruby-ezcrypto
SUBDIR += ruby-hmac
SUBDIR += ruby-openid
Index: sysutils/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/Makefile,v
retrieving revision 1.336
diff -u -p -r1.336 Makefile
--- sysutils/Makefile 31 Dec 2014 10:09:12 -0000 1.336
+++ sysutils/Makefile 8 Jan 2015 21:02:15 -0000
@@ -172,18 +172,22 @@
SUBDIR += rtty
SUBDIR += ruby-augeas,ruby20
SUBDIR += ruby-augeas,ruby21
+ SUBDIR += ruby-augeas,ruby22
SUBDIR += ruby-capistrano
SUBDIR += ruby-directory_watcher
SUBDIR += ruby-facter
SUBDIR += ruby-libvirt,ruby20
SUBDIR += ruby-libvirt,ruby21
+ SUBDIR += ruby-libvirt,ruby22
SUBDIR += ruby-posix-spawn,ruby20
SUBDIR += ruby-posix-spawn,ruby21
+ SUBDIR += ruby-posix-spawn,ruby22
SUBDIR += ruby-puppet
SUBDIR += ruby-puppet-lint
SUBDIR += ruby-puppet-syntax
SUBDIR += ruby-shadow,ruby20
SUBDIR += ruby-shadow,ruby21
+ SUBDIR += ruby-shadow,ruby22
SUBDIR += ruby-vlad
SUBDIR += runit
SUBDIR += safecat
Index: textproc/Makefile
===================================================================
RCS file: /cvs/ports/textproc/Makefile,v
retrieving revision 1.431
diff -u -p -r1.431 Makefile
--- textproc/Makefile 2 Jan 2015 14:45:50 -0000 1.431
+++ textproc/Makefile 8 Jan 2015 21:02:54 -0000
@@ -349,15 +349,19 @@
SUBDIR += ruby-classifier
SUBDIR += ruby-fast-stemmer,ruby20
SUBDIR += ruby-fast-stemmer,ruby21
+ SUBDIR += ruby-fast-stemmer,ruby22
SUBDIR += ruby-fast_xs,ruby20
SUBDIR += ruby-fast_xs,ruby21
+ SUBDIR += ruby-fast_xs,ruby22
SUBDIR += ruby-gyoku
SUBDIR += ruby-haml
SUBDIR += ruby-hpricot,ruby20
SUBDIR += ruby-hpricot,ruby21
+ SUBDIR += ruby-hpricot,ruby22
SUBDIR += ruby-htmlentities
SUBDIR += ruby-hyperestraier,ruby20
SUBDIR += ruby-hyperestraier,ruby21
+ SUBDIR += ruby-hyperestraier,ruby22
SUBDIR += ruby-icalendar
SUBDIR += ruby-kramdown
SUBDIR += ruby-liquid
@@ -366,15 +370,19 @@
SUBDIR += ruby-mustache
SUBDIR += ruby-nokogiri,ruby20
SUBDIR += ruby-nokogiri,ruby21
+ SUBDIR += ruby-nokogiri,ruby22
SUBDIR += ruby-nori
SUBDIR += ruby-pdf-reader
SUBDIR += ruby-pygments.rb
SUBDIR += ruby-rdiscount,ruby20
SUBDIR += ruby-rdiscount,ruby21
+ SUBDIR += ruby-rdiscount,ruby22
SUBDIR += ruby-redcarpet,ruby20
SUBDIR += ruby-redcarpet,ruby21
+ SUBDIR += ruby-redcarpet,ruby22
SUBDIR += ruby-redcloth,ruby20
SUBDIR += ruby-redcloth,ruby21
+ SUBDIR += ruby-redcloth,ruby22
SUBDIR += ruby-rexical
SUBDIR += ruby-ronn
SUBDIR += ruby-rss
Index: www/Makefile
===================================================================
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.694
diff -u -p -r1.694 Makefile
--- www/Makefile 28 Dec 2014 20:58:45 -0000 1.694
+++ www/Makefile 8 Jan 2015 21:03:27 -0000
@@ -450,22 +450,27 @@
SUBDIR += ruby-capybara
SUBDIR += ruby-capybara-webkit,ruby20
SUBDIR += ruby-capybara-webkit,ruby21
+ SUBDIR += ruby-capybara-webkit,ruby22
SUBDIR += ruby-fcgi,ruby20
SUBDIR += ruby-fcgi,ruby21
+ SUBDIR += ruby-fcgi,ruby22
SUBDIR += ruby-httpclient
SUBDIR += ruby-httpi
SUBDIR += ruby-jekyll
SUBDIR += ruby-mechanize
SUBDIR += ruby-ntlm,ruby20
SUBDIR += ruby-ntlm,ruby21
+ SUBDIR += ruby-ntlm,ruby22
SUBDIR += ruby-passenger,ruby20
SUBDIR += ruby-passenger,ruby21
+ SUBDIR += ruby-passenger,ruby22
SUBDIR += ruby-rack
SUBDIR += ruby-rack-protection
SUBDIR += ruby-rack-test
SUBDIR += ruby-rainbows
SUBDIR += ruby-raindrops,ruby20
SUBDIR += ruby-raindrops,ruby21
+ SUBDIR += ruby-raindrops,ruby22
SUBDIR += ruby-rest-client
SUBDIR += ruby-sanitize
SUBDIR += ruby-savon
@@ -475,6 +480,7 @@
SUBDIR += ruby-thin_http
SUBDIR += ruby-unicorn,ruby20
SUBDIR += ruby-unicorn,ruby21
+ SUBDIR += ruby-unicorn,ruby22
SUBDIR += ruby-vegas
SUBDIR += ruby-wasabi
SUBDIR += ruby-xpath
