From 601b0a7a90892ce3c7d036bcf2b4390d04b5cff2 Mon Sep 17 00:00:00 2001 From: jeremy Date: Thu, 29 Mar 2018 23:06:50 +0000 Subject: [PATCH] Stop building ports for ruby 2.3 libraries by default Per our current ruby support policy, as ruby 2.3's normal maintenance phase has ended. --- audio/Makefile | 4 +--- databases/Makefile | 10 +--------- devel/Makefile | 15 +-------------- graphics/Makefile | 3 +-- net/Makefile | 4 +--- security/Makefile | 5 +---- sysutils/Makefile | 6 +----- textproc/Makefile | 10 +--------- www/Makefile | 11 +---------- 9 files changed, 9 insertions(+), 59 deletions(-) diff --git a/audio/Makefile b/audio/Makefile index 224b78dc7fc..0b313144fd9 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.398 2018/01/16 01:42:40 jeremy Exp $ +# $OpenBSD: Makefile,v 1.399 2018/03/29 23:06:50 jeremy Exp $ SUBDIR = SUBDIR += abcde @@ -213,10 +213,8 @@ SUBDIR += rsynth SUBDIR += rtunes SUBDIR += ruby-sonos - SUBDIR += ruby-taglib,ruby23 SUBDIR += ruby-taglib,ruby24 SUBDIR += ruby-taglib,ruby25 - SUBDIR += ruby-vorbis_comment,ruby23 SUBDIR += ruby-vorbis_comment,ruby24 SUBDIR += ruby-vorbis_comment,ruby25 SUBDIR += schismtracker diff --git a/databases/Makefile b/databases/Makefile index 693384e16f5..6c78576fca1 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.355 2018/03/13 19:35:26 jturner Exp $ +# $OpenBSD: Makefile,v 1.356 2018/03/29 23:06:50 jeremy Exp $ SUBDIR = SUBDIR += apache-couchdb @@ -207,7 +207,6 @@ SUBDIR += redis SUBDIR += repmgr SUBDIR += riak - SUBDIR += ruby-amalgalite,ruby23 SUBDIR += ruby-amalgalite,ruby24 SUBDIR += ruby-amalgalite,ruby25 SUBDIR += ruby-hiera3 @@ -215,29 +214,22 @@ SUBDIR += ruby-hiera-eyaml-gpg SUBDIR += ruby-hiera-file SUBDIR += ruby-kirbybase - SUBDIR += ruby-ldap,ruby23 SUBDIR += ruby-ldap,ruby24 SUBDIR += ruby-ldap,ruby25 - SUBDIR += ruby-mysql,ruby23 SUBDIR += ruby-mysql,ruby24 SUBDIR += ruby-mysql,ruby25 - SUBDIR += ruby-mysql2,ruby23 SUBDIR += ruby-mysql2,ruby24 SUBDIR += ruby-mysql2,ruby25 - SUBDIR += ruby-pg,ruby23 SUBDIR += ruby-pg,ruby24 SUBDIR += ruby-pg,ruby25 SUBDIR += ruby-redis SUBDIR += ruby-redis-namespace SUBDIR += ruby-resque SUBDIR += ruby-sequel - SUBDIR += ruby-sequel_pg,ruby23 SUBDIR += ruby-sequel_pg,ruby24 SUBDIR += ruby-sequel_pg,ruby25 - SUBDIR += ruby-sqlite3,ruby23 SUBDIR += ruby-sqlite3,ruby24 SUBDIR += ruby-sqlite3,ruby25 - SUBDIR += ruby-tiny_tds,ruby23 SUBDIR += ruby-tiny_tds,ruby24 SUBDIR += ruby-tiny_tds,ruby25 SUBDIR += sharedance diff --git a/devel/Makefile b/devel/Makefile index 5bf440eb49d..bbca8b55da5 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -#${MODPY_COMMENT} $OpenBSD: Makefile,v 1.1715 2018/03/16 14:09:07 danj Exp $ +#${MODPY_COMMENT} $OpenBSD: Makefile,v 1.1716 2018/03/29 23:06:50 jeremy Exp $ SUBDIR = SUBDIR += ElectricFence @@ -1637,7 +1637,6 @@ SUBDIR += rlog SUBDIR += ruby-abstract SUBDIR += ruby-arrayfields - SUBDIR += ruby-atomic,ruby23 SUBDIR += ruby-atomic,ruby24 SUBDIR += ruby-atomic,ruby25 SUBDIR += ruby-bundler @@ -1653,7 +1652,6 @@ SUBDIR += ruby-diff-lcs SUBDIR += ruby-extlib SUBDIR += ruby-fast_gettext - SUBDIR += ruby-ffi,ruby23 SUBDIR += ruby-ffi,ruby24 SUBDIR += ruby-ffi,ruby25 SUBDIR += ruby-flexmock @@ -1668,10 +1666,8 @@ SUBDIR += ruby-isolate SUBDIR += ruby-jeweler SUBDIR += ruby-json_pure - SUBDIR += ruby-kgio,ruby23 SUBDIR += ruby-kgio,ruby24 SUBDIR += ruby-kgio,ruby25 - SUBDIR += ruby-libv8,ruby23 SUBDIR += ruby-libv8,ruby24 SUBDIR += ruby-libv8,ruby25 SUBDIR += ruby-locale @@ -1679,27 +1675,21 @@ SUBDIR += ruby-metaclass SUBDIR += ruby-minitest SUBDIR += ruby-mocha - SUBDIR += ruby-narray,ruby23 SUBDIR += ruby-narray,ruby24 SUBDIR += ruby-narray,ruby25 - SUBDIR += ruby-ncurses,ruby23 SUBDIR += ruby-ncurses,ruby24 SUBDIR += ruby-ncurses,ruby25 SUBDIR += ruby-ole SUBDIR += ruby-open4 SUBDIR += ruby-polyglot - SUBDIR += ruby-prof,ruby23 SUBDIR += ruby-prof,ruby24 SUBDIR += ruby-prof,ruby25 - SUBDIR += ruby-puppet_forge,ruby23 SUBDIR += ruby-puppet_forge,ruby24 SUBDIR += ruby-puppet_forge,ruby25 - SUBDIR += ruby-racc,ruby23 SUBDIR += ruby-racc,ruby24 SUBDIR += ruby-racc,ruby25 SUBDIR += ruby-rake-compiler SUBDIR += ruby-rake-remote_task - SUBDIR += ruby-rb-gsl,ruby23 SUBDIR += ruby-rb-gsl,ruby24 SUBDIR += ruby-rb-gsl,ruby25 SUBDIR += ruby-ref @@ -1712,11 +1702,9 @@ SUBDIR += ruby-safe_yaml SUBDIR += ruby-semantic_puppet SUBDIR += ruby-sexp_processor - SUBDIR += ruby-subset_sum,ruby23 SUBDIR += ruby-subset_sum,ruby24 SUBDIR += ruby-subset_sum,ruby25 SUBDIR += ruby-systemu - SUBDIR += ruby-therubyracer,ruby23 SUBDIR += ruby-therubyracer,ruby24 SUBDIR += ruby-therubyracer,ruby25 SUBDIR += ruby-thor @@ -1726,7 +1714,6 @@ SUBDIR += ruby-uuid SUBDIR += ruby-uuidtools SUBDIR += ruby-xdg - SUBDIR += ruby-yajl,ruby23 SUBDIR += ruby-yajl,ruby24 SUBDIR += ruby-yajl,ruby25 SUBDIR += ruby-zentest diff --git a/graphics/Makefile b/graphics/Makefile index fb15deb2b47..ba1eaf907b4 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.451 2018/01/16 01:42:40 jeremy Exp $ +# $OpenBSD: Makefile,v 1.452 2018/03/29 23:06:50 jeremy Exp $ SUBDIR = SUBDIR += DevIL @@ -252,7 +252,6 @@ SUBDIR += rawtherapee SUBDIR += ruby-color SUBDIR += ruby-gruff - SUBDIR += ruby-rmagick,ruby23 SUBDIR += ruby-rmagick,ruby24 SUBDIR += ruby-rmagick,ruby25 SUBDIR += s10sh diff --git a/net/Makefile b/net/Makefile index 1fa0afff260..e2fbc315c39 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1059 2018/03/17 13:01:37 robert Exp $ +# $OpenBSD: Makefile,v 1.1060 2018/03/29 23:06:50 jeremy Exp $ SUBDIR = SUBDIR += GeoIP @@ -618,12 +618,10 @@ SUBDIR += rtmpdump SUBDIR += rtorrent SUBDIR += ruby-agcaldav - SUBDIR += ruby-eventmachine,ruby23 SUBDIR += ruby-eventmachine,ruby24 SUBDIR += ruby-eventmachine,ruby25 SUBDIR += ruby-macaddr SUBDIR += ruby-mfi - SUBDIR += ruby-msgpack,ruby23 SUBDIR += ruby-msgpack,ruby24 SUBDIR += ruby-msgpack,ruby25 SUBDIR += ruby-net-dns diff --git a/security/Makefile b/security/Makefile index 00e725ef2ab..9feddd80ae3 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.495 2018/03/29 19:46:11 rpointel Exp $ +# $OpenBSD: Makefile,v 1.496 2018/03/29 23:06:51 jeremy Exp $ SUBDIR = SUBDIR += ADMsnmp @@ -327,13 +327,10 @@ SUBDIR += rhash SUBDIR += routersploit SUBDIR += ruby-akami - SUBDIR += ruby-bcrypt,ruby23 SUBDIR += ruby-bcrypt,ruby24 SUBDIR += ruby-bcrypt,ruby25 - SUBDIR += ruby-gpgme,ruby23 SUBDIR += ruby-gpgme,ruby24 SUBDIR += ruby-gpgme,ruby25 - SUBDIR += ruby-pledge,ruby23 SUBDIR += ruby-pledge,ruby24 SUBDIR += ruby-pledge,ruby25 SUBDIR += ruby-hmac diff --git a/sysutils/Makefile b/sysutils/Makefile index a160fbe91d2..e8dd078503d 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.472 2018/03/06 13:51:30 abieber Exp $ +# $OpenBSD: Makefile,v 1.473 2018/03/29 23:06:51 jeremy Exp $ SUBDIR = SUBDIR += accountsservice @@ -254,22 +254,18 @@ SUBDIR += rpl SUBDIR += rsyslog SUBDIR += rtty - SUBDIR += ruby-augeas,ruby23 SUBDIR += ruby-augeas,ruby24 SUBDIR += ruby-augeas,ruby25 SUBDIR += ruby-capistrano SUBDIR += ruby-directory_watcher - SUBDIR += ruby-libvirt,ruby23 SUBDIR += ruby-libvirt,ruby24 SUBDIR += ruby-libvirt,ruby25 - SUBDIR += ruby-posix-spawn,ruby23 SUBDIR += ruby-posix-spawn,ruby24 SUBDIR += ruby-posix-spawn,ruby25 SUBDIR += ruby-puppet SUBDIR += ruby-puppet-lint SUBDIR += ruby-puppet-syntax SUBDIR += ruby-r10k - SUBDIR += ruby-shadow,ruby23 SUBDIR += ruby-shadow,ruby24 SUBDIR += ruby-shadow,ruby25 SUBDIR += ruby-vlad diff --git a/textproc/Makefile b/textproc/Makefile index ab3a7c41cd3..bb900b4380a 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.567 2018/03/10 12:48:11 jasper Exp $ +# $OpenBSD: Makefile,v 1.568 2018/03/29 23:06:51 jeremy Exp $ SUBDIR = SUBDIR += TclXML @@ -457,18 +457,14 @@ SUBDIR += rubber SUBDIR += ruby-builder SUBDIR += ruby-erubis - SUBDIR += ruby-fast-stemmer,ruby23 SUBDIR += ruby-fast-stemmer,ruby24 SUBDIR += ruby-fast-stemmer,ruby25 - SUBDIR += ruby-fast_xs,ruby23 SUBDIR += ruby-fast_xs,ruby24 SUBDIR += ruby-fast_xs,ruby25 SUBDIR += ruby-gyoku SUBDIR += ruby-haml - SUBDIR += ruby-hpricot,ruby23 SUBDIR += ruby-hpricot,ruby24 SUBDIR += ruby-hpricot,ruby25 - SUBDIR += ruby-hyperestraier,ruby23 SUBDIR += ruby-hyperestraier,ruby24 SUBDIR += ruby-hyperestraier,ruby25 SUBDIR += ruby-icalendar @@ -476,18 +472,14 @@ SUBDIR += ruby-liquid SUBDIR += ruby-maruku SUBDIR += ruby-mustache - SUBDIR += ruby-nokogiri,ruby23 SUBDIR += ruby-nokogiri,ruby24 SUBDIR += ruby-nokogiri,ruby25 SUBDIR += ruby-nori SUBDIR += ruby-pygments.rb - SUBDIR += ruby-rdiscount,ruby23 SUBDIR += ruby-rdiscount,ruby24 SUBDIR += ruby-rdiscount,ruby25 - SUBDIR += ruby-redcarpet,ruby23 SUBDIR += ruby-redcarpet,ruby24 SUBDIR += ruby-redcarpet,ruby25 - SUBDIR += ruby-redcloth,ruby23 SUBDIR += ruby-redcloth,ruby24 SUBDIR += ruby-redcloth,ruby25 SUBDIR += ruby-rexical diff --git a/www/Makefile b/www/Makefile index 2de5cc6aed9..c7ffcb31ca0 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.854 2018/03/16 08:40:04 rpointel Exp $ +# $OpenBSD: Makefile,v 1.855 2018/03/29 23:06:51 jeremy Exp $ SUBDIR = SUBDIR += ajaxterm @@ -476,13 +476,11 @@ SUBDIR += rt SUBDIR += ruby-addressable SUBDIR += ruby-capybara - SUBDIR += ruby-capybara-webkit,ruby23 SUBDIR += ruby-capybara-webkit,ruby24 SUBDIR += ruby-capybara-webkit,ruby25 SUBDIR += ruby-faraday SUBDIR += ruby-faraday_middleware SUBDIR += ruby-faraday_middleware-multi_json - SUBDIR += ruby-fcgi,ruby23 SUBDIR += ruby-fcgi,ruby24 SUBDIR += ruby-fcgi,ruby25 SUBDIR += ruby-httpclient @@ -490,34 +488,27 @@ SUBDIR += ruby-mechanize SUBDIR += ruby-multipart-post SUBDIR += ruby-mustermann - SUBDIR += ruby-ntlm,ruby23 SUBDIR += ruby-ntlm,ruby24 SUBDIR += ruby-ntlm,ruby25 - SUBDIR += ruby-passenger,ruby23 SUBDIR += ruby-passenger,ruby24 SUBDIR += ruby-passenger,ruby25 - SUBDIR += ruby-puma,ruby23 SUBDIR += ruby-puma,ruby24 SUBDIR += ruby-puma,ruby25 SUBDIR += ruby-rack SUBDIR += ruby-rack-protection SUBDIR += ruby-rack-test SUBDIR += ruby-rainbows - SUBDIR += ruby-raindrops,ruby23 SUBDIR += ruby-raindrops,ruby24 SUBDIR += ruby-raindrops,ruby25 SUBDIR += ruby-sanitize SUBDIR += ruby-savon SUBDIR += ruby-sinatra - SUBDIR += ruby-thin,ruby23 SUBDIR += ruby-thin,ruby24 SUBDIR += ruby-thin,ruby25 - SUBDIR += ruby-unicorn,ruby23 SUBDIR += ruby-unicorn,ruby24 SUBDIR += ruby-unicorn,ruby25 SUBDIR += ruby-vegas SUBDIR += ruby-wasabi - SUBDIR += ruby-websocket-driver,ruby23 SUBDIR += ruby-websocket-driver,ruby24 SUBDIR += ruby-websocket-driver,ruby25 SUBDIR += ruby-websocket-extensions