diff options
| author | stas <stas@FreeBSD.org> | 2011-04-07 03:36:50 +0800 |
|---|---|---|
| committer | stas <stas@FreeBSD.org> | 2011-04-07 03:36:50 +0800 |
| commit | da4c592149a1b9806836bded9f4ab863f76ffdb8 (patch) | |
| tree | d973768753a1221b097007d48a8431203541e781 /Mk/bsd.ruby.mk | |
| parent | 65a10adb19b6bef137f156bdf5710703658d7dd1 (diff) | |
| download | freebsd-ports-gnome-da4c592149a1b9806836bded9f4ab863f76ffdb8.tar.gz freebsd-ports-gnome-da4c592149a1b9806836bded9f4ab863f76ffdb8.tar.zst freebsd-ports-gnome-da4c592149a1b9806836bded9f4ab863f76ffdb8.zip | |
- As ports ruby 1.9 now includes a recent version of rake,
revert a part of 1.197 by pgollucci which breaks rake with
ruby 1.9 and switch back to using the ruby 1.9 bundled one.
PR: ports/155539, ports/156217
Submitted by: Ralf Gebhart <gebhart@secnetix.de>, Anonymous <swell.k@gmail.com>
Diffstat (limited to 'Mk/bsd.ruby.mk')
| -rw-r--r-- | Mk/bsd.ruby.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index b125d495b499..d92013bbad5c 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -547,11 +547,11 @@ RUN_DEPENDS+= ${DEPEND_RUBY_ICONV} .endif .if defined(USE_RAKE) -BUILD_DEPENDS+= ${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake .if ${RUBY_VER} == 1.8 +BUILD_DEPENDS+= ${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake RAKE_BIN= ${LOCALBASE}/bin/rake .else -RAKE_BIN= ${GEM_LIB_DIR}/bin/rake${RUBY_VER:S/.//} +RAKE_BIN= ${LOCALBASE}/bin/rake${RUBY_VER:S/.//} .endif .endif |