diff options
| author | tota <tota@FreeBSD.org> | 2013-06-23 14:57:46 +0800 |
|---|---|---|
| committer | tota <tota@FreeBSD.org> | 2013-06-23 14:57:46 +0800 |
| commit | f84274adfa950383972556fb94d65736c9361dd2 (patch) | |
| tree | a472dd54d4a07a25a5ff2d7dfd239bd559281e14 /Mk/bsd.ruby.mk | |
| parent | f889433aec87ca02feb1e2cf65507e9d4f65f662 (diff) | |
| download | freebsd-ports-gnome-f84274adfa950383972556fb94d65736c9361dd2.tar.gz freebsd-ports-gnome-f84274adfa950383972556fb94d65736c9361dd2.tar.zst freebsd-ports-gnome-f84274adfa950383972556fb94d65736c9361dd2.zip | |
- Fix the value of RUBY_PROVIDED to be able to compare with
RUBY_REQUIRE correctly
- Define RUBY_RELVERSION_CODE
- Add descriptions about RUBY_RELVERSION and RUBY_RELVERSION_CODE
PR: ports/179830
Submitted by: tota (myself)
Diffstat (limited to 'Mk/bsd.ruby.mk')
| -rw-r--r-- | Mk/bsd.ruby.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 09515207b6ee..c693eaab552d 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -69,10 +69,15 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.org # # RUBY_PKGNAMEPREFIX - Common PKGNAMEPREFIX for ruby ports # (default: ruby${RUBY_SUFFIX}-) -# RUBY_VERSION - Full version of ruby without preview/beta suffix in +# RUBY_RELVERSION - Full version of ruby without preview/beta suffix in # the form of `x.y.z' (see below for current value). -# RUBY_VERSION_CODE - Full integer version of ruby without preview/beta -# suffix in the form of `xyz'. +# RUBY_RELVERSION_CODE - Integer version of RUBY_RELVERSION in the form of +# `xyz'. +# RUBY_VERSION - Composite version of RUBY_RELVERSION and +# RUBY_PATCHLEVEL in the form of `x.y.z.p'. +# (default: ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}) +# RUBY_VERSION_CODE - Composite integer version of RUBY_VERSION in the form +# of `xyzp'. # RUBY_PORTVERSION - PORTVERSION for the standard ruby ports (ruby, # ruby-gdbm, etc.). # RUBY_PORTREVISION - PORTREVISION for the standard ruby ports. @@ -275,6 +280,7 @@ RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION} RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} +RUBY_RELVERSION_CODE?= ${RUBY_RELVERSION:S/.//g} RUBY_VERSION_CODE?= ${RUBY_VERSION:S/.//g} RUBY_VER= ${RUBY_VERSION:C/([[:digit:]]+\.[[:digit:]]+).*/\1/} RUBY_SUFFIX= ${RUBY_VER:S/.//} @@ -362,7 +368,7 @@ USE_RUBY= yes .if exists(${RUBY}) RUBY_PROVIDED!= ${RUBY} -e '\ - Ruby = ${RUBY_VERSION_CODE}; \ + Ruby = ${RUBY_RELVERSION_CODE}; \ value = begin; ${RUBY_REQUIRE}; end and puts value' .else RUBY_PROVIDED= "should be" # the latest version is going to be installed |