1 files changed, 33 insertions, 22 deletions
diff --git a/Library/Formula/proj.rb b/Library/Formula/proj.rb
index 2c1e97249..041b1f288 100644
--- a/Library/Formula/proj.rb
+++ b/Library/Formula/proj.rb
@@ -1,70 +1,64 @@
-require 'formula'
-
 class Proj < Formula
-  homepage 'http://trac.osgeo.org/proj/'
-  url 'http://download.osgeo.org/proj/proj-4.8.0.tar.gz'
-  sha1 '5c8d6769a791c390c873fef92134bf20bb20e82a'
-  head "http://svn.osgeo.org/metacrs/proj/trunk/proj/"
+  homepage "http://trac.osgeo.org/proj/"
+  url "http://download.osgeo.org/proj/proj-4.9.1.tar.gz"
+  sha256 "fca0388f3f8bc5a1a803d2f6ff30017532367992b30cf144f2d39be88f36c319"
+  head "http://svn.osgeo.org/metacrs/proj/trunk/proj"
 
   option "with-vdatum", "Install vertical datum files (~380 MB)"
 
   bottle do
-    revision 2
-    sha1 "66efa5cca3047ce7cfa8414163c92a2f92f3aed9" => :yosemite
-    sha1 "8cf4680113ab1acf4251d8310b1f2e7a5231b150" => :mavericks
-    sha1 "57c74a55e948b3cb8565faa360a754e63a294084" => :mountain_lion
   end
 
   # The datum grid files are required to support datum shifting
-  resource 'datumgrid' do
-    url 'http://download.osgeo.org/proj/proj-datumgrid-1.5.zip'
-    sha1 '4429ba1a8c764d5c0e6724d868f6874f452f7440'
+  resource "datumgrid" do
+    url "http://download.osgeo.org/proj/proj-datumgrid-1.5.zip"
+    sha256 "723c4017d95d7a8abdf3bda4e18d3c15d79b00f9326d453da5fdf13f96c287db"
   end
 
   # Vertical datum files
   resource "usa_geoid2012" do
     url "http://download.osgeo.org/proj/vdatum/usa_geoid2012.zip"
-    sha1 "07359705877c2af2be3508e7905813f20ed4ba20"
+    sha256 "afe49dc2c405d19a467ec756483944a3c9148e8c1460cb7e82dc8d4a64c4c472"
   end
 
   resource "usa_geoid2009" do
     url "http://download.osgeo.org/proj/vdatum/usa_geoid2009.zip"
-    sha1 "7ba5ff82dacf1dd56d666dd3ee8470e86946a479"
+    sha256 "1a232fb7fe34d2dad2d48872025597ac7696882755ded1493118a573f60008b1"
   end
 
   resource "usa_geoid2003" do
     url "http://download.osgeo.org/proj/vdatum/usa_geoid2003.zip"
-    sha1 "d83c584c936045c9f6c51209e4726449eb5d1c17"
+    sha256 "1d15950f46e96e422ebc9202c24aadec221774587b7a4cd963c63f8837421351"
   end
 
   resource "usa_geoid1999" do
     url "http://download.osgeo.org/proj/vdatum/usa_geoid1999.zip"
-    sha1 "1374f67dced7350783458431d916d1d8934cb187"
+    sha256 "665cd4dfc991f2517752f9db84d632b56bba31a1ed6a5f0dc397e4b0b3311f36"
   end
 
   resource "vertconc" do
     url "http://download.osgeo.org/proj/vdatum/vertcon/vertconc.gtx"
-    sha1 "9ce4b68f3991ed54316c0d534a3c5744b55b5cd2"
+    sha256 "ecf7bce7bf9e56f6f79a2356d8d6b20b9cb49743701f81db802d979b5a01fcff"
   end
 
   resource "vertcone" do
     url "http://download.osgeo.org/proj/vdatum/vertcon/vertcone.gtx"
-    sha1 "265aa34c14ed049441c212aeda3cada9281e6ec7"
+    sha256 "f6da1c615c2682ecb7adcfdf22b1d37aba2771c2ea00abe8907acea07413903b"
   end
 
   resource "vertconw" do
     url "http://download.osgeo.org/proj/vdatum/vertcon/vertconw.gtx"
-    sha1 "379b4852b837ca4186f089f35d097521bf63ed1f"
+    sha256 "de648c0f6e8b5ebfc4b2d82f056c7b993ca3c37373a7f6b7844fe9bd4871821b"
   end
 
   resource "egm96_15" do
     url "http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx"
-    sha1 "5396c20a37c63abb1191ab44a164e2e2106dcb6c"
+    sha256 "c02a6eb70a7a78efebe5adf3ade626eb75390e170bb8b3f36136a2c28f5326a0"
   end
 
   resource "egm08_25" do
     url "http://download.osgeo.org/proj/vdatum/egm08_25/egm08_25.gtx"
-    sha1 "cddabcb9f9000afa869bdbfeb7bcf13521647fa7"
+    sha256 "c18f20d1fe88616e3497a3eff993227371e1d9acc76f96253e8d84b475bbe6bf"
   end
 
   skip_clean :la
@@ -86,4 +80,21 @@ class Proj < Formula
                           "--prefix=#{prefix}"
     system "make", "install"
   end
+
+  test do
+    (testpath/"test").write <<-EOS.undent
+      45d15n 71d07w Boston, United States
+      40d40n 73d58w New York, United States
+      48d51n 2d20e Paris, France
+      51d30n 7'w London, England
+    EOS
+    match = <<-EOS.undent
+      -4887590.49\t7317961.48 Boston, United States
+      -5542524.55\t6982689.05 New York, United States
+      171224.94\t5415352.81 Paris, France
+      -8101.66\t5707500.23 London, England
+    EOS
+    assert_equal match,
+                 `#{bin}/proj +proj=poly +ellps=clrk66 -r #{testpath}/test`
+  end
 end