diff options
| author | Steve Wills <swills@FreeBSD.org> | 2011-08-23 03:47:28 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2011-08-23 03:47:28 +0000 |
| commit | 894c447bb7dcd8b106a7102aee13228bd1d8a489 (patch) | |
| tree | 48b2d9cc3bb7ad4464d8444a8027c2fd54b6f785 /Mk | |
| parent | - Improve the portupgrade update recipe for ruby upgrade. (diff) | |
- 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.
Notes
Notes:
svn path=/head/; revision=280238
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 24b1ed7160dd..e37f4f33a685 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 |