summaryrefslogtreecommitdiff
path: root/lang/ruby200-base
diff options
context:
space:
mode:
authorfhajny <fhajny>2014-01-08 11:31:18 +0000
committerfhajny <fhajny>2014-01-08 11:31:18 +0000
commit336d57cede97f1783fa6c552415754dc29a20707 (patch)
tree87999aac58628018bf654cdf9f196cac55dc30aa /lang/ruby200-base
parent6e709b69f8e2f9140b7e547fbc4466017b098e0d (diff)
downloadpkgsrc-336d57cede97f1783fa6c552415754dc29a20707.tar.gz
Fix patch so that 'gem install' actually works outside pkgsrc.
Bump PKGREVISION.
Diffstat (limited to 'lang/ruby200-base')
-rw-r--r--lang/ruby200-base/Makefile3
-rw-r--r--lang/ruby200-base/distinfo4
-rw-r--r--lang/ruby200-base/patches/patch-lib_rubygems_installer.rb4
3 files changed, 6 insertions, 5 deletions
diff --git a/lang/ruby200-base/Makefile b/lang/ruby200-base/Makefile
index 6d7d4a138bd..6fc8a6b7474 100644
--- a/lang/ruby200-base/Makefile
+++ b/lang/ruby200-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/11/24 14:22:03 taca Exp $
+# $NetBSD: Makefile,v 1.6 2014/01/08 11:31:18 fhajny Exp $
#
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION= 1
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
diff --git a/lang/ruby200-base/distinfo b/lang/ruby200-base/distinfo
index a48da260a67..efedddc76a5 100644
--- a/lang/ruby200-base/distinfo
+++ b/lang/ruby200-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2013/11/24 15:26:30 taca Exp $
+$NetBSD: distinfo,v 1.9 2014/01/08 11:31:18 fhajny Exp $
SHA1 (ruby-2.0.0-p353.tar.bz2) = 0be863f1c39d7764c52cbb79ca06105743e27c42
RMD160 (ruby-2.0.0-p353.tar.bz2) = e12445ef618953c89d1c198899b6a3a959fc55f2
@@ -16,7 +16,7 @@ SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7be
SHA1 (patch-lib_rubygems_defaults.rb) = 1af4161a83c0bf5b894c4ab3f4a77d4ee4183985
SHA1 (patch-lib_rubygems_dependency__installer.rb) = a2f0d03924a70e8e6cb30736e0f3807e5baa520d
SHA1 (patch-lib_rubygems_install__update__options.rb) = 22cfafe090db72211253b8528937e5be0e677ebf
-SHA1 (patch-lib_rubygems_installer.rb) = 2dbcb3fc03c9a02112f196351fca77d766d6c6f6
+SHA1 (patch-lib_rubygems_installer.rb) = b22ece5d6fe8952512ee772ba28d8c60f273d726
SHA1 (patch-lib_rubygems_specification.rb) = 3e9e95178127da862add4141665b80d965874f21
SHA1 (patch-lib_rubygems_uninstaller.rb) = bf525fc55e9bf94e1561a7cac76e09873d3aaca2
SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116
diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb b/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb
index e0024cfd6e3..d7f75c7abe3 100644
--- a/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb
+++ b/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_rubygems_installer.rb,v 1.2 2013/11/24 14:22:03 taca Exp $
+$NetBSD: patch-lib_rubygems_installer.rb,v 1.3 2014/01/08 11:31:19 fhajny Exp $
* Add install_root option for pkgsrc's rubygems support.
* Tweak build_info directory with destdir to store build_args.
@@ -31,7 +31,7 @@ $NetBSD: patch-lib_rubygems_installer.rb,v 1.2 2013/11/24 14:22:03 taca Exp $
# (or use) a new bin dir under the gem_home.
- @bin_dir = options[:bin_dir] || Gem.bindir(gem_home)
+ @bin_dir = options[:bin_dir] || Gem.bindir(gem_home, @install_root)
-+ if not @install_root.empty?
++ unless @install_root.nil? or @install_root == ""
+ @bin_dir = File.join(@install_root, @bin_dir)
+ end
@development = options[:development]