Here is a diff to allow building ruby 2.0 versions of ruby C extension
ports. It changes the category makefiles to use explicit versions
for ruby C extensions. This should reduce churn when the default ruby
version switches from ruby 1.9 to ruby 2.0 at some point in the future.
OKs?
Thanks,
Jeremy
Index: audio/Makefile
===================================================================
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.306
diff -u -p -r1.306 Makefile
--- audio/Makefile 15 May 2013 06:25:36 -0000 1.306
+++ audio/Makefile 25 May 2013 23:04:48 -0000
@@ -197,10 +197,12 @@
SUBDIR += rplay
SUBDIR += rsynth
SUBDIR += rtunes
- SUBDIR += ruby-id3lib
SUBDIR += ruby-id3lib,ruby18
- SUBDIR += ruby-vorbis_comment
+ SUBDIR += ruby-id3lib,ruby19
+ SUBDIR += ruby-id3lib,ruby20
SUBDIR += ruby-vorbis_comment,ruby18
+ SUBDIR += ruby-vorbis_comment,ruby19
+ SUBDIR += ruby-vorbis_comment,ruby20
SUBDIR += scmpc
SUBDIR += shell-fm
SUBDIR += shntool
Index: converters/Makefile
===================================================================
RCS file: /cvs/ports/converters/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- converters/Makefile 6 Nov 2012 07:37:44 -0000 1.63
+++ converters/Makefile 25 May 2013 23:04:48 -0000
@@ -59,8 +59,9 @@
SUBDIR += ripmime
SUBDIR += rpm2cpio
SUBDIR += ruby-multi_json
- SUBDIR += ruby-json
SUBDIR += ruby-json,ruby18
+ SUBDIR += ruby-json,ruby19
+ SUBDIR += ruby-json,ruby20
SUBDIR += trans
SUBDIR += wv
SUBDIR += wv2
Index: databases/Makefile
===================================================================
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.244
diff -u -p -r1.244 Makefile
--- databases/Makefile 25 May 2013 22:27:12 -0000 1.244
+++ databases/Makefile 25 May 2013 23:04:48 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.244 2013/05/25 22:27:12 jeremy Exp $
+# $OpenBSD: Makefile,v 1.242 2013/05/06 16:20:11 fgsch Exp $
SUBDIR =
SUBDIR += apache-couchdb
@@ -179,22 +179,27 @@
SUBDIR += qt3-sqlite3-plugin
SUBDIR += redis
SUBDIR += riak
- SUBDIR += ruby-amalgalite
SUBDIR += ruby-amalgalite,ruby18
+ SUBDIR += ruby-amalgalite,ruby19
+ SUBDIR += ruby-amalgalite,ruby20
SUBDIR += ruby-bdb
SUBDIR += ruby-couchrest
- SUBDIR += ruby-data_objects
SUBDIR += ruby-data_objects,ruby18
+ SUBDIR += ruby-data_objects,ruby19
+ SUBDIR += ruby-data_objects,ruby20
SUBDIR += ruby-data_objects,rbx
SUBDIR += ruby-datamapper
- SUBDIR += ruby-do_mysql
SUBDIR += ruby-do_mysql,ruby18
+ SUBDIR += ruby-do_mysql,ruby19
+ SUBDIR += ruby-do_mysql,ruby20
SUBDIR += ruby-do_mysql,rbx
- SUBDIR += ruby-do_postgres
SUBDIR += ruby-do_postgres,ruby18
+ SUBDIR += ruby-do_postgres,ruby19
+ SUBDIR += ruby-do_postgres,ruby20
SUBDIR += ruby-do_postgres,rbx
- SUBDIR += ruby-do_sqlite3
SUBDIR += ruby-do_sqlite3,ruby18
+ SUBDIR += ruby-do_sqlite3,ruby19
+ SUBDIR += ruby-do_sqlite3,ruby20
SUBDIR += ruby-do_sqlite3,rbx
SUBDIR += ruby-hiera
SUBDIR += ruby-jdbc-h2
@@ -202,15 +207,19 @@
SUBDIR += ruby-jdbc-postgres
SUBDIR += ruby-jdbc-sqlite3
SUBDIR += ruby-kirbybase
- SUBDIR += ruby-ldap
SUBDIR += ruby-ldap,ruby18
- SUBDIR += ruby-mysql
+ SUBDIR += ruby-ldap,ruby19
+ SUBDIR += ruby-ldap,ruby20
SUBDIR += ruby-mysql,ruby18
+ SUBDIR += ruby-mysql,ruby19
+ SUBDIR += ruby-mysql,ruby20
SUBDIR += ruby-mysql,rbx
- SUBDIR += ruby-mysql2
SUBDIR += ruby-mysql2,ruby18
- SUBDIR += ruby-pg
+ SUBDIR += ruby-mysql2,ruby19
+ SUBDIR += ruby-mysql2,ruby20
SUBDIR += ruby-pg,ruby18
+ SUBDIR += ruby-pg,ruby19
+ SUBDIR += ruby-pg,ruby20
SUBDIR += ruby-pg,rbx
SUBDIR += ruby-postgres
SUBDIR += ruby-redis
@@ -222,10 +231,12 @@
SUBDIR += ruby-sequel
SUBDIR += ruby-sequel,ruby18
SUBDIR += ruby-sequel,rbx
- SUBDIR += ruby-sequel_pg
SUBDIR += ruby-sequel_pg,ruby18
- SUBDIR += ruby-sqlite3
+ SUBDIR += ruby-sequel_pg,ruby19
+ SUBDIR += ruby-sequel_pg,ruby20
SUBDIR += ruby-sqlite3,ruby18
+ SUBDIR += ruby-sqlite3,ruby19
+ SUBDIR += ruby-sqlite3,ruby20
SUBDIR += ruby-sqlite3,rbx
SUBDIR += ruby-swift
SUBDIR += ruby-swift-db-mysql,ruby19
@@ -234,8 +245,9 @@
SUBDIR += ruby-swift-db-postgres,ruby20
SUBDIR += ruby-swift-db-sqlite3,ruby19
SUBDIR += ruby-swift-db-sqlite3,ruby20
- SUBDIR += ruby-tiny_tds
SUBDIR += ruby-tiny_tds,ruby18
+ SUBDIR += ruby-tiny_tds,ruby19
+ SUBDIR += ruby-tiny_tds,ruby20
SUBDIR += ruby-tiny_tds,rbx
SUBDIR += ruby-validatable
SUBDIR += sharedance
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1133
diff -u -p -r1.1133 Makefile
--- devel/Makefile 22 May 2013 13:47:28 -0000 1.1133
+++ devel/Makefile 25 May 2013 23:04:48 -0000
@@ -1225,15 +1225,17 @@
SUBDIR += ruby-echoe
SUBDIR += ruby-extlib
SUBDIR += ruby-fastthread
- SUBDIR += ruby-ffi
SUBDIR += ruby-ffi,ruby18
+ SUBDIR += ruby-ffi,ruby19
+ SUBDIR += ruby-ffi,ruby20
SUBDIR += ruby-ffi-inliner
SUBDIR += ruby-flexmock
SUBDIR += ruby-gem_plugin
SUBDIR += ruby-gems
SUBDIR += ruby-gettext
- SUBDIR += ruby-gir_ffi
SUBDIR += ruby-gir_ffi,ruby18
+ SUBDIR += ruby-gir_ffi,ruby19
+ SUBDIR += ruby-gir_ffi,ruby20
SUBDIR += ruby-git
SUBDIR += ruby-highline
SUBDIR += ruby-hoe
@@ -1243,28 +1245,31 @@
SUBDIR += ruby-isolate
SUBDIR += ruby-jeweler
SUBDIR += ruby-json_pure
- SUBDIR += ruby-kgio
SUBDIR += ruby-kgio,ruby18
+ SUBDIR += ruby-kgio,ruby19
+ SUBDIR += ruby-kgio,ruby20
SUBDIR += ruby-linecache
SUBDIR += ruby-locale
SUBDIR += ruby-metaclass
SUBDIR += ruby-minitest
SUBDIR += ruby-mocha
SUBDIR += ruby-mspec
- SUBDIR += ruby-narray
- SUBDIR += ruby-ncurses
+ SUBDIR += ruby-narray,ruby19
+ SUBDIR += ruby-narray,ruby20
+ SUBDIR += ruby-ncurses,ruby19
+ SUBDIR += ruby-ncurses,ruby20
SUBDIR += ruby-needle
SUBDIR += ruby-ole
SUBDIR += ruby-open4
SUBDIR += ruby-parsetree
SUBDIR += ruby-polyglot
- SUBDIR += ruby-prof
SUBDIR += ruby-prof,ruby18
+ SUBDIR += ruby-prof,ruby19
SUBDIR += ruby-rake
SUBDIR += ruby-rake-compiler
- SUBDIR += ruby-rb-gsl
- SUBDIR += ruby-rcov
+ SUBDIR += ruby-rb-gsl,ruby19
SUBDIR += ruby-rcov,ruby18
+ SUBDIR += ruby-rcov,ruby19
SUBDIR += ruby-rdoc
SUBDIR += ruby-ref
SUBDIR += ruby-rspec
@@ -1275,19 +1280,22 @@
SUBDIR += ruby-safe_yaml
SUBDIR += ruby-sexp_processor
SUBDIR += ruby-stringex
- SUBDIR += ruby-subset_sum
SUBDIR += ruby-subset_sum,ruby18
+ SUBDIR += ruby-subset_sum,ruby19
+ SUBDIR += ruby-subset_sum,ruby20
SUBDIR += ruby-systemtimer
SUBDIR += ruby-systemu
SUBDIR += ruby-term-ansicolor
- SUBDIR += ruby-therubyracer
+ SUBDIR += ruby-therubyracer,ruby19
+ SUBDIR += ruby-therubyracer,ruby20
SUBDIR += ruby-tilt
SUBDIR += ruby-transaction-simple
SUBDIR += ruby-trollop
SUBDIR += ruby-uuidtools
SUBDIR += ruby-uuid
SUBDIR += ruby-uuid,ruby18
- SUBDIR += ruby-yajl
+ SUBDIR += ruby-yajl,ruby19
+ SUBDIR += ruby-yajl,ruby20
SUBDIR += ruby-zentest
SUBDIR += scons
SUBDIR += sdcc
Index: graphics/Makefile
===================================================================
RCS file: /cvs/ports/graphics/Makefile,v
retrieving revision 1.346
diff -u -p -r1.346 Makefile
--- graphics/Makefile 1 Apr 2013 12:03:30 -0000 1.346
+++ graphics/Makefile 25 May 2013 23:04:48 -0000
@@ -220,8 +220,9 @@
SUBDIR += ruby-color
SUBDIR += ruby-gruff
SUBDIR += ruby-mini_magick
- SUBDIR += ruby-rmagick
SUBDIR += ruby-rmagick,ruby18
+ SUBDIR += ruby-rmagick,ruby19
+ SUBDIR += ruby-rmagick,ruby20
SUBDIR += s10sh
SUBDIR += sane-backends
SUBDIR += sane-backends,snmp
Index: net/Makefile
===================================================================
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.804
diff -u -p -r1.804 Makefile
--- net/Makefile 21 May 2013 17:22:04 -0000 1.804
+++ net/Makefile 25 May 2013 23:04:48 -0000
@@ -502,8 +502,9 @@
SUBDIR += ruby-agcaldav
SUBDIR += ruby-amqp
SUBDIR += ruby-bunny
- SUBDIR += ruby-eventmachine
SUBDIR += ruby-eventmachine,ruby18
+ SUBDIR += ruby-eventmachine,ruby19
+ SUBDIR += ruby-eventmachine,ruby20
SUBDIR += ruby-macaddr
SUBDIR += ruby-macaddr,ruby18
SUBDIR += ruby-minion
@@ -516,7 +517,7 @@
SUBDIR += ruby-net-ssh-gateway
SUBDIR += ruby-nmap-parser
SUBDIR += ruby-pcap
- SUBDIR += ruby-pcaprub-msf
+ SUBDIR += ruby-pcaprub-msf,ruby19
SUBDIR += ruby-snmp
SUBDIR += ruby-stomp
SUBDIR += ruby-xmpp4r
Index: security/Makefile
===================================================================
RCS file: /cvs/ports/security/Makefile,v
retrieving revision 1.313
diff -u -p -r1.313 Makefile
--- security/Makefile 21 Apr 2013 13:54:30 -0000 1.313
+++ security/Makefile 25 May 2013 23:04:48 -0000
@@ -229,9 +229,10 @@
SUBDIR += radiusniff
SUBDIR += rarcrack
SUBDIR += rdp
- SUBDIR += ruby-bcrypt
SUBDIR += ruby-bcrypt,rbx
SUBDIR += ruby-bcrypt,ruby18
+ SUBDIR += ruby-bcrypt,ruby19
+ SUBDIR += ruby-bcrypt,ruby20
SUBDIR += ruby-ezcrypto
SUBDIR += ruby-openid
SUBDIR += ruby-yadis
Index: sysutils/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/Makefile,v
retrieving revision 1.294
diff -u -p -r1.294 Makefile
--- sysutils/Makefile 19 May 2013 14:47:16 -0000 1.294
+++ sysutils/Makefile 25 May 2013 23:04:48 -0000
@@ -163,13 +163,16 @@
SUBDIR += rpl
SUBDIR += rsyslog
SUBDIR += rtty
- SUBDIR += ruby-augeas
SUBDIR += ruby-augeas,ruby18
+ SUBDIR += ruby-augeas,ruby19
+ SUBDIR += ruby-augeas,ruby20
SUBDIR += ruby-capistrano
SUBDIR += ruby-directory_watcher
SUBDIR += ruby-facter
- SUBDIR += ruby-libvirt
- SUBDIR += ruby-posix-spawn
+ SUBDIR += ruby-libvirt,ruby19
+ SUBDIR += ruby-libvirt,ruby20
+ SUBDIR += ruby-posix-spawn,ruby19
+ SUBDIR += ruby-posix-spawn,ruby20
SUBDIR += ruby-puppet
SUBDIR += ruby-puppet-lint
SUBDIR += ruby-puppet-lint,ruby18
Index: textproc/Makefile
===================================================================
RCS file: /cvs/ports/textproc/Makefile,v
retrieving revision 1.386
diff -u -p -r1.386 Makefile
--- textproc/Makefile 20 Apr 2013 17:06:56 -0000 1.386
+++ textproc/Makefile 25 May 2013 23:04:48 -0000
@@ -318,31 +318,38 @@
SUBDIR += ruby-classifier
SUBDIR += ruby-fastercsv,ruby18
SUBDIR += ruby-fastri,ruby18
- SUBDIR += ruby-fast-stemmer
SUBDIR += ruby-fast-stemmer,ruby18
+ SUBDIR += ruby-fast-stemmer,ruby19
+ SUBDIR += ruby-fast-stemmer,ruby20
SUBDIR += ruby-haml
- SUBDIR += ruby-hpricot
SUBDIR += ruby-hpricot,ruby18
+ SUBDIR += ruby-hpricot,ruby19
+ SUBDIR += ruby-hpricot,ruby20
SUBDIR += ruby-htmlentities
SUBDIR += ruby-hyperestraier
SUBDIR += ruby-hyperestraier,ruby19
+ SUBDIR += ruby-hyperestraier,ruby20
SUBDIR += ruby-icalendar
SUBDIR += ruby-kramdown
SUBDIR += ruby-liquid
SUBDIR += ruby-markaby
SUBDIR += ruby-maruku
SUBDIR += ruby-mustache
- SUBDIR += ruby-nokogiri
SUBDIR += ruby-nokogiri,ruby18
+ SUBDIR += ruby-nokogiri,ruby19
+ SUBDIR += ruby-nokogiri,ruby20
SUBDIR += ruby-pdf-reader
SUBDIR += ruby-pygments.rb
SUBDIR += ruby-randexp
- SUBDIR += ruby-rdiscount
SUBDIR += ruby-rdiscount,ruby18
- SUBDIR += ruby-redcarpet
+ SUBDIR += ruby-rdiscount,ruby19
+ SUBDIR += ruby-rdiscount,ruby20
SUBDIR += ruby-redcarpet,ruby18
- SUBDIR += ruby-redcloth
+ SUBDIR += ruby-redcarpet,ruby19
+ SUBDIR += ruby-redcarpet,ruby20
SUBDIR += ruby-redcloth,ruby18
+ SUBDIR += ruby-redcloth,ruby19
+ SUBDIR += ruby-redcloth,ruby20
SUBDIR += ruby-rexical
SUBDIR += ruby-rexical,ruby18
SUBDIR += ruby-ronn
Index: www/Makefile
===================================================================
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.609
diff -u -p -r1.609 Makefile
--- www/Makefile 20 May 2013 09:16:36 -0000 1.609
+++ www/Makefile 25 May 2013 23:04:48 -0000
@@ -445,28 +445,33 @@
SUBDIR += rt
SUBDIR += ruby-addressable
SUBDIR += ruby-capybara
- SUBDIR += ruby-capybara-webkit
+ SUBDIR += ruby-capybara-webkit,ruby19
+ SUBDIR += ruby-capybara-webkit,ruby20
SUBDIR += ruby-fcgi
SUBDIR += ruby-httpclient
SUBDIR += ruby-jekyll
SUBDIR += ruby-mechanize
SUBDIR += ruby-mongrel
- SUBDIR += ruby-passenger
SUBDIR += ruby-passenger,ruby18
+ SUBDIR += ruby-passenger,ruby19
SUBDIR += ruby-rack
SUBDIR += ruby-rack-test
- SUBDIR += ruby-rainbows
SUBDIR += ruby-rainbows,ruby18
- SUBDIR += ruby-raindrops
+ SUBDIR += ruby-rainbows,ruby19
+ SUBDIR += ruby-rainbows,ruby20
SUBDIR += ruby-raindrops,ruby18
+ SUBDIR += ruby-raindrops,ruby19
+ SUBDIR += ruby-raindrops,ruby20
SUBDIR += ruby-rest-client
SUBDIR += ruby-sanitize
SUBDIR += ruby-sinatra
- SUBDIR += ruby-thin
SUBDIR += ruby-thin,ruby18
+ SUBDIR += ruby-thin,ruby19
+ SUBDIR += ruby-thin,ruby20
SUBDIR += ruby-thin_http
- SUBDIR += ruby-unicorn
SUBDIR += ruby-unicorn,ruby18
+ SUBDIR += ruby-unicorn,ruby19
+ SUBDIR += ruby-unicorn,ruby20
SUBDIR += ruby-vegas
SUBDIR += ruby-vegas,ruby18
SUBDIR += ruby-xpath
