From d7d69ebea2d35cf0359526628f113e90212c4494 Mon Sep 17 00:00:00 2001
From: xiron <dliepelt@gmx.net>
Date: Fri, 25 May 2012 17:23:28 +0300
Subject: [PATCH] Update for building matplotlib under Mac OS X 10.7 Lion and
 XCode > 4.2

---
 make.osx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/make.osx b/make.osx
index 8e4561ac42c8..29e7655d41fa 100644
--- a/make.osx
+++ b/make.osx
@@ -1,13 +1,13 @@
 # -*- makefile -*-
 # build mpl into a local install dir with
-# make -f make.osx PREFIX=/Users/jdhunter/dev PYVERSION=2.6 fetch deps mpl_install
+# make -f make.osx PREFIX=/Users/jdhunter/dev PYVERSION=2.7 fetch deps mpl_install
 # (see README.osx for more details)
 
 MPLVERSION=1.1.0
-PYVERSION=2.6
+PYVERSION=2.7
 PYTHON=python${PYVERSION}
-MACOSX_DEPLOYMENT_TARGET=10.6
-OSX_SDK_VER=10.6
+MACOSX_DEPLOYMENT_TARGET=10.7
+OSX_SDK_VER=10.7
 ARCH_FLAGS?=-arch i386 -arch x86_64
 
 # Dependency versions and URLs
@@ -25,17 +25,17 @@ ZLIBURL=http://sourceforge.net/projects/libpng/files/zlib/${ZLIBVERSION}/${ZLIBF
 
 PNGFILE=libpng-${PNGVERSION}.tar.gz
 PNGDIR=$(basename $(basename ${PNGFILE}))
-PNGURL=http://sourceforge.net/projects/libpng/files/libpng15/older-releases/${PNGVERSION}/${PNGFILE}/download
+PNGURL=http://sourceforge.net/projects/libpng/files/libpng15/${PNGVERSION}/${PNGFILE}/download
 
 FREETYPEFILE=freetype-${FREETYPEVERSION}.tar.bz2
 FREETYPEDIR=$(basename $(basename ${FREETYPEFILE}))
-FREETYPEURL=http://download.savannah.gnu.org/releases/freetype/${FREETYPEFILE}
+FREETYPEURL=http://sourceforge.net/projects/freetype/files/freetype2/${FREETYPEVERSION}/${FREETYPEFILE}/download
 
 ## You shouldn't need to configure past this point
 
 export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
-export CFLAGS=${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk
-export LDFLAGS=${ARCH_FLAGS} -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk
+export CFLAGS=${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk
+export LDFLAGS=${ARCH_FLAGS} -L${PREFIX}/lib -syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk
 export MACOSX_DEPLOYMENT_TARGET
 
 help: