diff -ruNd matplotlib-1.5.1.orig/lib/matplotlib/font_manager.py matplotlib-1.5.1/lib/matplotlib/font_manager.py
--- matplotlib-1.5.1.orig/lib/matplotlib/font_manager.py	2016-01-10 19:06:08.000000000 -0800
+++ matplotlib-1.5.1/lib/matplotlib/font_manager.py	2016-02-07 12:11:39.000000000 -0800
@@ -138,6 +138,11 @@
     "/Library/Fonts/",
     "/Network/Library/Fonts/",
     "/System/Library/Fonts/",
+    # new XQuartz font location
+    "/opt/X11/share/fonts",
+    "/opt/X11/share/fonts/TTF",
+    # fonts installed via Fink
+    "@PREFIX@/lib/X11/fonts",
     # fonts installed via MacPorts
     "/opt/local/share/fonts"
     ""
diff -ruNd matplotlib-1.5.1.orig/setup.cfg.template matplotlib-1.5.1/setup.cfg.template
--- matplotlib-1.5.1.orig/setup.cfg.template	2016-01-10 18:43:13.000000000 -0800
+++ matplotlib-1.5.1/setup.cfg.template	2016-02-07 12:04:29.000000000 -0800
@@ -57,18 +57,18 @@
 #           otherwise skip silently. This is the default
 #           behavior
 #
-#agg = auto
-#cairo = auto
-#gtk = auto
+agg = True
+cairo = True
+gtk = True
 #gtk3agg = auto
 #gtk3cairo = auto
-#gtkagg = auto
+gtkagg = True
 #macosx = auto
 #pyside = auto
-#qt4agg = auto
-#tkagg = auto
+qt5agg = True
+tkagg = True
 #windowing = auto
-#wxagg = auto
+wxagg = True
 
 [rc_options]
 # User-configurable options
diff -ruNd matplotlib-1.5.1.orig/setup.py matplotlib-1.5.1/setup.py
--- matplotlib-1.5.1.orig/setup.py	2016-01-10 19:06:08.000000000 -0800
+++ matplotlib-1.5.1/setup.py	2016-02-07 12:05:31.000000000 -0800
@@ -220,6 +220,10 @@
     with open('lib/matplotlib/mpl-data/matplotlibrc', 'w') as fd:
         fd.write(template % {'backend': default_backend})
 
+    for mod in ext_modules:
+        mod.include_dirs.append('@PREFIX@/include')
+        mod.library_dirs.append('@PREFIX@/lib')
+
     # Build in verbose mode if requested
     if setupext.options['verbose']:
         for mod in ext_modules:
diff -ruNd matplotlib-1.5.1.orig/setupext.py matplotlib-1.5.1/setupext.py
--- matplotlib-1.5.1.orig/setupext.py	2016-01-10 19:06:08.000000000 -0800
+++ matplotlib-1.5.1/setupext.py	2016-02-07 12:10:49.000000000 -0800
@@ -150,8 +150,8 @@
 
     basedir_map = {
         'win32': ['win32_static', ],
-        'darwin': ['/usr/local/', '/usr', '/usr/X11',
-                   '/opt/X11', '/opt/local'],
+        'darwin': ['@PREFIX@/lib/freetype219', '@PREFIX@',
+                   '/usr', '/usr/X11', '/opt/X11'],
         'sunos5': [os.getenv('MPLIB_BASE') or '/usr/local', ],
         'gnu0': ['/usr'],
         'aix5': ['/usr/local'],
@@ -1003,14 +1003,14 @@
         self.__class__.found_external = True
         try:
             return self._check_for_pkg_config(
-                'qhull', 'qhull/qhull_a.h', min_version='2003.1')
+                'qhull', 'libqhull/qhull_a.h', min_version='2003.1')
         except CheckFailed as e:
             self.__class__.found_pkgconfig = False
             # Qhull may not be in the pkg-config system but may still be
             # present on this system, so check if the header files can be
             # found.
             include_dirs = [
-                os.path.join(x, 'qhull') for x in get_include_dirs()]
+                os.path.join(x, 'libqhull') for x in get_include_dirs()]
             if has_include_file(include_dirs, 'qhull_a.h'):
                 return 'Using system Qhull (version unknown, no pkg-config info)'
             else:
diff -ruNd matplotlib-1.5.1.orig/src/qhull_wrap.c matplotlib-1.5.1/src/qhull_wrap.c
--- matplotlib-1.5.1.orig/src/qhull_wrap.c	2016-01-03 19:45:23.000000000 -0800
+++ matplotlib-1.5.1/src/qhull_wrap.c	2016-02-07 12:14:11.000000000 -0800
@@ -7,7 +7,7 @@
  */
 #include "Python.h"
 #include "numpy/noprefix.h"
-#include "qhull/qhull_a.h"
+#include "libqhull/qhull_a.h"
 #include <stdio.h>