diff options
| author | Steve Wills <swills@FreeBSD.org> | 2011-08-21 04:03:37 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2011-08-21 04:03:37 +0000 |
| commit | f7c36f227d52d696da195cc2579cba6df421832c (patch) | |
| tree | a9d377c3ca968e618e81a5e34c86eb0812a31f32 /Mk/bsd.ruby.mk | |
| parent | - games/ioquake3-devel (diff) | |
- Update Ruby 1.9 to p290
- Make Ruby 1.9 the default Ruby
Notes
Notes:
svn path=/head/; revision=280102
Diffstat (limited to 'Mk/bsd.ruby.mk')
| -rw-r--r-- | Mk/bsd.ruby.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index aff6f5ad6609..7356e716cf8c 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -136,8 +136,8 @@ Ruby_Include_MAINTAINER= stas@FreeBSD.org # RUBY_ELISPDIR - Installation path for emacs lisp files. # -RUBY_DEFAULT_VER?= 1.8 -RAKE_VER= 0.8.7 +RUBY_DEFAULT_VER?= 1.9 +RAKE_VER= 0.9.2 RUBY_VER?= ${RUBY_DEFAULT_VER} @@ -201,7 +201,7 @@ RUBY19= "@comment " RUBY_RELVERSION= 1.9.2 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 -RUBY_PATCHLEVEL= 136 +RUBY_PATCHLEVEL= 290 RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL} RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL} @@ -267,7 +267,11 @@ RUBY_MODNAME?= ${PORTNAME} # Commands RUBY_RD2?= ${LOCALBASE}/bin/rd2 +.if ${RUBY_VER} == 1.8 RUBY_RDOC?= ${LOCALBASE}/bin/rdoc +.else +RUBY_RDOC?= ${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//} +.endif # Ports RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//} @@ -325,6 +329,10 @@ PLIST_SUB+= ${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \ RUBY18=${RUBY18} \ RUBY19=${RUBY19} +.if defined(USE_RUBY_RDOC) +MAKE_ENV+= RUBY_RDOC=${RUBY_RDOC} +.endif + # require check .if defined(RUBY_REQUIRE) USE_RUBY= yes @@ -382,10 +390,8 @@ RUBY_FLAGS+= -d # .if defined(USE_RUBYGEMS) -. if ${RUBY_VER} == 1.8 BUILD_DEPENDS+= ${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems -RUN_DEPENDS+= ${BUILD_DEPENDS} -. endif +RUN_DEPENDS+= ${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems PKGNAMEPREFIX?= rubygem- EXTRACT_SUFX= .gem @@ -547,12 +553,8 @@ RUN_DEPENDS+= ${DEPEND_RUBY_ICONV} .endif .if defined(USE_RAKE) -.if ${RUBY_VER} == 1.8 BUILD_DEPENDS+= ${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake RAKE_BIN= ${LOCALBASE}/bin/rake -.else -RAKE_BIN= ${LOCALBASE}/bin/rake${RUBY_VER:S/.//} -.endif .endif .if defined(USE_RUBY_AMSTD) |