4 files changed, 51 insertions, 3 deletions

diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile
index e57d7e14ac87..7028a0255e1f 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rubinius
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/ \
 		http://asset.rubini.us/prebuilt/:llvm
diff --git a/lang/rubinius/distinfo b/lang/rubinius/distinfo
index 283bb2470e0b..f2853792d94f 100644
--- a/lang/rubinius/distinfo
+++ b/lang/rubinius/distinfo
@@ -1,4 +1,4 @@
-SHA256 (rubinius-1.2.2.tar.gz) = 91c1ca3bdc132525777eef0f6c42ca06e6226065570ade127ea528feb2129347
-SIZE (rubinius-1.2.2.tar.gz) = 9011164
+SHA256 (rubinius-1.2.3.tar.gz) = 519001ed9a1114d09960f19ff2add31be03b7b5fa521892e4c7b6d1c90d80deb
+SIZE (rubinius-1.2.3.tar.gz) = 9485259
 SHA256 (llvm-2.8.tgz) = 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 SIZE (llvm-2.8.tgz) = 9112527
diff --git a/lang/rubinius/files/patch-rakelib_blueprint.rb b/lang/rubinius/files/patch-rakelib_blueprint.rb
new file mode 100644
index 000000000000..8bc73c198705
--- /dev/null
+++ b/lang/rubinius/files/patch-rakelib_blueprint.rb
@@ -0,0 +1,22 @@
+--- rakelib/blueprint.rb.orig	2011-05-13 18:20:02.000000000 -0700
++++ rakelib/blueprint.rb	2011-05-13 18:20:19.000000000 -0700
+@@ -1,7 +1,9 @@
+ Daedalus.blueprint do |i|
+   gcc = i.gcc!
+ 
+-  gcc.cflags << "-Ivm -Ivm/test/cxxtest -I. -I/usr/local/include -I/opt/local/include "
++  system_includes = "-I/usr/local/include -I/opt/local/include"
++
++  gcc.cflags << "-Ivm -Ivm/test/cxxtest -I. "
+   gcc.cflags << "-pipe -Wall -fno-omit-frame-pointer"
+   gcc.cflags << "-ggdb3 -Werror"
+   gcc.cflags << "-DRBX_PROFILER"
+@@ -162,6 +164,8 @@
+   gcc.add_library onig
+   gcc.add_library ltm
+ 
++  gcc.cflags << system_includes + " "
++
+   if Rubinius::BUILD_CONFIG[:windows]
+     winp = i.external_lib "vm/external_libs/winpthreads" do |l|
+       l.cflags = ["-Ivm/external_libs/winpthreads/include"]
diff --git a/lang/rubinius/pkg-plist b/lang/rubinius/pkg-plist
index 8aec38720ceb..c7d71ec50850 100644
--- a/lang/rubinius/pkg-plist
+++ b/lang/rubinius/pkg-plist
@@ -775,6 +775,10 @@ lib/ruby/rubinius/rubinius/1.2/lib/rubinius/debugger.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/debugger.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2010/12/15/rubinius-has-a-blog/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/17/rubinius-what-s-next/index.html
+lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/22/rubinius-multiple-branches-with-rvm/index.html
+lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/23/introduction-to-fancy/index.html
+lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/25/why-use-rubinius/index.html
+lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/03/11/making-rubinius-rbc-files-disappear/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/404.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/422.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/500.html
@@ -877,6 +881,7 @@ lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/translat
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-a-blog-post/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-a-ruby-spec/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-a-ticket/index.html
+lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-benchmarks/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-documentation/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/index-of-terms/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/index.html
@@ -1169,6 +1174,7 @@ lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/1.1.1/index.h
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/1.2.0/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/1.2.1/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/1.2.2/index.html
+lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/1.2.3/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/roadmap/index.html
 lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/robots.txt
@@ -1308,8 +1314,12 @@ lib/ruby/rubinius/rubinius/1.2/lib/rubygems/install_update_options.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/install_update_options.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/installer.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/installer.rbc
+lib/ruby/rubinius/rubinius/1.2/lib/rubygems/installer_test_case.rb
+lib/ruby/rubinius/rubinius/1.2/lib/rubygems/installer_test_case.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/local_remote_options.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/local_remote_options.rbc
+lib/ruby/rubinius/rubinius/1.2/lib/rubygems/mock_gem_ui.rb
+lib/ruby/rubinius/rubinius/1.2/lib/rubygems/mock_gem_ui.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/old_format.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/old_format.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package/f_sync_dir.rb
@@ -1324,6 +1334,8 @@ lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package/tar_reader/entry.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package/tar_reader/entry.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package/tar_reader.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package/tar_reader.rbc
+lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package/tar_test_case.rb
+lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package/tar_test_case.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package/tar_writer.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package/tar_writer.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/package.rb
@@ -1356,6 +1368,8 @@ lib/ruby/rubinius/rubinius/1.2/lib/rubygems/spec_fetcher.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/spec_fetcher.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/specification.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/specification.rbc
+lib/ruby/rubinius/rubinius/1.2/lib/rubygems/test_case.rb
+lib/ruby/rubinius/rubinius/1.2/lib/rubygems/test_case.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/test_utilities.rb
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/test_utilities.rbc
 lib/ruby/rubinius/rubinius/1.2/lib/rubygems/text.rb
@@ -1739,6 +1753,7 @@ lib/ruby/rubinius/rubinius/1.2/runtime/common/type.rbc
 lib/ruby/rubinius/rubinius/1.2/runtime/common/undefined.rbc
 lib/ruby/rubinius/rubinius/1.2/runtime/common/variable_scope.rbc
 lib/ruby/rubinius/rubinius/1.2/runtime/common/vm.rbc
+lib/ruby/rubinius/rubinius/1.2/runtime/delta/agent.rbc
 lib/ruby/rubinius/rubinius/1.2/runtime/delta/class.rbc
 lib/ruby/rubinius/rubinius/1.2/runtime/delta/codeloader.rbc
 lib/ruby/rubinius/rubinius/1.2/runtime/delta/ctype.rbc
@@ -1844,7 +1859,16 @@ lib/ruby/rubinius/rubinius/1.2/runtime/signature.rbc
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2010
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/17/rubinius-what-s-next
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/17
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/22/rubinius-multiple-branches-with-rvm
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/22
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/23/introduction-to-fancy
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/23
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/25/why-use-rubinius
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02/25
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/02
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/03/11/making-rubinius-rbc-files-disappear
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/03/11
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011/03
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/2011
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/about/1.1.1
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/about/one_one
@@ -1945,6 +1969,7 @@ lib/ruby/rubinius/rubinius/1.2/runtime/signature.rbc
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-a-blog-post
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-a-ruby-spec
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-a-ticket
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-benchmarks
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to/write-documentation
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/how-to
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/doc/en/index-of-terms
@@ -2229,6 +2254,7 @@ lib/ruby/rubinius/rubinius/1.2/runtime/signature.rbc
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/1.2.0
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/1.2.1
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/1.2.2
+@dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases/1.2.3
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/releases
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/roadmap
 @dirrm lib/ruby/rubinius/rubinius/1.2/lib/rubinius/documentation/stylesheets/blueprint