Import of pkgsrc-2015Q3

This commit is contained in:
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions

View File

@@ -1,10 +1,10 @@
$NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.1 2015/05/20 13:26:45 ryoon Exp $
$NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.2 2015/09/02 12:39:33 fhajny Exp $
* Fix Ruby 2.2 build.
--- src/api/ruby/getsitearchdir.rb.orig 2015-04-09 01:48:10.000000000 +0000
--- src/api/ruby/getsitearchdir.rb.orig 2015-08-15 00:27:59.000000000 +0000
+++ src/api/ruby/getsitearchdir.rb
@@ -1,19 +1,19 @@
@@ -1,35 +1,35 @@
require "mkmf"
drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/
print "arch = "
@@ -16,8 +16,13 @@ $NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.1 2015/05/20 13:26:45 ryoon Ex
+print RbConfig::CONFIG["sitearch"]
print "\n"
print "ruby_version = "
begin
-print Config::CONFIG["ruby_version"]
+print RbConfig::CONFIG["ruby_version"]
rescue
-print CONFIG["ruby_version"]
+print RbConfig::CONFIG["ruby_version"]
end
print "\n"
print "prefix = "
-print CONFIG["prefix"].sub(drive, "").sub("$(DESTDIR)","")
@@ -29,3 +34,19 @@ $NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.1 2015/05/20 13:26:45 ryoon Ex
print "\n"
print "libdir = "
print $libdir.sub(drive, "").sub("$(DESTDIR)","")
print "\n"
-if CONFIG["RUBY_BASE_NAME"]!=nil then
+if RbConfig::CONFIG["RUBY_BASE_NAME"]!=nil then
print "RUBY_BASE_NAME = "
- print CONFIG["RUBY_BASE_NAME"]
+ print RbConfig::CONFIG["RUBY_BASE_NAME"]
print "\n"
end
-if CONFIG["rubylibprefix"]!=nil then
+if RbConfig::CONFIG["rubylibprefix"]!=nil then
print "rubylibprefix = "
- print CONFIG["rubylibprefix"].sub(drive, "").sub("$(DESTDIR)","")
+ print RbConfig::CONFIG["rubylibprefix"].sub(drive, "").sub("$(DESTDIR)","")
print "\n"
end
print "rubylibdir = "