proj 4.9.1

closes #37653

Closes #38667.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

13 files changed, 45 insertions, 79 deletions

diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb
index 730cfcc42..441e83f86 100644
--- a/Library/Formula/gdal.rb
+++ b/Library/Formula/gdal.rb
@@ -1,14 +1,10 @@
-require 'formula'
-
 class Gdal < Formula
   homepage 'http://www.gdal.org/'
   url "http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.gz"
   sha1 "6f3ccbe5643805784812072a33c25be0bbff00db"
+  revision 1
 
   bottle do
-    sha256 "123965a1d3072569339dd0a7e3ed4d4581c09cb88389fb9425d504c480e39fad" => :yosemite
-    sha256 "fd0676432a01f4d0d25ea24355edf4f76a1a467e94ee4790c193d8745b248d7e" => :mavericks
-    sha256 "fdec0fcb9f87b8be96ee2625a680afdb0cbcc05610d669290ed5bf9047dda537" => :mountain_lion
   end
 
   head do
diff --git a/Library/Formula/libgaiagraphics.rb b/Library/Formula/libgaiagraphics.rb
index f47e0d983..23b9b1dd5 100644
--- a/Library/Formula/libgaiagraphics.rb
+++ b/Library/Formula/libgaiagraphics.rb
@@ -1,16 +1,10 @@
-require "formula"
-
 class Libgaiagraphics < Formula
   homepage "https://www.gaia-gis.it/fossil/libgaiagraphics/index"
   url "http://www.gaia-gis.it/gaia-sins/gaiagraphics-sources/libgaiagraphics-0.5.tar.gz"
   sha1 "db9eaef329fc650da737c71aac6136088fcb6549"
+  revision 1
 
   bottle do
-    cellar :any
-    revision 1
-    sha1 "01d3f42ea440d68de828b842c5b8526f697a6b14" => :yosemite
-    sha1 "0cc91a527557a222c03ead9c4393a1b5decd7821" => :mavericks
-    sha1 "6d1fbadfa1580a1ae71ea22ea4ebbf215766ce6f" => :mountain_lion
   end
 
   depends_on "pkg-config" => :build
diff --git a/Library/Formula/libgeotiff.rb b/Library/Formula/libgeotiff.rb
index cac310c6f..d21b4fce1 100644
--- a/Library/Formula/libgeotiff.rb
+++ b/Library/Formula/libgeotiff.rb
@@ -1,14 +1,10 @@
-require 'formula'
-
 class Libgeotiff < Formula
   homepage 'http://geotiff.osgeo.org/'
   url 'http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.1.tar.gz'
   sha1 'bc9e2bb43f3877b795b4b191e7aec6267f4a1c7e'
+  revision 1
 
   bottle do
-    sha1 "36537de4979760793a529685086eba83f6bdf5d4" => :yosemite
-    sha1 "8d98c26cef589169e70db65455ee2df94cedc9ef" => :mavericks
-    sha1 "552b698613f5eab0842d408406185ca069fbb0d8" => :mountain_lion
   end
 
   depends_on 'libtiff'
diff --git a/Library/Formula/liblwgeom.rb b/Library/Formula/liblwgeom.rb
index 0c0df1bb3..ab1ea4e9f 100644
--- a/Library/Formula/liblwgeom.rb
+++ b/Library/Formula/liblwgeom.rb
@@ -1,10 +1,10 @@
 class Liblwgeom < Formula
   homepage "http://postgis.net"
+  revision 1
 
   stable do
     url "http://download.osgeo.org/postgis/source/postgis-2.1.5.tar.gz"
     sha1 "5ac24b95495be258a7430c08b3407d7beca1832a"
-
     # Strip all the PostgreSQL functions from PostGIS configure.ac, to allow
     # building liblwgeom.dylib without needing PostgreSQL
     # NOTE: this will need to be maintained per postgis version
@@ -16,11 +16,6 @@ class Liblwgeom < Formula
   end
 
   bottle do
-    cellar :any
-    revision 1
-    sha256 "a6e7d26a513a3ee5f5a13db4c397bbe3409ae6cfbed51e27c0bfc79033b85798" => :yosemite
-    sha256 "44d55f24d5ab7a41adfd0da71cf731462d4a7f2de37afc320517f23301ce62b7" => :mavericks
-    sha256 "ca87a1fe7586295e87fcfe93afa7ade655ce6a124bbab7a2fe3c30bef11e06ac" => :mountain_lion
   end
 
   head do
diff --git a/Library/Formula/libspatialite.rb b/Library/Formula/libspatialite.rb
index 2b770cecc..2a1044a67 100644
--- a/Library/Formula/libspatialite.rb
+++ b/Library/Formula/libspatialite.rb
@@ -2,13 +2,9 @@ class Libspatialite < Formula
   homepage "https://www.gaia-gis.it/fossil/libspatialite/index"
   url "http://www.gaia-gis.it/gaia-sins/libspatialite-4.2.0.tar.gz"
   sha1 "698bf70bec669ddcbf1b0cc48f40c2e03776bffc"
-  revision 1
+  revision 2
 
   bottle do
-    cellar :any
-    sha1 "ef9892e273b4cbc4acf626d3659a13d1fc7699a7" => :yosemite
-    sha1 "c9ecbcc0188f44fd8dad30a3e7fde31e09407a13" => :mavericks
-    sha1 "2eba5d49512f854f8bb4216072ce8aa83c0a961d" => :mountain_lion
   end
 
   head do
diff --git a/Library/Formula/mapnik.rb b/Library/Formula/mapnik.rb
index 6b82f85eb..578c4bc7e 100644
--- a/Library/Formula/mapnik.rb
+++ b/Library/Formula/mapnik.rb
@@ -1,17 +1,11 @@
-require "formula"
-
 class Mapnik < Formula
   homepage "http://www.mapnik.org/"
   head "https://github.com/mapnik/mapnik.git"
   url "https://s3.amazonaws.com/mapnik/dist/v2.2.0/mapnik-v2.2.0.tar.bz2"
   sha256 "9b30de4e58adc6d5aa8478779d0a47fdabe6bf8b166b67a383b35f5aa5d6c1b0"
-  revision 4
+  revision 5
 
   bottle do
-    revision 1
-    sha256 "87fa6cda55325d6d25c6a784f126168db31b17f2d8a393fcf32437da5a09762d" => :yosemite
-    sha256 "d1244a83b9c97afde10dd6a94855d8c4a9a130e611ad5ea8ce6692f0e8982a91" => :mavericks
-    sha256 "ff836a670b6991041ca99b776afda125f4b434c6c8d160bd413b7f25125f8fde" => :mountain_lion
   end
 
   stable do
diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb
index 4f5ca6cc4..ceecb0a43 100644
--- a/Library/Formula/mapserver.rb
+++ b/Library/Formula/mapserver.rb
@@ -1,10 +1,8 @@
-require 'formula'
-
 class Mapserver < Formula
   homepage 'http://mapserver.org/'
   url 'http://download.osgeo.org/mapserver/mapserver-6.2.1.tar.gz'
   sha1 'bbe4234a4dcc179812c6598f68fe59a3dae63e44'
-  revision 1
+  revision 2
 
   option "with-fastcgi", "Build with fastcgi support"
   option "with-geos", "Build support for GEOS spatial operations"
diff --git a/Library/Formula/osm2pgsql.rb b/Library/Formula/osm2pgsql.rb
index 487413782..546404c35 100644
--- a/Library/Formula/osm2pgsql.rb
+++ b/Library/Formula/osm2pgsql.rb
@@ -2,11 +2,9 @@ class Osm2pgsql < Formula
   homepage "http://wiki.openstreetmap.org/wiki/Osm2pgsql"
   url "https://github.com/openstreetmap/osm2pgsql/archive/0.87.0.tar.gz"
   sha1 "6f302500e52d6e42147cc8dff8f344677e3131f8"
+  revision 1
 
   bottle do
-    sha1 "613f83d5eec75fc35cf39dd74f6c93478f962d21" => :yosemite
-    sha1 "245a3e678eb6ff1f3af53cffb7fd1cd6ef3481a0" => :mavericks
-    sha1 "9c97bc588a3ddeb4c173327249437d485f4192a4" => :mountain_lion
   end
 
   depends_on :postgresql
diff --git a/Library/Formula/postgis.rb b/Library/Formula/postgis.rb
index 056b05c73..e38f06b79 100644
--- a/Library/Formula/postgis.rb
+++ b/Library/Formula/postgis.rb
@@ -2,6 +2,7 @@ class Postgis < Formula
   homepage "http://postgis.net"
   url "http://download.osgeo.org/postgis/source/postgis-2.1.7.tar.gz"
   sha256 "00ab79a3f609d7ea458f6fc358032ad059cb720baf88285243d6436a597a7ec2"
+  revision 1
 
   def pour_bottle?
     # Postgres extensions must live in the Postgres prefix, which precludes
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
diff --git a/Library/Formula/spatialite-gui.rb b/Library/Formula/spatialite-gui.rb
index dadec75a7..28c69e3fd 100644
--- a/Library/Formula/spatialite-gui.rb
+++ b/Library/Formula/spatialite-gui.rb
@@ -1,16 +1,10 @@
-require "formula"
-
 class SpatialiteGui < Formula
   homepage "https://www.gaia-gis.it/fossil/spatialite_gui/index"
   url "http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-1.7.1.tar.gz"
   sha1 "3b9d88e84ffa5a4f913cf74b098532c2cd15398f"
+  revision 1
 
   bottle do
-    cellar :any
-    revision 1
-    sha1 "54ee1f62973a5711be12125ff0237c715d925427" => :mavericks
-    sha1 "e9a4a406a5d5cae055316136a28c7f15063fd923" => :mountain_lion
-    sha1 "5cf52fd35bdb73e7a7c18227212e2b4ccbd7f646" => :lion
   end
 
   depends_on "pkg-config" => :build
diff --git a/Library/Formula/spatialite-tools.rb b/Library/Formula/spatialite-tools.rb
index 093983208..44683866a 100644
--- a/Library/Formula/spatialite-tools.rb
+++ b/Library/Formula/spatialite-tools.rb
@@ -1,16 +1,10 @@
-require 'formula'
-
 class SpatialiteTools < Formula
   homepage 'https://www.gaia-gis.it/fossil/spatialite-tools/index'
   url "http://www.gaia-gis.it/gaia-sins/spatialite-tools-4.2.0.tar.gz"
   sha1 "de07042afa734b17c840318fa8772466f53f1831"
+  revision 1
 
   bottle do
-    cellar :any
-    revision 3
-    sha1 "4598206e95a93f76ec379b928e539ab037db3927" => :yosemite
-    sha1 "67d0c0113b0723b3cab1e893ac57668f75d7ad7c" => :mavericks
-    sha1 "ad61069c865b7c11fa04b0fcbcf105a3f95edacd" => :mountain_lion
   end
 
   depends_on 'pkg-config' => :build
diff --git a/Library/Formula/xastir.rb b/Library/Formula/xastir.rb
index e842622e2..a52f0835f 100644
--- a/Library/Formula/xastir.rb
+++ b/Library/Formula/xastir.rb
@@ -1,9 +1,8 @@
-require "formula"
-
 class Xastir < Formula
   homepage "http://www.xastir.org/"
   url "https://downloads.sourceforge.net/xastir/xastir-2.0.6.tar.gz"
   sha1 "08268961357f69baa0eb833fe76ec1e0ac878151"
+  revision 1
 
   depends_on "proj"
   depends_on "pcre"