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.

10 files changed, 32 insertions, 25 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
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 123573d9462..839928c368a 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2016/03/05 11:28:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.87 2016/09/08 15:19:18 joerg Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -12,7 +12,7 @@ HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby 1.8 based release minimum package
 LICENSE=	gnu-gpl-v2 OR ruby-license
 
-RUBY_VERSION_SUPPORTED=	18
+RUBY_VERSIONS_ACCEPTED=	18
 
 CONFLICTS=	${RUBY_PKGPREFIX}-dbm-[0-9]* \
 		${RUBY_PKGPREFIX}-digest-[0-9]* \
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 7840c233b07..fd658f28778 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/03/13 17:06:42 taca Exp $
+# $NetBSD: Makefile,v 1.24 2016/09/08 15:19:17 joerg Exp $
 #
 
 DISTNAME=	# empty
@@ -20,7 +20,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-curses>=${RUBY_VERSION_FULL}:../../devel/ruby-curses
 DEPENDS+= ${RUBY_PKGPREFIX}-readline>=${RUBY_VERSION_FULL}:../../devel/ruby-readline
 DEPENDS+= ${RUBY_PKGPREFIX}-tk>=${RUBY_VERSION_FULL}:../../x11/ruby-tk
 
-RUBY_VERSION_SUPPORTED=	18
+RUBY_VERSIONS_ACCEPTED=	18
 
 .include "../../lang/ruby/rubyversion.mk"
 .include "../../lang/ruby/Makefile.common"
diff --git a/lang/ruby21-base/Makefile b/lang/ruby21-base/Makefile
index 4560dd55afa..7cb650d2f78 100644
--- a/lang/ruby21-base/Makefile
+++ b/lang/ruby21-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2016/07/10 18:42:50 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2016/09/08 15:19:18 joerg Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby ${RUBY_VERSION} release minimum base package
 
-RUBY_VERSION_SUPPORTED=	21
+RUBY_VERSIONS_ACCEPTED=	21
 
 USE_LANGUAGES=		c c99
 USE_TOOLS+=		pax yacc pkg-config
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index d8c446ecf0c..9362c30d8dd 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/19 16:20:42 taca Exp $
+# $NetBSD: Makefile,v 1.4 2016/09/08 15:19:18 joerg Exp $
 #
 
 DISTNAME=	# empty
@@ -20,7 +20,7 @@ DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION_FULL}:../../devel/ruby-fiddle
 DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION_FULL}:../../devel/ruby-readline
 DEPENDS+= ${RUBY_NAME}-tk>=${RUBY_VERSION_FULL}:../../x11/ruby-tk
 
-RUBY_VERSION_SUPPORTED=	21
+RUBY_VERSIONS_ACCEPTED=	21
 
 .include "../../lang/ruby/rubyversion.mk"
 .include "../../lang/ruby/Makefile.common"
diff --git a/lang/ruby22-base/Makefile b/lang/ruby22-base/Makefile
index 30a307adf95..ea02c24e8c8 100644
--- a/lang/ruby22-base/Makefile
+++ b/lang/ruby22-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/07/10 18:42:50 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2016/09/08 15:19:18 joerg Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
@@ -9,7 +9,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby ${RUBY_VERSION} release minimum base package
 
-RUBY_VERSION_SUPPORTED=	22
+RUBY_VERSIONS_ACCEPTED=	22
 
 USE_LANGUAGES=		c c99
 USE_TOOLS+=		pax yacc pkg-config
diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile
index e3ca8ca9f26..a79c78939e2 100644
--- a/lang/ruby22/Makefile
+++ b/lang/ruby22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/12/20 05:26:31 taca Exp $
+# $NetBSD: Makefile,v 1.4 2016/09/08 15:19:18 joerg Exp $
 #
 
 DISTNAME=	# empty
@@ -20,7 +20,7 @@ DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION_FULL}:../../devel/ruby-fiddle
 DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION_FULL}:../../devel/ruby-readline
 DEPENDS+= ${RUBY_NAME}-tk>=${RUBY_VERSION_FULL}:../../x11/ruby-tk
 
-RUBY_VERSION_SUPPORTED=	22
+RUBY_VERSIONS_ACCEPTED=	22
 
 .include "../../lang/ruby/rubyversion.mk"
 .include "../../lang/ruby/Makefile.common"
diff --git a/lang/ruby23-base/Makefile b/lang/ruby23-base/Makefile
index 20a03e0f7b7..1d6a05c6dc4 100644
--- a/lang/ruby23-base/Makefile
+++ b/lang/ruby23-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/10 18:42:50 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2016/09/08 15:19:18 joerg Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
@@ -9,7 +9,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby ${RUBY_VERSION} release minimum base package
 
-RUBY_VERSION_SUPPORTED=	23
+RUBY_VERSIONS_ACCEPTED=	23
 
 USE_LANGUAGES=		c
 USE_TOOLS+=		pax yacc pkg-config
diff --git a/lang/ruby23/Makefile b/lang/ruby23/Makefile
index b0f4b371151..5c4f2c2cb14 100644
--- a/lang/ruby23/Makefile
+++ b/lang/ruby23/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/12/30 15:06:39 taca Exp $
+# $NetBSD: Makefile,v 1.2 2016/09/08 15:19:18 joerg Exp $
 #
 
 DISTNAME=	# empty
@@ -20,7 +20,7 @@ DEPENDS+= ${RUBY_NAME}-fiddle>=${RUBY_VERSION_FULL}:../../devel/ruby-fiddle
 DEPENDS+= ${RUBY_NAME}-readline>=${RUBY_VERSION_FULL}:../../devel/ruby-readline
 DEPENDS+= ${RUBY_NAME}-tk>=${RUBY_VERSION_FULL}:../../x11/ruby-tk
 
-RUBY_VERSION_SUPPORTED=	23
+RUBY_VERSIONS_ACCEPTED=	23
 
 .include "../../lang/ruby/rubyversion.mk"
 .include "../../lang/ruby/Makefile.common"