commit 7aed6f67d0653267a7c8e7bd1c2dd221f624369a
Author: Tom Hughes <tom@compton.nu>
Date:   Mon Nov 23 00:12:59 2015 +0000

    Patch out attempts to clone various dependencies

diff --git a/Makefile b/Makefile
index 95096ee..343a04a 100755
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,29 @@
-GYP_REVISION=3464008
-
 SSE_MATH ?= true
 
 default: release
 
-mason_packages/.link/bin:
-	SKIP_MAPNIK_INSTALL=YES ./install_mason.sh
-
-mason_packages/.link/bin/mapnik-config:
-	./install_mason.sh
-
 pre_build_check:
 	@echo "Looking for mapnik-config on your PATH..."
 	mapnik-config -v
 
-./deps/gyp:
-	git clone https://chromium.googlesource.com/external/gyp.git ./deps/gyp && cd ./deps/gyp && git checkout $(GYP_REVISION)
-
-build/Makefile: pre_build_check ./deps/gyp gyp/build.gyp test/*
-	deps/gyp/gyp gyp/build.gyp -Denable_sse=$(SSE_MATH) --depth=. -DMAPNIK_PLUGINDIR=\"$(shell mapnik-config --input-plugins)\" -Goutput_dir=. --generator-output=./build -f make
+build/Makefile: pre_build_check gyp/build.gyp test/*
+	gyp gyp/build.gyp -Denable_sse=$(SSE_MATH) --depth=. -DMAPNIK_PLUGINDIR=\"$(shell mapnik-config --input-plugins)\" -Goutput_dir=. --generator-output=./build -f make
 	$(MAKE) -C build/ V=$(V)
 
-release: mason_packages/.link/bin/mapnik-config Makefile
-	CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 $(CXXFLAGS)" $(MAKE) release_base
+release: Makefile
+	$(MAKE) release_base
 
-debug: mason_packages/.link/bin/mapnik-config Makefile
-	CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 $(CXXFLAGS)" $(MAKE) debug_base
+debug: Makefile
+	$(MAKE) debug_base
 
 # note: we set PATH to the mason bins to pick up protoc
 # and CXXFLAGS/LDFLAGS to find protobuf headers/libs
 # This will only find mason installed mapnik-config if run via the `release` or `debug` targets
-release_base: mason_packages/.link/bin Makefile
-	CXXFLAGS="-isystem `pwd`/mason_packages/.link/include $(CXXFLAGS)" \
-	 LDFLAGS="-L`pwd`/mason_packages/.link/lib $(LDFLAGS)" \
-	 PATH="`pwd`/mason_packages/.link/bin/:${PATH}" \
-	 BUILDTYPE=Release $(MAKE) build/Makefile
-
-debug_base: mason_packages/.link/bin Makefile
-	CXXFLAGS="-isystem `pwd`/mason_packages/.link/include $(CXXFLAGS)" \
-	 LDFLAGS="-L`pwd`/mason_packages/.link/lib $(LDFLAGS)" \
-	 PATH="`pwd`/mason_packages/.link/bin/:${PATH}" \
-	 BUILDTYPE=Debug $(MAKE) build/Makefile
+release_base: Makefile
+	BUILDTYPE=Release $(MAKE) build/Makefile
+
+debug_base: Makefile
+	BUILDTYPE=Debug $(MAKE) build/Makefile
 
 test/geometry-test-data/README.md:
 	git submodule update --init
diff --git a/gyp/build.gyp b/gyp/build.gyp
index a74cf3f..cfd921d 100644
--- a/gyp/build.gyp
+++ b/gyp/build.gyp
@@ -61,7 +61,8 @@
       },
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)/'
+          '<(SHARED_INTERMEDIATE_DIR)/',
+          '/usr/include/protozero'
         ],
         'libraries':[
           '-lprotobuf-lite'
@@ -95,6 +96,9 @@
       'cflags_cc' : [
           '<!@(mapnik-config --cflags)'
       ],
+      'include_dirs': [
+        '/usr/include/protozero'
+      ],
       'xcode_settings': {
         'OTHER_CPLUSPLUSFLAGS':[
            '<!@(mapnik-config --cflags)'
@@ -102,7 +106,8 @@
       },
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)/'
+          '<(SHARED_INTERMEDIATE_DIR)/',
+          '/usr/include/protozero'
         ],
         'defines' : [
           "<@(common_defines)"
@@ -144,6 +149,7 @@
       ],
       "include_dirs": [
         "../src",
+        '/usr/include/protozero',
         '../test',
         '../test/utils'
       ]
@@ -166,6 +172,7 @@
       ],
       "include_dirs": [
         "../src",
+        '/usr/include/protozero'
       ]
     },
     {
@@ -186,6 +193,7 @@
       ],
       "include_dirs": [
         "../src",
+        '/usr/include/protozero'
       ]
     },
     {