io 2011.09.12

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

Formula/io.rb

@@ -1,59 +1,30 @@
 require 'formula'
 
 class Io < Formula
-  url 'https://github.com/stevedekorte/io/tarball/2010.06.06'
-  md5 '7968fbe5367aad7a630fc7094be1775b'
+  url 'https://github.com/stevedekorte/io/tarball/2011.09.12'
+  md5 'b5c4b4117e43b4bbe571e4e12018535b'
   head 'https://github.com/stevedekorte/io.git'
   homepage 'http://iolanguage.com/'
 
-  depends_on 'cmake' => :build if ARGV.build_head?
+  depends_on 'cmake' => :build
   depends_on 'libsgml'
   depends_on 'ossp-uuid'
   depends_on 'libevent'
-
-  # Either CMake doesn't detect OS X's png include path correctly,
-  # or there's an issue with io's build system; force the path in
-  # so we can build.
-  def patches
-    DATA if ARGV.build_head?
-  end
+  depends_on 'yajl'
 
   def install
     ENV.j1
-
-    if not ARGV.build_head?
-      system "make vm"
-      system "make install"
-      system "make port"
-      system "make install"
+    mkdir 'buildroot'
+    Dir.chdir 'buildroot'
+    system "cmake .. #{std_cmake_parameters}"
+    system 'make'
+    output = %x[./_build/binaries/io ../libs/iovm/tests/correctness/run.io]
+    if $?.exitstatus != 0
+      opoo "Test suite not 100% successful:\n#{output}"
     else
-      opoo "IO --HEAD usually doesn't build!"
-
-      mkdir 'io-build'
-      Dir.chdir 'io-build' do
-        system "cmake .. #{std_cmake_parameters}"
-        system "make install"
-      end
+      ohai "Test suite ran successfully:\n#{output}"
     end
-
-    rm_f Dir['docs/*.pdf']
+    system 'make install'
     doc.install Dir['docs/*']
-
-    prefix.install 'license/bsd_license.txt' => 'LICENSE'
   end
-end
-
-__END__
-diff --git a/addons/Image/CMakeLists.txt b/addons/Image/CMakeLists.txt
-index a65693d..2166f1b 100644
---- a/addons/Image/CMakeLists.txt
-+++ b/addons/Image/CMakeLists.txt
-@@ -22,7 +22,7 @@ if(PNG_FOUND AND TIFF_FOUND AND JPEG_FOUND)
- 	add_definitions(-DBUILDING_IMAGE_ADDON)
- 
- 	# Additional include directories
--	include_directories(${PNG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
-+	include_directories("/usr/X11/include" ${PNG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
- 
- 	# Generate the IoImageInit.c file.
- 	# Argument SHOULD ALWAYS be the exact name of the addon, case is
+end