Wednesday, August 11, 2021

Normalizing behavior of MODRUBY_FLAVOR versus MODPY_FLAVOR

Index: python-module.5
===================================================================
RCS file: /cvs/src/share/man/man5/python-module.5,v
retrieving revision 1.3
diff -u -p -r1.3 python-module.5
--- python-module.5 27 Jul 2021 13:21:50 -0000 1.3
+++ python-module.5 11 Aug 2021 21:28:13 -0000
@@ -94,6 +94,16 @@ is set to No.
It also appends
.Ev MODPY_TEST_LOCALE
to
+<<<<<<< python-module.5
+.Ev TEST_ENV
+and hanges to the directory specified in
+.Ev MODPY_TEST_DIR
+.Po
+by default ${WRKSRC}
+.Pc
+before running tests.
+.Pp
+=======
.Ev TEST_ENV
and changes to the directory specified in
.Ev MODPY_TEST_DIR
@@ -102,6 +112,7 @@ by default ${WRKSRC}
.Pc
before running tests.
.Pp
+>>>>>>> 1.3
Ports which use the setuptools module should set
.Ev MODPY_SETUPTOOLS
to Yes.
Index: ruby-module.5
===================================================================
RCS file: /cvs/src/share/man/man5/ruby-module.5,v
retrieving revision 1.32
diff -u -p -r1.32 ruby-module.5
--- ruby-module.5 25 Jul 2021 11:29:42 -0000 1.32
+++ ruby-module.5 11 Aug 2021 21:28:13 -0000
@@ -180,7 +180,7 @@ To ensure that dependencies use the same
current port, all ruby gem dependencies specified in the port
should use this format:
.Pp
-.Dl category/ruby-foo,${MODRUBY_FLAVOR}
+.Dl category/ruby-foo${MODRUBY_FLAVOR}
.Pp
The "ruby gem" and "ruby gem ext"
.Ev CONFIGURE_STYLE Ns s
I noticed that MODRUBY_FLAVOR doesn't include the comma, unlike
MODPY_FLAVOR. That seemed a weird inconsistency. I'd like to make
them the same. Since there are a lot less ruby ports than python,
I nominated Ruby to change. :D

I've cc'd the folks who are the maintainers of all the ports that used
MODRUBY_FLAVOR since it's only 3 people. :)

I changed ruby.port.mk so its usages of MODRUBY_FLAVOR where it expects
no comma have ${MODRUBY_FLAVOR:S/,//}.

I've inlined the diff that updates the usage in the existing 98 ports
and then attached the diff for the ruby-module man page. (Just so it's
easier to separate the diff for base versus the ports tree).

Thoughts? OKs?

--Kurt

Index: audio/ruby-vorbis_comment/Makefile
===================================================================
RCS file: /cvs/ports/audio/ruby-vorbis_comment/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- audio/ruby-vorbis_comment/Makefile 2 Oct 2020 22:58:20 -0000 1.18
+++ audio/ruby-vorbis_comment/Makefile 11 Aug 2021 21:25:20 -0000
@@ -17,7 +17,7 @@ WANTLIB = vorbis ogg
MODULES = lang/ruby

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-cicphash,${MODRUBY_FLAVOR}
+RUN_DEPENDS= devel/ruby-cicphash${MODRUBY_FLAVOR}
LIB_DEPENDS = audio/libvorbis

CONFIGURE_STYLE = ruby gem ext
Index: databases/ruby-amalgalite/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-amalgalite/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- databases/ruby-amalgalite/Makefile 21 May 2021 22:27:33 -0000 1.25
+++ databases/ruby-amalgalite/Makefile 11 Aug 2021 21:25:21 -0000
@@ -20,7 +20,7 @@ CONFIGURE_ARGS = --with-cflags="-O1"
.endif

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-arrayfields,${MODRUBY_FLAVOR}>=4.9,<5.0
+RUN_DEPENDS = devel/ruby-arrayfields${MODRUBY_FLAVOR}>=4.9,<5.0

AMALGALITE_SO_DIR = amalgalite/${MODRUBY_REV}
SUBST_VARS += AMALGALITE_SO_DIR
Index: databases/ruby-hiera-eyaml/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-hiera-eyaml/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- databases/ruby-hiera-eyaml/Makefile 23 May 2021 18:36:40 -0000 1.15
+++ databases/ruby-hiera-eyaml/Makefile 11 Aug 2021 21:25:21 -0000
@@ -15,8 +15,8 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = databases/ruby-hiera3,${MODRUBY_FLAVOR} \
- devel/ruby-highline,${MODRUBY_FLAVOR}<1.7 \
- devel/ruby-optimist,${MODRUBY_FLAVOR}
+RUN_DEPENDS = databases/ruby-hiera3${MODRUBY_FLAVOR} \
+ devel/ruby-highline${MODRUBY_FLAVOR}<1.7 \
+ devel/ruby-optimist${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: databases/ruby-hiera-eyaml-gpg/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-hiera-eyaml-gpg/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- databases/ruby-hiera-eyaml-gpg/Makefile 22 Oct 2019 13:54:39 -0000 1.4
+++ databases/ruby-hiera-eyaml-gpg/Makefile 11 Aug 2021 21:25:21 -0000
@@ -16,7 +16,7 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = databases/ruby-hiera-eyaml,${MODRUBY_FLAVOR} \
- security/ruby-gpgme,${MODRUBY_FLAVOR}
+RUN_DEPENDS = databases/ruby-hiera-eyaml${MODRUBY_FLAVOR} \
+ security/ruby-gpgme${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: databases/ruby-hiera-file/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-hiera-file/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- databases/ruby-hiera-file/Makefile 12 Jul 2019 20:44:01 -0000 1.9
+++ databases/ruby-hiera-file/Makefile 11 Aug 2021 21:25:21 -0000
@@ -16,6 +16,6 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = databases/ruby-hiera3,${MODRUBY_FLAVOR}
+RUN_DEPENDS = databases/ruby-hiera3${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: databases/ruby-hiera3/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-hiera3/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- databases/ruby-hiera3/Makefile 23 Mar 2021 18:57:13 -0000 1.25
+++ databases/ruby-hiera3/Makefile 11 Aug 2021 21:25:21 -0000
@@ -20,9 +20,9 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-deep_merge,${MODRUBY_FLAVOR}
+RUN_DEPENDS= devel/ruby-deep_merge${MODRUBY_FLAVOR}

-TEST_DEPENDS= devel/ruby-mocha,${MODRUBY_FLAVOR}
+TEST_DEPENDS= devel/ruby-mocha${MODRUBY_FLAVOR}
MODRUBY_TEST= rspec3

pre-configure:
Index: databases/ruby-redis-namespace/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-redis-namespace/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- databases/ruby-redis-namespace/Makefile 12 Jul 2019 21:02:13 -0000 1.9
+++ databases/ruby-redis-namespace/Makefile 11 Aug 2021 21:25:21 -0000
@@ -16,6 +16,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= databases/ruby-redis,${MODRUBY_FLAVOR}>=3.0.4v1,<4.0.0v1
+RUN_DEPENDS= databases/ruby-redis${MODRUBY_FLAVOR}>=3.0.4v1,<4.0.0v1

.include <bsd.port.mk>
Index: databases/ruby-resque/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-resque/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- databases/ruby-resque/Makefile 12 Jul 2019 21:02:13 -0000 1.9
+++ databases/ruby-resque/Makefile 11 Aug 2021 21:25:21 -0000
@@ -16,17 +16,17 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= converters/ruby-multi_json,${MODRUBY_FLAVOR} \
- databases/ruby-redis,${MODRUBY_FLAVOR}>=3.0.4v1,<4.0.0v1 \
- databases/ruby-redis-namespace,${MODRUBY_FLAVOR} \
- www/ruby-sinatra,${MODRUBY_FLAVOR} \
- www/ruby-vegas,${MODRUBY_FLAVOR}
+RUN_DEPENDS= converters/ruby-multi_json${MODRUBY_FLAVOR} \
+ databases/ruby-redis${MODRUBY_FLAVOR}>=3.0.4v1,<4.0.0v1 \
+ databases/ruby-redis-namespace${MODRUBY_FLAVOR} \
+ www/ruby-sinatra${MODRUBY_FLAVOR} \
+ www/ruby-vegas${MODRUBY_FLAVOR}

MODRUBY_TEST= rake
TEST_DEPENDS= databases/redis \
- devel/ruby-bundler,${MODRUBY_FLAVOR} \
- devel/ruby-mocha,${MODRUBY_FLAVOR} \
- www/ruby-rack-test,${MODRUBY_FLAVOR}
+ devel/ruby-bundler${MODRUBY_FLAVOR} \
+ devel/ruby-mocha${MODRUBY_FLAVOR} \
+ www/ruby-rack-test${MODRUBY_FLAVOR}

MODRUBY_TEST_ENV+= PATH=${PATH}

Index: databases/ruby-sequel_pg/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-sequel_pg/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- databases/ruby-sequel_pg/Makefile 22 Sep 2020 16:25:55 -0000 1.46
+++ databases/ruby-sequel_pg/Makefile 11 Aug 2021 21:25:21 -0000
@@ -17,8 +17,8 @@ WANTLIB = pq>=2
MODULES = lang/ruby

LIB_DEPENDS = databases/postgresql
-RUN_DEPENDS = databases/ruby-sequel,${MODRUBY_FLAVOR}>=4.38.0 \
- databases/ruby-pg,${MODRUBY_FLAVOR}>=0.18.0
+RUN_DEPENDS = databases/ruby-sequel${MODRUBY_FLAVOR}>=4.38.0 \
+ databases/ruby-pg${MODRUBY_FLAVOR}>=0.18.0
BUILD_DEPENDS = ${RUN_DEPENDS}

CONFIGURE_STYLE = ruby gem ext
Index: databases/ruby-sqlite3/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-sqlite3/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- databases/ruby-sqlite3/Makefile 3 Feb 2020 19:03:27 -0000 1.45
+++ databases/ruby-sqlite3/Makefile 11 Aug 2021 21:25:21 -0000
@@ -20,7 +20,7 @@ LIB_DEPENDS= databases/sqlite3
CONFIGURE_STYLE= ruby gem ext

MODRUBY_TEST= rake
-TEST_DEPENDS= devel/ruby-mocha,${MODRUBY_FLAVOR} \
+TEST_DEPENDS= devel/ruby-mocha${MODRUBY_FLAVOR} \
${FULLPKGNAME}:${BUILD_PKGPATH}

do-test:
Index: devel/ruby-activesupport/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-activesupport/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- devel/ruby-activesupport/Makefile 10 Jul 2021 22:02:41 -0000 1.46
+++ devel/ruby-activesupport/Makefile 11 Aug 2021 21:25:29 -0000
@@ -12,11 +12,11 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR},>=1.0.2,<2 \
- devel/ruby-i18n,${MODRUBY_FLAVOR},>=0.7,<2 \
- devel/ruby-minitest,${MODRUBY_FLAVOR}>=5.1,<6 \
- devel/ruby-zeitwerk,${MODRUBY_FLAVOR}>=2.3,<3 \
- sysutils/ruby-tzinfo,${MODRUBY_FLAVOR}>=2.0,<3
+RUN_DEPENDS += devel/ruby-concurrent-ruby${MODRUBY_FLAVOR},>=1.0.2,<2 \
+ devel/ruby-i18n${MODRUBY_FLAVOR},>=0.7,<2 \
+ devel/ruby-minitest${MODRUBY_FLAVOR}>=5.1,<6 \
+ devel/ruby-zeitwerk${MODRUBY_FLAVOR}>=2.3,<3 \
+ sysutils/ruby-tzinfo${MODRUBY_FLAVOR}>=2.0,<3


CONFIGURE_STYLE = ruby gem
Index: devel/ruby-commander/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-commander/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/ruby-commander/Makefile 12 Jul 2019 21:07:45 -0000 1.5
+++ devel/ruby-commander/Makefile 11 Aug 2021 21:25:29 -0000
@@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-highline,${MODRUBY_FLAVOR}>=1.6.11
+RUN_DEPENDS = devel/ruby-highline${MODRUBY_FLAVOR}>=1.6.11

CONFIGURE_STYLE = ruby gem

Index: devel/ruby-ffi-compiler/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-ffi-compiler/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- devel/ruby-ffi-compiler/Makefile 2 Feb 2021 19:25:20 -0000 1.1.1.1
+++ devel/ruby-ffi-compiler/Makefile 11 Aug 2021 21:25:29 -0000
@@ -17,7 +17,7 @@ MODULES = lang/ruby
WANTLIB = ffi

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-ffi,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-ffi${MODRUBY_FLAVOR}

CONFIGURE_STYLE = ruby gem

Index: devel/ruby-get_process_mem/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-get_process_mem/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/ruby-get_process_mem/Makefile 2 Sep 2020 21:10:23 -0000 1.2
+++ devel/ruby-get_process_mem/Makefile 11 Aug 2021 21:25:29 -0000
@@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes

MODULES = lang/ruby
BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += devel/ruby-ffi,${MODRUBY_FLAVOR}>=1.0,<2
+RUN_DEPENDS += devel/ruby-ffi${MODRUBY_FLAVOR}>=1.0,<2

CONFIGURE_STYLE = ruby gem

Index: devel/ruby-gettext/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-gettext/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- devel/ruby-gettext/Makefile 12 Jul 2019 20:45:58 -0000 1.22
+++ devel/ruby-gettext/Makefile 11 Aug 2021 21:25:29 -0000
@@ -11,8 +11,8 @@ PERMIT_PACKAGE= Yes
MODULES= lang/ruby

BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += devel/ruby-locale,${MODRUBY_FLAVOR}>=2.0.5 \
- textproc/ruby-text,${MODRUBY_FLAVOR}>=1.3.0
+RUN_DEPENDS += devel/ruby-locale${MODRUBY_FLAVOR}>=2.0.5 \
+ textproc/ruby-text${MODRUBY_FLAVOR}>=1.3.0

CONFIGURE_STYLE= ruby gem

Index: devel/ruby-gettext-setup/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-gettext-setup/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- devel/ruby-gettext-setup/Makefile 6 Nov 2020 20:46:15 -0000 1.9
+++ devel/ruby-gettext-setup/Makefile 11 Aug 2021 21:25:29 -0000
@@ -13,14 +13,14 @@ PERMIT_PACKAGE= Yes
MODULES= lang/ruby

BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += devel/ruby-fast_gettext,${MODRUBY_FLAVOR}>=1.1.0,<1.7 \
- devel/ruby-gettext,${MODRUBY_FLAVOR}>=3.0.2,<3.3
+RUN_DEPENDS += devel/ruby-fast_gettext${MODRUBY_FLAVOR}>=1.1.0,<1.7 \
+ devel/ruby-gettext${MODRUBY_FLAVOR}>=3.0.2,<3.3

CONFIGURE_STYLE = ruby gem

# At least ruby-crack gem missing
# MODRUBY_TEST = rake
-# TEST_DEPENDS += devel/ruby-safe_yaml,${MODRUBY_FLAVOR} \
-# www/ruby-addressable,${MODRUBY_FLAVOR}
+# TEST_DEPENDS += devel/ruby-safe_yaml${MODRUBY_FLAVOR} \
+# www/ruby-addressable${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: devel/ruby-gir_ffi/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-gir_ffi/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- devel/ruby-gir_ffi/Makefile 12 Jul 2019 20:45:58 -0000 1.12
+++ devel/ruby-gir_ffi/Makefile 11 Aug 2021 21:25:29 -0000
@@ -14,9 +14,9 @@ PERMIT_PACKAGE= Yes
MODULES= lang/ruby

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-ffi,${MODRUBY_FLAVOR}>=1.8,<=2.0 \
- devel/ruby-indentation,${MODRUBY_FLAVOR}>=0.1.1,<0.2.0
-TEST_DEPENDS= devel/ruby-bundler,${MODRUBY_FLAVOR}
+RUN_DEPENDS= devel/ruby-ffi${MODRUBY_FLAVOR}>=1.8,<=2.0 \
+ devel/ruby-indentation${MODRUBY_FLAVOR}>=0.1.1,<0.2.0
+TEST_DEPENDS= devel/ruby-bundler${MODRUBY_FLAVOR}

CONFIGURE_STYLE=ruby gem

Index: devel/ruby-hoe/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-hoe/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- devel/ruby-hoe/Makefile 8 Jan 2020 19:13:08 -0000 1.30
+++ devel/ruby-hoe/Makefile 11 Aug 2021 21:25:29 -0000
@@ -13,6 +13,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE=ruby gem

MODRUBY_TEST = rake
-TEST_DEPENDS = devel/ruby-minitest,${MODRUBY_FLAVOR},>=5.11.3
+TEST_DEPENDS = devel/ruby-minitest${MODRUBY_FLAVOR},>=5.11.3

.include <bsd.port.mk>
Index: devel/ruby-i18n/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-i18n/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- devel/ruby-i18n/Makefile 12 Jul 2019 20:45:58 -0000 1.9
+++ devel/ruby-i18n/Makefile 11 Aug 2021 21:25:29 -0000
@@ -8,7 +8,7 @@ CATEGORIES = devel
HOMEPAGE= https://github.com/svenfuchs/i18n

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR},>=1.0,<2
+RUN_DEPENDS = devel/ruby-concurrent-ruby${MODRUBY_FLAVOR},>=1.0,<2

# MIT License
PERMIT_PACKAGE = Yes
Index: devel/ruby-minitest/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-minitest/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- devel/ruby-minitest/Makefile 12 Jul 2019 20:45:59 -0000 1.18
+++ devel/ruby-minitest/Makefile 11 Aug 2021 21:25:29 -0000
@@ -20,6 +20,6 @@ MODRUBY_TEST = rake
PLIST = ${PKGDIR}/PLIST.empty
.endif

-TEST_DEPENDS = devel/ruby-hoe,${MODRUBY_FLAVOR}
+TEST_DEPENDS = devel/ruby-hoe${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: devel/ruby-mocha/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-mocha/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- devel/ruby-mocha/Makefile 12 Jul 2019 21:07:45 -0000 1.22
+++ devel/ruby-mocha/Makefile 11 Aug 2021 21:25:29 -0000
@@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-metaclass,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-metaclass${MODRUBY_FLAVOR}

CONFIGURE_STYLE = ruby gem

Index: devel/ruby-opt_parse_validator/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-opt_parse_validator/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- devel/ruby-opt_parse_validator/Makefile 23 Mar 2021 22:18:04 -0000 1.13
+++ devel/ruby-opt_parse_validator/Makefile 11 Aug 2021 21:25:29 -0000
@@ -16,7 +16,7 @@ MODULES= lang/ruby
CONFIGURE_STYLE= gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-activesupport,${MODRUBY_FLAVOR}>=5.1.2,<6.2 \
- www/ruby-addressable,${MODRUBY_FLAVOR}>=2.5,<2.8
+RUN_DEPENDS= devel/ruby-activesupport${MODRUBY_FLAVOR}>=5.1.2,<6.2 \
+ www/ruby-addressable${MODRUBY_FLAVOR}>=2.5,<2.8

.include <bsd.port.mk>
Index: devel/ruby-puppet_forge/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-puppet_forge/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/ruby-puppet_forge/Makefile 7 Apr 2020 21:18:54 -0000 1.14
+++ devel/ruby-puppet_forge/Makefile 11 Aug 2021 21:25:29 -0000
@@ -12,11 +12,11 @@ PERMIT_PACKAGE = Yes

MODULES = lang/ruby
BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += archivers/ruby-minitar,${MODRUBY_FLAVOR} \
- devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.11,<1 \
- devel/ruby-semantic_puppet,${MODRUBY_FLAVOR}>=1.0,<2.0 \
- www/ruby-faraday,${MODRUBY_FLAVOR}>=0.14,<0.15 \
- www/ruby-faraday_middleware,${MODRUBY_FLAVOR}>=0.9.0,<0.14
+RUN_DEPENDS += archivers/ruby-minitar${MODRUBY_FLAVOR} \
+ devel/ruby-gettext-setup${MODRUBY_FLAVOR}>=0.11,<1 \
+ devel/ruby-semantic_puppet${MODRUBY_FLAVOR}>=1.0,<2.0 \
+ www/ruby-faraday${MODRUBY_FLAVOR}>=0.14,<0.15 \
+ www/ruby-faraday_middleware${MODRUBY_FLAVOR}>=0.9.0,<0.14

CONFIGURE_STYLE = ruby gem

Index: devel/ruby-racc/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-racc/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/ruby-racc/Makefile 12 Nov 2019 06:43:14 -0000 1.7
+++ devel/ruby-racc/Makefile 11 Aug 2021 21:25:29 -0000
@@ -15,7 +15,7 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem ext

MODRUBY_TEST = rake
-TEST_DEPENDS = devel/ruby-hoe,${MODRUBY_FLAVOR} \
- devel/ruby-rake-compiler,${MODRUBY_FLAVOR}
+TEST_DEPENDS = devel/ruby-hoe${MODRUBY_FLAVOR} \
+ devel/ruby-rake-compiler${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: devel/ruby-rake-compiler/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-rake-compiler/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- devel/ruby-rake-compiler/Makefile 12 Jul 2019 21:07:45 -0000 1.13
+++ devel/ruby-rake-compiler/Makefile 11 Aug 2021 21:25:29 -0000
@@ -24,7 +24,7 @@ pre-configure:
rm ${WRKSRC}/lib/rake/extensiontask.rb.beforesubst \
${WRKSRC}/tasks/bin/cross-ruby.rake.beforesubst

-TEST_DEPENDS = devel/ruby-isolate,${MODRUBY_FLAVOR}
+TEST_DEPENDS = devel/ruby-isolate${MODRUBY_FLAVOR}
MODRUBY_TEST = rake rspec

.include <bsd.port.mk>
Index: devel/ruby-rake-remote_task/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-rake-remote_task/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/ruby-rake-remote_task/Makefile 11 Nov 2020 02:42:55 -0000 1.7
+++ devel/ruby-rake-remote_task/Makefile 11 Aug 2021 21:25:29 -0000
@@ -14,8 +14,8 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-open4,${MODRUBY_FLAVOR}
-TEST_DEPENDS= devel/ruby-hoe,${MODRUBY_FLAVOR}
+RUN_DEPENDS= devel/ruby-open4${MODRUBY_FLAVOR}
+TEST_DEPENDS= devel/ruby-hoe${MODRUBY_FLAVOR}

MODRUBY_TEST= rake

Index: devel/ruby-rb-gsl/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-rb-gsl/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/ruby-rb-gsl/Makefile 7 Oct 2020 00:03:21 -0000 1.14
+++ devel/ruby-rb-gsl/Makefile 11 Aug 2021 21:25:29 -0000
@@ -14,7 +14,7 @@ MODULES = lang/ruby
WANTLIB += gsl gslcblas

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-narray,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-narray${MODRUBY_FLAVOR}
LIB_DEPENDS = devel/gsl

CONFIGURE_STYLE =ruby gem ext
Index: devel/ruby-rgen/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-rgen/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- devel/ruby-rgen/Makefile 3 Nov 2019 14:07:43 -0000 1.14
+++ devel/ruby-rgen/Makefile 11 Aug 2021 21:25:29 -0000
@@ -15,7 +15,7 @@ MODULES= lang/ruby

CONFIGURE_STYLE= ruby gem

-TEST_DEPENDS= textproc/ruby-nokogiri,${MODRUBY_FLAVOR}
+TEST_DEPENDS= textproc/ruby-nokogiri${MODRUBY_FLAVOR}

# XXX: testrb for ruby 2.2 doesn't exist?
#MODRUBY_TEST= testrb
Index: devel/ruby-rspec/1/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-rspec/1/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- devel/ruby-rspec/1/Makefile 4 Apr 2019 06:21:04 -0000 1.12
+++ devel/ruby-rspec/1/Makefile 11 Aug 2021 21:25:29 -0000
@@ -18,7 +18,7 @@ post-install:

# Requires heckle and quite a few other libraries to run its own
# specs, so this is currently broken.
-TEST_DEPENDS = devel/ruby-bundler,${MODRUBY_FLAVOR}>=1.0.21
+TEST_DEPENDS = devel/ruby-bundler${MODRUBY_FLAVOR}>=1.0.21
MODRUBY_TEST = rake rspec

.include <bsd.port.mk>
Index: devel/ruby-ruby2ruby/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-ruby2ruby/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- devel/ruby-ruby2ruby/Makefile 12 Jul 2019 20:46:00 -0000 1.19
+++ devel/ruby-ruby2ruby/Makefile 11 Aug 2021 21:25:29 -0000
@@ -12,12 +12,12 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-ruby_parser,${MODRUBY_FLAVOR}>=2.0,<3.0 \
- devel/ruby-sexp_processor,${MODRUBY_FLAVOR}>=3.0,<4.0
+RUN_DEPENDS = devel/ruby-ruby_parser${MODRUBY_FLAVOR}>=2.0,<3.0 \
+ devel/ruby-sexp_processor${MODRUBY_FLAVOR}>=3.0,<4.0

CONFIGURE_STYLE = ruby gem

-TEST_DEPENDS = devel/ruby-hoe,${MODRUBY_FLAVOR}>=2.3.3
+TEST_DEPENDS = devel/ruby-hoe${MODRUBY_FLAVOR}>=2.3.3

MODRUBY_TEST = rake

Index: devel/ruby-ruby_parser/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-ruby_parser/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- devel/ruby-ruby_parser/Makefile 12 Jul 2019 20:46:00 -0000 1.16
+++ devel/ruby-ruby_parser/Makefile 11 Aug 2021 21:25:29 -0000
@@ -14,10 +14,10 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-sexp_processor,${MODRUBY_FLAVOR}>=3.0,<4.0
+RUN_DEPENDS = devel/ruby-sexp_processor${MODRUBY_FLAVOR}>=3.0,<4.0

-TEST_DEPENDS = devel/ruby-hoe,${MODRUBY_FLAVOR} \
- devel/ruby-minitest,${MODRUBY_FLAVOR}
+TEST_DEPENDS = devel/ruby-hoe${MODRUBY_FLAVOR} \
+ devel/ruby-minitest${MODRUBY_FLAVOR}

MODRUBY_TEST = rake

Index: devel/ruby-rubyinline/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-rubyinline/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- devel/ruby-rubyinline/Makefile 12 Jul 2019 20:46:00 -0000 1.17
+++ devel/ruby-rubyinline/Makefile 11 Aug 2021 21:25:29 -0000
@@ -17,7 +17,7 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-zentest,${MODRUBY_FLAVOR}>=4.3,<5.0
+RUN_DEPENDS= devel/ruby-zentest${MODRUBY_FLAVOR}>=4.3,<5.0

TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH}

Index: devel/ruby-sys-proctable/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-sys-proctable/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/ruby-sys-proctable/Makefile 1 Sep 2020 11:04:40 -0000 1.4
+++ devel/ruby-sys-proctable/Makefile 11 Aug 2021 21:25:29 -0000
@@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes

MODULES = lang/ruby
BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += devel/ruby-ffi,${MODRUBY_FLAVOR}
+RUN_DEPENDS += devel/ruby-ffi${MODRUBY_FLAVOR}

CONFIGURE_STYLE = ruby gem

Index: devel/ruby-therubyracer/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-therubyracer/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- devel/ruby-therubyracer/Makefile 12 Jul 2019 20:46:00 -0000 1.15
+++ devel/ruby-therubyracer/Makefile 11 Aug 2021 21:25:29 -0000
@@ -18,8 +18,8 @@ CONFIGURE_STYLE = ruby gem ext
COMPILER = base-clang ports-gcc base-gcc

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-libv8,${MODRUBY_FLAVOR}>=3.16.14.15,<3.16.15 \
- devel/ruby-ref,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-libv8${MODRUBY_FLAVOR}>=3.16.14.15,<3.16.15 \
+ devel/ruby-ref${MODRUBY_FLAVOR}

TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
MODRUBY_TEST_ENV = RUBYOPT='-rubygems -rv8'
Index: devel/ruby-thor/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-thor/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/ruby-thor/Makefile 12 Jul 2019 20:46:00 -0000 1.4
+++ devel/ruby-thor/Makefile 11 Aug 2021 21:25:29 -0000
@@ -16,6 +16,6 @@ CONFIGURE_STYLE = ruby gem

# XXX: unported dependency
#MODRUBY_TEST = rspec3
-#TEST_DEPENDS = devel/ruby-simplecov,${MODRUBY_FLAVOR}
+#TEST_DEPENDS = devel/ruby-simplecov${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: devel/ruby-uuid/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-uuid/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/ruby-uuid/Makefile 19 Jan 2021 19:30:46 -0000 1.7
+++ devel/ruby-uuid/Makefile 11 Aug 2021 21:25:29 -0000
@@ -15,8 +15,8 @@ MODULES= lang/ruby
CONFIGURE_STYLE= gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= net/ruby-macaddr,${MODRUBY_FLAVOR}
-TEST_DEPENDS= devel/ruby-mocha,${MODRUBY_FLAVOR}
+RUN_DEPENDS= net/ruby-macaddr${MODRUBY_FLAVOR}
+TEST_DEPENDS= devel/ruby-mocha${MODRUBY_FLAVOR}

MODRUBY_TEST= rake

Index: devel/ruby-uuidtools/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-uuidtools/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- devel/ruby-uuidtools/Makefile 12 Jul 2019 20:46:00 -0000 1.17
+++ devel/ruby-uuidtools/Makefile 11 Aug 2021 21:25:29 -0000
@@ -14,6 +14,6 @@ CONFIGURE_STYLE=ruby gem

MODRUBY_TEST=rake rspec
MODRUBY_TEST_TARGET=spec:normal
-TEST_DEPENDS+= textproc/ruby-yard,${MODRUBY_FLAVOR}
+TEST_DEPENDS+= textproc/ruby-yard${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: devel/ruby-zentest/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-zentest/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- devel/ruby-zentest/Makefile 12 Jul 2019 20:46:00 -0000 1.19
+++ devel/ruby-zentest/Makefile 11 Aug 2021 21:25:29 -0000
@@ -14,7 +14,7 @@ MODULES = lang/ruby

CONFIGURE_STYLE = ruby gem

-TEST_DEPENDS = devel/ruby-minitest,${MODRUBY_FLAVOR}
+TEST_DEPENDS = devel/ruby-minitest${MODRUBY_FLAVOR}

MODRUBY_TEST = rake

Index: geo/ruby-findmyiphone/Makefile
===================================================================
RCS file: /cvs/ports/geo/ruby-findmyiphone/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- geo/ruby-findmyiphone/Makefile 12 Jul 2019 20:46:55 -0000 1.16
+++ geo/ruby-findmyiphone/Makefile 11 Aug 2021 21:25:30 -0000
@@ -16,7 +16,7 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= www/ruby-mechanize,${MODRUBY_FLAVOR}
+RUN_DEPENDS= www/ruby-mechanize${MODRUBY_FLAVOR}

MODRUBY_TEST= rake

Index: graphics/ruby-gruff/Makefile
===================================================================
RCS file: /cvs/ports/graphics/ruby-gruff/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- graphics/ruby-gruff/Makefile 12 Jul 2019 20:47:09 -0000 1.19
+++ graphics/ruby-gruff/Makefile 11 Aug 2021 21:25:31 -0000
@@ -15,7 +15,7 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= graphics/ruby-rmagick,${MODRUBY_FLAVOR}
+RUN_DEPENDS= graphics/ruby-rmagick${MODRUBY_FLAVOR}

MODRUBY_TEST= rake

Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.103
diff -u -p -r1.103 ruby.port.mk
--- lang/ruby/ruby.port.mk 28 Dec 2020 16:48:27 -0000 1.103
+++ lang/ruby/ruby.port.mk 11 Aug 2021 21:25:31 -0000
@@ -76,16 +76,16 @@ MODRUBY_REV?= 2.7
GEM_MAN_SUFFIX = ${GEM_BIN_SUFFIX}

# Use the FLAVOR as the prefix for the package, to avoid conflicts.
-MODRUBY_PKG_PREFIX = ${MODRUBY_FLAVOR}
+MODRUBY_PKG_PREFIX = ${MODRUBY_FLAVOR:S/,//}

# Set MODRUBY_* variables as well as the path for the ruby interpreter and
# related commands used by MODRUBY_TEST and manually in some port targets.
.if ${MODRUBY_REV} == jruby
-GEM_MAN_SUFFIX = -${MODRUBY_FLAVOR}
+GEM_MAN_SUFFIX = -${MODRUBY_FLAVOR:S/,//}
MODRUBY_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-java
MODRUBY_BIN_RSPEC = ${RUBY} -S rspec
MODRUBY_BIN_TESTRB = ${RUBY} -S testrb
-MODRUBY_FLAVOR = jruby
+MODRUBY_FLAVOR = ,jruby
MODRUBY_LIBDIR= ${LOCALBASE}/jruby/lib/ruby
MODRUBY_LIBREV = 2.5
MODRUBY_SITEARCHDIR = ${MODRUBY_SITEDIR}/java
@@ -106,7 +106,7 @@ MODRUBY_ARCH= ${MACHINE_ARCH:S/amd64/x8
MODRUBY_BINREV = ${MODRUBY_LIBREV:S/.//}
MODRUBY_BIN_RSPEC = ${LOCALBASE}/bin/rspec${MODRUBY_BINREV}
MODRUBY_BIN_TESTRB = ${LOCALBASE}/bin/testrb${MODRUBY_BINREV}
-MODRUBY_FLAVOR = ruby${MODRUBY_BINREV}
+MODRUBY_FLAVOR = ,ruby${MODRUBY_BINREV}
MODRUBY_LIBDIR= ${LOCALBASE}/lib/ruby
MODRUBY_LIBREV = ${MODRUBY_REV}
MODRUBY_LIB_DEPENDS= ${MODRUBY_RUN_DEPENDS}
@@ -119,8 +119,8 @@ RSPEC= ${LOCALBASE}/bin/spec${MODRUBY_
RUBY= ${LOCALBASE}/bin/ruby${MODRUBY_BINREV}
.endif

-MODRUBY_RSPEC_DEPENDS = devel/ruby-rspec/1,${MODRUBY_FLAVOR}<2.0
-MODRUBY_RSPEC3_DEPENDS = devel/ruby-rspec/3/rspec,${MODRUBY_FLAVOR}>=3.0
+MODRUBY_RSPEC_DEPENDS = devel/ruby-rspec/1${MODRUBY_FLAVOR}<2.0
+MODRUBY_RSPEC3_DEPENDS = devel/ruby-rspec/3/rspec${MODRUBY_FLAVOR}>=3.0

.if defined(MODRUBY_TEST)
. if !${MODRUBY_TEST:L:Mrspec} && !${MODRUBY_TEST:L:Mrspec3} && \
Index: mail/mew/Makefile
===================================================================
RCS file: /cvs/ports/mail/mew/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- mail/mew/Makefile 17 Nov 2020 03:19:37 -0000 1.19
+++ mail/mew/Makefile 11 Aug 2021 21:25:31 -0000
@@ -23,7 +23,7 @@ MODRUBY_ADJ_FILES= cmew smew
BUILD_DEPENDS= emacs->=24:editors/emacs
RUN_DEPENDS= emacs->=24:editors/emacs \
security/stunnel \
- databases/ruby-sqlite3,${MODRUBY_FLAVOR}
+ databases/ruby-sqlite3${MODRUBY_FLAVOR}

CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= elispdir=${PREFIX}/share/emacs/site-lisp \
Index: mail/ruby-mail/Makefile
===================================================================
RCS file: /cvs/ports/mail/ruby-mail/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- mail/ruby-mail/Makefile 2 Aug 2021 21:55:54 -0000 1.12
+++ mail/ruby-mail/Makefile 11 Aug 2021 21:25:32 -0000
@@ -11,7 +11,7 @@ PERMIT_PACKAGE= Yes
MODULES= lang/ruby

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= mail/ruby-mini_mime,${MODRUBY_FLAVOR}
+RUN_DEPENDS= mail/ruby-mini_mime${MODRUBY_FLAVOR}

CONFIGURE_STYLE=ruby gem

Index: mail/ruby-mime-types/Makefile
===================================================================
RCS file: /cvs/ports/mail/ruby-mime-types/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- mail/ruby-mime-types/Makefile 21 Nov 2019 16:15:44 -0000 1.16
+++ mail/ruby-mime-types/Makefile 11 Aug 2021 21:25:32 -0000
@@ -15,6 +15,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= mail/ruby-mime-types-data,${MODRUBY_FLAVOR}>=3.2015,<4
+RUN_DEPENDS= mail/ruby-mime-types-data${MODRUBY_FLAVOR}>=3.2015,<4

.include <bsd.port.mk>
Index: misc/tpp/Makefile
===================================================================
RCS file: /cvs/ports/misc/tpp/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- misc/tpp/Makefile 17 Nov 2020 03:19:37 -0000 1.22
+++ misc/tpp/Makefile 11 Aug 2021 21:25:36 -0000
@@ -15,7 +15,7 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = http://synflood.at/tpp/

MODULES = lang/ruby
-RUN_DEPENDS = devel/ruby-ncurses,${MODRUBY_FLAVOR} \
+RUN_DEPENDS = devel/ruby-ncurses${MODRUBY_FLAVOR} \
misc/figlet

NO_BUILD = Yes
Index: net/ruby-agcaldav/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-agcaldav/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- net/ruby-agcaldav/Makefile 12 Jul 2019 20:48:47 -0000 1.4
+++ net/ruby-agcaldav/Makefile 11 Aug 2021 21:25:41 -0000
@@ -16,9 +16,9 @@ MODULES= lang/ruby
CONFIGURE_STYLE= gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-uuid,${MODRUBY_FLAVOR} \
- net/ruby-net-http-digest_auth,${MODRUBY_FLAVOR} \
- textproc/ruby-builder,${MODRUBY_FLAVOR} \
- textproc/ruby-icalendar,${MODRUBY_FLAVOR}
+RUN_DEPENDS= devel/ruby-uuid${MODRUBY_FLAVOR} \
+ net/ruby-net-http-digest_auth${MODRUBY_FLAVOR} \
+ textproc/ruby-builder${MODRUBY_FLAVOR} \
+ textproc/ruby-icalendar${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: net/ruby-macaddr/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-macaddr/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- net/ruby-macaddr/Makefile 24 Jan 2020 19:53:56 -0000 1.5
+++ net/ruby-macaddr/Makefile 11 Aug 2021 21:25:41 -0000
@@ -15,6 +15,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE= gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-systemu,${MODRUBY_FLAVOR}>=2.6.2,<2.7.0
+RUN_DEPENDS= devel/ruby-systemu${MODRUBY_FLAVOR}>=2.6.2,<2.7.0

.include <bsd.port.mk>
Index: net/ruby-mfi/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-mfi/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- net/ruby-mfi/Makefile 3 Nov 2019 14:07:44 -0000 1.4
+++ net/ruby-mfi/Makefile 11 Aug 2021 21:25:41 -0000
@@ -14,6 +14,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= net/ruby-net-ssh,${MODRUBY_FLAVOR}
+RUN_DEPENDS= net/ruby-net-ssh${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: net/ruby-net-dns/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-net-dns/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- net/ruby-net-dns/Makefile 12 Jul 2019 20:48:48 -0000 1.12
+++ net/ruby-net-dns/Makefile 11 Aug 2021 21:25:41 -0000
@@ -14,6 +14,6 @@ CONFIGURE_STYLE = ruby gem

MODRUBY_TEST = rake

-TEST_DEPENDS = textproc/ruby-yard,${MODRUBY_FLAVOR}
+TEST_DEPENDS = textproc/ruby-yard${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: net/ruby-net-scp/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-net-scp/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- net/ruby-net-scp/Makefile 11 Nov 2020 01:31:09 -0000 1.19
+++ net/ruby-net-scp/Makefile 11 Aug 2021 21:25:41 -0000
@@ -11,12 +11,12 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = net/ruby-net-ssh,${MODRUBY_FLAVOR}>=2.6.5
+RUN_DEPENDS = net/ruby-net-ssh${MODRUBY_FLAVOR}>=2.6.5

CONFIGURE_STYLE = ruby gem

MODRUBY_TEST = rake

-TEST_DEPENDS = devel/ruby-mocha,${MODRUBY_FLAVOR}
+TEST_DEPENDS = devel/ruby-mocha${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: net/ruby-net-sftp/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-net-sftp/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- net/ruby-net-sftp/Makefile 11 Nov 2020 01:33:06 -0000 1.22
+++ net/ruby-net-sftp/Makefile 11 Aug 2021 21:25:41 -0000
@@ -11,12 +11,12 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = net/ruby-net-ssh,${MODRUBY_FLAVOR}>=2.6.5
+RUN_DEPENDS = net/ruby-net-ssh${MODRUBY_FLAVOR}>=2.6.5

CONFIGURE_STYLE = ruby gem

MODRUBY_TEST = rake

-TEST_DEPENDS = devel/ruby-mocha,${MODRUBY_FLAVOR}
+TEST_DEPENDS = devel/ruby-mocha${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: net/ruby-net-ssh/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-net-ssh/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- net/ruby-net-ssh/Makefile 11 Nov 2020 01:34:29 -0000 1.25
+++ net/ruby-net-ssh/Makefile 11 Aug 2021 21:25:41 -0000
@@ -11,12 +11,12 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-highline,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-highline${MODRUBY_FLAVOR}

CONFIGURE_STYLE = ruby gem

MODRUBY_TEST = rake

-TEST_DEPENDS = devel/ruby-mocha,${MODRUBY_FLAVOR}
+TEST_DEPENDS = devel/ruby-mocha${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: net/ruby-net-ssh-gateway/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-net-ssh-gateway/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- net/ruby-net-ssh-gateway/Makefile 11 Nov 2020 01:36:01 -0000 1.17
+++ net/ruby-net-ssh-gateway/Makefile 11 Aug 2021 21:25:41 -0000
@@ -11,7 +11,7 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = net/ruby-net-ssh,${MODRUBY_FLAVOR}>=2.6.5
+RUN_DEPENDS = net/ruby-net-ssh${MODRUBY_FLAVOR}>=2.6.5

CONFIGURE_STYLE = ruby gem

Index: net/ruby-sshkit/Makefile
===================================================================
RCS file: /cvs/ports/net/ruby-sshkit/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- net/ruby-sshkit/Makefile 12 Jul 2019 20:48:48 -0000 1.2
+++ net/ruby-sshkit/Makefile 11 Aug 2021 21:25:41 -0000
@@ -13,9 +13,9 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-colorize,${MODRUBY_FLAVOR} \
- net/ruby-net-scp,${MODRUBY_FLAVOR} \
- net/ruby-net-ssh,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-colorize${MODRUBY_FLAVOR} \
+ net/ruby-net-scp${MODRUBY_FLAVOR} \
+ net/ruby-net-ssh${MODRUBY_FLAVOR}

# needs unported unindent gem
#MODRUBY_TEST = rake
Index: security/origami/Makefile
===================================================================
RCS file: /cvs/ports/security/origami/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- security/origami/Makefile 12 Jul 2019 20:49:06 -0000 1.2
+++ security/origami/Makefile 11 Aug 2021 21:25:46 -0000
@@ -17,7 +17,7 @@ CONFIGURE_STYLE = gem

MODULES = lang/ruby
BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-colorize,${MODRUBY_FLAVOR}>=0.7,<1.0 \
- devel/ruby-therubyracer,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-colorize${MODRUBY_FLAVOR}>=0.7,<1.0 \
+ devel/ruby-therubyracer${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: security/ruby-argon2/Makefile
===================================================================
RCS file: /cvs/ports/security/ruby-argon2/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- security/ruby-argon2/Makefile 2 Feb 2021 20:07:55 -0000 1.1.1.1
+++ security/ruby-argon2/Makefile 11 Aug 2021 21:25:46 -0000
@@ -17,8 +17,8 @@ MODULES = lang/ruby
BUILD_DEPENDS = devel/gmake \
${RUN_DEPENDS}

-RUN_DEPENDS = devel/ruby-ffi,${MODRUBY_FLAVOR}>=1.14,<2.0 \
- devel/ruby-ffi-compiler,${MODRUBY_FLAVOR}>=1.0,<2.0
+RUN_DEPENDS = devel/ruby-ffi${MODRUBY_FLAVOR}>=1.14,<2.0 \
+ devel/ruby-ffi-compiler${MODRUBY_FLAVOR}>=1.0,<2.0


CONFIGURE_STYLE = ruby gem ext
Index: security/ruby-cms_scanner/Makefile
===================================================================
RCS file: /cvs/ports/security/ruby-cms_scanner/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- security/ruby-cms_scanner/Makefile 18 Jun 2021 09:07:33 -0000 1.16
+++ security/ruby-cms_scanner/Makefile 11 Aug 2021 21:25:46 -0000
@@ -16,14 +16,14 @@ WANTLIB = crypto ssl ${MODRUBY_WANTLIB}
NO_TEST = Yes

BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += devel/ruby-get_process_mem,${MODRUBY_FLAVOR},>=0.2.5,<0.3 \
- devel/ruby-ruby-progressbar,${MODRUBY_FLAVOR},>=1.10,<1.12 \
- devel/ruby-opt_parse_validator,${MODRUBY_FLAVOR}>=1.9.4,<1.10 \
- devel/ruby-yajl,${MODRUBY_FLAVOR},>=1.4.1,<1.5 \
- devel/ruby-sys-proctable,${MODRUBY_FLAVOR},>=1.2.2,<1.3 \
- net/ruby-public_suffix,${MODRUBY_FLAVOR},>=4.0.3,<4.1 \
- textproc/ruby-nokogiri,${MODRUBY_FLAVOR},>=1.11.4,<1.12 \
- www/ruby-typhoeus,${MODRUBY_FLAVOR},>=1.3,<1.5
+RUN_DEPENDS += devel/ruby-get_process_mem${MODRUBY_FLAVOR},>=0.2.5,<0.3 \
+ devel/ruby-ruby-progressbar${MODRUBY_FLAVOR},>=1.10,<1.12 \
+ devel/ruby-opt_parse_validator${MODRUBY_FLAVOR}>=1.9.4,<1.10 \
+ devel/ruby-yajl${MODRUBY_FLAVOR},>=1.4.1,<1.5 \
+ devel/ruby-sys-proctable${MODRUBY_FLAVOR},>=1.2.2,<1.3 \
+ net/ruby-public_suffix${MODRUBY_FLAVOR},>=4.0.3,<4.1 \
+ textproc/ruby-nokogiri${MODRUBY_FLAVOR},>=1.11.4,<1.12 \
+ www/ruby-typhoeus${MODRUBY_FLAVOR},>=1.3,<1.5

CONFIGURE_STYLE = ruby gem

Index: security/wpscan/Makefile
===================================================================
RCS file: /cvs/ports/security/wpscan/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- security/wpscan/Makefile 18 Jun 2021 09:08:07 -0000 1.20
+++ security/wpscan/Makefile 11 Aug 2021 21:25:46 -0000
@@ -13,7 +13,7 @@ MAINTAINER = Sebastian Reitenbach <sebas
PERMIT_PACKAGE= Yes

BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += security/ruby-cms_scanner,${MODRUBY_FLAVOR},>=0.13.5,<0.14
+RUN_DEPENDS += security/ruby-cms_scanner${MODRUBY_FLAVOR},>=0.13.5,<0.14


MODULES = lang/ruby
Index: sysutils/mcollective/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/mcollective/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- sysutils/mcollective/Makefile 17 Nov 2020 03:19:37 -0000 1.58
+++ sysutils/mcollective/Makefile 11 Aug 2021 21:25:46 -0000
@@ -21,7 +21,7 @@ MODULES= lang/ruby

NO_BUILD= Yes
BUILD_DEPENDS= lang/ruby/${MODRUBY_REV}
-RUN_DEPENDS= net/ruby-stomp,${MODRUBY_FLAVOR}>=1.4.4
+RUN_DEPENDS= net/ruby-stomp${MODRUBY_FLAVOR}>=1.4.4

PKG_ARCH= *
NO_TEST= Yes
Index: sysutils/ruby-capistrano/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-capistrano/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- sysutils/ruby-capistrano/Makefile 12 Jul 2019 20:49:50 -0000 1.22
+++ sysutils/ruby-capistrano/Makefile 11 Aug 2021 21:25:46 -0000
@@ -16,7 +16,7 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-i18n,${MODRUBY_FLAVOR} \
- net/ruby-sshkit,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-i18n${MODRUBY_FLAVOR} \
+ net/ruby-sshkit${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: sysutils/ruby-posix-spawn/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-posix-spawn/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- sysutils/ruby-posix-spawn/Makefile 12 Jul 2019 20:49:50 -0000 1.12
+++ sysutils/ruby-posix-spawn/Makefile 11 Aug 2021 21:25:46 -0000
@@ -17,7 +17,7 @@ MODULES= lang/ruby
CONFIGURE_STYLE=ruby gem ext

MODRUBY_TEST= rake
-TEST_DEPENDS= devel/ruby-rake-compiler,${MODRUBY_FLAVOR}
+TEST_DEPENDS= devel/ruby-rake-compiler${MODRUBY_FLAVOR}

pre-configure:
perl -pi -e 's,"ruby","${RUBY}",,g' ${WRKSRC}/test/test_spawn.rb
Index: sysutils/ruby-puppet/5/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/5/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- sysutils/ruby-puppet/5/Makefile 4 May 2021 20:56:20 -0000 1.38
+++ sysutils/ruby-puppet/5/Makefile 11 Aug 2021 21:25:46 -0000
@@ -5,12 +5,12 @@ PORTROACH= limit:^5
VERSION= 5.5.22
REVISION= 8

-RUN_DEPENDS+= databases/ruby-hiera3,${MODRUBY_FLAVOR} \
- devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
- devel/ruby-locale,${MODRUBY_FLAVOR}>=2.1,<3 \
- devel/ruby-rgen,${MODRUBY_FLAVOR} \
- devel/ruby-sync,${MODRUBY_FLAVOR} \
- converters/ruby-multi_json,${MODRUBY_FLAVOR} \
+RUN_DEPENDS+= databases/ruby-hiera3${MODRUBY_FLAVOR} \
+ devel/ruby-gettext-setup${MODRUBY_FLAVOR}>=0.28,<1 \
+ devel/ruby-locale${MODRUBY_FLAVOR}>=2.1,<3 \
+ devel/ruby-rgen${MODRUBY_FLAVOR} \
+ devel/ruby-sync${MODRUBY_FLAVOR} \
+ converters/ruby-multi_json${MODRUBY_FLAVOR} \
sysutils/facter

SUBST_VARS += MODPY_DEFAULT_VERSION_2 MODPY_DEFAULT_VERSION_3
Index: sysutils/ruby-puppet/6/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/6/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- sysutils/ruby-puppet/6/Makefile 23 Jul 2021 20:21:49 -0000 1.20
+++ sysutils/ruby-puppet/6/Makefile 11 Aug 2021 21:25:46 -0000
@@ -6,12 +6,12 @@ VERSION= 6.24.0

MAINTAINER= Klemens Nanni <kn@openbsd.org>

-RUN_DEPENDS+= databases/ruby-hiera3,${MODRUBY_FLAVOR} \
- devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
- devel/ruby-locale,${MODRUBY_FLAVOR}>=2.1,<3 \
- devel/ruby-rgen,${MODRUBY_FLAVOR} \
- devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR} \
- devel/ruby-semantic_puppet,${MODRUBY_FLAVOR} \
+RUN_DEPENDS+= databases/ruby-hiera3${MODRUBY_FLAVOR} \
+ devel/ruby-gettext-setup${MODRUBY_FLAVOR}>=0.28,<1 \
+ devel/ruby-locale${MODRUBY_FLAVOR}>=2.1,<3 \
+ devel/ruby-rgen${MODRUBY_FLAVOR} \
+ devel/ruby-concurrent-ruby${MODRUBY_FLAVOR} \
+ devel/ruby-semantic_puppet${MODRUBY_FLAVOR} \
sysutils/facter

SUBST_VARS += MODPY_DEFAULT_VERSION_2 MODPY_DEFAULT_VERSION_3
Index: sysutils/ruby-r10k/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-r10k/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- sysutils/ruby-r10k/Makefile 21 Jul 2021 21:13:18 -0000 1.36
+++ sysutils/ruby-r10k/Makefile 11 Aug 2021 21:25:46 -0000
@@ -13,12 +13,12 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.10,<2 \
- devel/ruby-colored2,${MODRUBY_FLAVOR}=3.1.2 \
- devel/ruby-cri,${MODRUBY_FLAVOR}>=2.15.10,<3 \
- devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.24,<1 \
- devel/ruby-log4r,${MODRUBY_FLAVOR}=1.1.10 \
- devel/ruby-puppet_forge,${MODRUBY_FLAVOR}>=2.3.0,<3
+RUN_DEPENDS += converters/ruby-multi_json${MODRUBY_FLAVOR}>=1.10,<2 \
+ devel/ruby-colored2${MODRUBY_FLAVOR}=3.1.2 \
+ devel/ruby-cri${MODRUBY_FLAVOR}>=2.15.10,<3 \
+ devel/ruby-gettext-setup${MODRUBY_FLAVOR}>=0.24,<1 \
+ devel/ruby-log4r${MODRUBY_FLAVOR}=1.1.10 \
+ devel/ruby-puppet_forge${MODRUBY_FLAVOR}>=2.3.0,<3

CONFIGURE_STYLE = ruby gem

Index: sysutils/ruby-tzinfo/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-tzinfo/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- sysutils/ruby-tzinfo/Makefile 8 Mar 2021 20:44:48 -0000 1.4
+++ sysutils/ruby-tzinfo/Makefile 11 Aug 2021 21:25:46 -0000
@@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes
MODULES= lang/ruby

BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR},>=1.0,<2
+RUN_DEPENDS += devel/ruby-concurrent-ruby${MODRUBY_FLAVOR},>=1.0,<2

CONFIGURE_STYLE=ruby gem

Index: sysutils/ruby-vlad/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-vlad/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- sysutils/ruby-vlad/Makefile 12 Jul 2019 20:49:51 -0000 1.21
+++ sysutils/ruby-vlad/Makefile 11 Aug 2021 21:25:46 -0000
@@ -16,10 +16,10 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-rake-remote_task,${MODRUBY_FLAVOR}
+RUN_DEPENDS= devel/ruby-rake-remote_task${MODRUBY_FLAVOR}

MODRUBY_TEST= rake
-TEST_DEPENDS= devel/ruby-hoe,${MODRUBY_FLAVOR} \
- devel/ruby-minitest,${MODRUBY_FLAVOR}
+TEST_DEPENDS= devel/ruby-hoe${MODRUBY_FLAVOR} \
+ devel/ruby-minitest${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: sysutils/tmuxinator/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/tmuxinator/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- sysutils/tmuxinator/Makefile 17 Nov 2020 03:19:38 -0000 1.20
+++ sysutils/tmuxinator/Makefile 11 Aug 2021 21:25:47 -0000
@@ -18,9 +18,9 @@ CONFIGURE_STYLE = ruby gem
GEM_FLAGS = --no-format-executable

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-thor,${MODRUBY_FLAVOR} \
- devel/ruby-xdg,${MODRUBY_FLAVOR}<3 \
- textproc/ruby-erubis,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-thor${MODRUBY_FLAVOR} \
+ devel/ruby-xdg${MODRUBY_FLAVOR}<3 \
+ textproc/ruby-erubis${MODRUBY_FLAVOR}

# Fix mux.fish symlink
pre-configure:
Index: textproc/ruby-fast_xs/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-fast_xs/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- textproc/ruby-fast_xs/Makefile 12 Jul 2019 20:50:14 -0000 1.4
+++ textproc/ruby-fast_xs/Makefile 11 Aug 2021 21:25:52 -0000
@@ -20,6 +20,6 @@ CONFIGURE_STYLE = ruby gem ext
MODRUBY_TEST = testrb
MODRUBY_TEST_ENV = RUBYOPT=-rubygems
TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
- www/ruby-rack,${MODRUBY_FLAVOR}
+ www/ruby-rack${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: textproc/ruby-maruku/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-maruku/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- textproc/ruby-maruku/Makefile 12 Jul 2019 21:02:27 -0000 1.10
+++ textproc/ruby-maruku/Makefile 11 Aug 2021 21:25:52 -0000
@@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = textproc/ruby-syntax,${MODRUBY_FLAVOR}
+RUN_DEPENDS = textproc/ruby-syntax${MODRUBY_FLAVOR}

CONFIGURE_STYLE = ruby gem

Index: textproc/ruby-mustache/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-mustache/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- textproc/ruby-mustache/Makefile 12 Jul 2019 20:50:15 -0000 1.6
+++ textproc/ruby-mustache/Makefile 11 Aug 2021 21:25:52 -0000
@@ -19,7 +19,7 @@ post-install:
mv mustache.5 ${WRKINST}/${LOCALBASE}/man/man5/mustache${GEM_MAN_SUFFIX}.5
rm -r ${WRKINST}/${LOCALBASE}/${GEM_LIB}/gems/${DISTNAME}/man

-TEST_DEPENDS = textproc/ruby-ronn,${MODRUBY_FLAVOR}
+TEST_DEPENDS = textproc/ruby-ronn${MODRUBY_FLAVOR}
MODRUBY_TEST = testrb
MODRUBY_TEST_TARGET = -I lib test/*_test.rb

Index: textproc/ruby-nokogiri/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-nokogiri/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- textproc/ruby-nokogiri/Makefile 18 Jun 2021 08:57:51 -0000 1.39
+++ textproc/ruby-nokogiri/Makefile 11 Aug 2021 21:25:52 -0000
@@ -21,7 +21,7 @@ FLAVOR ?=

.if ${FLAVOR:Mruby26}
BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += devel/ruby-racc,${MODRUBY_FLAVOR}
+RUN_DEPENDS += devel/ruby-racc${MODRUBY_FLAVOR}
.endif

CONFIGURE_STYLE= ruby gem ext
Index: textproc/ruby-pygments.rb/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-pygments.rb/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- textproc/ruby-pygments.rb/Makefile 23 Feb 2021 19:39:46 -0000 1.15
+++ textproc/ruby-pygments.rb/Makefile 11 Aug 2021 21:25:52 -0000
@@ -20,8 +20,8 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION_
MODPY_BUILDDEP= No

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/ruby-yajl,${MODRUBY_FLAVOR}>=1.2.0,<2.0 \
- sysutils/ruby-posix-spawn,${MODRUBY_FLAVOR}>=0.3.6,<0.4
+RUN_DEPENDS= devel/ruby-yajl${MODRUBY_FLAVOR}>=1.2.0,<2.0 \
+ sysutils/ruby-posix-spawn${MODRUBY_FLAVOR}>=0.3.6,<0.4

CONFIGURE_STYLE=ruby gem

Index: textproc/ruby-ronn/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-ronn/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- textproc/ruby-ronn/Makefile 12 Jul 2019 20:50:15 -0000 1.8
+++ textproc/ruby-ronn/Makefile 11 Aug 2021 21:25:52 -0000
@@ -26,9 +26,9 @@ post-install:
rm -r ${WRKINST}/${LOCALBASE}/${GEM_LIB}/gems/${DISTNAME}/man

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = textproc/ruby-hpricot,${MODRUBY_FLAVOR}>=0.8.2 \
- textproc/ruby-mustache,${MODRUBY_FLAVOR}>=0.7.0 \
- textproc/ruby-rdiscount,${MODRUBY_FLAVOR}>=1.5.8
+RUN_DEPENDS = textproc/ruby-hpricot${MODRUBY_FLAVOR}>=0.8.2 \
+ textproc/ruby-mustache${MODRUBY_FLAVOR}>=0.7.0 \
+ textproc/ruby-rdiscount${MODRUBY_FLAVOR}>=1.5.8

MODRUBY_TEST = rake

Index: textproc/ruby-treetop/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-treetop/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- textproc/ruby-treetop/Makefile 12 Jul 2019 21:02:28 -0000 1.19
+++ textproc/ruby-treetop/Makefile 11 Aug 2021 21:25:52 -0000
@@ -14,12 +14,12 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-polyglot,${MODRUBY_FLAVOR}>=0.3.1
+RUN_DEPENDS = devel/ruby-polyglot${MODRUBY_FLAVOR}>=0.3.1

CONFIGURE_STYLE = ruby gem

MODRUBY_TEST = rspec3
-TEST_DEPENDS = devel/ruby-rr,${MODRUBY_FLAVOR}
+TEST_DEPENDS = devel/ruby-rr${MODRUBY_FLAVOR}

SUBST_VARS += RUBY

Index: textproc/ruby-yard/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-yard/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- textproc/ruby-yard/Makefile 5 Oct 2020 19:20:22 -0000 1.10
+++ textproc/ruby-yard/Makefile 11 Aug 2021 21:25:52 -0000
@@ -14,9 +14,9 @@ MODULES= lang/ruby

CONFIGURE_STYLE=ruby gem

-RUN_DEPENDS= textproc/ruby-redcarpet,${MODRUBY_FLAVOR}
-#TEST_DEPENDS= textproc/ruby-redcarpet,${MODRUBY_FLAVOR} \
-# www/ruby-rack,${MODRUBY_FLAVOR}
+RUN_DEPENDS= textproc/ruby-redcarpet${MODRUBY_FLAVOR}
+#TEST_DEPENDS= textproc/ruby-redcarpet${MODRUBY_FLAVOR} \
+# www/ruby-rack${MODRUBY_FLAVOR}

#MODRUBY_TEST=rspec2

Index: www/ruby-addressable/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-addressable/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- www/ruby-addressable/Makefile 26 Sep 2019 06:32:37 -0000 1.25
+++ www/ruby-addressable/Makefile 11 Aug 2021 21:25:53 -0000
@@ -15,9 +15,9 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += net/ruby-public_suffix,${MODRUBY_FLAVOR},>=2.0.2,<5
+RUN_DEPENDS += net/ruby-public_suffix${MODRUBY_FLAVOR},>=2.0.2,<5

MODRUBY_TEST = rake rspec3
-TEST_DEPENDS += devel/ruby-rspec/3/its,${MODRUBY_FLAVOR}
+TEST_DEPENDS += devel/ruby-rspec/3/its${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: www/ruby-capybara/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-capybara/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- www/ruby-capybara/Makefile 16 Nov 2020 18:42:05 -0000 1.9
+++ www/ruby-capybara/Makefile 11 Aug 2021 21:25:53 -0000
@@ -14,13 +14,13 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-regexp_parser,${MODRUBY_FLAVOR}>=1.5,<2 \
- mail/ruby-mini_mime,${MODRUBY_FLAVOR}>=0.1.3 \
- textproc/ruby-nokogiri,${MODRUBY_FLAVOR}>=1.8,<2 \
- www/ruby-addressable,${MODRUBY_FLAVOR} \
- www/ruby-rack,${MODRUBY_FLAVOR}>=1.6.0 \
- www/ruby-rack-test,${MODRUBY_FLAVOR}>=0.6.3 \
- www/ruby-xpath,${MODRUBY_FLAVOR}>=3.2,<4
+RUN_DEPENDS = devel/ruby-regexp_parser${MODRUBY_FLAVOR}>=1.5,<2 \
+ mail/ruby-mini_mime${MODRUBY_FLAVOR}>=0.1.3 \
+ textproc/ruby-nokogiri${MODRUBY_FLAVOR}>=1.8,<2 \
+ www/ruby-addressable${MODRUBY_FLAVOR} \
+ www/ruby-rack${MODRUBY_FLAVOR}>=1.6.0 \
+ www/ruby-rack-test${MODRUBY_FLAVOR}>=0.6.3 \
+ www/ruby-xpath${MODRUBY_FLAVOR}>=3.2,<4

# Tests require dependencies not in ports

Index: www/ruby-capybara-webkit/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-capybara-webkit/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- www/ruby-capybara-webkit/Makefile 31 Mar 2021 07:26:06 -0000 1.28
+++ www/ruby-capybara-webkit/Makefile 11 Aug 2021 21:25:53 -0000
@@ -23,7 +23,7 @@ USE_WXNEEDED = Yes
MAKE_ENV = QMAKE=qmake-qt5 LDFLAGS="-Wl,-z,wxneeded"

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = www/ruby-capybara,${MODRUBY_FLAVOR}>=2.3.0,<4.0
+RUN_DEPENDS = www/ruby-capybara${MODRUBY_FLAVOR}>=2.3.0,<4.0

LIB_DEPENDS = x11/qt5/qtwebkit

Index: www/ruby-ethon/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-ethon/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- www/ruby-ethon/Makefile 17 Jun 2021 21:55:48 -0000 1.3
+++ www/ruby-ethon/Makefile 11 Aug 2021 21:25:53 -0000
@@ -16,10 +16,10 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-ffi,${MODRUBY_FLAVOR},>=1.15
+RUN_DEPENDS = devel/ruby-ffi${MODRUBY_FLAVOR},>=1.15

MODRUBY_TEST = rake rspec
-TEST_DEPENDS += www/ruby-sinatra,${MODRUBY_FLAVOR} \
- mail/ruby-mime-types,${MODRUBY_FLAVOR}
+TEST_DEPENDS += www/ruby-sinatra${MODRUBY_FLAVOR} \
+ mail/ruby-mime-types${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: www/ruby-faraday/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-faraday/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- www/ruby-faraday/Makefile 21 Nov 2019 10:36:32 -0000 1.5
+++ www/ruby-faraday/Makefile 11 Aug 2021 21:25:53 -0000
@@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes

MODULES = lang/ruby
BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += www/ruby-multipart-post,${MODRUBY_FLAVOR}>=1.2,<3
+RUN_DEPENDS += www/ruby-multipart-post${MODRUBY_FLAVOR}>=1.2,<3

CONFIGURE_STYLE = ruby gem

Index: www/ruby-faraday_middleware/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-faraday_middleware/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- www/ruby-faraday_middleware/Makefile 12 Jul 2019 21:02:29 -0000 1.5
+++ www/ruby-faraday_middleware/Makefile 11 Aug 2021 21:25:53 -0000
@@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes

MODULES = lang/ruby
BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += www/ruby-faraday,${MODRUBY_FLAVOR}>=0.7.4,<1.0
+RUN_DEPENDS += www/ruby-faraday${MODRUBY_FLAVOR}>=0.7.4,<1.0

CONFIGURE_STYLE = ruby gem

Index: www/ruby-faraday_middleware-multi_json/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-faraday_middleware-multi_json/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- www/ruby-faraday_middleware-multi_json/Makefile 12 Jul 2019 21:02:29 -0000 1.2
+++ www/ruby-faraday_middleware-multi_json/Makefile 11 Aug 2021 21:25:53 -0000
@@ -12,8 +12,8 @@ PERMIT_PACKAGE = Yes

MODULES = lang/ruby
BUILD_DEPENDS += ${RUN_DEPENDS}
-RUN_DEPENDS += converters/ruby-multi_json,${MODRUBY_FLAVOR} \
- www/ruby-faraday_middleware,${MODRUBY_FLAVOR}
+RUN_DEPENDS += converters/ruby-multi_json${MODRUBY_FLAVOR} \
+ www/ruby-faraday_middleware${MODRUBY_FLAVOR}

CONFIGURE_STYLE = ruby gem

Index: www/ruby-mechanize/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-mechanize/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- www/ruby-mechanize/Makefile 12 Jul 2019 20:51:04 -0000 1.15
+++ www/ruby-mechanize/Makefile 11 Aug 2021 21:25:53 -0000
@@ -12,7 +12,7 @@ HOMEPAGE= http://docs.seattlerb.org/mec
PERMIT_PACKAGE= Yes

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= textproc/ruby-nokogiri,${MODRUBY_FLAVOR}
+RUN_DEPENDS= textproc/ruby-nokogiri${MODRUBY_FLAVOR}

MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem
Index: www/ruby-passenger/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-passenger/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- www/ruby-passenger/Makefile 20 Mar 2020 16:44:28 -0000 1.67
+++ www/ruby-passenger/Makefile 11 Aug 2021 21:25:53 -0000
@@ -33,7 +33,7 @@ COMPILER = base-clang ports-gcc base-gc
BUILD_DEPENDS = ${RUN_DEPENDS} \
devel/gmake \
textproc/gsed
-RUN_DEPENDS = www/ruby-rack,${MODRUBY_FLAVOR}
+RUN_DEPENDS = www/ruby-rack${MODRUBY_FLAVOR}
LIB_DEPENDS = ${MODRUBY_LIB_DEPENDS} \
devel/pcre \
net/curl
Index: www/ruby-puma/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-puma/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- www/ruby-puma/Makefile 26 May 2021 20:32:38 -0000 1.10
+++ www/ruby-puma/Makefile 11 Aug 2021 21:25:53 -0000
@@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes

MODULES = lang/ruby

-RUN_DEPENDS = devel/ruby-nio4r,${MODRUBY_FLAVOR}>=2,<3
+RUN_DEPENDS = devel/ruby-nio4r${MODRUBY_FLAVOR}>=2,<3
BUILD_DEPENDS = ${RUN_DEPENDS}

WANTLIB = crypto ssl
Index: www/ruby-rack-protection/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-rack-protection/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- www/ruby-rack-protection/Makefile 12 Jul 2019 20:51:04 -0000 1.5
+++ www/ruby-rack-protection/Makefile 11 Aug 2021 21:25:53 -0000
@@ -13,7 +13,7 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = www/ruby-rack,${MODRUBY_FLAVOR}
+RUN_DEPENDS = www/ruby-rack${MODRUBY_FLAVOR}

CONFIGURE_STYLE = ruby gem

Index: www/ruby-rack-test/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-rack-test/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- www/ruby-rack-test/Makefile 12 Jul 2019 20:51:04 -0000 1.10
+++ www/ruby-rack-test/Makefile 11 Aug 2021 21:25:53 -0000
@@ -13,7 +13,7 @@ PERMIT_PACKAGE= Yes
MODULES= lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = www/ruby-rack,${MODRUBY_FLAVOR}>=1.0
+RUN_DEPENDS = www/ruby-rack${MODRUBY_FLAVOR}>=1.0

CONFIGURE_STYLE= ruby gem

Index: www/ruby-rainbows/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-rainbows/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- www/ruby-rainbows/Makefile 20 Mar 2021 19:51:41 -0000 1.20
+++ www/ruby-rainbows/Makefile 11 Aug 2021 21:25:53 -0000
@@ -15,9 +15,9 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-kgio,${MODRUBY_FLAVOR}>=2.5,<3.0 \
- www/ruby-unicorn,${MODRUBY_FLAVOR}>=5.1 \
- www/ruby-rack,${MODRUBY_FLAVOR}>=1.1.0,<3.0
+RUN_DEPENDS = devel/ruby-kgio${MODRUBY_FLAVOR}>=2.5,<3.0 \
+ www/ruby-unicorn${MODRUBY_FLAVOR}>=5.1 \
+ www/ruby-rack${MODRUBY_FLAVOR}>=1.1.0,<3.0

CONFIGURE_STYLE = ruby gem

Index: www/ruby-raindrops/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-raindrops/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- www/ruby-raindrops/Makefile 12 Jul 2019 20:51:04 -0000 1.19
+++ www/ruby-raindrops/Makefile 11 Aug 2021 21:25:53 -0000
@@ -19,8 +19,8 @@ CONFIGURE_STYLE = ruby gem ext
BUILD_DEPENDS += libatomic_ops-*:devel/boehm-gc,-atomic

TEST_DEPENDS = devel/gmake \
- www/ruby-rack,${MODRUBY_FLAVOR} \
- www/ruby-unicorn,${MODRUBY_FLAVOR} \
+ www/ruby-rack${MODRUBY_FLAVOR} \
+ www/ruby-unicorn${MODRUBY_FLAVOR} \
${FULLPKGNAME}:${BUILD_PKGPATH}

do-test:
Index: www/ruby-sanitize/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-sanitize/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- www/ruby-sanitize/Makefile 12 Jul 2019 20:51:05 -0000 1.8
+++ www/ruby-sanitize/Makefile 11 Aug 2021 21:25:53 -0000
@@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/rgrove/san
PERMIT_PACKAGE= Yes

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= textproc/ruby-nokogiri,${MODRUBY_FLAVOR}>=1.4.4
+RUN_DEPENDS= textproc/ruby-nokogiri${MODRUBY_FLAVOR}>=1.4.4

MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem
Index: www/ruby-sassc/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-sassc/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- www/ruby-sassc/Makefile 21 May 2021 22:26:28 -0000 1.3
+++ www/ruby-sassc/Makefile 11 Aug 2021 21:25:53 -0000
@@ -18,6 +18,6 @@ CONFIGURE_STYLE = ruby gem ext

WANTLIB = ${COMPILER_LIBCXX}
BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-ffi,${MODRUBY_FLAVOR}>=1.9,<2.0
+RUN_DEPENDS = devel/ruby-ffi${MODRUBY_FLAVOR}>=1.9,<2.0

.include <bsd.port.mk>
Index: www/ruby-sinatra/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-sinatra/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- www/ruby-sinatra/Makefile 12 Jul 2019 20:51:05 -0000 1.24
+++ www/ruby-sinatra/Makefile 11 Aug 2021 21:25:53 -0000
@@ -15,9 +15,9 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-tilt,${MODRUBY_FLAVOR}>=2.0,<3.0 \
- www/ruby-mustermann,${MODRUBY_FLAVOR}>=1.0,<2.0 \
- www/ruby-rack,${MODRUBY_FLAVOR}>=2.0,<3.0 \
- www/ruby-rack-protection,${MODRUBY_FLAVOR}=2.0.0
+RUN_DEPENDS = devel/ruby-tilt${MODRUBY_FLAVOR}>=2.0,<3.0 \
+ www/ruby-mustermann${MODRUBY_FLAVOR}>=1.0,<2.0 \
+ www/ruby-rack${MODRUBY_FLAVOR}>=2.0,<3.0 \
+ www/ruby-rack-protection${MODRUBY_FLAVOR}=2.0.0

.include <bsd.port.mk>
Index: www/ruby-thin/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-thin/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- www/ruby-thin/Makefile 12 Jul 2019 20:51:05 -0000 1.27
+++ www/ruby-thin/Makefile 11 Aug 2021 21:25:53 -0000
@@ -15,8 +15,8 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem ext

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = www/ruby-rack,${MODRUBY_FLAVOR}>=1.0,<3.0 \
- devel/ruby-daemons,${MODRUBY_FLAVOR}>=1.0.9,<2.0 \
- net/ruby-eventmachine,${MODRUBY_FLAVOR}>=1.0.4,<2.0
+RUN_DEPENDS = www/ruby-rack${MODRUBY_FLAVOR}>=1.0,<3.0 \
+ devel/ruby-daemons${MODRUBY_FLAVOR}>=1.0.9,<2.0 \
+ net/ruby-eventmachine${MODRUBY_FLAVOR}>=1.0.4,<2.0

.include <bsd.port.mk>
Index: www/ruby-typhoeus/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-typhoeus/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- www/ruby-typhoeus/Makefile 12 Jul 2019 20:51:05 -0000 1.2
+++ www/ruby-typhoeus/Makefile 11 Aug 2021 21:25:53 -0000
@@ -15,7 +15,7 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = www/ruby-ethon,${MODRUBY_FLAVOR}
+RUN_DEPENDS = www/ruby-ethon${MODRUBY_FLAVOR}

# tests would need additional ports

Index: www/ruby-unicorn/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-unicorn/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- www/ruby-unicorn/Makefile 19 Mar 2021 17:49:51 -0000 1.31
+++ www/ruby-unicorn/Makefile 11 Aug 2021 21:25:53 -0000
@@ -15,8 +15,8 @@ PERMIT_PACKAGE = Yes
MODULES = lang/ruby

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/ruby-kgio,${MODRUBY_FLAVOR}>=2.6,<3.0 \
- www/ruby-raindrops,${MODRUBY_FLAVOR}>=0.7,<1.0
+RUN_DEPENDS = devel/ruby-kgio${MODRUBY_FLAVOR}>=2.6,<3.0 \
+ www/ruby-raindrops${MODRUBY_FLAVOR}>=0.7,<1.0

CONFIGURE_STYLE = ruby gem ext

@@ -27,8 +27,8 @@ post-install:
rm -r ${WRKINST}/${LOCALBASE}/${GEM_LIB}/gems/${DISTNAME}/man

TEST_DEPENDS = devel/gmake \
- devel/ruby-isolate,${MODRUBY_FLAVOR} \
- www/ruby-rack,${MODRUBY_FLAVOR}
+ devel/ruby-isolate${MODRUBY_FLAVOR} \
+ www/ruby-rack${MODRUBY_FLAVOR}

do-test:
cd ${WRKSRC} && RUBY=${RUBY} MRI=${RUBY} \
Index: www/ruby-vegas/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-vegas/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- www/ruby-vegas/Makefile 12 Jul 2019 21:02:29 -0000 1.5
+++ www/ruby-vegas/Makefile 11 Aug 2021 21:25:53 -0000
@@ -16,6 +16,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem

BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= www/ruby-rack,${MODRUBY_FLAVOR}
+RUN_DEPENDS= www/ruby-rack${MODRUBY_FLAVOR}

.include <bsd.port.mk>
Index: www/ruby-websocket-driver/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-websocket-driver/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/ruby-websocket-driver/Makefile 12 Nov 2019 06:48:39 -0000 1.6
+++ www/ruby-websocket-driver/Makefile 11 Aug 2021 21:25:53 -0000
@@ -14,6 +14,6 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem ext

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = www/ruby-websocket-extensions,${MODRUBY_FLAVOR}>=0.1.0
+RUN_DEPENDS = www/ruby-websocket-extensions${MODRUBY_FLAVOR}>=0.1.0

.include <bsd.port.mk>
Index: www/ruby-xpath/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-xpath/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- www/ruby-xpath/Makefile 16 Nov 2020 18:41:21 -0000 1.7
+++ www/ruby-xpath/Makefile 11 Aug 2021 21:25:53 -0000
@@ -14,7 +14,7 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem

BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = textproc/ruby-nokogiri,${MODRUBY_FLAVOR}>=1.8,<2
+RUN_DEPENDS = textproc/ruby-nokogiri${MODRUBY_FLAVOR}>=1.8,<2

# Tests require gems not in ports

No comments:

Post a Comment