From 18c6e18276691edf5274406bf82a3b06792ff9ae Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Sat, 14 Jan 2023 17:05:28 -0600 Subject: 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 --- Mk/bsd.port.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'Mk/bsd.port.mk') diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 7628e7d1d48a..b20876eff9f0 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -371,9 +371,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_OCAML - If set, this port relies on the OCaml language. # Implies inclusion of bsd.ocaml.mk. (Also see # that file for more information on USE_OCAML*). -# USE_RUBY - If set, this port relies on the Ruby language. -# Implies inclusion of bsd.ruby.mk. (Also see -# that file for more information on USE_RUBY_*). ## # USE_GECKO - If set, this port uses the Gecko/Mozilla product. # See bsd.gecko.mk for more details. @@ -1391,10 +1388,6 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg .include "${PORTSDIR}/Mk/bsd.java.mk" . endif -. if defined(USE_RUBY) -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -. endif - . if defined(USE_OCAML) .include "${PORTSDIR}/Mk/bsd.ocaml.mk" . endif @@ -1640,8 +1633,7 @@ QA_ENV+= STAGEDIR=${STAGEDIR} \ DISABLE_LICENSES="${DISABLE_LICENSES:Dyes}" \ PORTNAME=${PORTNAME} \ NO_ARCH=${NO_ARCH} \ - "NO_ARCH_IGNORE=${NO_ARCH_IGNORE}" \ - USE_RUBY=${USE_RUBY} + "NO_ARCH_IGNORE=${NO_ARCH_IGNORE}" . if !empty(USES:Mssl) QA_ENV+= USESSSL=yes . endif -- cgit v1.2.3