From nobody Mon Nov 1 13:48:41 2021 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 C085B183A429; Mon, 1 Nov 2021 13:48:46 +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 4HjZBP5SDCz4lqt; Mon, 1 Nov 2021 13:48:45 +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 1E4B912A8B; Mon, 1 Nov 2021 13:48:42 +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 1A1Dmf8G053167; Mon, 1 Nov 2021 13:48:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A1Dmf1Q053166; Mon, 1 Nov 2021 13:48:41 GMT (envelope-from git) Date: Mon, 1 Nov 2021 13:48:41 GMT Message-Id: <202111011348.1A1Dmf1Q053166@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: 13be7b04899e - main - lang/ruby26: Use proper variables, RUBY_SHLIBVER and RUBY_SUFFIX 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: 13be7b04899e2356316c9e34cc1727d6fb78cc1a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=13be7b04899e2356316c9e34cc1727d6fb78cc1a commit 13be7b04899e2356316c9e34cc1727d6fb78cc1a Author: Po-Chuan Hsieh AuthorDate: 2021-11-01 13:30:25 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-11-01 13:42:21 +0000 lang/ruby26: Use proper variables, RUBY_SHLIBVER and RUBY_SUFFIX --- lang/ruby26/Makefile | 2 +- lang/ruby26/pkg-plist | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/ruby26/Makefile b/lang/ruby26/Makefile index 25f90997ef22..ed561d943283 100644 --- a/lang/ruby26/Makefile +++ b/lang/ruby26/Makefile @@ -113,7 +113,7 @@ MAKE_JOBS_UNSAFE= yes .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} PLIST_SUB+= IF_DEFAULT="" .else -PKGNAMESUFFIX= ${RUBY_VER:C/\.//} +PKGNAMESUFFIX= ${RUBY_SUFFIX} PLIST_SUB+= IF_DEFAULT="@comment " .endif diff --git a/lang/ruby26/pkg-plist b/lang/ruby26/pkg-plist index da56ac22fced..cadbbcf8eed4 100644 --- a/lang/ruby26/pkg-plist +++ b/lang/ruby26/pkg-plist @@ -36,9 +36,9 @@ include/ruby-%%RUBY_VER%%/ruby/thread_native.h include/ruby-%%RUBY_VER%%/ruby/util.h include/ruby-%%RUBY_VER%%/ruby/version.h include/ruby-%%RUBY_VER%%/ruby/vm.h -lib/lib%%RUBY_NAME%%-static.a -lib/lib%%RUBY_NAME%%.so -lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% +lib/libruby%%RUBY_SHLIBVER%%-static.a +lib/libruby%%RUBY_SHLIBVER%%.so +lib/libruby%%RUBY_SHLIBVER%%.so.%%RUBY_SHLIBVER%% %%RUBY_LIBDIR%%/English.rb %%RUBY_LIBDIR%%/abbrev.rb %%RUBY_ARCHLIBDIR%%/bigdecimal.so