diff options
| author | swills <swills@FreeBSD.org> | 2011-08-23 03:47:28 +0000 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2011-08-23 03:47:28 +0000 |
| commit | 492558129dd9214226c5a412e81070c78c449611 (patch) | |
| tree | 2fb41e577311438b2f40167989c36d29b983e87c /Mk | |
| parent | 948d8cd1d721b72260dd84c10427ce10dee866d6 (diff) | |
| download | FreeBSD-ports-492558129dd9214226c5a412e81070c78c449611.zip FreeBSD-ports-492558129dd9214226c5a412e81070c78c449611.tar.gz | |
- Undo some of the changes related to making Ruby 1.9 default.
Specifically, don't try to use devel/ruby-gems instead of the bundled
gem.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.ruby.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 24b1ed7..e37f4f3 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -267,11 +267,7 @@ 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/.//} @@ -390,8 +386,10 @@ RUBY_FLAGS+= -d # .if defined(USE_RUBYGEMS) +. if ${RUBY_VER} == 1.8 BUILD_DEPENDS+= ${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems RUN_DEPENDS+= ${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems +. endif PKGNAMEPREFIX?= rubygem- EXTRACT_SUFX= .gem |
