Since we removed building of ports for ruby 1.8 and 1.9, it doesn't
make sense to keep building packages for rubinius (rbx-*), considering
that both ruby 1.8 and 1.9 are probably used more than rubinius. So
this removes the building of rbx packages.
While here, clean up some other issues:
* For ruby gems with C extensions, always use a specific FLAVOR in the
category Makefile.
* Unlink devel/ruby-fastthread, as it is a no-op on ruby 1.9+, and it
only existed because it was a dependency of www/ruby-mongrel, removed
a few days ago. fastthread will be removed after this is committed.
* Add back devel/ruby-prof, temporarily unlinked.
* Build pure ruby gems with the default ruby version, instead of
specifying an older ruby version (hiera, hiera-file, gir_ffi)
I plan on committing this in a couple days unless I hear objections.
Thanks,
Jeremy
Index: databases/Makefile
===================================================================
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.277
diff -u -p -r1.277 Makefile
--- databases/Makefile 27 Sep 2014 16:31:40 -0000 1.277
+++ databases/Makefile 28 Sep 2014 18:15:08 -0000
@@ -193,21 +193,17 @@
SUBDIR += riak
SUBDIR += ruby-amalgalite,ruby20
SUBDIR += ruby-amalgalite,ruby21
- SUBDIR += ruby-bdb
+ SUBDIR += ruby-bdb,ruby20
SUBDIR += ruby-couchrest
- SUBDIR += ruby-data_objects,rbx
- SUBDIR += ruby-data_objects,ruby20
- SUBDIR += ruby-do_mysql,rbx
+ SUBDIR += ruby-data_objects
SUBDIR += ruby-do_mysql,ruby20
SUBDIR += ruby-do_mysql,ruby21
- SUBDIR += ruby-do_postgres,rbx
SUBDIR += ruby-do_postgres,ruby20
SUBDIR += ruby-do_postgres,ruby21
- SUBDIR += ruby-do_sqlite3,rbx
SUBDIR += ruby-do_sqlite3,ruby20
SUBDIR += ruby-do_sqlite3,ruby21
- SUBDIR += ruby-hiera,ruby20
- SUBDIR += ruby-hiera-file,ruby20
+ SUBDIR += ruby-hiera
+ SUBDIR += ruby-hiera-file
SUBDIR += ruby-jdbc-h2
SUBDIR += ruby-jdbc-mysql
SUBDIR += ruby-jdbc-postgres
@@ -215,12 +211,10 @@
SUBDIR += ruby-kirbybase
SUBDIR += ruby-ldap,ruby20
SUBDIR += ruby-ldap,ruby21
- SUBDIR += ruby-mysql,rbx
SUBDIR += ruby-mysql,ruby20
SUBDIR += ruby-mysql,ruby21
SUBDIR += ruby-mysql2,ruby20
SUBDIR += ruby-mysql2,ruby21
- SUBDIR += ruby-pg,rbx
SUBDIR += ruby-pg,ruby20
SUBDIR += ruby-pg,ruby21
SUBDIR += ruby-redis
@@ -229,7 +223,6 @@
SUBDIR += ruby-sequel
SUBDIR += ruby-sequel_pg,ruby20
SUBDIR += ruby-sequel_pg,ruby21
- SUBDIR += ruby-sqlite3,rbx
SUBDIR += ruby-sqlite3,ruby20
SUBDIR += ruby-sqlite3,ruby21
SUBDIR += ruby-swift
@@ -239,7 +232,6 @@
SUBDIR += ruby-swift-db-postgres,ruby21
SUBDIR += ruby-swift-db-sqlite3,ruby20
SUBDIR += ruby-swift-db-sqlite3,ruby21
- SUBDIR += ruby-tiny_tds,rbx
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.1255
diff -u -p -r1.1255 Makefile
--- devel/Makefile 27 Sep 2014 16:31:40 -0000 1.1255
+++ devel/Makefile 28 Sep 2014 18:22:50 -0000
@@ -1308,7 +1308,6 @@
SUBDIR += ruby-deep_merge
SUBDIR += ruby-diff-lcs
SUBDIR += ruby-extlib
- SUBDIR += ruby-fastthread
SUBDIR += ruby-ffi,ruby20
SUBDIR += ruby-ffi,ruby21
SUBDIR += ruby-ffi-inliner
@@ -1316,8 +1315,7 @@
SUBDIR += ruby-gem_plugin
SUBDIR += ruby-gems
SUBDIR += ruby-gettext
- SUBDIR += ruby-gir_ffi,ruby20
- SUBDIR += ruby-gir_ffi,ruby21
+ SUBDIR += ruby-gir_ffi
SUBDIR += ruby-git
SUBDIR += ruby-highline
SUBDIR += ruby-hoe
@@ -1343,10 +1341,13 @@
SUBDIR += ruby-ole
SUBDIR += ruby-open4
SUBDIR += ruby-polyglot
+ SUBDIR += ruby-prof,ruby20
+ SUBDIR += ruby-prof,ruby21
SUBDIR += ruby-rake
SUBDIR += ruby-rake-compiler
SUBDIR += ruby-rake-remote_task
- SUBDIR += ruby-rb-gsl
+ SUBDIR += ruby-rb-gsl,ruby20
+ SUBDIR += ruby-rb-gsl,ruby21
SUBDIR += ruby-ref
SUBDIR += ruby-rgen,ruby20
SUBDIR += ruby-rgen,ruby21
Index: security/Makefile
===================================================================
RCS file: /cvs/ports/security/Makefile,v
retrieving revision 1.352
diff -u -p -r1.352 Makefile
--- security/Makefile 27 Sep 2014 16:31:40 -0000 1.352
+++ security/Makefile 28 Sep 2014 18:20:37 -0000
@@ -250,7 +250,6 @@
SUBDIR += reop
SUBDIR += ruby-akami,ruby20
SUBDIR += ruby-akami,ruby21
- SUBDIR += ruby-bcrypt,rbx
SUBDIR += ruby-bcrypt,ruby20
SUBDIR += ruby-bcrypt,ruby21
SUBDIR += ruby-ezcrypto
