Mon Jul 6 01:15:22 2015 UTC ()
Add RUBY_API_VERSION to PLIST_SUBST.


(rodent)
diff -r1.143 -r1.144 pkgsrc/lang/ruby/rubyversion.mk
cvs diff -r1.143 -r1.144 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2015/06/23 14:07:36 1.143
+++ pkgsrc/lang/ruby/rubyversion.mk 2015/07/06 01:15:22 1.144
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.143 2015/06/23 14:07:36 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.144 2015/07/06 01:15:22 rodent 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 193 200 21 13# Possible values: 18 193 200 21
14# Default: 200 14# Default: 200
@@ -567,26 +567,27 @@ MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER @@ -567,26 +567,27 @@ MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER
567 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \ 567 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
568 RUBY_SUFFIX=${RUBY_SUFFIX} \ 568 RUBY_SUFFIX=${RUBY_SUFFIX} \
569 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} 569 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
570 570
571PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ 571PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
572 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \ 572 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \
573 RUBY_SUFFIX=${RUBY_SUFFIX} \ 573 RUBY_SUFFIX=${RUBY_SUFFIX} \
574 RUBY_VERSION=${RUBY_VERSION:Q} \ 574 RUBY_VERSION=${RUBY_VERSION:Q} \
575 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \ 575 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \
576 RUBY_DLEXT=${RUBY_DLEXT:Q} RUBY_SLEXT=${RUBY_SLEXT:Q} \ 576 RUBY_DLEXT=${RUBY_DLEXT:Q} RUBY_SLEXT=${RUBY_SLEXT:Q} \
577 RUBY_SHLIB=${RUBY_SHLIB:Q} \ 577 RUBY_SHLIB=${RUBY_SHLIB:Q} \
578 RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \ 578 RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \
579 RUBY_STATICLIB=${RUBY_STATICLIB:Q} \ 579 RUBY_STATICLIB=${RUBY_STATICLIB:Q} \
 580 RUBY_API_VERSION=${RUBY_API_VERSION:Q} \
580 RUBY_ARCH=${RUBY_ARCH:Q} \ 581 RUBY_ARCH=${RUBY_ARCH:Q} \
581 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} \ 582 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} \
582 RUBY_MAJOR_MINOR=${RUBY_MAJOR_MINOR} 583 RUBY_MAJOR_MINOR=${RUBY_MAJOR_MINOR}
583 584
584# 585#
585# make dynamic PLIST 586# make dynamic PLIST
586# 587#
587.if !empty(RUBY_DYNAMIC_DIRS) 588.if !empty(RUBY_DYNAMIC_DIRS)
588 589
589RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work 590RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work
590 591
591.if !defined(PLIST_SRC) 592.if !defined(PLIST_SRC)
592. if exists(${PKGDIR}/PLIST.common) 593. if exists(${PKGDIR}/PLIST.common)