[pkgsrc/trunk]: pkgsrc/lang/ruby Drop RUBYGEMS_REQD. Since all ruby*-base pa...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/989814ddbb26
branches:  trunk
changeset: 645228:989814ddbb26
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Jan 25 16:09:16 2015 +0000

description:
Drop RUBYGEMS_REQD.  Since all ruby*-base package contains enough version
of rubygems except ruby18-base.

diffstat:

 lang/ruby/gem.mk |  51 ++++++++-------------------------------------------
 1 files changed, 8 insertions(+), 43 deletions(-)

diffs (87 lines):

diff -r cf6f145c79b9 -r 989814ddbb26 lang/ruby/gem.mk
--- a/lang/ruby/gem.mk  Sun Jan 25 16:03:38 2015 +0000
+++ b/lang/ruby/gem.mk  Sun Jan 25 16:09:16 2015 +0000
@@ -1,23 +1,10 @@
-# $NetBSD: gem.mk,v 1.33 2015/01/16 09:18:47 taca Exp $
+# $NetBSD: gem.mk,v 1.34 2015/01/25 16:09:16 taca Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
 #
 # Package-settable variables:
 #
-# RUBYGEMS_REQD
-#      Minimum version of required rubygems.  Ruby base packages contain:
-#
-#              ruby18-base:    none
-#              ruby193-base:   1.8.23
-#              ruby200-base:   2.0.3
-#              ruby210-base:   2.2.0
-#
-#      If newer version of rubygems is resuiqred, set RUBYGEMS_REQD to
-#      minimum version.
-#
-#      Default: not defined
-#
 # OVERRIDE_GEMSPEC
 #      Fix version of depending gem or modify files in gemspec.
 #
@@ -163,40 +150,22 @@
 # build tool.
 #
 
-.if !empty(RUBY_GEMS_VERSION)
+FIND_PREFIX+=  RUBYGEM_PREFIX=${RUBY_BASE}
+.include "../../mk/find-prefix.mk"
+RUBYGEM=       ${RUBYGEM_PREFIX}/bin/${RUBYGEM_NAME}
+
+RUBY_GEMS_VERSION?=    ${RUBY_GEMS_PKGSRC_VERS}
+
 _RUBYGEMS_MAJOR=       ${RUBY_GEMS_VERSION:C/\.[0-9\.]+$//}
 _RUBYGEMS_MINORS=      ${RUBY_GEMS_VERSION:C/^([0-9]+)\.*//}
-.endif
 
 .if ${RUBY_VER} == "18"
 BUILD_DEPENDS+=        ${RUBY_PKGPREFIX}-rubygems>=1.1.0:../../misc/rubygems
 DEPENDS+=      ${RUBY_PKGPREFIX}-rubygems>=1.0.1:../../misc/rubygems
-.else # !ruby18
-. if defined(RUBYGEMS_REQD)
-
-_RUBYGEMS_REQD_MAJOR=  ${RUBYGEMS_REQD:C/\.[0-9\.]+$//}
-_RUBYGEMS_REQD_MINORS= ${RUBYGEMS_REQD:C/^([0-9]+)\.*//}
-
-_RUBYGEMS_REQD=        NO
-
-.  if ${_RUBYGEMS_REQD_MAJOR} > ${_RUBYGEMS_MAJOR}
-_RUBYGEMS_REQD=        YES
-.  elif ${_RUBYGEMS_REQD_MAJOR} == ${_RUBYGEMS_MAJOR}
-.   if !empty(_RUBYGEMS_MINORS) && ${_RUBYGEMS_REQD_MINORS} > ${_RUBYGEMS_MINORS}
-_RUBYGEMS_REQD=        YES
-.   endif
-.  endif
-
-.  if empty(_RUBYGEMS_REQD:M[nN][oO])
-DEPENDS+=      ${RUBY_PKGPREFIX}-rubygems>=${RUBYGEMS_REQD}:../../misc/rubygems
-.  endif
-. endif
 .endif # !ruby18
 
-.if !empty(RUBY_GEMS_VERSION)
 .if ${_RUBYGEMS_MAJOR} >= 2 && ${_RUBYGEMS_MINORS} >= 2
-GEM_EXTSDIR=   ${GEM_HOME}/extensions/${RUBY_ARCH}/${RUBY_VERSION}/${GEM_NAME}
-.endif
+GEM_EXTSDIR=   ${GEM_HOME}/extensions/${RUBY_ARCH}/${RUBY_VER_DIR}/${GEM_NAME}
 .endif
 
 CATEGORIES+=   ruby
@@ -234,10 +203,6 @@
 CHECK_INTERPRETER_SKIP+=       ${GEM_LIBDIR}/*
 CHECK_PERMS_SKIP+=             ${GEM_LIBDIR}/*
 
-# RUBYGEM holds the path to RubyGems' gem command
-EVAL_PREFIX+=  RUBYGEM_PREFIX=${RUBYGEM_NAME}
-RUBYGEM=       ${RUBYGEM_PREFIX}/bin/${RUBYGEM_NAME}
-
 # PLIST support
 PLIST_SUBST+=          GEM_NAME=${GEM_NAME}
 PLIST_SUBST+=          GEM_LIBDIR=${GEM_LIBDIR}