merge revision(s) 44598,44599,44600:

	/usr/lib/libc.so is not symlink on FreeBSD 10

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 11 insertions, 5 deletions

diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb
index c0d91f9edb..6dc98765f3 100644
--- a/test/dl/test_base.rb
+++ b/test/dl/test_base.rb
@@ -36,6 +36,9 @@ when /kfreebsd/
 when /gnu/	#GNU/Hurd
   libc_so = "/lib/libc.so.0.3"
   libm_so = "/lib/libm.so.6"
+when /freebsd/
+  libc_so = "/lib/libc.so.7"
+  libm_so = "/lib/libm.so.5"
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"
diff --git a/test/dl/test_handle.rb b/test/dl/test_handle.rb
index 4ef93adf41..83b8af1960 100644
--- a/test/dl/test_handle.rb
+++ b/test/dl/test_handle.rb
@@ -181,7 +181,7 @@ module DL
       # In general uses of dlerror(3) should call it before use it.
       require 'socket'
       Socket.gethostbyname("localhost")
-      DL.dlopen("/usr/lib/libc.so").sym('strcpy')
+      DL.dlopen("/lib/libc.so.7").sym('strcpy')
     end if /freebsd/=~ RUBY_PLATFORM
   end
 end
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index e5cbecd1db..7f8fe131d6 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -37,6 +37,9 @@ when /kfreebsd/
 when /gnu/	#GNU/Hurd
   libc_so = "/lib/libc.so.0.3"
   libm_so = "/lib/libm.so.6"
+when /freebsd/
+  libc_so = "/lib/libc.so.7"
+  libm_so = "/lib/libm.so.5"
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
index f11272abbf..ccdce7bf45 100644
--- a/test/fiddle/test_handle.rb
+++ b/test/fiddle/test_handle.rb
@@ -180,7 +180,7 @@ module Fiddle
       # In general uses of dlerror(3) should call it before use it.
       require 'socket'
       Socket.gethostbyname("localhost")
-      Fiddle.dlopen("/usr/lib/libc.so").sym('strcpy')
+      Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
     end if /freebsd/=~ RUBY_PLATFORM
   end
 end
diff --git a/version.h b/version.h
index 9d655c55c9..60a13830a3 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-01-12"
-#define RUBY_PATCHLEVEL 384
+#define RUBY_RELEASE_DATE "2014-01-19"
+#define RUBY_PATCHLEVEL 385
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"