cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that ruby 1.9 is the default ruby implementation for gem/extconf

Browse Source 
ports, for the ports that are built both on ruby 1.8 and ruby 1.9,
switch the category Makefiles to explicitly list the ruby18 FLAVOR
instead of the ruby19 FLAVOR.

Also, for home_run, fastri, and fastercsv, explicitly build only the
ruby 1.8 version of the port.  These libraries can run on ruby 1.9, but
it doesn't make sense to build a ruby 1.9 version by default.
This commit is contained in:
jeremy 2012-09-23 17:20:41 +00:00
parent fe19214bf7
commit 5542f53b23
9 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.288 2012/09/20 17:41:30 jasper Exp $
# $OpenBSD: Makefile,v 1.289 2012/09/23 17:20:41 jeremy Exp $
SUBDIR =
SUBDIR += abcde
@ -187,9 +187,9 @@
SUBDIR += rsynth
SUBDIR += rtunes
SUBDIR += ruby-id3lib
SUBDIR += ruby-id3lib,ruby19
SUBDIR += ruby-id3lib,ruby18
SUBDIR += ruby-vorbis_comment
SUBDIR += ruby-vorbis_comment,ruby19
SUBDIR += ruby-vorbis_comment,ruby18
SUBDIR += scmpc
SUBDIR += shell-fm
SUBDIR += shntool

4
converters/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.61 2012/09/04 19:01:41 jasper Exp $
# $OpenBSD: Makefile,v 1.62 2012/09/23 17:20:41 jeremy Exp $
SUBDIR =
SUBDIR += base64
@ -59,7 +59,7 @@
SUBDIR += rpm2cpio
SUBDIR += ruby-multi_json
SUBDIR += ruby-json
SUBDIR += ruby-json,ruby19
SUBDIR += ruby-json,ruby18
SUBDIR += trans
SUBDIR += wv
SUBDIR += wv2

32
databases/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.220 2012/09/04 07:02:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.221 2012/09/23 17:20:41 jeremy Exp $
SUBDIR =
SUBDIR += apache-couchdb
@ -166,23 +166,23 @@
SUBDIR += redis
SUBDIR += ruby-activerecord
SUBDIR += ruby-amalgalite
SUBDIR += ruby-amalgalite,ruby19
SUBDIR += ruby-amalgalite,ruby18
SUBDIR += ruby-arel
SUBDIR += ruby-bdb
SUBDIR += ruby-couch_potato
SUBDIR += ruby-couchrest
SUBDIR += ruby-data_objects
SUBDIR += ruby-data_objects,ruby19
SUBDIR += ruby-data_objects,ruby18
SUBDIR += ruby-data_objects,rbx
SUBDIR += ruby-datamapper
SUBDIR += ruby-do_mysql
SUBDIR += ruby-do_mysql,ruby19
SUBDIR += ruby-do_mysql,ruby18
SUBDIR += ruby-do_mysql,rbx
SUBDIR += ruby-do_postgres
SUBDIR += ruby-do_postgres,ruby19
SUBDIR += ruby-do_postgres,ruby18
SUBDIR += ruby-do_postgres,rbx
SUBDIR += ruby-do_sqlite3
SUBDIR += ruby-do_sqlite3,ruby19
SUBDIR += ruby-do_sqlite3,ruby18
SUBDIR += ruby-do_sqlite3,rbx
SUBDIR += ruby-jdbc-h2
SUBDIR += ruby-jdbc-mysql
@ -190,31 +190,31 @@
SUBDIR += ruby-jdbc-sqlite3
SUBDIR += ruby-kirbybase
SUBDIR += ruby-ldap
SUBDIR += ruby-ldap,ruby19
SUBDIR += ruby-ldap,ruby18
SUBDIR += ruby-mysql
SUBDIR += ruby-mysql,ruby19
SUBDIR += ruby-mysql,ruby18
SUBDIR += ruby-mysql,rbx
SUBDIR += ruby-mysql2
SUBDIR += ruby-mysql2,ruby19
SUBDIR += ruby-mysql2,ruby18
SUBDIR += ruby-mysqlplus
SUBDIR += ruby-mysqlplus,ruby19
SUBDIR += ruby-mysqlplus,ruby18
SUBDIR += ruby-pg
SUBDIR += ruby-pg,ruby19
SUBDIR += ruby-pg,ruby18
SUBDIR += ruby-pg,rbx
SUBDIR += ruby-postgres
SUBDIR += ruby-redis
SUBDIR += ruby-redis,ruby19
SUBDIR += ruby-redis,ruby18
SUBDIR += ruby-sequel
SUBDIR += ruby-sequel,ruby19
SUBDIR += ruby-sequel,ruby18
SUBDIR += ruby-sequel,rbx
SUBDIR += ruby-sequel_pg
SUBDIR += ruby-sequel_pg,ruby19
SUBDIR += ruby-sequel_pg,ruby18
SUBDIR += ruby-sqlite3
SUBDIR += ruby-sqlite3,ruby19
SUBDIR += ruby-sqlite3,ruby18
SUBDIR += ruby-sqlite3,rbx
SUBDIR += ruby-swift
SUBDIR += ruby-tiny_tds
SUBDIR += ruby-tiny_tds,ruby19
SUBDIR += ruby-tiny_tds,ruby18
SUBDIR += ruby-tiny_tds,rbx
SUBDIR += ruby-validatable
SUBDIR += sharedance

14
devel/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1074 2012/09/23 12:33:56 rpe Exp $
# $OpenBSD: Makefile,v 1.1075 2012/09/23 17:20:41 jeremy Exp $
SUBDIR =
SUBDIR += ElectricFence
@ -1164,7 +1164,7 @@
SUBDIR += ruby-extlib
SUBDIR += ruby-fastthread
SUBDIR += ruby-ffi
SUBDIR += ruby-ffi,ruby19
SUBDIR += ruby-ffi,ruby18
SUBDIR += ruby-ffi-inliner
SUBDIR += ruby-flexmock
SUBDIR += ruby-gem_plugin
@ -1175,12 +1175,12 @@
SUBDIR += ruby-highline
SUBDIR += ruby-hike
SUBDIR += ruby-hoe
SUBDIR += ruby-home_run
SUBDIR += ruby-home_run,ruby18
SUBDIR += ruby-i18n
SUBDIR += ruby-isolate
SUBDIR += ruby-jeweler
SUBDIR += ruby-kgio
SUBDIR += ruby-kgio,ruby19
SUBDIR += ruby-kgio,ruby18
SUBDIR += ruby-linecache
SUBDIR += ruby-locale
SUBDIR += ruby-minitest
@ -1194,11 +1194,11 @@
SUBDIR += ruby-parsetree
SUBDIR += ruby-polyglot
SUBDIR += ruby-prof
SUBDIR += ruby-prof,ruby19
SUBDIR += ruby-prof,ruby18
SUBDIR += ruby-rake
SUBDIR += ruby-rake-compiler
SUBDIR += ruby-rcov
SUBDIR += ruby-rcov,ruby19
SUBDIR += ruby-rcov,ruby18
SUBDIR += ruby-rdoc
SUBDIR += ruby-rspec
SUBDIR += ruby-ruby2ruby
@ -1209,7 +1209,7 @@
SUBDIR += ruby-sprockets
SUBDIR += ruby-stringex
SUBDIR += ruby-subset_sum
SUBDIR += ruby-subset_sum,ruby19
SUBDIR += ruby-subset_sum,ruby18
SUBDIR += ruby-systemtimer
SUBDIR += ruby-systemu
SUBDIR += ruby-term-ansicolor

4
graphics/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.335 2012/09/15 17:53:15 jeremy Exp $
# $OpenBSD: Makefile,v 1.336 2012/09/23 17:20:41 jeremy Exp $
SUBDIR =
SUBDIR += DevIL
@ -213,7 +213,7 @@
SUBDIR += ruby-gruff
SUBDIR += ruby-mini_magick
SUBDIR += ruby-rmagick
SUBDIR += ruby-rmagick,ruby19
SUBDIR += ruby-rmagick,ruby18
SUBDIR += s10sh
SUBDIR += sane-backends
SUBDIR += sane-backends,snmp

4
net/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.771 2012/09/22 07:59:35 landry Exp $
# $OpenBSD: Makefile,v 1.772 2012/09/23 17:20:41 jeremy Exp $
SUBDIR =
SUBDIR += BitTorrent
@ -485,7 +485,7 @@
SUBDIR += ruby-amqp
SUBDIR += ruby-bunny
SUBDIR += ruby-eventmachine
SUBDIR += ruby-eventmachine,ruby19
SUBDIR += ruby-eventmachine,ruby18
SUBDIR += ruby-minion
SUBDIR += ruby-net-dns
SUBDIR += ruby-net-scp

4
security/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.297 2012/08/31 20:44:52 sthen Exp $
# $OpenBSD: Makefile,v 1.298 2012/09/23 17:20:41 jeremy Exp $
SUBDIR =
SUBDIR += ADMfzap
@ -220,7 +220,7 @@
SUBDIR += rdp
SUBDIR += ruby-bcrypt
SUBDIR += ruby-bcrypt,rbx
SUBDIR += ruby-bcrypt,ruby19
SUBDIR += ruby-bcrypt,ruby18
SUBDIR += ruby-ezcrypto
SUBDIR += ruby-openid
SUBDIR += ruby-yadis

18
textproc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.367 2012/09/15 17:53:15 jeremy Exp $
# $OpenBSD: Makefile,v 1.368 2012/09/23 17:20:41 jeremy Exp $
SUBDIR =
SUBDIR += TclXML
@ -308,13 +308,13 @@
SUBDIR += ruby-builder
SUBDIR += ruby-classifier
SUBDIR += ruby-erubis
SUBDIR += ruby-fastercsv
SUBDIR += ruby-fastri
SUBDIR += ruby-fastercsv,ruby18
SUBDIR += ruby-fastri,ruby18
SUBDIR += ruby-fast-stemmer
SUBDIR += ruby-fast-stemmer,ruby19
SUBDIR += ruby-fast-stemmer,ruby18
SUBDIR += ruby-haml
SUBDIR += ruby-hpricot
SUBDIR += ruby-hpricot,ruby19
SUBDIR += ruby-hpricot,ruby18
SUBDIR += ruby-htmlentities
SUBDIR += ruby-hyperestraier
SUBDIR += ruby-hyperestraier,ruby19
@ -324,15 +324,15 @@
SUBDIR += ruby-maruku
SUBDIR += ruby-mustache
SUBDIR += ruby-nokogiri
SUBDIR += ruby-nokogiri,ruby19
SUBDIR += ruby-nokogiri,ruby18
SUBDIR += ruby-pdf-reader
SUBDIR += ruby-randexp
SUBDIR += ruby-rdiscount
SUBDIR += ruby-rdiscount,ruby19
SUBDIR += ruby-rdiscount,ruby18
SUBDIR += ruby-redcarpet
SUBDIR += ruby-redcarpet,ruby19
SUBDIR += ruby-redcarpet,ruby18
SUBDIR += ruby-redcloth
SUBDIR += ruby-redcloth,ruby19
SUBDIR += ruby-redcloth,ruby18
SUBDIR += ruby-ronn
SUBDIR += ruby-rss
SUBDIR += ruby-rtex

14
www/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.574 2012/09/15 17:53:15 jeremy Exp $
# $OpenBSD: Makefile,v 1.575 2012/09/23 17:20:41 jeremy Exp $
SUBDIR =
SUBDIR += ajaxterm
@ -436,27 +436,27 @@
SUBDIR += ruby-mechanize
SUBDIR += ruby-mongrel
SUBDIR += ruby-passenger
SUBDIR += ruby-passenger,ruby19
SUBDIR += ruby-passenger,ruby18
SUBDIR += ruby-rack
SUBDIR += ruby-rack-cache
SUBDIR += ruby-rack-mount
SUBDIR += ruby-rack-ssl
SUBDIR += ruby-rack-test
SUBDIR += ruby-rails
SUBDIR += ruby-rails,ruby19
SUBDIR += ruby-rails,ruby18
SUBDIR += ruby-railties
SUBDIR += ruby-rainbows
SUBDIR += ruby-rainbows,ruby19
SUBDIR += ruby-rainbows,ruby18
SUBDIR += ruby-raindrops
SUBDIR += ruby-raindrops,ruby19
SUBDIR += ruby-raindrops,ruby18
SUBDIR += ruby-rest-client
SUBDIR += ruby-sanitize
SUBDIR += ruby-sinatra
SUBDIR += ruby-thin
SUBDIR += ruby-thin,ruby19
SUBDIR += ruby-thin,ruby18
SUBDIR += ruby-thin_http
SUBDIR += ruby-unicorn
SUBDIR += ruby-unicorn,ruby19
SUBDIR += ruby-unicorn,ruby18
SUBDIR += sabredav
SUBDIR += sarg
SUBDIR += seamonkey