From f6990d01eb565575b2cf20bd467cc503957458b5 Mon Sep 17 00:00:00 2001 From: jeremy Date: Mon, 1 Aug 2016 20:26:34 +0000 Subject: [PATCH] Remove building of ruby21 ports by default Add building of ruby22 and ruby23 versions of devel/ruby-ffi. OK sthen@ --- audio/Makefile | 5 +---- converters/Makefile | 3 +-- databases/Makefile | 16 +--------------- devel/Makefile | 16 +++------------- graphics/Makefile | 3 +-- net/Makefile | 4 +--- security/Makefile | 3 +-- sysutils/Makefile | 6 +----- textproc/Makefile | 10 +--------- www/Makefile | 11 +---------- 10 files changed, 12 insertions(+), 65 deletions(-) diff --git a/audio/Makefile b/audio/Makefile index 428402f14d5..cf0c2b6a701 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.371 2016/07/10 11:05:02 czarkoff Exp $ +# $OpenBSD: Makefile,v 1.372 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += abcde @@ -212,14 +212,11 @@ SUBDIR += rhythmbox SUBDIR += rsynth SUBDIR += rtunes - SUBDIR += ruby-id3lib,ruby21 SUBDIR += ruby-id3lib,ruby22 SUBDIR += ruby-id3lib,ruby23 SUBDIR += ruby-sonos - SUBDIR += ruby-taglib,ruby21 SUBDIR += ruby-taglib,ruby22 SUBDIR += ruby-taglib,ruby23 - SUBDIR += ruby-vorbis_comment,ruby21 SUBDIR += ruby-vorbis_comment,ruby22 SUBDIR += ruby-vorbis_comment,ruby23 SUBDIR += schismtracker diff --git a/converters/Makefile b/converters/Makefile index fbf05815910..a692747c050 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.80 2016/04/28 08:38:26 jasper Exp $ +# $OpenBSD: Makefile,v 1.81 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += base64 @@ -65,7 +65,6 @@ SUBDIR += recode SUBDIR += ripmime SUBDIR += rpm2cpio - SUBDIR += ruby-json,ruby21 SUBDIR += ruby-json,ruby22 SUBDIR += ruby-json,ruby23 SUBDIR += ruby-multi_json diff --git a/databases/Makefile b/databases/Makefile index 24dda386f86..4c52412e03a 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.314 2016/06/20 09:50:24 feinerer Exp $ +# $OpenBSD: Makefile,v 1.315 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += apache-couchdb @@ -201,18 +201,14 @@ SUBDIR += redis SUBDIR += repmgr SUBDIR += riak - SUBDIR += ruby-amalgalite,ruby21 SUBDIR += ruby-amalgalite,ruby22 SUBDIR += ruby-amalgalite,ruby23 SUBDIR += ruby-bdb,ruby18 SUBDIR += ruby-data_objects - SUBDIR += ruby-do_mysql,ruby21 SUBDIR += ruby-do_mysql,ruby22 SUBDIR += ruby-do_mysql,ruby23 - SUBDIR += ruby-do_postgres,ruby21 SUBDIR += ruby-do_postgres,ruby22 SUBDIR += ruby-do_postgres,ruby23 - SUBDIR += ruby-do_sqlite3,ruby21 SUBDIR += ruby-do_sqlite3,ruby22 SUBDIR += ruby-do_sqlite3,ruby23 SUBDIR += ruby-hiera @@ -224,39 +220,29 @@ SUBDIR += ruby-jdbc-postgres SUBDIR += ruby-jdbc-sqlite3 SUBDIR += ruby-kirbybase - SUBDIR += ruby-ldap,ruby21 SUBDIR += ruby-ldap,ruby22 SUBDIR += ruby-ldap,ruby23 - SUBDIR += ruby-mysql,ruby21 SUBDIR += ruby-mysql,ruby22 SUBDIR += ruby-mysql,ruby23 - SUBDIR += ruby-mysql2,ruby21 SUBDIR += ruby-mysql2,ruby22 SUBDIR += ruby-mysql2,ruby23 - SUBDIR += ruby-pg,ruby21 SUBDIR += ruby-pg,ruby22 SUBDIR += ruby-pg,ruby23 SUBDIR += ruby-redis SUBDIR += ruby-redis-namespace SUBDIR += ruby-resque SUBDIR += ruby-sequel - SUBDIR += ruby-sequel_pg,ruby21 SUBDIR += ruby-sequel_pg,ruby22 SUBDIR += ruby-sequel_pg,ruby23 - SUBDIR += ruby-sqlite3,ruby21 SUBDIR += ruby-sqlite3,ruby22 SUBDIR += ruby-sqlite3,ruby23 SUBDIR += ruby-swift - SUBDIR += ruby-swift-db-mysql,ruby21 SUBDIR += ruby-swift-db-mysql,ruby22 SUBDIR += ruby-swift-db-mysql,ruby23 - SUBDIR += ruby-swift-db-postgres,ruby21 SUBDIR += ruby-swift-db-postgres,ruby22 SUBDIR += ruby-swift-db-postgres,ruby23 - SUBDIR += ruby-swift-db-sqlite3,ruby21 SUBDIR += ruby-swift-db-sqlite3,ruby22 SUBDIR += ruby-swift-db-sqlite3,ruby23 - SUBDIR += ruby-tiny_tds,ruby21 SUBDIR += ruby-tiny_tds,ruby22 SUBDIR += ruby-tiny_tds,ruby23 SUBDIR += ruby-validatable diff --git a/devel/Makefile b/devel/Makefile index 66aadc4f97d..0351f8fa9d9 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1511 2016/08/01 08:39:05 sthen Exp $ +# $OpenBSD: Makefile,v 1.1512 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += ElectricFence @@ -1451,7 +1451,6 @@ SUBDIR += rlog SUBDIR += ruby-abstract SUBDIR += ruby-arrayfields - SUBDIR += ruby-atomic,ruby21 SUBDIR += ruby-atomic,ruby22 SUBDIR += ruby-atomic,ruby23 SUBDIR += ruby-bacon @@ -1469,7 +1468,8 @@ SUBDIR += ruby-deep_merge SUBDIR += ruby-diff-lcs SUBDIR += ruby-extlib - SUBDIR += ruby-ffi,ruby21 + SUBDIR += ruby-ffi,ruby22 + SUBDIR += ruby-ffi,ruby23 SUBDIR += ruby-ffi-inliner SUBDIR += ruby-flexmock SUBDIR += ruby-gem_plugin @@ -1484,7 +1484,6 @@ SUBDIR += ruby-isolate SUBDIR += ruby-jeweler SUBDIR += ruby-json_pure - SUBDIR += ruby-kgio,ruby21 SUBDIR += ruby-kgio,ruby22 SUBDIR += ruby-kgio,ruby23 SUBDIR += ruby-locale @@ -1493,29 +1492,23 @@ SUBDIR += ruby-minitest SUBDIR += ruby-mocha SUBDIR += ruby-mspec - SUBDIR += ruby-narray,ruby21 SUBDIR += ruby-narray,ruby22 SUBDIR += ruby-narray,ruby23 - SUBDIR += ruby-ncurses,ruby21 SUBDIR += ruby-ncurses,ruby22 SUBDIR += ruby-ncurses,ruby23 SUBDIR += ruby-needle SUBDIR += ruby-ole SUBDIR += ruby-open4 SUBDIR += ruby-polyglot - SUBDIR += ruby-prof,ruby21 SUBDIR += ruby-prof,ruby22 SUBDIR += ruby-prof,ruby23 - SUBDIR += ruby-puppet_forge,ruby21 SUBDIR += ruby-puppet_forge,ruby22 SUBDIR += ruby-puppet_forge,ruby23 - SUBDIR += ruby-racc,ruby21 SUBDIR += ruby-racc,ruby22 SUBDIR += ruby-racc,ruby23 SUBDIR += ruby-rake SUBDIR += ruby-rake-compiler SUBDIR += ruby-rake-remote_task - SUBDIR += ruby-rb-gsl,ruby21 SUBDIR += ruby-rb-gsl,ruby22 SUBDIR += ruby-rb-gsl,ruby23 SUBDIR += ruby-ref @@ -1529,11 +1522,9 @@ SUBDIR += ruby-semantic_puppet SUBDIR += ruby-sexp_processor SUBDIR += ruby-stringex - SUBDIR += ruby-subset_sum,ruby21 SUBDIR += ruby-subset_sum,ruby22 SUBDIR += ruby-subset_sum,ruby23 SUBDIR += ruby-systemu - SUBDIR += ruby-therubyracer,ruby21 SUBDIR += ruby-therubyracer,ruby22 SUBDIR += ruby-therubyracer,ruby23 SUBDIR += ruby-thor @@ -1542,7 +1533,6 @@ SUBDIR += ruby-trollop SUBDIR += ruby-uuid SUBDIR += ruby-uuidtools - SUBDIR += ruby-yajl,ruby21 SUBDIR += ruby-yajl,ruby22 SUBDIR += ruby-yajl,ruby23 SUBDIR += ruby-zentest diff --git a/graphics/Makefile b/graphics/Makefile index 734dfba1b5d..f0ee54c0d4e 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.415 2016/07/10 10:39:37 czarkoff Exp $ +# $OpenBSD: Makefile,v 1.416 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += DevIL @@ -235,7 +235,6 @@ SUBDIR += rawtherapee SUBDIR += ruby-color SUBDIR += ruby-gruff - SUBDIR += ruby-rmagick,ruby21 SUBDIR += ruby-rmagick,ruby22 SUBDIR += ruby-rmagick,ruby23 SUBDIR += s10sh diff --git a/net/Makefile b/net/Makefile index c0faf46faca..68e28853543 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.977 2016/06/26 21:40:36 awolk Exp $ +# $OpenBSD: Makefile,v 1.978 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += GeoIP @@ -592,12 +592,10 @@ SUBDIR += rtmpdump SUBDIR += rtorrent SUBDIR += ruby-agcaldav - SUBDIR += ruby-eventmachine,ruby21 SUBDIR += ruby-eventmachine,ruby22 SUBDIR += ruby-eventmachine,ruby23 SUBDIR += ruby-macaddr SUBDIR += ruby-mfi - SUBDIR += ruby-msgpack,ruby21 SUBDIR += ruby-msgpack,ruby22 SUBDIR += ruby-msgpack,ruby23 SUBDIR += ruby-net-dns diff --git a/security/Makefile b/security/Makefile index 77f55b45cd2..2db37fd2c66 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.430 2016/07/04 21:04:08 awolk Exp $ +# $OpenBSD: Makefile,v 1.431 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += ADMsnmp @@ -289,7 +289,6 @@ SUBDIR += reop SUBDIR += routersploit SUBDIR += ruby-akami - SUBDIR += ruby-bcrypt,ruby21 SUBDIR += ruby-bcrypt,ruby22 SUBDIR += ruby-bcrypt,ruby23 SUBDIR += ruby-ezcrypto diff --git a/sysutils/Makefile b/sysutils/Makefile index d502c6140eb..9132e801ea5 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.396 2016/07/11 09:25:18 yasuoka Exp $ +# $OpenBSD: Makefile,v 1.397 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += accountsservice @@ -194,21 +194,17 @@ SUBDIR += rpl SUBDIR += rsyslog SUBDIR += rtty - SUBDIR += ruby-augeas,ruby21 SUBDIR += ruby-augeas,ruby22 SUBDIR += ruby-capistrano SUBDIR += ruby-directory_watcher SUBDIR += ruby-facter - SUBDIR += ruby-libvirt,ruby21 SUBDIR += ruby-libvirt,ruby22 - SUBDIR += ruby-posix-spawn,ruby21 SUBDIR += ruby-posix-spawn,ruby22 SUBDIR += ruby-posix-spawn,ruby23 SUBDIR += ruby-puppet SUBDIR += ruby-puppet-lint SUBDIR += ruby-puppet-syntax SUBDIR += ruby-r10k - SUBDIR += ruby-shadow,ruby21 SUBDIR += ruby-shadow,ruby22 SUBDIR += ruby-shadow,ruby23 SUBDIR += ruby-vlad diff --git a/textproc/Makefile b/textproc/Makefile index 1097daf9b2c..5f9890e3718 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.502 2016/06/10 13:01:07 awolk Exp $ +# $OpenBSD: Makefile,v 1.503 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += TclXML @@ -397,19 +397,15 @@ SUBDIR += ruby-builder SUBDIR += ruby-classifier SUBDIR += ruby-erubis - SUBDIR += ruby-fast-stemmer,ruby21 SUBDIR += ruby-fast-stemmer,ruby22 SUBDIR += ruby-fast-stemmer,ruby23 - SUBDIR += ruby-fast_xs,ruby21 SUBDIR += ruby-fast_xs,ruby22 SUBDIR += ruby-fast_xs,ruby23 SUBDIR += ruby-gyoku SUBDIR += ruby-haml - SUBDIR += ruby-hpricot,ruby21 SUBDIR += ruby-hpricot,ruby22 SUBDIR += ruby-hpricot,ruby23 SUBDIR += ruby-htmlentities - SUBDIR += ruby-hyperestraier,ruby21 SUBDIR += ruby-hyperestraier,ruby22 SUBDIR += ruby-hyperestraier,ruby23 SUBDIR += ruby-icalendar @@ -418,19 +414,15 @@ SUBDIR += ruby-markaby SUBDIR += ruby-maruku SUBDIR += ruby-mustache - SUBDIR += ruby-nokogiri,ruby21 SUBDIR += ruby-nokogiri,ruby22 SUBDIR += ruby-nokogiri,ruby23 SUBDIR += ruby-nori SUBDIR += ruby-pdf-reader SUBDIR += ruby-pygments.rb - SUBDIR += ruby-rdiscount,ruby21 SUBDIR += ruby-rdiscount,ruby22 SUBDIR += ruby-rdiscount,ruby23 - SUBDIR += ruby-redcarpet,ruby21 SUBDIR += ruby-redcarpet,ruby22 SUBDIR += ruby-redcarpet,ruby23 - SUBDIR += ruby-redcloth,ruby21 SUBDIR += ruby-redcloth,ruby22 SUBDIR += ruby-redcloth,ruby23 SUBDIR += ruby-rexical diff --git a/www/Makefile b/www/Makefile index 7d9ded992a2..93f349ca4e7 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.787 2016/06/05 17:14:56 danj Exp $ +# $OpenBSD: Makefile,v 1.788 2016/08/01 20:26:34 jeremy Exp $ SUBDIR = SUBDIR += ajaxterm @@ -456,48 +456,39 @@ SUBDIR += rt SUBDIR += ruby-addressable SUBDIR += ruby-capybara - SUBDIR += ruby-capybara-webkit,ruby21 SUBDIR += ruby-capybara-webkit,ruby22 SUBDIR += ruby-capybara-webkit,ruby23 SUBDIR += ruby-faraday SUBDIR += ruby-faraday_middleware SUBDIR += ruby-faraday_middleware-multi_json - SUBDIR += ruby-fcgi,ruby21 SUBDIR += ruby-fcgi,ruby22 SUBDIR += ruby-fcgi,ruby23 SUBDIR += ruby-httpclient SUBDIR += ruby-httpi SUBDIR += ruby-mechanize SUBDIR += ruby-multipart-post - SUBDIR += ruby-ntlm,ruby21 SUBDIR += ruby-ntlm,ruby22 SUBDIR += ruby-ntlm,ruby23 - SUBDIR += ruby-passenger,ruby21 SUBDIR += ruby-passenger,ruby22 SUBDIR += ruby-passenger,ruby23 - SUBDIR += ruby-puma,ruby21 SUBDIR += ruby-puma,ruby22 SUBDIR += ruby-puma,ruby23 SUBDIR += ruby-rack SUBDIR += ruby-rack-protection SUBDIR += ruby-rack-test SUBDIR += ruby-rainbows - SUBDIR += ruby-raindrops,ruby21 SUBDIR += ruby-raindrops,ruby22 SUBDIR += ruby-raindrops,ruby23 SUBDIR += ruby-sanitize SUBDIR += ruby-savon SUBDIR += ruby-sinatra - SUBDIR += ruby-thin,ruby21 SUBDIR += ruby-thin,ruby22 SUBDIR += ruby-thin,ruby23 SUBDIR += ruby-thin_http - SUBDIR += ruby-unicorn,ruby21 SUBDIR += ruby-unicorn,ruby22 SUBDIR += ruby-unicorn,ruby23 SUBDIR += ruby-vegas SUBDIR += ruby-wasabi - SUBDIR += ruby-websocket-driver,ruby21 SUBDIR += ruby-websocket-driver,ruby22 SUBDIR += ruby-websocket-driver,ruby23 SUBDIR += ruby-websocket-extensions