apply sf patches 2830233 and 2823885 for osx setup and 64 bit; thanks Michiel

jdh2358 · jdh2358 · commit 563a37664a84 · 2009-07-31T15:32:11.000Z
svn path=/branches/v0_99_maint/; revision=7323
diff --git a/release/osx/Makefile b/release/osx/Makefile
@@ -2,7 +2,7 @@ SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
 FREETYPEVERSION=2.3.7
-MPLVERSION=0.98.5.3
+MPLVERSION=0.99.0.rc1
 MPLSRC=matplotlib-${MPLVERSION}
 MACOSX_DEPLOYMENT_TARGET=10.4
 
diff --git a/setupext.py b/setupext.py
@@ -51,7 +51,7 @@
     'linux'  : ['/usr/local', '/usr',],
     'cygwin' : ['/usr/local', '/usr',],
     'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
-                '/usr', '/sw', '/usr/X11R6'],
+                '/usr', '/sw'],
     'freebsd4' : ['/usr/local', '/usr'],
     'freebsd5' : ['/usr/local', '/usr'],
     'freebsd6' : ['/usr/local', '/usr'],
diff --git a/src/_macosx.m b/src/_macosx.m
