From efa3a582bff22ca9f8ad99074dc5eee4d6ad5ed2 Mon Sep 17 00:00:00 2001
From: Brian Ford <brixen@gmail.com>
Date: Mon, 5 Dec 2011 14:35:16 -0800
Subject: [PATCH] Use vendor/oniguruma.

---
 rakelib/blueprint.rb  |  8 ++++----
 rakelib/vm.rake       |  2 +-
 vendor/.gitignore     | 14 +++++++-------
 vm/builtin/regexp.hpp |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/rakelib/blueprint.rb b/rakelib/blueprint.rb
index 26c74e4118..586d175838 100644
--- a/rakelib/blueprint.rb
+++ b/rakelib/blueprint.rb
@@ -145,8 +145,8 @@
     end
   end
 
-  onig = i.external_lib "vendor/onig" do |l|
-    l.cflags = ["-Ivendor/onig"]
+  oniguruma = i.external_lib "vendor/oniguruma" do |l|
+    l.cflags = ["-Ivendor/oniguruma"]
     l.objects = [l.file(".libs/libonig.a")]
     l.to_build do |x|
       x.command "sh -c ./configure" unless File.exists?("Makefile")
@@ -204,7 +204,7 @@
   gcc.add_library udis
   gcc.add_library ffi
   gcc.add_library gdtoa
-  gcc.add_library onig
+  gcc.add_library oniguruma
   gcc.add_library ltm
 
   %w[ /usr/local/include /opt/local/include ].each do |path|
@@ -230,7 +230,7 @@
   files << udis
   files << ffi
   files << gdtoa
-  files << onig
+  files << oniguruma
   files << ltm
 
   cli = files.dup
diff --git a/rakelib/vm.rake b/rakelib/vm.rake
index 17e66a9d75..2eb1f24081 100644
--- a/rakelib/vm.rake
+++ b/rakelib/vm.rake
@@ -189,7 +189,7 @@ files TYPE_GEN, field_extract_headers + %w[vm/codegen/field_extract.rb] + [:run_
 end
 
 file encoding_database => 'vm/codegen/encoding_extract.rb' do |t|
-  dir = File.expand_path "../vendor/onig"
+  dir = File.expand_path "../vendor/oniguruma"
   ruby 'vm/codegen/encoding_extract.rb', dir, t.name
 end
 
diff --git a/vendor/.gitignore b/vendor/.gitignore
index d654a86f32..bbf02bd55f 100644
--- a/vendor/.gitignore
+++ b/vendor/.gitignore
@@ -39,13 +39,13 @@ libffi/src/x86/.dirstamp
 libffi/testsuite/Makefile
 
 # oniguruma
-onig/Makefile
-onig/config.h
-onig/config.log
-onig/config.status
-onig/libtool
-onig/onig-config
-onig/sample/Makefile
+oniguruma/Makefile
+oniguruma/config.h
+oniguruma/config.log
+oniguruma/config.status
+oniguruma/libtool
+oniguruma/onig-config
+oniguruma/sample/Makefile
 
 # libudis
 udis86/Makefile
diff --git a/vm/builtin/regexp.hpp b/vm/builtin/regexp.hpp
index aecf79334c..d93f12e0ab 100644
--- a/vm/builtin/regexp.hpp
+++ b/vm/builtin/regexp.hpp
@@ -5,7 +5,7 @@
 #include "type_info.hpp"
 
 // HACK gross.
-// Forward declare ONLY if we haven't already included onig.h
+// Forward declare ONLY if we haven't already included oniguruma.h
 // We do this because onigurama seems to have regex_t be a weird
 // typedef. It's easier to just not bother with trying to duplicate
 // what it does and do this.