summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2003-12-15 06:35:48 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2003-12-15 06:35:48 +0000
commit940b7f1c3900c62d030b29c8b6e30b75b45fb5f2 (patch)
tree01d9b32f4c832addce2120461723e179f57214a8 /Mk
parent5877e27e050875c42041e216ebaf6313272a8511 (diff)
downloadfreebsd-ports-940b7f1c3900c62d030b29c8b6e30b75b45fb5f2.zip
Update lang/ruby18 and lang/ruby16-shim-ruby18 to 1.8.1-preview3.
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.ruby.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 8cdaf119fc18..9e615749091b 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -130,9 +130,9 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
.if defined(RUBY_VER) && ${RUBY_VER} == 1.8
RUBY_VERSION?= 1.8.1
-RUBY_DISTVERSION?= ${RUBY_VERSION}-preview2
+RUBY_DISTVERSION?= ${RUBY_VERSION}-preview3
#RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2
-RUBY_PORTVERSION?= ${RUBY_VERSION}.p2
+RUBY_PORTVERSION?= ${RUBY_VERSION}.p3
RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION}
#MASTER_SITE_SUBDIR_RUBY= snapshots
.elif defined(RUBY_VER) && ${RUBY_VER} == 1.7
@@ -223,7 +223,6 @@ DEPEND_RUBY?= ${RUBY}:${PORTSDIR}/${RUBY_PORT}
DEPEND_RUBY_SHIM18?= ${RUBY_SITEARCHLIBDIR}/features/ruby18/file_ruby18.so:${PORTSDIR}/${RUBY_SHIM18_PORT}
DEPEND_RUBY_AMSTD?= ${RUBY_SITELIBDIR}/amstd/version.rb:${PORTSDIR}/${RUBY_AMSTD_PORT}
DEPEND_RUBY_RDTOOL?= ${RUBY_RD2}:${PORTSDIR}/${RUBY_RDTOOL_PORT}
-DEPEND_RUBY_RDOC?= ${RUBY_RDOC}:${PORTSDIR}/${RUBY_RDOC_PORT}
# Directories
RUBY_LIBDIR?= ${_RUBY_SYSLIBDIR}/ruby/${RUBY_VER}
@@ -390,6 +389,10 @@ RUN_DEPENDS+= ${DEPEND_RUBY}
.endif
.endif
+.if !defined(NOPORTDOCS) && defined(USE_RUBY_RDOC)
+USE_RUBY_FEATURES+= rdoc
+.endif
+
.if defined(USE_RUBY_FEATURES)
shim= ${USE_RUBY_FEATURES:Mbenchmark} \
${USE_RUBY_FEATURES:Mbigdecimal} \
@@ -405,6 +408,7 @@ shim= ${USE_RUBY_FEATURES:Mbenchmark} \
${USE_RUBY_FEATURES:Moptparse} \
${USE_RUBY_FEATURES:Mpp} \
${USE_RUBY_FEATURES:Mracc-runtime} \
+ ${USE_RUBY_FEATURES:Mrdoc} \
${USE_RUBY_FEATURES:Mrexml} \
${USE_RUBY_FEATURES:Mruby18} \
${USE_RUBY_FEATURES:Mrunit} \
@@ -476,10 +480,6 @@ PLIST_SUB+= RUBY_RD_HTML_FILES="@comment "
BUILD_DEPENDS+= ${DEPEND_RUBY_RDTOOL}
.endif
-.if !defined(NOPORTDOCS) && defined(USE_RUBY_RDOC)
-BUILD_DEPENDS+= ${DEPEND_RUBY_RDOC}
-.endif
-
MASTER_SITE_BACKUP+= \
ftp://ftp.iDaemons.org/pub/distfiles/${DIST_SUBDIR}/