Mon May 30 09:22:58 2016 UTC ()
Fix build problem with Ruby 2.2 and later.


(taca)
diff -r1.11 -r1.12 pkgsrc/devel/libthrift/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/libthrift/patches/patch-lib__rb__setup.rb
cvs diff -r1.11 -r1.12 pkgsrc/devel/libthrift/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libthrift/Attic/distinfo 2015/11/03 03:27:45 1.11
+++ pkgsrc/devel/libthrift/Attic/distinfo 2016/05/30 09:22:58 1.12
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.11 2015/11/03 03:27:45 agc Exp $ 1$NetBSD: distinfo,v 1.12 2016/05/30 09:22:58 taca Exp $
2 2
3SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a 3SHA1 (thrift-0.7.0.tar.gz) = b8f6877bc75878984355da4efe171ad99ff05b6a
4RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052 4RMD160 (thrift-0.7.0.tar.gz) = d9db8ff077347134101cd017e086511c4317b052
5SHA512 (thrift-0.7.0.tar.gz) = 43f2ef8da3d7dad2d790401da78a2bc9bc5e1d256f05ba4c541ea82b6d4546ee2878ae90c94916ade57a83de25f2ad215ef05339d411570ab0892db5386b640c 5SHA512 (thrift-0.7.0.tar.gz) = 43f2ef8da3d7dad2d790401da78a2bc9bc5e1d256f05ba4c541ea82b6d4546ee2878ae90c94916ade57a83de25f2ad215ef05339d411570ab0892db5386b640c
6Size (thrift-0.7.0.tar.gz) = 2248326 bytes 6Size (thrift-0.7.0.tar.gz) = 2248326 bytes
7SHA1 (patch-ac) = 84032447dc90b7071d8f54fc56dd30584fbc8116 7SHA1 (patch-ac) = 84032447dc90b7071d8f54fc56dd30584fbc8116
8SHA1 (patch-compiler_cpp_src_generate_t__rb__generator.cc) = 1b2e71c38fdf3211be65bc199f348fcbadfe805c 8SHA1 (patch-compiler_cpp_src_generate_t__rb__generator.cc) = 1b2e71c38fdf3211be65bc199f348fcbadfe805c
9SHA1 (patch-compiler_cpp_src_thrifty.yy) = 69ccc48794edf8358ab39950794e1c542641fb3f 9SHA1 (patch-compiler_cpp_src_thrifty.yy) = 69ccc48794edf8358ab39950794e1c542641fb3f
10SHA1 (patch-lib__rb__ext__extconf.rb) = 627725567f6d78070e28d430ebe7ac96910df8ec 10SHA1 (patch-lib__rb__ext__extconf.rb) = 627725567f6d78070e28d430ebe7ac96910df8ec
11SHA1 (patch-lib__rb__setup.rb) = 4e08bb4c0828306ee2391f5d5760e74a5df30a73 11SHA1 (patch-lib__rb__setup.rb) = 9b189208c01a654ff633756d8800fb327ba7a9b7
12SHA1 (patch-lib_cpp_src_async_TAsyncBufferProcessor.h) = 2387b52d1dcd01637bd0853743ede85dd4a3357b 12SHA1 (patch-lib_cpp_src_async_TAsyncBufferProcessor.h) = 2387b52d1dcd01637bd0853743ede85dd4a3357b
13SHA1 (patch-lib_cpp_src_async_TAsyncChannel.cpp) = dd3d65fd83f6ab4ebbc81f7e6ea98b05ef13592e 13SHA1 (patch-lib_cpp_src_async_TAsyncChannel.cpp) = dd3d65fd83f6ab4ebbc81f7e6ea98b05ef13592e
14SHA1 (patch-lib_cpp_src_async_TAsyncChannel.h) = 6a9e25f84d9d1d8b1192c5f3b059ea7a39c8396a 14SHA1 (patch-lib_cpp_src_async_TAsyncChannel.h) = 6a9e25f84d9d1d8b1192c5f3b059ea7a39c8396a
15SHA1 (patch-lib_cpp_src_async_TAsyncProcessor.h) = 15c9b3534276fc6b75f5f3c7978ad7e914b38f61 15SHA1 (patch-lib_cpp_src_async_TAsyncProcessor.h) = 15c9b3534276fc6b75f5f3c7978ad7e914b38f61
16SHA1 (patch-lib_cpp_src_async_TAsyncProtocolProcessor.cpp) = 70b06199d2908c7de3b0b18594e9492480f1a031 16SHA1 (patch-lib_cpp_src_async_TAsyncProtocolProcessor.cpp) = 70b06199d2908c7de3b0b18594e9492480f1a031
17SHA1 (patch-lib_cpp_src_async_TAsyncProtocolProcessor.h) = 49fd58352134e684e92bb9a70c423fe54b2688b5 17SHA1 (patch-lib_cpp_src_async_TAsyncProtocolProcessor.h) = 49fd58352134e684e92bb9a70c423fe54b2688b5
18SHA1 (patch-lib_cpp_src_async_TEvhttpServer.cpp) = 84558ef95935914cccb74405031bc532c9b180ad 18SHA1 (patch-lib_cpp_src_async_TEvhttpServer.cpp) = 84558ef95935914cccb74405031bc532c9b180ad
19SHA1 (patch-lib_cpp_src_concurrency_FunctionRunner.h) = 8e15b54872ad0bb59276d25d7200517382a9fcb4 19SHA1 (patch-lib_cpp_src_concurrency_FunctionRunner.h) = 8e15b54872ad0bb59276d25d7200517382a9fcb4
20SHA1 (patch-lib_cpp_src_concurrency_ThreadManager.h) = e97795f632ed98c19172fa25ff6a83a0c9580ff2 20SHA1 (patch-lib_cpp_src_concurrency_ThreadManager.h) = e97795f632ed98c19172fa25ff6a83a0c9580ff2
21SHA1 (patch-lib_cpp_src_server_TNonblockingServer.cpp) = 1f94bcad637279b151b8c0830854c5fc72919e68 21SHA1 (patch-lib_cpp_src_server_TNonblockingServer.cpp) = 1f94bcad637279b151b8c0830854c5fc72919e68
22SHA1 (patch-lib_cpp_src_transport_TSSLSocket.cpp) = 5b0ee2a0d276affc4ead52492e0100f4c0665550 22SHA1 (patch-lib_cpp_src_transport_TSSLSocket.cpp) = 5b0ee2a0d276affc4ead52492e0100f4c0665550
23SHA1 (patch-lib_cpp_src_transport_TServerSocket.cpp) = dc54a0991f5918de04da73f184c551d7a2bd57ed 23SHA1 (patch-lib_cpp_src_transport_TServerSocket.cpp) = dc54a0991f5918de04da73f184c551d7a2bd57ed
24SHA1 (patch-lib_cpp_test_Benchmark.cpp) = 65a3a873b33f7290551c535b4ef8c9a109aae3e1 24SHA1 (patch-lib_cpp_test_Benchmark.cpp) = 65a3a873b33f7290551c535b4ef8c9a109aae3e1
cvs diff -r1.1 -r1.2 pkgsrc/devel/libthrift/patches/Attic/patch-lib__rb__setup.rb (expand / switch to unified diff)

--- pkgsrc/devel/libthrift/patches/Attic/patch-lib__rb__setup.rb 2011/06/03 13:39:45 1.1
+++ pkgsrc/devel/libthrift/patches/Attic/patch-lib__rb__setup.rb 2016/05/30 09:22:58 1.2
@@ -1,18 +1,39 @@ @@ -1,18 +1,39 @@
1$NetBSD: patch-lib__rb__setup.rb,v 1.1 2011/06/03 13:39:45 fhajny Exp $ 1$NetBSD: patch-lib__rb__setup.rb,v 1.2 2016/05/30 09:22:58 taca Exp $
 2
 3* Changes for pkgsrc.
 4* Remove duplicate 'bin-dir' key.
 5* Do not use obsolete Config::CONFIG but RbConfig::CONFIG.
2 6
3pkgsrc prefers vendor Ruby dirs. 7pkgsrc prefers vendor Ruby dirs.
4--- lib/rb/setup.rb.orig 2011-01-31 01:13:14.000000000 +0000 8--- lib/rb/setup.rb.orig 2011-08-11 13:19:12.000000000 +0000
5+++ lib/rb/setup.rb 9+++ lib/rb/setup.rb
6@@ -165,9 +165,9 @@ class ConfigTable 10@@ -165,9 +165,9 @@ class ConfigTable
7 libruby = "#{c['prefix']}/lib/ruby" 11 libruby = "#{c['prefix']}/lib/ruby"
8 librubyver = c['rubylibdir'] 12 librubyver = c['rubylibdir']
9 librubyverarch = c['archdir'] 13 librubyverarch = c['archdir']
10- siteruby = c['sitedir'] 14- siteruby = c['sitedir']
11- siterubyver = c['sitelibdir'] 15- siterubyver = c['sitelibdir']
12- siterubyverarch = c['sitearchdir'] 16- siterubyverarch = c['sitearchdir']
13+ siteruby = c['vendordir'] 17+ siteruby = c['vendordir']
14+ siterubyver = c['vendorlibdir'] 18+ siterubyver = c['vendorlibdir']
15+ siterubyverarch = c['vendorarchdir'] 19+ siterubyverarch = c['vendorarchdir']
16 elsif newpath_p 20 elsif newpath_p
17 # 1.4.4 <= V <= 1.6.3 21 # 1.4.4 <= V <= 1.6.3
18 libruby = "#{c['prefix']}/lib/ruby" 22 libruby = "#{c['prefix']}/lib/ruby"
 23@@ -281,7 +281,6 @@ class ConfigTable
 24 'site-ruby-common' => 'siteruby', # For backward compatibility
 25 'site-ruby' => 'siterubyver', # For backward compatibility
 26 'bin-dir' => 'bindir',
 27- 'bin-dir' => 'bindir',
 28 'rb-dir' => 'rbdir',
 29 'so-dir' => 'sodir',
 30 'data-dir' => 'datadir',
 31@@ -785,7 +784,7 @@ class ToplevelInstaller
 32 else
 33 require 'rbconfig'
 34 end
 35- ::Config::CONFIG
 36+ ::RbConfig::CONFIG
 37 end
 38
 39 def initialize(ardir_root, config)