git: 13be7b04899e - main - lang/ruby26: Use proper variables, RUBY_SHLIBVER and RUBY_SUFFIX

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=13be7b04899e2356316c9e34cc1727d6fb78cc1a

commit 13be7b04899e2356316c9e34cc1727d6fb78cc1a
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2021-11-01 13:30:25 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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