From nobody Mon Feb 28 12:53:36 2022 X-Original-To: dev-commits-ports-main@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 4112819F7CF6; Mon, 28 Feb 2022 12:53:38 +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 4K6gKs4gVKz3kjF; Mon, 28 Feb 2022 12:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052817; 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=zdhkhBTCzraCvYepy4YXCGzQm/XsqZZHRGs3fSwe7So=; b=jaE0M0xMaDvSaudzSBbP9Bn1C6dqv3WepaYjEfXtA9FJ7lbwmPC69yoL7Ylz/EbW5DOzPl IAtmQb7lf+K2A7/16QIN4X4jzfYquh00qd5JbH8sIS580RI6IN5Qyn0heT0/jwghfO1Vku hCRI4WWJoZOu90NKEckW3eq4xiITNRfkMY/qIEkjYqB4H5RQlLyy1BD9VjWKZfGhR9uVik 6SvD/0QeefyCW3XQezmLbftdlVnDXvWHKl/PfwFzK3/InbziGJ/45qriExf9557XxgcTc/ yeiRg0N9im8TxoBF05RSGC+mfCxMylN+pBzkpxOumI3cgM14x+XiceaW7r0fmA== 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 07EC21BF02; Mon, 28 Feb 2022 12:53:37 +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 21SCrawq067028; Mon, 28 Feb 2022 12:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SCraEE067027; Mon, 28 Feb 2022 12:53:36 GMT (envelope-from git) Date: Mon, 28 Feb 2022 12:53:36 GMT Message-Id: <202202281253.21SCraEE067027@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: f800970bc87a - main - devel/ruby-gems: Clean up List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: f800970bc87ab1fac4110c4482ec064be1140b90 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052817; 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=zdhkhBTCzraCvYepy4YXCGzQm/XsqZZHRGs3fSwe7So=; b=PYq/p/YILTvTFr0z8XRoB4CDhVDV+Xf0ZsSGZeNrud3cZVzlXqLIzRia4dmbOw8mLeJYIO JhGDaYRMfJj/clDOXAYbKQWf9iQoR718wVPH4qc6bYsCtstJy7dYnuZ63QTkXrtw9SEdfJ 65cJWpQcA3lXR7ZnkBTv8XYFCOXwhGBzaCzVciMO35n4jeBkFMJQbYJyZTq4bSYLNtQXpt frRS6CBnxV0DzikGc0NmvmbPObK2TABZx9ZRiKralKkCoHlWbU8bvkx56niml3W+O2w9ge lbBaxQNy5oTSNISPI/bXZFOVOwK9StV+5q+bR/tcdTHoQNXI7rWoOUXuzUaKtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646052817; a=rsa-sha256; cv=none; b=axdXu5lWBN1uFtJc+KsdFtUqmWp9vu0+Vfy+JpBiS17eSRVGHirnGa1TUbTZzPistxFwXV Kn3EweAxsYrFeRC3toOUyb5AZg1YG2HeZU3n+2k9itYxuqGeGmi69HFOJCyHiRTzrMB3Bg vLAD/I3T5plLV37fI0nM8Jj/tskGfZ39Ujn3NF8a4TR4aYUBz+pBYAdzJ9CFKR0qFelI7F D1SEc6SdGhcpFb8t7qk6GZPyg29u8mS/d6jwHfhqxN+mRyS5OgyUHWEtf01e5ZxpiiZ2lD iU+eGANWAXWKcQb73i0ZK80AX+zlgVVBYdei5ActvbLM984428tQ+NKJib61YA== 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=f800970bc87ab1fac4110c4482ec064be1140b90 commit f800970bc87ab1fac4110c4482ec064be1140b90 Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 09:39:58 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 12:46:37 +0000 devel/ruby-gems: Clean up - Remove unnecessary bin/gem{26,27,30,31} - Add PLUGINS_DIR - Silence extraction message - Simplify patch file name - Bump PORTREVISION for package change --- devel/ruby-gems/Makefile | 21 +++++++++++++-------- ...ch-bundler-remove.patch => patch-remove-bundler} | 0 devel/ruby-gems/pkg-plist | 3 +-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile index 141bd7a9ed80..2baa88184c4d 100644 --- a/devel/ruby-gems/Makefile +++ b/devel/ruby-gems/Makefile @@ -2,6 +2,7 @@ PORTNAME= gems PORTVERSION= 3.3.7 +PORTREVISION= 1 CATEGORIES= devel ruby MASTER_SITES= https://rubygems.org/rubygems/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -27,20 +28,22 @@ NO_ARCH= yes NO_BUILD= yes RUBY_SETUP= setup.rb RUBY_SETUP_OPTIONS= --destdir=${STAGEDIR} \ - --no-regenerate-binstubs \ - --no-regenerate-plugins \ - --format-executable + --no-format-executable \ + --no-regenerate-binstubs \ + --no-regenerate-plugins CACHE_DIR= ${GEMS_BASE_DIR}/cache 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 PLIST_SUB= CACHE_DIR="${CACHE_DIR}" \ DOC_DIR="${DOC_DIR}" \ EXT_DIR="${EXT_DIR}" \ GEMS_DIR="${GEMS_DIR}" \ + PLUGINS_DIR="${PLUGINS_DIR}" \ SPEC_DIR="${SPEC_DIR}" CPE_VENDOR= rubygems @@ -51,21 +54,23 @@ OPTIONS_DEFINE= DOCS DOCS_VARS_OFF= RUBY_SETUP_OPTIONS+="--no-ri --no-rdoc" post-extract: - ${RM} -r ${WRKSRC}/bundler - ${RM} -r ${WRKSRC}/lib/rubygems/ssl_certs - ${FIND} ${WRKSRC} -name .document -delete + @${RM} -r ${WRKSRC}/bundler + @${RM} -r ${WRKSRC}/lib/rubygems/ssl_certs + @${FIND} ${WRKSRC} -name .document -delete + +post-patch: + @${RM} ${WRKSRC}/lib/rubygems/commands/setup_command.rb.orig do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} ${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info - ${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/plugins ${MKDIR} ${STAGEDIR}${PREFIX}/${CACHE_DIR} ${MKDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR} ${MKDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} ${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_DIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGINS_DIR} ${MKDIR} ${STAGEDIR}${PREFIX}/${SPEC_DIR} cd ${WRKSRC}/ && ${SETENV} ${GEMS_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS} - ${LN} -sf gem${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/gem # Find all RDOC and RI files post-install-DOCS-on: diff --git a/devel/ruby-gems/files/patch-bundler-remove.patch b/devel/ruby-gems/files/patch-remove-bundler similarity index 100% rename from devel/ruby-gems/files/patch-bundler-remove.patch rename to devel/ruby-gems/files/patch-remove-bundler diff --git a/devel/ruby-gems/pkg-plist b/devel/ruby-gems/pkg-plist index f63ddbdbc651..490ef682d2d1 100644 --- a/devel/ruby-gems/pkg-plist +++ b/devel/ruby-gems/pkg-plist @@ -1,5 +1,4 @@ bin/gem -bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems.rb %%RUBY_SITELIBDIR%%/rubygems/available_set.rb %%RUBY_SITELIBDIR%%/rubygems/basic_specification.rb @@ -198,9 +197,9 @@ bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems/version.rb %%RUBY_SITELIBDIR%%/rubygems/version_option.rb @dir lib/ruby/gems/%%RUBY_VER%%/build_info -@dir lib/ruby/gems/%%RUBY_VER%%/plugins @dir %%CACHE_DIR%% @dir %%DOC_DIR%% @dir %%EXT_DIR%% @dir %%GEMS_DIR%% +@dir %%PLUGINS_DIR%% @dir %%SPEC_DIR%%