<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/36fd4d269a32d180133857f017e8715c7b7abccf">https://github.com/macports/macports-ports/commit/36fd4d269a32d180133857f017e8715c7b7abccf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 36fd4d269a32d180133857f017e8715c7b7abccf
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Tue May 12 19:56:56 2020 +0300

<span style='display:block; white-space:pre;color:#404040;'>    py-magic: update to 0.4.18
</span>---
 python/py-magic/Portfile                    | 16 ++++++----------
 python/py-magic/files/patch-magic.py.diff   | 14 ++++++++++++++
 python/py-magic/files/patch-prefix-lib.diff | 14 --------------
 3 files changed, 20 insertions(+), 24 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-magic/Portfile b/python/py-magic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6d7ca32..cd7a7f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-magic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-magic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,8 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-magic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             0.4.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.rootname     python-magic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             0.4.18
</span> revision            0
 categories-append   devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,26 +23,21 @@ long_description    Determines the mime type of a file using magic \
</span>                     Much like the Unix file(1) program.
 
 homepage            https://github.com/ahupp/python-magic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        pypi:p/python-magic
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname            python-magic-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  ad4925d65a20c56ff8696070ac7afdd824989c29 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    73194
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  54bd572566e60eec7e8b2652ecc6d287ff300d56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  b757db2a5289ea3f1ced9e60f072965243ea43a2221430048fd8cacab17be0ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    11442
</span> 
 if {${name} ne ${subport}} {
     depends_build-append \
                         port:py${python.version}-setuptools
     depends_lib-append  port:file
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles          patch-prefix-lib.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles          patch-magic.py.diff
</span> 
     post-patch {
         reinplace -E "s:__PREFIX__:${prefix}:g" ${worksrcpath}/magic.py
     }
 
     livecheck.type      none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.name      python-magic
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-magic/files/patch-magic.py.diff b/python/py-magic/files/patch-magic.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c3641f1
</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-magic/files/patch-magic.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- magic.py.orig  2020-05-06 05:14:40.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ magic.py       2020-05-12 19:50:40.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,10 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not libmagic or not libmagic._name:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     windows_dlls = ['magic1.dll', 'cygmagic-1.dll', 'libmagic-1.dll', 'msys-magic-1.dll']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                  '/usr/local/lib/libmagic.dylib'] +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                       # Assumes there will only be one version installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                       glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'),  # flake8:noqa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    platform_to_lib = {'darwin': ['__PREFIX__/lib/libmagic.dylib'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        'win32': windows_dlls,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        'cygwin': windows_dlls,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        'linux': ['libmagic.so.1'],  # fallback for some Linuxes (e.g. Alpine) where library search does not work # flake8:noqa
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-magic/files/patch-prefix-lib.diff b/python/py-magic/files/patch-prefix-lib.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2fdbbaa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-magic/files/patch-prefix-lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- magic.py.orig  2016-07-08 15:21:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ magic.py       2016-07-08 15:22:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,10 +155,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not libmagic or not libmagic._name:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     windows_dlls = ['magic1.dll','cygmagic-1.dll']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                                  '/usr/local/lib/libmagic.dylib'] +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                         # Assumes there will only be one version installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                         glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    platform_to_lib = {'darwin': ['__PREFIX__/lib/libmagic.dylib'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        'win32': windows_dlls,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        'cygwin': windows_dlls }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     for dll in platform_to_lib.get(sys.platform, []):
</span></pre><pre style='margin:0'>

</pre>