diff options
author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-01-14 17:05:28 -0600 |
---|---|---|
committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-01-14 17:08:33 -0600 |
commit | 18c6e18276691edf5274406bf82a3b06792ff9ae (patch) | |
tree | 23a66e6997d92422bec9960a22edc07e5386d547 /lang | |
parent | devel/py-types-Pillow: update 9.4.0.1 → 9.4.0.2 (diff) |
Mk/**ruby.mk: Switch from USE_RUBY=yes to USES=ruby
Switch from Mk/bsd.ruby.mk to Mk/Uses/ruby.mk
Notable changes are.
- Mk/bsd.ruby.mk is moved to Mk/Uses/ruby.mk.
- USE_RUBY=yes is replaced with USES=ruby.
- USE_RUBY_EXTCONF is replaced with USES=ruby:extconf.
- USE_RUBY_RDOC is replaced with USES=ruby:rdoc.
- USE_RUBY_SETUP is replaces with USES=ruby:setup.
- RUBY_NO_BUILD_DEPENDS and RUBY_NO_RUN_DEPENDS are replaced with
USES=ruby:{build,none,run}.
- RUBY_REQUIRE isn't used anywhere, so removed.
- USES=gem now implies USES=ruby.
This is mainly the work of yasu@ at https://reviews.freebsd.org/D27863
I have just made some cosmetic changes and ran exp-run to test that the
tree is not in a BROKEN state.
Approved by: portmgr
Differential Revision: https://reviews.freebsd.org/D37925
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby27/Makefile | 5 | ||||
-rw-r--r-- | lang/ruby30/Makefile | 5 | ||||
-rw-r--r-- | lang/ruby31/Makefile | 5 | ||||
-rw-r--r-- | lang/ruby32/Makefile | 5 | ||||
-rw-r--r-- | lang/rubygem-ruby_language_server/Makefile | 1 |
5 files changed, 4 insertions, 17 deletions
diff --git a/lang/ruby27/Makefile b/lang/ruby27/Makefile index 1326301338a5..73c1965bae3d 100644 --- a/lang/ruby27/Makefile +++ b/lang/ruby27/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml RUN_DEPENDS= libffi>=0:devel/libffi -USES= autoreconf cpe ssl tar:xz +USES= autoreconf cpe ruby:none ssl tar:xz CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --disable-rpath \ @@ -44,9 +44,6 @@ WRKSRC= ${RUBY_WRKSRC} MAKE_JOBS_UNSAFE= yes RUBY_VER= 2.7 -USE_RUBY= yes -RUBY_NO_BUILD_DEPENDS= yes -RUBY_NO_RUN_DEPENDS= yes OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC OPTIONS_DEFAULT= RDOC LIBEDIT diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile index b4e564ce8bd8..1dddd85809bf 100644 --- a/lang/ruby30/Makefile +++ b/lang/ruby30/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml RUN_DEPENDS= libffi>=0:devel/libffi -USES= autoreconf cpe ssl tar:xz +USES= autoreconf cpe ruby:none ssl tar:xz CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --disable-rpath \ @@ -40,9 +40,6 @@ USE_LDCONFIG= yes WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 3.0 -USE_RUBY= yes -RUBY_NO_BUILD_DEPENDS= yes -RUBY_NO_RUN_DEPENDS= yes OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC OPTIONS_DEFAULT= RDOC LIBEDIT diff --git a/lang/ruby31/Makefile b/lang/ruby31/Makefile index 0bf41f00efa0..d8eac85a03f8 100644 --- a/lang/ruby31/Makefile +++ b/lang/ruby31/Makefile @@ -20,14 +20,11 @@ BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml RUN_DEPENDS= libffi>=0:devel/libffi -USES= autoreconf cpe ssl tar:xz +USES= autoreconf cpe ruby:none ssl tar:xz CPE_VENDOR= ruby-lang CPE_VERSION= ${RUBY_RELVERSION} CPE_UPDATE= p${RUBY_PATCHLEVEL} USE_LDCONFIG= yes -USE_RUBY= yes -RUBY_NO_BUILD_DEPENDS= yes -RUBY_NO_RUN_DEPENDS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ diff --git a/lang/ruby32/Makefile b/lang/ruby32/Makefile index 7ac4d13817e0..928c79b8e2a2 100644 --- a/lang/ruby32/Makefile +++ b/lang/ruby32/Makefile @@ -20,14 +20,11 @@ BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml RUN_DEPENDS= libffi>=0:devel/libffi -USES= autoreconf cpe ssl tar:xz +USES= autoreconf cpe ruby:none ssl tar:xz CPE_VENDOR= ruby-lang CPE_VERSION= ${RUBY_RELVERSION} CPE_UPDATE= p${RUBY_PATCHLEVEL} USE_LDCONFIG= yes -USE_RUBY= yes -RUBY_NO_BUILD_DEPENDS= yes -RUBY_NO_RUN_DEPENDS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ diff --git a/lang/rubygem-ruby_language_server/Makefile b/lang/rubygem-ruby_language_server/Makefile index e00858b01b01..e059812ac367 100644 --- a/lang/rubygem-ruby_language_server/Makefile +++ b/lang/rubygem-ruby_language_server/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= rubygem-activerecord61>=6.1<7:databases/rubygem-activerecord61 \ rubygem-sqlite3>=0:databases/rubygem-sqlite3 USES= gem -USE_RUBY= yes NO_ARCH= yes |