aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDane Springmeyer2011-10-18 13:48:00 -0700
committerJack Nagel2012-02-01 19:01:45 -0600
commit38dbdd91e556172c81af23f7fe8dcdd50ec4ebea (patch)
treef2623271ddb933f81c5d8a118ee80bd5f957e7c3
parentd7e4fd45eab1904cafa8dd6c11985fd08cb4999e (diff)
downloadhomebrew-38dbdd91e556172c81af23f7fe8dcdd50ec4ebea.tar.bz2
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 #8177. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
-rw-r--r--Library/Formula/mapnik.rb23
1 files changed, 15 insertions, 8 deletions
diff --git a/Library/Formula/mapnik.rb b/Library/Formula/mapnik.rb
index 7fcbdccc5..a3109f007 100644
--- a/Library/Formula/mapnik.rb
+++ b/Library/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