<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f8d10c64bde7895fd70509e7488d6e631606f287">https://github.com/macports/macports-ports/commit/f8d10c64bde7895fd70509e7488d6e631606f287</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f8d10c64bde7895fd70509e7488d6e631606f287
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Wed Oct 3 11:17:28 2018 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-matplotlib: use qhull installed by MacPorts
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Currently matplotlib will always use its vendored qhull version, since
</span><span style='display:block; white-space:pre;color:#404040;'>    pkg-config does not find the package installed by MacPorts due to a
</span><span style='display:block; white-space:pre;color:#404040;'>    missing .pc file.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Patch taken from:
</span><span style='display:block; white-space:pre;color:#404040;'>    https://github.com/fedora-python/matplotlib/commit/5d4c2d0f653cd7b43ecd775693584e0ec8a12ddd
</span>---
 python/py-matplotlib/Portfile               |  3 ++-
 python/py-matplotlib/files/patch-qhull.diff | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/Portfile b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 83f066d..be7b639 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,8 @@ if {${name} ne ${subport}} {
</span> 
     patchfiles-append   patch-setup.cfg.diff \
                         patch-setupext.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-qhull.diff
</span> 
     build.env           PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig"
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-qhull.diff b/python/py-matplotlib/files/patch-qhull.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5b6cbd75
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/files/patch-qhull.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setupext.py.orig       2018-10-03 09:21:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setupext.py    2018-10-03 09:23:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1318,23 +1318,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     def check(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         self.__class__.found_external = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            return self._check_for_pkg_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                'libqhull', 'libqhull/qhull_a.h', min_version='2015.2')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        except CheckFailed as e:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            self.__class__.found_pkgconfig = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            self.__class__.found_external = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            return str(e) + ' Using local copy.'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        return ' Using copy installed by MacPorts.'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     def add_flags(self, ext):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        if self.found_external:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            pkg_config.setup_extension(ext, 'qhull',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                       default_libraries=['qhull'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            ext.include_dirs.insert(0, 'extern')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            if sysconfig.get_config_var('LIBM') == '-lm':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                ext.libraries.extend('m')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        ext.libraries.append('qhull')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class TTConv(SetupPackage):
</span></pre><pre style='margin:0'>

</pre>