Python 2.x and 3.x support

New `depends_on :python` Dependency.
New `depends_on :python3` Dependency.

To avoid having multiple formulae with endings -py2 and -py3,
we will handle support for different pythons (2.x vs. 3.x)
in the same formula.
Further brewed vs. external python will be transparently supported.

The formula also gets a new object `python`, which is false if
no Python is available or the user has disabled it. Otherwise
it is defined and provides several support methods:

python.site_packages # the site-packages in the formula's Cellar
python.global_site_packages
python.binary # the full path to the python binary
python.prefix
python.version
python.version.major
python.version.minor
python.xy # => e.g. "python2.7"
python.incdir # includes of python
python.libdir # the python dylib library
python.pkg_config_path # used internally by brew
python.from_osx?
python.framework?
python.universal?
python.pypy?
python.standard_caveats # Text to set PYTHONPATH for python.from_osx?
python.if3then3 # => "" for 2.x and to "3" for 3.x.

Further, to avoid code duplication, `python` takes an optional
block that is run twice if the formula defines depends_on
:python AND :python3.

python do
  system python, 'setup.py', "--prefix=#{prefix}"
end

Read more in the Homebrew wiki.

1 files changed, 12 insertions, 5 deletions

diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb
index 9206b87e7..8bbc36ddc 100644
--- a/Library/Formula/mapserver.rb
+++ b/Library/Formula/mapserver.rb
@@ -9,21 +9,21 @@ class Mapserver < Formula
   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
+  depends_on :python => :recommended
+  depends_on 'swig' => :build
   depends_on 'giflib'
   depends_on 'gd' => %w{with-freetype}
   depends_on 'proj'
   depends_on 'gdal'
-
   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'
+  depends_on 'cairo' => :optional
 
   def install
     args = [
@@ -47,6 +47,11 @@ class Mapserver < Formula
 
     args << "--with-fastcgi=#{HOMEBREW_PREFIX}" if build.include? 'with-fastcgi'
 
+    unless MacOS::CLT.installed?
+      inreplace 'configure', "_JTOPDIR=`echo \"$_ACJNI_FOLLOWED\" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`",
+                             "_JTOPDIR='#{MacOS.sdk_path}/System/Library/Frameworks/JavaVM.framework/Headers'"
+    end
+
     system "./configure", *args
     system "make"
 
@@ -54,9 +59,11 @@ class Mapserver < Formula
     install_args << "PHP_EXT_DIR=#{prefix}" if build.include? 'with-php'
     system "make", "install", *install_args
 
-    if build.include? 'with-python'
+    python do
       cd 'mapscript/python' do
-        system "python", "setup.py", "install"
+        system python, "setup.py", "install", "--prefix=#{prefix}",
+                                   "--single-version-externally-managed",
+                                   "--record=installed-files.txt"
       end
     end
   end