mapserver 6.2.0

* Removed patch
* make install now works, so remove manual bin installation
* Add python option

TODOs:

* Add custom PHPs rather than hardcoding to system
* Add other language bindings

Fixes #17933.

1 files changed, 17 insertions, 48 deletions

diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb
index b9b8b6c5c..2a857ff28 100644
--- a/Library/Formula/mapserver.rb
+++ b/Library/Formula/mapserver.rb
@@ -2,13 +2,17 @@ require 'formula'
 
 class Mapserver < Formula
   homepage 'http://mapserver.org/'
-  url 'http://download.osgeo.org/mapserver/mapserver-6.0.3.tar.gz'
-  sha1 'd7aa1041c6d9a46da7f5e29ae1b66639d5d050ab'
+  url 'http://download.osgeo.org/mapserver/mapserver-6.2.0.tar.gz'
+  sha1 '3aafa2c8367580bffcac8c53ec41b37cabaa2f82'
 
   option "with-fastcgi", "Build with fastcgi support"
   option "with-geos", "Build support for GEOS spatial operations"
   option "with-php", "Build PHP MapScript module"
   option "with-postgresql", "Build support for PostgreSQL as a data source"
+  option "with-python", "Build Python MapScript module"
+
+  # to find custom python
+  env :userpaths
 
   depends_on :freetype
   depends_on :libpng
@@ -17,18 +21,10 @@ class Mapserver < Formula
   depends_on 'proj'
   depends_on 'gdal'
 
-  depends_on 'geos' if build.include? 'with-geos'
+  depends_on 'geos' => :optional
   depends_on 'postgresql' if build.include? 'with-postgresql' and not MacOS.version >= :lion
   depends_on 'fcgi' if build.include? 'with-fastcgi'
 
-  def patches
-    # Fix clang compilation issue, remove on future release
-    # See http://trac.osgeo.org/mapserver/changeset/12809
-    # Fix msGetMarkerSize() called on unloaded pixmap symbol
-    # https://github.com/mapserver/mapserver/issues/4225
-    DATA
-  end
-
   def install
     args = [
       "--prefix=#{prefix}",
@@ -37,8 +33,8 @@ class Mapserver < Formula
       "--with-ogr",
     ]
 
-    args << "--with-geos" if build.include? 'with-geos'
-    args << "--with-php=/usr/include/php" if build.include? 'with-php'
+    args << "--with-geos" if build.with? 'geos'
+    args << "--with-php=/usr/bin/php-config" if build.include? 'with-php'
 
     if build.include? 'with-postgresql'
       if MacOS.version >= :lion # Lion ships with PostgreSQL libs
@@ -52,13 +48,15 @@ class Mapserver < Formula
 
     system "./configure", *args
     system "make"
-    libexec.install "mapscriptvars"
-    bin.install %w(mapserv shp2img legend shptree shptreevis
-        shptreetst scalebar sortshp tile4ms
-        msencrypt mapserver-config)
 
-    if build.include? 'with-php'
-      prefix.install %w(mapscript/php/php_mapscript.so)
+    install_args = []
+    install_args << "PHP_EXT_DIR=#{prefix}" if build.include? 'with-php'
+    system "make", "install", *install_args
+
+    if build.include? 'with-python'
+      cd 'mapscript/python' do
+        system "python", "setup.py", "install"
+      end
     end
   end
 
@@ -77,32 +75,3 @@ class Mapserver < Formula
     system "#{bin}/mapserver-config", "--version"
   end
 end
-
-__END__
-diff --git a/renderers/agg/include/agg_renderer_outline_aa.h b/renderers/agg/include/agg_renderer_outline_aa.h
-index 5ff3f20..7a14588 100644
---- a/renderers/agg/include/agg_renderer_outline_aa.h
-+++ b/renderers/agg/include/agg_renderer_outline_aa.h
-@@ -1365,7 +1365,6 @@ namespace mapserver
-         //---------------------------------------------------------------------
-         void profile(const line_profile_aa& prof) { m_profile = &prof; }
-         const line_profile_aa& profile() const { return *m_profile; }
--        line_profile_aa& profile() { return *m_profile; }
-
-         //---------------------------------------------------------------------
-         int subpixel_width() const { return m_profile->subpixel_width(); }
-diff --git a/mapsymbol.c b/mapsymbol.c
-index 164a0ac..f9dcb20 100644
---- a/mapsymbol.c
-+++ b/mapsymbol.c
-@@ -601,6 +601,10 @@ int msGetMarkerSize(symbolSetObj *symbolset, styleObj *style, int *width, int *h
-   }
-
-   symbol = symbolset->symbol[style->symbol];
-+  if (symbol->type == MS_SYMBOL_PIXMAP && !symbol->pixmap_buffer) {
-+    if (MS_SUCCESS != msPreloadImageSymbol(MS_MAP_RENDERER(symbolset->map), symbol))
-+        return MS_FAILURE;
-+  }
-   if(style->size == -1) {
-       size = MS_NINT( msSymbolGetDefaultSize(symbol) * scalefactor );
-   }