mapnik updates

- new download link for mapnik 2.0.0 - and tweaks to avoid needing
   external scons and to properly set the CC/CXX/JOBS so that the mapnik
   build scripts will pick them up

Closes Homebrew/homebrew#8177.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

Formula/mapnik.rb

@@ -1,13 +1,12 @@
 require 'formula'
 
 class Mapnik < Formula
-  url 'http://download.berlios.de/mapnik/mapnik-2.0.0.tar.gz'
+  url 'https://github.com/downloads/mapnik/mapnik/mapnik-2.0.0.tar.bz2'
+  md5 '499c6a61544014b9bc2a7c978f963ef3'
   homepage 'http://www.mapnik.org/'
-  md5 '3b0dacbf98f24dbcf113c6f4b1d7f0c8'
-  head 'http://svn.mapnik.org/trunk', :using => :svn
+  head 'https://github.com/mapnik/mapnik.git'
 
   depends_on 'pkg-config' => :build
-  depends_on 'scons' => :build
   depends_on 'libtiff'
   depends_on 'jpeg'
   depends_on 'proj'
@@ -19,9 +18,17 @@ class Mapnik < Formula
     ENV.x11 # for freetype-config
 
     icu = Formula.factory("icu4c")
-    system "scons",
-        "PREFIX=#{prefix}",
-        "ICU_INCLUDES=#{icu.include}", "ICU_LIBS=#{icu.lib}",
-        "install"
+    system "python",
+           "scons/scons.py",
+           "configure",
+           "CC=\"#{ENV.cc}\"",
+           "CXX=\"#{ENV.cxx}\"",
+           "JOBS=#{ENV.make_jobs}",
+           "PREFIX=#{prefix}",
+           "ICU_INCLUDES=#{icu.include}",
+           "ICU_LIBS=#{icu.lib}"
+    system "python",
+           "scons/scons.py",
+           "install"
   end
 end