Thu Mar 15 08:35:24 2012 UTC ()
lang/ruby: Fix ruby193-base for DragonFly

The maintainers of ruby have changed the shared library naming scheme for
FreeBSD and DragonFly:
For ruby18,  it's libruby18.so.18   (last part = RUBY_VER)
For ruby19,  it's libruby19.so.19   (last part = RUBY_VER)
for ruby193, it's libruby193.so.191 (last part derived from API, not version)

The rubyversion.mk was never updated to reflect that, and as a result ruby
1.9.3 has never built on DragonFly.  This commit will allow
lang/ruby193-base package to build.


(marino)
diff -r1.74 -r1.75 pkgsrc/lang/ruby/rubyversion.mk
cvs diff -r1.74 -r1.75 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2012/02/23 14:15:58 1.74
+++ pkgsrc/lang/ruby/rubyversion.mk 2012/03/15 08:35:24 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.74 2012/02/23 14:15:58 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.75 2012/03/15 08:35:24 marino Exp $
2# 2#
3 3
4# This file determines which Ruby version is used as a dependency for 4# This file determines which Ruby version is used as a dependency for
5# a package. 5# a package.
6# 6#
7# 7#
8# === User-settable variables === 8# === User-settable variables ===
9# 9#
10# RUBY_VERSION_DEFAULT 10# RUBY_VERSION_DEFAULT
11# The preferered Ruby version to use. 11# The preferered Ruby version to use.
12# 12#
13# Possible values: 18 192 193 13# Possible values: 18 192 193
14# Default: 192 14# Default: 192
@@ -311,27 +311,31 @@ RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS} @@ -311,27 +311,31 @@ RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}
311 311
312# 312#
313# Ruby shared and static library version handling. 313# Ruby shared and static library version handling.
314# 314#
315RUBY_SHLIBVER?= ${RUBY_API_VERSION} 315RUBY_SHLIBVER?= ${RUBY_API_VERSION}
316RUBY_SHLIB?= ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_SHLIBVER} 316RUBY_SHLIB?= ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
317RUBY_SHLIBALIAS?= @comment 317RUBY_SHLIBALIAS?= @comment
318RUBY_STATICLIB?= ${RUBY_VER}-static.a 318RUBY_STATICLIB?= ${RUBY_VER}-static.a
319 319
320.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix" 320.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
321RUBY_SHLIBVER= ${_RUBY_API_MAJOR}.${_RUBY_API_MINOR} 321RUBY_SHLIBVER= ${_RUBY_API_MAJOR}.${_RUBY_API_MINOR}
322_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_API_MAJOR} 322_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_API_MAJOR}
323.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 323.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 324.if ${RUBY_VER} == "18" || ${RUBY_VER} == "19"
324RUBY_SHLIBVER= ${RUBY_VER} 325RUBY_SHLIBVER= ${RUBY_VER}
 326.else
 327RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_API_MINOR}
 328.endif
325.elif ${OPSYS} == "OpenBSD" 329.elif ${OPSYS} == "OpenBSD"
326RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_API_MINOR} 330RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_API_MINOR}
327.elif ${OPSYS} == "Darwin" 331.elif ${OPSYS} == "Darwin"
328RUBY_SHLIB= ${RUBY_VER}.${RUBY_SHLIBVER}.${RUBY_SLEXT} 332RUBY_SHLIB= ${RUBY_VER}.${RUBY_SHLIBVER}.${RUBY_SLEXT}
329.if ${RUBY_VER} == "18" 333.if ${RUBY_VER} == "18"
330_RUBY_SHLIBALIAS= ${RUBY_VER}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT} 334_RUBY_SHLIBALIAS= ${RUBY_VER}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
331.else 335.else
332_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT} 336_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
333RUBY_STATICLIB= ${RUBY_VER}.${RUBY_API_VERSION}-static.a 337RUBY_STATICLIB= ${RUBY_VER}.${RUBY_API_VERSION}-static.a
334.endif 338.endif
335.elif ${OPSYS} == "Linux" 339.elif ${OPSYS} == "Linux"
336_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 340_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
337.elif ${OPSYS} == "SunOS" 341.elif ${OPSYS} == "SunOS"