From 73bbdab346024d7a20e9e0f07ffc305b96a27dcf Mon Sep 17 00:00:00 2001
From: Adam Vandenberg <flangy@gmail.com>
Date: Wed, 26 Feb 2014 19:58:29 -0800
Subject: [PATCH] mapnik: use Formula[]

---
 Formula/mapnik.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Formula/mapnik.rb b/Formula/mapnik.rb
index 17d6b04dc4..f6039d934d 100644
--- a/Formula/mapnik.rb
+++ b/Formula/mapnik.rb
@@ -27,13 +27,13 @@ class Mapnik < Formula
   depends_on 'py2cairo' if build.with? 'cairo'
 
   def install
-    icu = Formula.factory("icu4c").opt_prefix
-    boost = Formula.factory('boost').opt_prefix
-    proj = Formula.factory('proj').opt_prefix
-    jpeg = Formula.factory('jpeg').opt_prefix
-    libpng = Formula.factory('libpng').opt_prefix
-    libtiff = Formula.factory('libtiff').opt_prefix
-    freetype = Formula.factory('freetype').opt_prefix
+    icu = Formula["icu4c"].opt_prefix
+    boost = Formula["boost"].opt_prefix
+    proj = Formula["proj"].opt_prefix
+    jpeg = Formula["jpeg"].opt_prefix
+    libpng = Formula["libpng"].opt_prefix
+    libtiff = Formula["libtiff"].opt_prefix
+    freetype = Formula["freetype"].opt_prefix
 
     # mapnik compiles can take ~1.5 GB per job for some .cpp files
     # so lets be cautious by limiting to CPUS/2
@@ -65,8 +65,8 @@ class Mapnik < Formula
     else
       args << "CAIRO=False"
     end
-    args << "GDAL_CONFIG=#{Formula.factory('gdal').opt_prefix}/bin/gdal-config" if build.with? 'gdal'
-    args << "PG_CONFIG=#{Formula.factory('postgresql').opt_prefix}/bin/pg_config" if build.with? 'postgresql'
+    args << "GDAL_CONFIG=#{Formula["gdal"].opt_prefix}/bin/gdal-config" if build.with? 'gdal'
+    args << "PG_CONFIG=#{Formula["postgresql"].opt_prefix}/bin/pg_config" if build.with? 'postgresql'
 
     system "python", "scons/scons.py", "configure", *args
     system "python", "scons/scons.py", "install"