aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.ruby.mk13
1 files changed, 9 insertions, 4 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 6a001eebc156..5ea913424289 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -159,12 +159,17 @@ _RUBY_SITEDIR!= ${_RUBY_CONFIG} 'puts C["sitedir"]'
RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
.if defined(RUBY_VER) && ${RUBY_VER} == 1.8
-RUBY_RELVERSION= 1.8.5
-RUBY_PATCHLEVEL= 12
+RUBY_RELVERSION= 1.8.6
+RUBY_PORTREVISION= 0
+RUBY_PATCHLEVEL= 0
+
+.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}
-RUBY_PORTREVISION= 1
-#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
+.endif
# Security patch
RUBY_PATCHFILES?= ${RUBY_VERSION}-patch1.gz