Sat Nov 19 15:36:34 2016 UTC ()
Extract _RUBYGEMS_MINORS more strictly.


(taca)
diff -r1.3 -r1.4 pkgsrc/lang/ruby/gem-vars.mk
cvs diff -r1.3 -r1.4 pkgsrc/lang/ruby/gem-vars.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/gem-vars.mk 2015/11/25 12:51:17 1.3
+++ pkgsrc/lang/ruby/gem-vars.mk 2016/11/19 15:36:34 1.4
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: gem-vars.mk,v 1.3 2015/11/25 12:51:17 jperkin Exp $ 1# $NetBSD: gem-vars.mk,v 1.4 2016/11/19 15:36:34 taca Exp $
2# 2#
3# This Makefile fragment defines various make(1) variables for Ruby gems 3# This Makefile fragment defines various make(1) variables for Ruby gems
4# support. 4# support.
5# 5#
6.if !defined(_RUBYGEM_VARS_MK) 6.if !defined(_RUBYGEM_VARS_MK)
7_RUBYGEM_VARS_MK= # defined 7_RUBYGEM_VARS_MK= # defined
8 8
9# Specify GEM_PATH 9# Specify GEM_PATH
10GEM_PATH?= ${PREFIX}/${GEM_HOME} 10GEM_PATH?= ${PREFIX}/${GEM_HOME}
11 11
12# Base directory for Gems 12# Base directory for Gems
13MAKE_ENV+= GEM_PATH=${GEM_PATH} 13MAKE_ENV+= GEM_PATH=${GEM_PATH}
14 14
15RUBYGEM_LANG?= en_US.UTF-8 15RUBYGEM_LANG?= en_US.UTF-8
16RUBYGEM_ENV?= LANG=${RUBYGEM_LANG} LC_CTYPE=${RUBYGEM_LANG} 16RUBYGEM_ENV?= LANG=${RUBYGEM_LANG} LC_CTYPE=${RUBYGEM_LANG}
17 17
18RUBYGEM= ${LOCALBASE}/bin/${RUBYGEM_NAME} 18RUBYGEM= ${LOCALBASE}/bin/${RUBYGEM_NAME}
19 19
20RUBY_GEMS_VERSION?= ${RUBY_GEMS_PKGSRC_VERS} 20RUBY_GEMS_VERSION?= ${RUBY_GEMS_PKGSRC_VERS}
21 21
22_RUBYGEMS_MAJOR= ${RUBY_GEMS_VERSION:C/\.[0-9\.]+$//} 22_RUBYGEMS_MAJOR= ${RUBY_GEMS_VERSION:C/\.[0-9\.]+$//}
23_RUBYGEMS_MINORS= ${RUBY_GEMS_VERSION:C/^([0-9]+)\.*//} 23_RUBYGEMS_MINORS= ${RUBY_GEMS_VERSION:C/^([0-9]+)\.*//:C/\..*//}
24 24
25.if ${RUBY_VER} == "18" 25.if ${RUBY_VER} == "18"
26BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-rubygems>=1.1.0:../../misc/rubygems 26BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-rubygems>=1.1.0:../../misc/rubygems
27DEPENDS+= ${RUBY_PKGPREFIX}-rubygems>=1.0.1:../../misc/rubygems 27DEPENDS+= ${RUBY_PKGPREFIX}-rubygems>=1.0.1:../../misc/rubygems
28.endif # !ruby18 28.endif # !ruby18
29 29
30.if ${_RUBYGEMS_MAJOR} >= 2 && ${_RUBYGEMS_MINORS} >= 2 && exists(${RUBYGEM}) 30.if ${_RUBYGEMS_MAJOR} >= 2 && ${_RUBYGEMS_MINORS} >= 2 && exists(${RUBYGEM})
31GEM_EXTSDIR_NEEDS_SUBDIR?= yes 31GEM_EXTSDIR_NEEDS_SUBDIR?= yes
32RUBY_GEM_ARCH!= ${RUBYGEM} environment platform | ${SED} -e 's|.*:||' 32RUBY_GEM_ARCH!= ${RUBYGEM} environment platform | ${SED} -e 's|.*:||'
33 33
34.if !empty(GEM_EXTSDIR_NEEDS_SUBDIR:M[nN][oO]) 34.if !empty(GEM_EXTSDIR_NEEDS_SUBDIR:M[nN][oO])
35GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR} 35GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}
36.else 36.else