Applied Michiel's sf patch 2823885 to remove the /usr/X11R6 dirs from darwin

jdh2358 · jdh2358 · commit 82d4ef240913 · 2009-08-01T17:37:26.000Z
svn path=/branches/v0_99_maint/; revision=7328
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -3,7 +3,7 @@
 
 
 {% block body %}
-  <h1>Welcome</h1>
+  <h1>mpl</h1>
 
   <p>matplotlib is a python 2D plotting library which produces
   publication quality figures in a variety of hardcopy formats and
diff --git a/doc/users/installing.rst b/doc/users/installing.rst
@@ -114,7 +114,8 @@ Build requirements
 These are external packages which you will need to install before
 installing matplotlib. Windows users only need the first two (python
 and numpy) since the others are built into the matplotlib windows
-installers available for download at the sourceforge site.
+installers available for download at the sourceforge site.  If you are
+building on OSX, see :ref:`build_osx`
 
 :term:`python` 2.4 (or later but not python3)
     matplotlib requires python 2.4 or later (`download <http://www.python.org/download/>`__)
@@ -183,3 +184,19 @@ dateutil 1.1 or later
 
 
 
+.. _build_osx:
+
+Building on OSX
+==================
+
+The build situation on OSX is complicated by the various places one
+can get the png and freetype requirements from (darwinports, fink,
+/usr/X11R6) and the different architectures (x86, ppc, universal) and
+the different OSX version (10.4 and 10.5). We recommend that you build
+the way we do for the OSX release: by grabbing the tarbar or svn
+repository, cd-ing into the release/osx dir, and following the
+instruction in the README.  This directory has a Makefile which will
+automatically grab the zlib, png and freetype dependencies from the
+web, build them with the right flags to make universal libraries, and
+then build the matplotlib source and binary installers.  
+  
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'],
