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.

43 files changed, 98 insertions, 91 deletions

diff --git a/audio/amarok-kde3/Makefile b/audio/amarok-kde3/Makefile
index 4b78759d793..9329dbe6b50 100644
--- a/audio/amarok-kde3/Makefile
+++ b/audio/amarok-kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2016/08/17 00:06:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2016/09/08 15:19:16 joerg Exp $
 
 DISTNAME=		amarok-${VERSION}
 VERSION=		1.4.10
@@ -20,7 +20,7 @@ USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 SET_LIBDIR=		yes
 USE_LIBTOOL=		yes
-RUBY_VERSION_SUPPORTED=	18
+RUBY_VERSIONS_ACCEPTED=	18
 
 CONFIGURE_ARGS+=	--without-nmm
 CONFIGURE_ARGS+=	--without-mas
diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile
index 7e573e9be2d..1b3c4adf502 100644
--- a/databases/ruby-gdbm/Makefile
+++ b/databases/ruby-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/03/14 00:59:05 tnn Exp $
+# $NetBSD: Makefile,v 1.30 2016/09/08 15:19:16 joerg Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER=		taca@NetBSD.org
 HOMEPAGE=		${RUBY_HOMEPAGE}
 COMMENT=		Ruby extension to GDBM library
 
-RUBY_VERSION_SUPPORTED= 23 22 21 18
+RUBY_VERSIONS_ACCEPTED= 23 22 21 18
 USE_RUBY_EXTCONF=	yes
 DISTINFO_FILE=		${RUBY_DISTINFO_FILE}
 EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/ext/gdbm
diff --git a/devel/ruby-curses-gem/Makefile b/devel/ruby-curses-gem/Makefile
index 1edd320f731..182e709b429 100644
--- a/devel/ruby-curses-gem/Makefile
+++ b/devel/ruby-curses-gem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/03/16 13:07:31 taca Exp $
+# $NetBSD: Makefile,v 1.6 2016/09/08 15:19:16 joerg Exp $
 
 DISTNAME=	curses-1.0.2
 CATEGORIES=	devel
@@ -8,7 +8,7 @@ HOMEPAGE=	https://github.com/ruby/curses
 COMMENT=	Ruby binding for curses, ncurses, and PDCurses
 LICENSE=	2-clause-bsd
 
-RUBY_VERSION_SUPPORTED= 21 22 23
+RUBY_VERSIONS_ACCEPTED= 21 22 23
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/devel/ruby-curses/Makefile b/devel/ruby-curses/Makefile
index e5bec817546..9b7e07319f8 100644
--- a/devel/ruby-curses/Makefile
+++ b/devel/ruby-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/03/14 00:59:05 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2016/09/08 15:19:16 joerg Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
@@ -20,7 +20,7 @@ CURSES_EXAMPLES=	hello.rb rain.rb view.rb view2.rb
 REPLACE_RUBY=		${CURSES_EXAMPLES}
 INSTALLATION_DIRS=	${RUBY_EG}/curses
 
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 post-install:
 .for f in ${CURSES_EXAMPLES}
diff --git a/devel/ruby-eet/Makefile b/devel/ruby-eet/Makefile
index 6f5e71f1b54..aa06a0e0ee4 100644
--- a/devel/ruby-eet/Makefile
+++ b/devel/ruby-eet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/03/05 11:28:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/08 15:19:16 joerg Exp $
 
 DISTNAME=	ruby-eet-0.1.4
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://code-monkey.de/pages/ruby-eet
 COMMENT=	Ruby module to read and write EET files
 LICENSE=	mit
 
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 RUBY_RDOC_REQD=	2.0.0
 USE_RAKE=	YES
diff --git a/devel/ruby-mode/Makefile b/devel/ruby-mode/Makefile
index 6a92849cbf5..c72c59fece8 100644
--- a/devel/ruby-mode/Makefile
+++ b/devel/ruby-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/12/30 15:42:33 taca Exp $
+# $NetBSD: Makefile,v 1.34 2016/09/08 15:19:17 joerg Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -13,7 +13,7 @@ COMMENT=	Ruby editing mode for Emacs
 DISTINFO_FILE=		${RUBY_DISTINFO_FILE}
 WRKSRC=			${RUBY_WRKSRC}/misc
 EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/misc
-RUBY_VERSION_SUPPORTED=	23
+RUBY_VERSIONS_ACCEPTED=	23
 RUBY_NOVERSION=		yes
 NO_CONFIGURE=		yes
 SRCS=			inf-ruby.el ruby-electric.el ruby-mode.el \
diff --git a/devel/ruby-power_assert/Makefile b/devel/ruby-power_assert/Makefile
index 5d509cc6bda..e128e75a8e7 100644
--- a/devel/ruby-power_assert/Makefile
+++ b/devel/ruby-power_assert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2016/09/08 15:19:17 joerg Exp $
 
 DISTNAME=	power_assert-0.2.7
 CATEGORIES=	devel
@@ -8,7 +8,7 @@ HOMEPAGE=	https://github.com/k-tsj/power_assert
 COMMENT=	Power Assert for Ruby
 LICENSE=	2-clause-bsd
 
-#RUBY_VERSION_SUPPORTED?= 21 22
+#RUBY_VERSIONS_ACCEPTED?= 21 22
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-rake/Makefile b/devel/ruby-rake/Makefile
index 8586b23c510..0fb3a987f58 100644
--- a/devel/ruby-rake/Makefile
+++ b/devel/ruby-rake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/08 15:19:17 joerg Exp $
 
 DISTNAME=	rake-${VERS}
 CATEGORIES=	devel
@@ -14,7 +14,7 @@ USE_TOOLS+=	gzip
 FIX_PERM=	doc/release_notes/rake-0.7.3.rdoc
 VERS=		10.4.2
 
-RUBY_VERSION_SUPPORTED= 18 21 22
+RUBY_VERSIONS_ACCEPTED= 18 21 22
 
 FILES_SUBST+=	GEM_NAME=${GEM_NAME} RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN}
 PLIST_SUBST+=	RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN}
diff --git a/devel/ruby-rcov/Makefile b/devel/ruby-rcov/Makefile
index 44aa177edce..189209f7031 100644
--- a/devel/ruby-rcov/Makefile
+++ b/devel/ruby-rcov/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/03/08 16:01:26 taca Exp $
+# $NetBSD: Makefile,v 1.13 2016/09/08 15:19:17 joerg Exp $
 
 DISTNAME=	rcov-1.0.0
 PKGREVISION=	1
@@ -9,7 +9,7 @@ HOMEPAGE=	http://github.com/relevance/rcov
 COMMENT=	Code coverage analysis for Ruby
 LICENSE=	gnu-gpl-v2 OR ruby-license
 
-RUBY_VERSION_SUPPORTED=	18
+RUBY_VERSIONS_ACCEPTED=	18
 
 USE_GCC_RUNTIME=	yes
 RUBYGEM_OPTIONS+=	--format-executable
diff --git a/devel/ruby-rdoc/Makefile b/devel/ruby-rdoc/Makefile
index cf438cf9689..b2277c39489 100644
--- a/devel/ruby-rdoc/Makefile
+++ b/devel/ruby-rdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2016/09/08 15:19:17 joerg Exp $
 
 DISTNAME=	rdoc-${RUBY_RDOC_PKGSRC_VERS}
 CATEGORIES=	devel
@@ -9,7 +9,7 @@ COMMENT=	Produces HTML and command-line documentation for Ruby projects
 LICENSE=	gnu-gpl-v2 OR ruby-license
 
 # ruby23 has 4.2.1 in tree.
-RUBY_VERSION_SUPPORTED= 22 18 21
+RUBY_VERSIONS_ACCEPTED= 22 18 21
 
 RUBY_JSON_REQD=	1.4
 GEM_PATH=	${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_LIBDIR}:${PREFIX}/${GEM_HOME}
diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile
index 345cf5a9a1f..897595449c5 100644
--- a/devel/ruby-readline/Makefile
+++ b/devel/ruby-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.43 2016/09/08 15:19:17 joerg Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
@@ -12,7 +12,7 @@ MAINTAINER=		taca@NetBSD.org
 HOMEPAGE=		${RUBY_HOMEPAGE}
 COMMENT=		Ruby extension to readline library
 
-RUBY_VERSION_SUPPORTED= 23 22 21 18
+RUBY_VERSIONS_ACCEPTED= 23 22 21 18
 USE_RUBY_EXTCONF=	yes
 EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/ext/readline
 WRKSRC=			${RUBY_WRKSRC}/ext/readline
diff --git a/inputmethod/prime-dict/Makefile b/inputmethod/prime-dict/Makefile
index dcaf1c2e966..f940cb44efb 100644
--- a/inputmethod/prime-dict/Makefile
+++ b/inputmethod/prime-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/06/29 11:06:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2016/09/08 15:19:17 joerg Exp $
 #
 
 DISTNAME=	prime-dict-1.0.0
@@ -15,7 +15,7 @@ USE_LANGUAGES=	# none
 
 CONFIGURE_ARGS+=	--with-rubydir=${PREFIX}/${RUBY_VENDORLIB}
 
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/prime-el/Makefile b/inputmethod/prime-el/Makefile
index dbee37177b0..e8f21b8b66a 100644
--- a/inputmethod/prime-el/Makefile
+++ b/inputmethod/prime-el/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/06/29 11:06:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2016/09/08 15:19:17 joerg Exp $
 #
 
 DISTNAME=	prime-el-1.5.1.3
@@ -13,7 +13,7 @@ COMMENT=	PRIME client for emacsen
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}suikyo-elisp-[0-9]*:../../textproc/suikyo-elisp
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	# none
diff --git a/inputmethod/prime/Makefile b/inputmethod/prime/Makefile
index 2c392a2153c..afc60724717 100644
--- a/inputmethod/prime/Makefile
+++ b/inputmethod/prime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/06/29 11:06:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2016/09/08 15:19:17 joerg Exp $
 #
 
 DISTNAME=	prime-1.0.0.1
@@ -22,7 +22,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-sary-[0-9]*:../../textproc/ruby-sary
 #
 # Currently, it seems some encoding problem.
 #
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
diff --git a/inputmethod/scim-prime/Makefile b/inputmethod/scim-prime/Makefile
index a7c64c23b2a..02bacbe6780 100644
--- a/inputmethod/scim-prime/Makefile
+++ b/inputmethod/scim-prime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2016/08/03 10:23:01 adam Exp $
+# $NetBSD: Makefile,v 1.28 2016/09/08 15:19:17 joerg Exp $
 #
 
 DISTNAME=		scim-prime-1.0.1
@@ -11,7 +11,7 @@ HOMEPAGE=		http://osdn.jp/projects/scim-imengine/
 COMMENT=		SCIM IMEngine module for PRIME
 LICENSE=		gnu-gpl-v2
 
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
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"
diff --git a/misc/ruby-progressbar/Makefile b/misc/ruby-progressbar/Makefile
index b96d686683f..9b8f7b6da0c 100644
--- a/misc/ruby-progressbar/Makefile
+++ b/misc/ruby-progressbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2016/09/08 15:19:18 joerg Exp $
 
 DISTNAME=	ruby-progressbar-1.7.5
 PKGNAME=	${DISTNAME:S/ruby-/${RUBY_PKGPREFIX}-/}
@@ -9,7 +9,7 @@ HOMEPAGE=	https://github.com/jfelchner/ruby-progressbar
 COMMENT=	Text Progress Bar Library for Ruby
 LICENSE=	mit
 
-RUBY_VERSION_SUPPORTED=	18 21 22 23
+RUBY_VERSIONS_ACCEPTED=	18 21 22 23
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index ca800429776..2ea8bb3e8e6 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2016/04/10 16:39:28 joerg Exp $
+# $NetBSD: Makefile,v 1.60 2016/09/08 15:19:18 joerg Exp $
 
 DISTNAME=	rubygems-${RUBY_GEMS_PKGSRC_VERS}
 CATEGORIES=	misc ruby
@@ -15,7 +15,7 @@ CONFLICTS+=	rubygems-[0-9]*
 .include "../../mk/bsd.prefs.mk"
 
 # Modern ruby bundles rubygems.
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/mk/pbulk/pbulk-index.mk b/mk/pbulk/pbulk-index.mk
index a56126b106c..45c76d642fa 100644
--- a/mk/pbulk/pbulk-index.mk
+++ b/mk/pbulk/pbulk-index.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: pbulk-index.mk,v 1.21 2016/09/08 09:40:11 joerg Exp $
+#	$NetBSD: pbulk-index.mk,v 1.22 2016/09/08 15:19:18 joerg Exp $
 
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to the parallel bulk build
@@ -42,7 +42,7 @@ _PBULK_MULTI_LIST.python=	_PYTHON_VERSIONS_ACCEPTED
 _PBULK_MULTI_VAR.python=	PYTHON_VERSION_REQD
 _PBULK_MULTI_DEFAULT.python=	PYTHON_VERSION_DEFAULT
 
-_PBULK_MULTI_LIST.ruby=		RUBY_VERSION_SUPPORTED
+_PBULK_MULTI_LIST.ruby=		_RUBY_VERSIONS_ACCEPTED
 _PBULK_MULTI_VAR.ruby=		RUBY_VERSION_REQD
 _PBULK_MULTI_DEFAULT.ruby=	RUBY_VERSION_DEFAULT
 
diff --git a/net/dnsdoctor/Makefile b/net/dnsdoctor/Makefile
index 6be99d325f3..363cc88318c 100644
--- a/net/dnsdoctor/Makefile
+++ b/net/dnsdoctor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/04/01 15:29:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2016/09/08 15:19:18 joerg Exp $
 #
 
 DISTNAME=	dnsdoctor-1.0.1
@@ -16,7 +16,7 @@ DEPENDS+=	${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 WRKSRC=		${WRKDIR}/dnsdoctor
 
 # Config name conflict, need many changes.
-RUBY_VERSION_SUPPORTED=	18
+RUBY_VERSIONS_ACCEPTED=	18
 NO_BUILD=	yes
 
 DDOC_HTML_PATH?=	/dnsdoctor
diff --git a/security/libprelude-ruby/Makefile b/security/libprelude-ruby/Makefile
index 777a761e5bf..c7a1e2ab4d1 100644
--- a/security/libprelude-ruby/Makefile
+++ b/security/libprelude-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/03/13 09:36:59 taca Exp $
+# $NetBSD: Makefile,v 1.13 2016/09/08 15:19:18 joerg Exp $
 
 PKGNAME=		libprelude-ruby-${VERSION}
 PKGREVISION=		8
@@ -6,7 +6,7 @@ COMMENT=                Ruby bindings to LibPrelude
 
 .include "../../security/libprelude/Makefile.common"
 
-RUBY_VERSION_SUPPORTED=	18
+RUBY_VERSIONS_ACCEPTED=	18
 BUILD_DIRS=		bindings/ruby
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libprelude
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index e9b302ac13d..db1a72690e3 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2016/09/01 10:27:24 fhajny Exp $
+# $NetBSD: Makefile,v 1.28 2016/09/08 15:19:18 joerg Exp $
 
 DISTNAME=		puppet-3.8.7
 CATEGORIES=		sysutils
@@ -12,7 +12,7 @@ LICENSE=		apache-2.0
 DEPENDS+=	${RUBY_PKGPREFIX}-facter>=1.7.0<3:../../sysutils/ruby-facter
 DEPENDS+=	${RUBY_PKGPREFIX}-hiera>=1.0.0<3:../../databases/ruby-hiera
 
-RUBY_VERSION_SUPPORTED=	21
+RUBY_VERSIONS_ACCEPTED=	21
 
 RUBY_JSON_REQD=		0
 OVERRIDE_GEMSPEC=	json_pure:json>0
diff --git a/sysutils/ruby-chef/Makefile b/sysutils/ruby-chef/Makefile
index 4d16dda4640..53e9c6c1826 100644
--- a/sysutils/ruby-chef/Makefile
+++ b/sysutils/ruby-chef/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2016/09/08 15:19:19 joerg Exp $
 
 DISTNAME=	chef-12.0.3
 CATEGORIES=	sysutils
@@ -25,7 +25,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-diff-lcs>=1.2.5<2.0:../../textproc/ruby-diff-lcs
 DEPENDS+=	${RUBY_PKGPREFIX}-plist>=3.1.0:../../textproc/ruby-plist
 DEPENDS+=	${RUBY_PKGPREFIX}-erubis>=2.7.0<3.0:../../www/ruby-erubis
 
-RUBY_VERSION_SUPPORTED=	21
+RUBY_VERSIONS_ACCEPTED=	21
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/migemo/Makefile.common b/textproc/migemo/Makefile.common
index 26454322551..0ceb1a396d9 100644
--- a/textproc/migemo/Makefile.common
+++ b/textproc/migemo/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile.common,v 1.10 2016/09/08 15:19:19 joerg Exp $
 #
 # used by textproc/migemo/Makefile
 # used by textproc/migemo-elisp/Makefile
@@ -12,4 +12,4 @@ MASTER_SITES=		http://0xcc.net/migemo/
 MAINTAINER=		yamajun@ofug.net
 HOMEPAGE=		http://0xcc.net/migemo/
 
-RUBY_VERSION_SUPPORTED= 21 22 23
+RUBY_VERSIONS_ACCEPTED= 21 22 23
diff --git a/textproc/ruby-diff-lcs/Makefile b/textproc/ruby-diff-lcs/Makefile
index 68aae48dfd9..df635244325 100644
--- a/textproc/ruby-diff-lcs/Makefile
+++ b/textproc/ruby-diff-lcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2016/09/08 15:19:19 joerg Exp $
 
 DISTNAME=	diff-lcs-1.2.5
 PKGREVISION=	2
@@ -11,7 +11,7 @@ LICENSE=	gnu-gpl-v2 OR artistic OR ruby-license
 
 RUBYGEM_OPTIONS+=	--format-executable
 
-RUBY_VERSION_SUPPORTED= 18 21 22 23
+RUBY_VERSIONS_ACCEPTED= 18 21 22 23
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile
index 9b464889a02..8267f60aca8 100644
--- a/textproc/ruby-eruby/Makefile
+++ b/textproc/ruby-eruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/06/11 15:37:21 taca Exp $
+# $NetBSD: Makefile,v 1.31 2016/09/08 15:19:19 joerg Exp $
 
 DISTNAME=	eruby-${ERUBY_VERSION}
 PKGREVISION=	8
@@ -16,7 +16,7 @@ CONFLICTS+=	ruby[1-9][0-9]-eruby-*
 USE_GCC_RUNTIME=	yes
 
 # Need to update encoding processing.
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 ERUBY_VERSION=		1.0.5
 HAS_CONFIGURE=		yes
diff --git a/textproc/ruby-json/Makefile b/textproc/ruby-json/Makefile
index 4f9aac81896..ba743d8f1b0 100644
--- a/textproc/ruby-json/Makefile
+++ b/textproc/ruby-json/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2016/09/08 15:19:19 joerg Exp $
 
 DISTNAME=	json-1.8.3
 CATEGORIES=	textproc
@@ -10,7 +10,7 @@ LICENSE=	ruby-license
 
 USE_GCC_RUNTIME=	yes
 
-RUBY_VERSION_SUPPORTED= 18 21 22 23
+RUBY_VERSIONS_ACCEPTED= 18 21 22 23
 
 post-extract:
 	cd ${WRKSRC}; ${FIND} . -xdev -type f -print | ${XARGS} ${CHMOD} g-w
diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index ae836026fd9..f36e230e7db 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.43 2016/09/08 15:19:19 joerg Exp $
 
 DISTNAME=	rdtool-0.6.38
 PKGREVISION=	2
@@ -18,7 +18,7 @@ SUBST_SED.path=		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|"
 SUBST_MESSAGE.path=	Fixing PKG_SYSCONFDIR paths.
 
 RUBYGEM_OPTIONS+=	--format-executable
-RUBY_VERSION_SUPPORTED= 18 21 22 23
+RUBY_VERSIONS_ACCEPTED= 18 21 22 23
 
 .include "../../lang/ruby/gem.mk"
 .include "../../lang/ruby/modules.mk"
diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile
index f0b258741e2..f2e1cbc2ff9 100644
--- a/textproc/ruby-sary/Makefile
+++ b/textproc/ruby-sary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/03/14 00:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2016/09/08 15:19:19 joerg Exp $
 #
 
 DISTNAME=	sary-ruby-1.2.0
@@ -12,7 +12,7 @@ HOMEPAGE=	http://sary.sourceforge.net/
 COMMENT=	Ruby Binding of Sary
 LICENSE=	gnu-lgpl-v2.1
 
-RUBY_VERSION_SUPPORTED= 18 21 22 23
+RUBY_VERSIONS_ACCEPTED= 18 21 22 23
 
 USE_RUBY_EXTCONF=	yes
 USE_TOOLS+=		pkg-config
diff --git a/textproc/suikyo/Makefile.common b/textproc/suikyo/Makefile.common
index 7dbb9b62076..9d8eebb42f3 100644
--- a/textproc/suikyo/Makefile.common
+++ b/textproc/suikyo/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2015/06/29 11:06:49 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.8 2016/09/08 15:19:19 joerg Exp $
 #
 # used by textproc/ruby-suikyo/Makefile
 # used by textproc/suikyo-docs/Makefile
@@ -21,4 +21,4 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	# none
 
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
diff --git a/textproc/xhtmldiff/Makefile b/textproc/xhtmldiff/Makefile
index fc861d3f051..f0238719634 100644
--- a/textproc/xhtmldiff/Makefile
+++ b/textproc/xhtmldiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/04/14 15:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/09/08 15:19:19 joerg Exp $
 
 DISTNAME=	xhtmldiff-1.2.2
 PKGREVISION=	2
@@ -15,7 +15,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-diff-lcs>=1.1.1:../../textproc/ruby-diff-lcs
 
 CONFLICTS+=	ruby[1-9][0-9]-xhtmldiff-[0-9]* xhtmldiff-[0-9]*
 
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 post-extract:
 	cp ${WRKSRC}/packaging/xhtmldiff.gemspec ${GEM_SPECFILE}
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index e29ad97e01f..fb99f2d40ee 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/06/14 00:40:30 taca Exp $
+# $NetBSD: Makefile,v 1.42 2016/09/08 15:19:19 joerg Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
@@ -11,7 +11,7 @@ HOMEPAGE=	# http://www.modruby.net/
 COMMENT=	Apache module that embeds Ruby interpreter within
 
 # textproc/ruby-eruby is restricted to 1.8
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 
 APACHE_MODULE=		yes
 PKG_APACHE_ACCEPTED=	apache22
diff --git a/x11/kdebindings-ruby/Makefile b/x11/kdebindings-ruby/Makefile
index 8950e47b1ff..5825659f9c8 100644
--- a/x11/kdebindings-ruby/Makefile
+++ b/x11/kdebindings-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2016/07/09 06:39:17 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2016/09/08 15:19:19 joerg Exp $
 
 DISTNAME=	kdebindings-${_KDE_VERSION}
 PKGNAME=	kdebindings-ruby-${_KDE_VERSION}
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=	--without-java
 CONFIGURE_ARGS+=	--without-pythondir
 CONFIGURE_ENV+=		DO_NOT_COMPILE="dcopperl python kjsembed qtsharp"
 
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSIONS_ACCEPTED= 18
 REPLACE_RUBY+= \
 	qtruby/bin/rbqtapi \
 	qtruby/bin/rbqtsh
diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile
index afb4e1f3afb..51531dea0d1 100644
--- a/x11/ruby-tk/Makefile
+++ b/x11/ruby-tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2016/03/14 00:59:07 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2016/09/08 15:19:19 joerg Exp $
 
 DISTNAME=		${RUBY_DISTNAME}
 PKGNAME=		${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL}
@@ -11,7 +11,7 @@ MAINTAINER=		taca@NetBSD.org
 HOMEPAGE=		${RUBY_HOMEPAGE}
 COMMENT=		Ruby interface to the Tk widget set
 
-RUBY_VERSION_SUPPORTED= 23 22 21 18
+RUBY_VERSIONS_ACCEPTED= 23 22 21 18
 USE_TOOLS+=		pax
 USE_RUBY_EXTCONF=	yes
 RUBY_EXTCONF_SUBDIRS=	. tkutil