Sun Jul 7 15:02:57 2013 UTC ()
Fix creating proper build_info directory.

Bump PKGREVISION.


(taca)
diff -r1.52 -r1.53 pkgsrc/misc/rubygems/Makefile
diff -r1.41 -r1.42 pkgsrc/misc/rubygems/distinfo
diff -r1.11 -r1.12 pkgsrc/misc/rubygems/patches/patch-ad
cvs diff -r1.52 -r1.53 pkgsrc/misc/rubygems/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/rubygems/Attic/Makefile 2013/06/15 02:12:48 1.52
+++ pkgsrc/misc/rubygems/Attic/Makefile 2013/07/07 15:02:56 1.53
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.52 2013/06/15 02:12:48 taca Exp $ 1# $NetBSD: Makefile,v 1.53 2013/07/07 15:02:56 taca Exp $
2 2
3DISTNAME= rubygems-2.0.3 3DISTNAME= rubygems-2.0.3
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= misc ruby 5CATEGORIES= misc ruby
6MASTER_SITES= http://production.cf.rubygems.org/rubygems/ 6MASTER_SITES= http://production.cf.rubygems.org/rubygems/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
10HOMEPAGE= https://rubygems.org/ 10HOMEPAGE= https://rubygems.org/
11COMMENT= Ruby standard for publishing and managing third party libraries 11COMMENT= Ruby standard for publishing and managing third party libraries
12LICENSE= gnu-gpl-v2 OR ruby-license 12LICENSE= gnu-gpl-v2 OR ruby-license
13 13
14CONFLICTS+= rubygems-[0-9]* 14CONFLICTS+= rubygems-[0-9]*
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
cvs diff -r1.41 -r1.42 pkgsrc/misc/rubygems/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/rubygems/Attic/distinfo 2013/06/15 02:12:48 1.41
+++ pkgsrc/misc/rubygems/Attic/distinfo 2013/07/07 15:02:56 1.42
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.41 2013/06/15 02:12:48 taca Exp $ 1$NetBSD: distinfo,v 1.42 2013/07/07 15:02:56 taca Exp $
2 2
3SHA1 (rubygems-2.0.3.tgz) = 51b2d002874a30ae729bcc48a3a0c5983ffb508b 3SHA1 (rubygems-2.0.3.tgz) = 51b2d002874a30ae729bcc48a3a0c5983ffb508b
4RMD160 (rubygems-2.0.3.tgz) = e2abad996a2380ba5f764a55304c3e416b715080 4RMD160 (rubygems-2.0.3.tgz) = e2abad996a2380ba5f764a55304c3e416b715080
5Size (rubygems-2.0.3.tgz) = 334203 bytes 5Size (rubygems-2.0.3.tgz) = 334203 bytes
6SHA1 (patch-aa) = 02958c28dc9da54bf6d9f854335aa8d8e071497b 6SHA1 (patch-aa) = 02958c28dc9da54bf6d9f854335aa8d8e071497b
7SHA1 (patch-ab) = 9339a71c9c45b8990d72075a68a8992a40b8c0d0 7SHA1 (patch-ab) = 9339a71c9c45b8990d72075a68a8992a40b8c0d0
8SHA1 (patch-ac) = 1a59a5d2fc090dfcf6d3bd3b9c133f0ce4a1feee 8SHA1 (patch-ac) = 1a59a5d2fc090dfcf6d3bd3b9c133f0ce4a1feee
9SHA1 (patch-ad) = de5b5a08035c2da3e8b08bcc5295d3998f13a854 9SHA1 (patch-ad) = 17e1c7fe9cb7de2c08e8d11a94dcbea082c3b4d1
10SHA1 (patch-af) = d96d5dafd830b0c94bf6c191a3274701ebc6d564 10SHA1 (patch-af) = d96d5dafd830b0c94bf6c191a3274701ebc6d564
11SHA1 (patch-ag) = 5b94252ea03eba04849770bc141dfc58de932389 11SHA1 (patch-ag) = 5b94252ea03eba04849770bc141dfc58de932389
12SHA1 (patch-ah) = dd50c10662c0a295a8790446f9cd7159d0b498dd 12SHA1 (patch-ah) = dd50c10662c0a295a8790446f9cd7159d0b498dd
13SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e 13SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e
14SHA1 (patch-am) = 24b664a1c360e90c0874cdad9d107477f86e4fd5 14SHA1 (patch-am) = 24b664a1c360e90c0874cdad9d107477f86e4fd5
15SHA1 (patch-ao) = 4a8be3bdab5e465814b626d17a5f2811fbfc808c 15SHA1 (patch-ao) = 4a8be3bdab5e465814b626d17a5f2811fbfc808c
16SHA1 (patch-lib_rubygems_ext_ext__conf__builder.rb) = c532aee8aa9dbf92c48a643d8da65bebb50a0348 16SHA1 (patch-lib_rubygems_ext_ext__conf__builder.rb) = c532aee8aa9dbf92c48a643d8da65bebb50a0348
17SHA1 (patch-test_rubygems_test__gem.rb) = 883675c1af0314c66c3d02fb9c012fac768ebb9b 17SHA1 (patch-test_rubygems_test__gem.rb) = 883675c1af0314c66c3d02fb9c012fac768ebb9b
cvs diff -r1.11 -r1.12 pkgsrc/misc/rubygems/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/misc/rubygems/patches/Attic/patch-ad 2013/06/11 14:55:54 1.11
+++ pkgsrc/misc/rubygems/patches/Attic/patch-ad 2013/07/07 15:02:56 1.12
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ad,v 1.11 2013/06/11 14:55:54 taca Exp $ 1$NetBSD: patch-ad,v 1.12 2013/07/07 15:02:56 taca Exp $
2 2
3* Add install_root option for pkgsrc's rubygems support. 3* Add install_root option for pkgsrc's rubygems support.
4 4
5--- lib/rubygems/installer.rb.orig 2013-02-21 21:50:03.000000000 +0000 5--- lib/rubygems/installer.rb.orig 2013-03-05 21:25:39.000000000 +0000
6+++ lib/rubygems/installer.rb 6+++ lib/rubygems/installer.rb
7@@ -89,6 +89,9 @@ class Gem::Installer 7@@ -89,6 +89,9 @@ class Gem::Installer
8 # foo_exec18. 8 # foo_exec18.
9 # :ignore_dependencies:: Don't raise if a dependency is missing. 9 # :ignore_dependencies:: Don't raise if a dependency is missing.
10 # :install_dir:: The directory to install the gem into. 10 # :install_dir:: The directory to install the gem into.
11+ # :install_root:: The directory to use as a buildroot for "destdir"-style 11+ # :install_root:: The directory to use as a buildroot for "destdir"-style
12+ # installation. All paths during installation are relative 12+ # installation. All paths during installation are relative
13+ # to the buildroot. 13+ # to the buildroot.
14 # :security_policy:: Use the specified security policy. See Gem::Security 14 # :security_policy:: Use the specified security policy. See Gem::Security
15 # :user_install:: Indicate that the gem should be unpacked into the users 15 # :user_install:: Indicate that the gem should be unpacked into the users
16 # personal gem directory. 16 # personal gem directory.
17@@ -538,7 +541,8 @@ class Gem::Installer 17@@ -538,7 +541,8 @@ class Gem::Installer
18 :env_shebang => false, 18 :env_shebang => false,
@@ -29,13 +29,24 @@ $NetBSD: patch-ad,v 1.11 2013/06/11 14:5 @@ -29,13 +29,24 @@ $NetBSD: patch-ad,v 1.11 2013/06/11 14:5
29 # the system gem directory, then use the system bin directory, else create 29 # the system gem directory, then use the system bin directory, else create
30 # (or use) a new bin dir under the gem_home. 30 # (or use) a new bin dir under the gem_home.
31- @bin_dir = options[:bin_dir] || Gem.bindir(gem_home) 31- @bin_dir = options[:bin_dir] || Gem.bindir(gem_home)
32+ install_root = options[:install_root] 32+ install_root = options[:install_root]
33+ @bin_dir = options[:bin_dir] || Gem.bindir(gem_home, install_root) 33+ @bin_dir = options[:bin_dir] || Gem.bindir(gem_home, install_root)
34 @development = options[:development] 34 @development = options[:development]
35+ unless install_root.nil? or install_root == "" 35+ unless install_root.nil? or install_root == ""
36+ @install_root = File.expand_path install_root 36+ @install_root = File.expand_path install_root
37+ @gem_home = File.join(@install_root, @gem_home) 37+ @gem_home = File.join(@install_root, @gem_home)
38+ end 38+ end
39  39
40 @build_args = options[:build_args] || Gem::Command.build_args 40 @build_args = options[:build_args] || Gem::Command.build_args
41 end 41 end
 42@@ -773,7 +782,9 @@ EOF
 43 def write_build_info_file
 44 return if @build_args.empty?
 45
 46- open spec.build_info_file, 'w' do |io|
 47+ build_info_file = (@options[:install_root].nil?) ? spec.build_info_file :
 48+ File.join(@options[:install_root], spec.build_info_file)
 49+ open build_info_file, 'w' do |io|
 50 @build_args.each do |arg|
 51 io.puts arg
 52 end