Tue Feb 1 22:32:38 2011 UTC ()
Apply patch provided by obache@, fixing build problem on Solaris.
Should be fix PR pkg/44480.


(taca)
diff -r1.55 -r1.56 pkgsrc/lang/ruby/rubyversion.mk
cvs diff -r1.55 -r1.56 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2010/12/26 12:29:07 1.55
+++ pkgsrc/lang/ruby/rubyversion.mk 2011/02/01 22:32:37 1.56
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.55 2010/12/26 12:29:07 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.56 2011/02/01 22:32:37 taca Exp $
2# 2#
3 3
4.if !defined(_RUBYVERSION_MK) 4.if !defined(_RUBYVERSION_MK)
5_RUBYVERSION_MK= # defined 5_RUBYVERSION_MK= # defined
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9# current supported Ruby's version 9# current supported Ruby's version
10RUBY18_VERSION= 1.8.7 10RUBY18_VERSION= 1.8.7
11RUBY19_VERSION= 1.9.2 11RUBY19_VERSION= 1.9.2
12 12
13# patch 13# patch
14RUBY18_PATCHLEVEL= pl330 14RUBY18_PATCHLEVEL= pl330
@@ -183,26 +183,29 @@ _RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLE @@ -183,26 +183,29 @@ _RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLE
183RUBY_SHLIBVER= ${RUBY_VER} 183RUBY_SHLIBVER= ${RUBY_VER}
184.elif ${OPSYS} == "OpenBSD" 184.elif ${OPSYS} == "OpenBSD"
185RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${RUBY_API_TEENY} 185RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${RUBY_API_TEENY}
186.elif ${OPSYS} == "Darwin" 186.elif ${OPSYS} == "Darwin"
187RUBY_SHLIB= ${RUBY_VER}.${RUBY_SHLIBVER}.${RUBY_SLEXT} 187RUBY_SHLIB= ${RUBY_VER}.${RUBY_SHLIBVER}.${RUBY_SLEXT}
188.if ${RUBY_VER} == "18" 188.if ${RUBY_VER} == "18"
189_RUBY_SHLIBALIAS= ${RUBY_VER}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT} 189_RUBY_SHLIBALIAS= ${RUBY_VER}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
190.else 190.else
191_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT} 191_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
192RUBY_STATICLIB= ${RUBY_VER}.${RUBY_API_VERSION}-static.a 192RUBY_STATICLIB= ${RUBY_VER}.${RUBY_API_VERSION}-static.a
193.endif 193.endif
194.elif ${OPSYS} == "Linux" 194.elif ${OPSYS} == "Linux"
195_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 195_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
 196.elif ${OPSYS} == "SunOS"
 197RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}
 198 _RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${_RUBY_VER_TEENY}
196.endif 199.endif
197 200
198.if !empty(_RUBY_SHLIBALIAS) 201.if !empty(_RUBY_SHLIBALIAS)
199RUBY_SHLIBALIAS= lib/libruby${_RUBY_SHLIBALIAS} 202RUBY_SHLIBALIAS= lib/libruby${_RUBY_SHLIBALIAS}
200.endif 203.endif
201 204
202# 205#
203# RUBY_DLEXT is suffix of extention library. 206# RUBY_DLEXT is suffix of extention library.
204# RUBY_SLEXT is suffix of shared library. 207# RUBY_SLEXT is suffix of shared library.
205# 208#
206.if ${OPSYS} == "Darwin" 209.if ${OPSYS} == "Darwin"
207RUBY_DLEXT= bundle 210RUBY_DLEXT= bundle
208RUBY_SLEXT= dylib 211RUBY_SLEXT= dylib