From nobody Fri May 13 11:48:47 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DA8831ADD426; Fri, 13 May 2022 11:48:49 +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 4L06Nw4rg3z3vHn; Fri, 13 May 2022 11:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652442529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Moota1c1a3M0bWy9KGy+ZyfPu7xczDt4vokoMio+u7Y=; b=wljyqLeqC5bSkgC0t0k1Vv9QWBJ25PHdQq4lor9HXkwwPCrebtvw7Em4ac/bCjN55NrfKH 89ODKk4WGac4d3kOBmto2Oey4cpGYcsfO//+hP2imqampdoLxo/MjbuItSsm135Xr3Eg3q 0eB3cYj4rCSE70jaUCAISNU7G+iBdiaNjCvMnW8k2mtt9TrULcNBkBKohahRD6Q2vMp8Wr RRHvfcS3KrOOW87NXnTdrhheIqHN/16vBp/UzNbIeWC92Y3h/4sGmQhC981nybAoAfKf2J MjDra+EZvrl7uroI5EtJ6eZMzDFQYgBgRyfEx73h9AS9q1Q4heJ9fxR4MVprgQ== 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 016AB21E5A; Fri, 13 May 2022 11:48:48 +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 24DBmlKk068135; Fri, 13 May 2022 11:48:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DBmlid068134; Fri, 13 May 2022 11:48:47 GMT (envelope-from git) Date: Fri, 13 May 2022 11:48:47 GMT Message-Id: <202205131148.24DBmlid068134@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: ab3fa742e17e - main - Mk/Uses/gem.mk: Clean up List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: ab3fa742e17e92c86ad81efc19ee0d4f63fafeea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652442529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Moota1c1a3M0bWy9KGy+ZyfPu7xczDt4vokoMio+u7Y=; b=rlL0IOIiGoS7bvr2YtoeDHBHg/UPRvDmYgwR6g+yjW7MBUdggi6M86viXP+rIKZTjNwE7o ixQt0gRcO9KstN8HVX0KOS8riHToBSTbym89ce4LonlkHvNfmCYhGDZy+94Hco4zK5Bi6C 8kkahx28remUkeIPQ4IcqtyW5OsmCgJKs97rG60Apd2FCrkRA35uMx+5TmkDxwok7yD39w 79B8manfFqK/dqsupONwNfB/5R6KJZpjE1UUvmKIlEGm5KUXLzuhRWRq0fYr5iNsPXFwOM SKDxRVZ4ATJlgA+x04CTGD6V2Fzio406dVKkqBY/qiLV6oW7KiKGv4LJaGWtaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652442529; a=rsa-sha256; cv=none; b=UfE6b5jh1nsBTxIzOEl1Mb19I0KpkiqzB/SLmcWDW77003Vak8N/zocxCtqg0TE++nD2sC OVopgD+7Zp3zXcVJRtxunRbAJGjCIMq1rGiy/XYPbWuyScj6YwCrx+Q/OkVXkI+SxZKAOf bj1G6NZIdOP529w91IaGyiFC+xAKU3nRUmkzBJCL7TQiMpKuG69MKkxzELjWNCsMSLMPxr Hb/bqiYWS+BneeFsaVygcdMu16/kFRE1E3fXvlCuPI+jn/TEpJJrzEh6oCp4gj/fuLQzSh N71cNCMEUJ1F2n2utHX0ceYtItap73Vrg93sVy/GYMfkNKvHOa67/xe50gasrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab3fa742e17e92c86ad81efc19ee0d4f63fafeea commit ab3fa742e17e92c86ad81efc19ee0d4f63fafeea Author: Po-Chuan Hsieh AuthorDate: 2022-05-13 11:35:43 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-05-13 11:40:07 +0000 Mk/Uses/gem.mk: Clean up - Move *_DEPENDS together - Fix PLIST_SUB: - Use defined GEMS_BASE_DIR - Remove unused PORT - Fix indent --- Mk/Uses/gem.mk | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk index 499bc1fb752a..de5f2fbd6fd3 100644 --- a/Mk/Uses/gem.mk +++ b/Mk/Uses/gem.mk @@ -10,7 +10,7 @@ _INCLUDE_USES_GEM_MK= yes -_valid_ARGS= noautoplist +_valid_ARGS= noautoplist # Sanity check . for arg in ${gem_ARGS} @@ -19,22 +19,22 @@ IGNORE= Incorrect 'USES+= gem:${gem_ARGS}' usage: argument [${arg}] is not recog . endif . endfor -BUILD_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems -RUN_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems - PKGNAMEPREFIX?= rubygem- EXTRACT_SUFX= .gem EXTRACT_ONLY= DIST_SUBDIR= rubygem +BUILD_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems EXTRACT_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems +RUN_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems + GEMS_BASE_DIR= lib/ruby/gems/${RUBY_VER} -GEMS_DIR= ${GEMS_BASE_DIR}/gems -DOC_DIR= ${GEMS_BASE_DIR}/doc CACHE_DIR= ${GEMS_BASE_DIR}/cache -SPEC_DIR= ${GEMS_BASE_DIR}/specifications +DOC_DIR= ${GEMS_BASE_DIR}/doc EXT_DIR= ${GEMS_BASE_DIR}/extensions +GEMS_DIR= ${GEMS_BASE_DIR}/gems PLUGINS_DIR= ${GEMS_BASE_DIR}/plugins +SPEC_DIR= ${GEMS_BASE_DIR}/specifications GEM_NAME?= ${DISTNAME} GEM_LIB_DIR?= ${GEMS_DIR}/${GEM_NAME} GEM_DOC_DIR?= ${DOC_DIR}/${GEM_NAME} @@ -48,14 +48,13 @@ GEM_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} PLIST_SUB+= PORTVERSION="${PORTVERSION}" \ REV="${RUBY_GEM}" \ - GEMS_BASE_DIR="lib/ruby/gems/${RUBY_VER}" \ + GEMS_BASE_DIR="${GEMS_BASE_DIR}" \ GEMS_DIR="${GEMS_DIR}" \ DOC_DIR="${DOC_DIR}" \ CACHE_DIR="${CACHE_DIR}" \ SPEC_DIR="${SPEC_DIR}" \ EXT_DIR="${EXT_DIR}" \ PLUGINS_DIR="${PLUGINS_DIR}" \ - PORT="${PORTNAME}-${PORTVERSION}" \ GEM_NAME="${GEM_NAME}" \ GEM_LIB_DIR="${GEM_LIB_DIR}" \ GEM_DOC_DIR="${GEM_DOC_DIR}" \