diff options
| author | joerg <joerg@pkgsrc.org> | 2016-09-08 15:19:16 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-09-08 15:19:16 +0000 |
| commit | ad04c26296cd9676b996c46dddd4145a907dc6d8 (patch) | |
| tree | 2e22eacdcdfe6cc73c0ed56e14421f55e8f6094f /lang/ruby | |
| parent | 2c6da70059476b991802c692853b48b3c977cddd (diff) | |
| download | pkgsrc-ad04c26296cd9676b996c46dddd4145a907dc6d8.tar.gz | |
Rename RUBY_VERSION_SUPPORTED into _RUBY_VERSIONS_ACCEPTED to follow the
naming scheme of the other multi-version packages. Add support for the
coorresponding RUBY_VERSIONS_INCOMPATIBLE list.
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/Makefile | 4 | ||||
| -rw-r--r-- | lang/ruby/rubyversion.mk | 21 |
2 files changed, 16 insertions, 9 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 36c8c01b62c..7fba1199d9b 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2016/03/14 00:59:06 tnn Exp $ +# $NetBSD: Makefile,v 1.60 2016/09/08 15:19:17 joerg Exp $ DISTNAME= # empty PKGNAME= ruby-${RUBY_VERSION_FULL} @@ -15,7 +15,7 @@ CONFLICTS= pkg_alternatives-[0-9]* NO_CONFIGURE= yes NO_BUILD= yes -RUBY_VERSION_SUPPORTED= 23 22 21 18 +RUBY_VERSIONS_ACCEPTED= 23 22 21 18 .include "../../lang/ruby/rubyversion.mk" diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 01298a1e6c7..ba390a1c995 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.164 2016/07/09 10:11:08 rillig Exp $ +# $NetBSD: rubyversion.mk,v 1.165 2016/09/08 15:19:17 joerg Exp $ # # This file determines which Ruby version is used as a dependency for @@ -33,12 +33,12 @@ # Ruby version to use. This variable should not be set in # packages. Normally it is used by bulk build tools. # -# Possible values: ${RUBY_VERSION_SUPPORTED} +# Possible values: ${RUBY_VERSIONS_ACCEPTED} # Default: ${RUBY_VERSION_DEFAULT} # # === Package-settable variables === # -# RUBY_VERSION_SUPPORTED +# RUBY_VERSIONS_ACCEPTED # The Ruby versions that are acceptable for the package. # # Possible values: 18 21 22 23 @@ -248,16 +248,23 @@ RUBY_RDOC_PKGSRC_VERS= 4.2.2 # RUBY_VERSION_DEFAULT?= 22 -RUBY_VERSION_SUPPORTED?= 22 23 21 +RUBY_VERSIONS_ACCEPTED?= 22 23 21 +RUBY_VERSIONS_INCOMPATIBLE?= + +.for rv in ${RUBY_VERSIONS_ACCEPTED} +. if empty(RUBY_VERSIONS_INCOMPATIBLE:M${rv}) +_RUBY_VERSIONS_ACCEPTED+= ${rv} +. endif +.endfor .if defined(RUBY_VERSION_REQD) -. for rv in ${RUBY_VERSION_SUPPORTED} +. for rv in ${_RUBY_VERSIONS_ACCEPTED} . if "${rv}" == ${RUBY_VERSION_REQD} RUBY_VER= ${rv} . endif . endfor .elif !defined(RUBY_VER) -. for rv in ${RUBY_VERSION_SUPPORTED} +. for rv in ${_RUBY_VERSIONS_ACCEPTED} . if "${rv}" == ${RUBY_VERSION_DEFAULT} RUBY_VER= ${rv} . endif @@ -265,7 +272,7 @@ RUBY_VER= ${rv} .endif .if !defined(RUBY_VER) -. for rv in ${RUBY_VERSION_SUPPORTED} +. for rv in ${_RUBY_VERSIONS_ACCEPTED} . if !defined(RUBY_VER) RUBY_VER= ${rv} . endif |