CVS commit: pkgsrc/lang/ruby

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jun 30 11:44:15 UTC 2017

Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk

Log Message:
Fix static library name on Darwin, from minskim@.


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 pkgsrc/lang/ruby/rubyversion.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.180 pkgsrc/lang/ruby/rubyversion.mk:1.181
--- pkgsrc/lang/ruby/rubyversion.mk:1.180       Tue Jun 20 13:41:45 2017
+++ pkgsrc/lang/ruby/rubyversion.mk     Fri Jun 30 11:44:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.180 2017/06/20 13:41:45 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.181 2017/06/30 11:44:15 jperkin Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -413,7 +413,7 @@ RUBY_SHLIBVER=              ${_RUBY_VER_MAJOR}.${_RU
 .elif ${OPSYS} == "Darwin"
 RUBY_SHLIB=            ${RUBY_SUFFIX}.${RUBY_SHLIBVER}.${RUBY_SLEXT}
 _RUBY_SHLIBALIAS=      .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
-RUBY_STATICLIB=                ${RUBY_SUFFIX}.${RUBY_SHLIB_VERSION}-static.a
+RUBY_STATICLIB=                ${RUBY_SUFFIX}.${RUBY_SHLIBVER}-static.a
 .elif ${OPSYS} == "Linux"
 _RUBY_SHLIBALIAS=      ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
 .elif ${OPSYS} == "SunOS"
@@ -534,8 +534,7 @@ PLIST_SUBST+=       \
        RUBY_VERSION=${RUBY_VERSION:Q}  RUBY_VER_DIR=${RUBY_VER_DIR:Q} \
        RUBY_DLEXT=${RUBY_DLEXT} RUBY_SLEXT=${RUBY_SLEXT} \
        RUBY_SHLIB=${RUBY_SHLIB:Q} RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \
-       RUBY_STATICLIB=${RUBY_STATICLIB:Q} \
-       RUBY_SHLIBI_VERSION=${RUBY_SHLIB_VERSION:Q} RUBY_ARCH=${RUBY_ARCH:Q} \
+       RUBY_STATICLIB=${RUBY_STATICLIB:Q} RUBY_ARCH=${RUBY_ARCH:Q} \
        ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} \
        RUBY_MAJOR_MINOR=${RUBY_MAJOR_MINOR} \
        RUBY_RAKE_VERSION=${RUBY_RAKE_VERSION} \