SF.net SVN: matplotlib:[7328] branches/v0_99_maint

[<jd...@us...>]

Revision: 7328
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7328&view=rev
Author:   jdh2358
Date:     2009-08-01 17:37:26 +0000 (Sat, 01 Aug 2009)

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

Modified Paths:
--------------
    branches/v0_99_maint/doc/_templates/index.html
    branches/v0_99_maint/doc/users/installing.rst
    branches/v0_99_maint/setupext.py

Modified: branches/v0_99_maint/doc/_templates/index.html
===================================================================
--- branches/v0_99_maint/doc/_templates/index.html	2009-07-31 18:55:17 UTC (rev 7327)
+++ branches/v0_99_maint/doc/_templates/index.html	2009-08-01 17:37:26 UTC (rev 7328)
@@ -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

Modified: branches/v0_99_maint/doc/users/installing.rst
===================================================================
--- branches/v0_99_maint/doc/users/installing.rst	2009-07-31 18:55:17 UTC (rev 7327)
+++ branches/v0_99_maint/doc/users/installing.rst	2009-08-01 17:37:26 UTC (rev 7328)
@@ -114,7 +114,8 @@
 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 @@
 
 
 
+.. _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.  
+  
\ No newline at end of file

Modified: branches/v0_99_maint/setupext.py
===================================================================
--- branches/v0_99_maint/setupext.py	2009-07-31 18:55:17 UTC (rev 7327)
+++ branches/v0_99_maint/setupext.py	2009-08-01 17:37:26 UTC (rev 7328)
@@ -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'],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.