From owner-dev-commits-ports-all@freebsd.org Sun Jul 18 22:07:59 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EDA3A6728F6; Sun, 18 Jul 2021 22:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GSfHL1v6Hz3JNW; Sun, 18 Jul 2021 22:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 04483395A; Sun, 18 Jul 2021 22:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16IM7uU4074460; Sun, 18 Jul 2021 22:07:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16IM7uM4074459; Sun, 18 Jul 2021 22:07:56 GMT (envelope-from git) Date: Sun, 18 Jul 2021 22:07:56 GMT Message-Id: <202107182207.16IM7uM4074459@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 2bb087ae1291 - main - Mk/bsd.ruby.mk: Clean up unused RUBY_REQUIRE MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bb087ae1291834566f42137cb06b37990d6cbae Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 22:07:59 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2bb087ae1291834566f42137cb06b37990d6cbae commit 2bb087ae1291834566f42137cb06b37990d6cbae Author: Po-Chuan Hsieh AuthorDate: 2021-07-18 21:44:41 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-07-18 22:07:08 +0000 Mk/bsd.ruby.mk: Clean up unused RUBY_REQUIRE --- Mk/bsd.ruby.mk | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index a70cc4cab026..b933608d0f6b 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -37,12 +37,6 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.org # build. # RUBY_SETUP - Set to the alternative name of setup.rb # (default: setup.rb). -# RUBY_REQUIRE - Set to a Ruby expression to evaluate before building -# the port. The constant "Ruby" is set to the integer -# version number of ruby, and the result of the -# expression will be set to RUBY_PROVIDED, which is -# left undefined if the result is nil, false or a -# zero-length string. Implies USE_RUBY. # USE_RUBYGEMS - Do not use this -- instead USES=gem # # [variables that each port should not (re)define] @@ -293,23 +287,6 @@ PLIST_SUB+= ${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \ RUBY27=${RUBY27} \ RUBY30=${RUBY30} -# require check -.if defined(RUBY_REQUIRE) -USE_RUBY= yes - -.if exists(${RUBY}) -RUBY_PROVIDED!= ${RUBY} -e '\ - Ruby = ${RUBY_RELVERSION_CODE}; \ - value = begin; ${RUBY_REQUIRE}; end and puts value' -.else -RUBY_PROVIDED= "should be" # the latest version is going to be installed -.endif - -.if empty(RUBY_PROVIDED) -.undef RUBY_PROVIDED -.endif -.endif - .if ${PORT_OPTIONS:MDEBUG} RUBY_FLAGS+= -d .endif