aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2014-02-18 15:35:42 +0000
committerSteve Wills <swills@FreeBSD.org>2014-02-18 15:35:42 +0000
commit20c88bccc7693b0da33d312c3a645e7d714707ce (patch)
tree65df95f975116318eff6ee3bf709407931a77339 /Mk
parent5ebd2956bc03483486e686c3af5ce7ce25ee0e90 (diff)
downloadports-20c88bccc7693b0da33d312c3a645e7d714707ce.tar.gz
ports-20c88bccc7693b0da33d312c3a645e7d714707ce.zip
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.ruby.mk28
1 files changed, 26 insertions, 2 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 3aa55e1e7edc..405f4c36fe44 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -186,6 +186,7 @@ RUBY_PATCHLEVEL= 484
#
RUBY19= ""
RUBY20= "@comment "
+RUBY21= "@comment "
. elif ${RUBY_VER} == 2.0
#
@@ -201,17 +202,39 @@ RUBY_PATCHLEVEL= 353
#
RUBY19= "@comment "
RUBY20= ""
+RUBY21= "@comment "
+
+. elif ${RUBY_VER} == 2.1
+#
+# Ruby 2.1
+#
+RUBY_RELVERSION= 2.1.0
+RUBY_PORTREVISION= 0
+RUBY_PORTEPOCH= 1
+RUBY_PATCHLEVEL= 0
+
+#
+# PLIST_SUB helpers
+#
+RUBY19= "@comment "
+RUBY20= "@comment "
+RUBY21= ""
. else
#
# Other versions
#
-IGNORE= Only ruby 1.9 and 2.0 are supported
+IGNORE= Only ruby 1.9, 2.0 and 2.1 are supported
. endif
.endif # defined(RUBY_VER)
+.if ${RUBY_PATCHLEVEL} == 0
+RUBY_VERSION?= ${RUBY_RELVERSION}
+RUBY_DISTVERSION?= ${RUBY_RELVERSION}
+.else
RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
+.endif
RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION}
@@ -333,7 +356,8 @@ PLIST_SUB+= ${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \
RUBY_NAME="${RUBY_NAME}" \
RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
RUBY19=${RUBY19} \
- RUBY20=${RUBY20}
+ RUBY20=${RUBY20} \
+ RUBY21=${RUBY21}
.if defined(USE_RUBY_RDOC)
MAKE_ENV+= RUBY_RDOC=${RUBY_RDOC}