lang/ruby27: Use proper variables, RUBY_SHLIBVER and RUBY_SUFFIX

freebsd · Nov 1, 2021 · 9c7833b · 9c7833b
1 parent 13be7b0
commit 9c7833b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lang/ruby27/Makefile b/lang/ruby27/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/ruby27/pkg-plist b/lang/ruby27/pkg-plist
@@ -32,9 +32,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