From 7a83a0466ace789e43dd61095287b5c87231c1ff Mon Sep 17 00:00:00 2001 From: jeremy Date: Sun, 8 Jan 2023 03:05:06 +0000 Subject: [PATCH] Build ruby32 FLAVORs of ruby gem ext ports by default For devel/ruby-sorted_set and graphics/ruby-rqrcode-core, do not do FLAVORed builds by default, as these are pure ruby libraries with no native component. --- audio/Makefile | 2 ++ databases/Makefile | 11 +++++++++++ devel/Makefile | 15 +++++++++++++-- graphics/Makefile | 4 ++-- net/Makefile | 3 +++ security/Makefile | 4 ++++ sysutils/Makefile | 4 ++++ textproc/Makefile | 8 ++++++++ www/Makefile | 10 ++++++++++ x11/Makefile | 1 + 10 files changed, 58 insertions(+), 4 deletions(-) diff --git a/audio/Makefile b/audio/Makefile index ccaa3c3fb90..97fc30b70d5 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -210,8 +210,10 @@ SUBDIR += rubberband SUBDIR += ruby-taglib,ruby30 SUBDIR += ruby-taglib,ruby31 + SUBDIR += ruby-taglib,ruby32 SUBDIR += ruby-vorbis_comment,ruby30 SUBDIR += ruby-vorbis_comment,ruby31 + SUBDIR += ruby-vorbis_comment,ruby32 SUBDIR += s-cdda SUBDIR += s-cdda-to-db SUBDIR += schismtracker diff --git a/databases/Makefile b/databases/Makefile index 5d00ccfed10..f25c3008281 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -194,35 +194,46 @@ SUBDIR += riak SUBDIR += ruby-amalgalite,ruby30 SUBDIR += ruby-amalgalite,ruby31 + SUBDIR += ruby-amalgalite,ruby32 SUBDIR += ruby-hiera-eyaml,ruby27 SUBDIR += ruby-hiera-eyaml,ruby30 SUBDIR += ruby-hiera-eyaml,ruby31 + SUBDIR += ruby-hiera-eyaml,ruby32 SUBDIR += ruby-hiera-eyaml-gpg,ruby27 SUBDIR += ruby-hiera-eyaml-gpg,ruby30 SUBDIR += ruby-hiera-eyaml-gpg,ruby31 + SUBDIR += ruby-hiera-eyaml-gpg,ruby32 SUBDIR += ruby-hiera-file,ruby27 SUBDIR += ruby-hiera-file,ruby30 SUBDIR += ruby-hiera-file,ruby31 + SUBDIR += ruby-hiera-file,ruby32 SUBDIR += ruby-hiera3 SUBDIR += ruby-kirbybase SUBDIR += ruby-ldap,ruby30 SUBDIR += ruby-ldap,ruby31 + SUBDIR += ruby-ldap,ruby32 SUBDIR += ruby-mysql,ruby30 SUBDIR += ruby-mysql,ruby31 + SUBDIR += ruby-mysql,ruby32 SUBDIR += ruby-mysql2,ruby30 SUBDIR += ruby-mysql2,ruby31 + SUBDIR += ruby-mysql2,ruby32 SUBDIR += ruby-pg,ruby30 SUBDIR += ruby-pg,ruby31 + SUBDIR += ruby-pg,ruby32 SUBDIR += ruby-redis SUBDIR += ruby-redis-namespace SUBDIR += ruby-resque SUBDIR += ruby-sequel SUBDIR += ruby-sequel_pg,ruby30 SUBDIR += ruby-sequel_pg,ruby31 + SUBDIR += ruby-sequel_pg,ruby32 SUBDIR += ruby-sqlite3,ruby30 SUBDIR += ruby-sqlite3,ruby31 + SUBDIR += ruby-sqlite3,ruby32 SUBDIR += ruby-tiny_tds,ruby30 SUBDIR += ruby-tiny_tds,ruby31 + SUBDIR += ruby-tiny_tds,ruby32 SUBDIR += sharedance SUBDIR += sqlbox SUBDIR += sqlcipher diff --git a/devel/Makefile b/devel/Makefile index dc451d1f68c..2b3e174726f 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1687,6 +1687,7 @@ SUBDIR += ruby-fast_gettext SUBDIR += ruby-ffi,ruby30 SUBDIR += ruby-ffi,ruby31 + SUBDIR += ruby-ffi,ruby32 SUBDIR += ruby-ffi-compiler SUBDIR += ruby-flexmock SUBDIR += ruby-get_process_mem @@ -1701,8 +1702,10 @@ SUBDIR += ruby-json_pure SUBDIR += ruby-kgio,ruby30 SUBDIR += ruby-kgio,ruby31 + SUBDIR += ruby-kgio,ruby32 SUBDIR += ruby-libv8,ruby30 SUBDIR += ruby-libv8,ruby31 + SUBDIR += ruby-libv8,ruby32 SUBDIR += ruby-locale SUBDIR += ruby-log4r SUBDIR += ruby-metaclass @@ -1710,10 +1713,13 @@ SUBDIR += ruby-mocha SUBDIR += ruby-narray,ruby30 SUBDIR += ruby-narray,ruby31 + SUBDIR += ruby-narray,ruby32 SUBDIR += ruby-ncurses,ruby30 SUBDIR += ruby-ncurses,ruby31 + SUBDIR += ruby-ncurses,ruby32 SUBDIR += ruby-nio4r,ruby30 SUBDIR += ruby-nio4r,ruby31 + SUBDIR += ruby-nio4r,ruby32 SUBDIR += ruby-ole SUBDIR += ruby-open4 SUBDIR += ruby-opt_parse_validator @@ -1721,13 +1727,16 @@ SUBDIR += ruby-polyglot SUBDIR += ruby-prof,ruby30 SUBDIR += ruby-prof,ruby31 + SUBDIR += ruby-prof,ruby32 SUBDIR += ruby-puppet_forge SUBDIR += ruby-rake-compiler SUBDIR += ruby-rake-remote_task SUBDIR += ruby-rb-gsl,ruby30 SUBDIR += ruby-rb-gsl,ruby31 + SUBDIR += ruby-rb-gsl,ruby32 SUBDIR += ruby-rbtree,ruby30 SUBDIR += ruby-rbtree,ruby31 + SUBDIR += ruby-rbtree,ruby32 SUBDIR += ruby-ref SUBDIR += ruby-regexp_parser SUBDIR += ruby-rgen @@ -1741,14 +1750,15 @@ SUBDIR += ruby-semantic_puppet SUBDIR += ruby-sexp_processor SUBDIR += ruby-shims - SUBDIR += ruby-sorted_set,ruby30 - SUBDIR += ruby-sorted_set,ruby31 + SUBDIR += ruby-sorted_set SUBDIR += ruby-subset_sum,ruby30 SUBDIR += ruby-subset_sum,ruby31 + SUBDIR += ruby-subset_sum,ruby32 SUBDIR += ruby-sync SUBDIR += ruby-systemu SUBDIR += ruby-therubyracer,ruby30 SUBDIR += ruby-therubyracer,ruby31 + SUBDIR += ruby-therubyracer,ruby32 SUBDIR += ruby-thor SUBDIR += ruby-thread_safe SUBDIR += ruby-tilt @@ -1759,6 +1769,7 @@ SUBDIR += ruby-xdg SUBDIR += ruby-yajl,ruby30 SUBDIR += ruby-yajl,ruby31 + SUBDIR += ruby-yajl,ruby32 SUBDIR += ruby-zeitwerk SUBDIR += ruby-zentest SUBDIR += samurai diff --git a/graphics/Makefile b/graphics/Makefile index e0821a8a762..47bbd915089 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -285,9 +285,9 @@ SUBDIR += ruby-gruff SUBDIR += ruby-rmagick,ruby30 SUBDIR += ruby-rmagick,ruby31 + SUBDIR += ruby-rmagick,ruby32 SUBDIR += ruby-rqrcode - SUBDIR += ruby-rqrcode-core,ruby30 - SUBDIR += ruby-rqrcode-core,ruby31 + SUBDIR += ruby-rqrcode-core SUBDIR += s10sh SUBDIR += sane-backends SUBDIR += sane-backends,escl diff --git a/net/Makefile b/net/Makefile index d91a10764df..f53e7ab71a5 100644 --- a/net/Makefile +++ b/net/Makefile @@ -633,13 +633,16 @@ SUBDIR += rtorrent SUBDIR += ruby-cbor,ruby30 SUBDIR += ruby-cbor,ruby31 + SUBDIR += ruby-cbor,ruby32 SUBDIR += ruby-eventmachine,ruby30 SUBDIR += ruby-eventmachine,ruby31 + SUBDIR += ruby-eventmachine,ruby32 SUBDIR += ruby-macaddr SUBDIR += ruby-mfi SUBDIR += ruby-msgpack,ruby27 SUBDIR += ruby-msgpack,ruby30 SUBDIR += ruby-msgpack,ruby31 + SUBDIR += ruby-msgpack,ruby32 SUBDIR += ruby-net-dns SUBDIR += ruby-net-http-digest_auth SUBDIR += ruby-net-scp diff --git a/security/Makefile b/security/Makefile index c30ebb02814..4062bba3c2a 100644 --- a/security/Makefile +++ b/security/Makefile @@ -334,15 +334,19 @@ SUBDIR += routersploit SUBDIR += ruby-argon2,ruby30 SUBDIR += ruby-argon2,ruby31 + SUBDIR += ruby-argon2,ruby32 SUBDIR += ruby-bcrypt,ruby30 SUBDIR += ruby-bcrypt,ruby31 + SUBDIR += ruby-bcrypt,ruby32 SUBDIR += ruby-cms_scanner SUBDIR += ruby-gpgme,ruby30 SUBDIR += ruby-gpgme,ruby31 + SUBDIR += ruby-gpgme,ruby32 SUBDIR += ruby-hmac SUBDIR += ruby-openid SUBDIR += ruby-pledge,ruby30 SUBDIR += ruby-pledge,ruby31 + SUBDIR += ruby-pledge,ruby32 SUBDIR += ruby-rbnacl SUBDIR += ruby-rotp SUBDIR += rust-openssl-tests diff --git a/sysutils/Makefile b/sysutils/Makefile index ea54f6403cb..5535776d7aa 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -350,18 +350,22 @@ SUBDIR += rtty SUBDIR += ruby-augeas,ruby30 SUBDIR += ruby-augeas,ruby31 + SUBDIR += ruby-augeas,ruby32 SUBDIR += ruby-capistrano SUBDIR += ruby-directory_watcher SUBDIR += ruby-libvirt,ruby30 SUBDIR += ruby-libvirt,ruby31 + SUBDIR += ruby-libvirt,ruby32 SUBDIR += ruby-posix-spawn,ruby30 SUBDIR += ruby-posix-spawn,ruby31 + SUBDIR += ruby-posix-spawn,ruby32 SUBDIR += ruby-puppet SUBDIR += ruby-puppet-lint SUBDIR += ruby-puppet-syntax SUBDIR += ruby-r10k SUBDIR += ruby-shadow,ruby30 SUBDIR += ruby-shadow,ruby31 + SUBDIR += ruby-shadow,ruby32 SUBDIR += ruby-serverengine SUBDIR += ruby-sigdump SUBDIR += ruby-tzinfo diff --git a/textproc/Makefile b/textproc/Makefile index a57363c7956..440a96dad70 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -492,13 +492,17 @@ SUBDIR += ruby-erubis SUBDIR += ruby-fast-stemmer,ruby30 SUBDIR += ruby-fast-stemmer,ruby31 + SUBDIR += ruby-fast-stemmer,ruby32 SUBDIR += ruby-fast_xs,ruby30 SUBDIR += ruby-fast_xs,ruby31 + SUBDIR += ruby-fast_xs,ruby32 SUBDIR += ruby-haml SUBDIR += ruby-hpricot,ruby30 SUBDIR += ruby-hpricot,ruby31 + SUBDIR += ruby-hpricot,ruby32 SUBDIR += ruby-hyperestraier,ruby30 SUBDIR += ruby-hyperestraier,ruby31 + SUBDIR += ruby-hyperestraier,ruby32 SUBDIR += ruby-icalendar SUBDIR += ruby-kramdown SUBDIR += ruby-liquid @@ -506,13 +510,17 @@ SUBDIR += ruby-mustache SUBDIR += ruby-nokogiri,ruby30 SUBDIR += ruby-nokogiri,ruby31 + SUBDIR += ruby-nokogiri,ruby32 SUBDIR += ruby-pygments.rb SUBDIR += ruby-rdiscount,ruby30 SUBDIR += ruby-rdiscount,ruby31 + SUBDIR += ruby-rdiscount,ruby32 SUBDIR += ruby-redcarpet,ruby30 SUBDIR += ruby-redcarpet,ruby31 + SUBDIR += ruby-redcarpet,ruby32 SUBDIR += ruby-redcloth,ruby30 SUBDIR += ruby-redcloth,ruby31 + SUBDIR += ruby-redcloth,ruby32 SUBDIR += ruby-rexical SUBDIR += ruby-ronn SUBDIR += ruby-rouge diff --git a/www/Makefile b/www/Makefile index 21a7e06c5db..3cf88259f4c 100644 --- a/www/Makefile +++ b/www/Makefile @@ -502,22 +502,27 @@ SUBDIR += ruby-capybara SUBDIR += ruby-capybara-webkit,ruby30 SUBDIR += ruby-capybara-webkit,ruby31 + SUBDIR += ruby-capybara-webkit,ruby32 SUBDIR += ruby-ethon SUBDIR += ruby-faraday SUBDIR += ruby-faraday_middleware SUBDIR += ruby-faraday_middleware-multi_json SUBDIR += ruby-fcgi,ruby30 SUBDIR += ruby-fcgi,ruby31 + SUBDIR += ruby-fcgi,ruby32 SUBDIR += ruby-httpclient SUBDIR += ruby-jwt SUBDIR += ruby-multipart-post SUBDIR += ruby-mustermann SUBDIR += ruby-ntlm,ruby30 SUBDIR += ruby-ntlm,ruby31 + SUBDIR += ruby-ntlm,ruby32 SUBDIR += ruby-passenger,ruby30 SUBDIR += ruby-passenger,ruby31 + SUBDIR += ruby-passenger,ruby32 SUBDIR += ruby-puma,ruby30 SUBDIR += ruby-puma,ruby31 + SUBDIR += ruby-puma,ruby32 SUBDIR += ruby-rack,ruby27 SUBDIR += ruby-rack SUBDIR += ruby-rack-protection @@ -525,20 +530,25 @@ SUBDIR += ruby-rainbows SUBDIR += ruby-raindrops,ruby30 SUBDIR += ruby-raindrops,ruby31 + SUBDIR += ruby-raindrops,ruby32 SUBDIR += ruby-sanitize SUBDIR += ruby-sassc,ruby30 SUBDIR += ruby-sassc,ruby31 + SUBDIR += ruby-sassc,ruby32 SUBDIR += ruby-sinatra SUBDIR += ruby-thin,ruby30 SUBDIR += ruby-thin,ruby31 + SUBDIR += ruby-thin,ruby32 SUBDIR += ruby-typhoeus SUBDIR += ruby-unicorn,ruby27 SUBDIR += ruby-unicorn,ruby30 SUBDIR += ruby-unicorn,ruby31 + SUBDIR += ruby-unicorn,ruby32 SUBDIR += ruby-vegas SUBDIR += ruby-webrick SUBDIR += ruby-websocket-driver,ruby30 SUBDIR += ruby-websocket-driver,ruby31 + SUBDIR += ruby-websocket-driver,ruby32 SUBDIR += ruby-websocket-extensions SUBDIR += ruby-xmlrpc SUBDIR += ruby-xpath diff --git a/x11/Makefile b/x11/Makefile index 3002f7da718..4a063d62ace 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -270,6 +270,7 @@ SUBDIR += ruby-dbus SUBDIR += ruby-tk,ruby30 SUBDIR += ruby-tk,ruby31 + SUBDIR += ruby-tk,ruby32 SUBDIR += rxvt-unicode SUBDIR += rxvt-unicode,small SUBDIR += rxvt-unicode,everything