[150008] trunk/dports/python/py-magic

[raimue at macports.org]

Revision: 150008
          https://trac.macports.org/changeset/150008
Author:   raimue at macports.org
Date:     2016-07-08 06:33:35 -0700 (Fri, 08 Jul 2016)
Log Message:
-----------
python/py-magic:
Ensure use of libmagic from the same prefix as this installation by hardcoding the path

Modified Paths:
--------------
    trunk/dports/python/py-magic/Portfile

Added Paths:
-----------
    trunk/dports/python/py-magic/files/
    trunk/dports/python/py-magic/files/patch-prefix-lib.diff

Modified: trunk/dports/python/py-magic/Portfile
===================================================================
--- trunk/dports/python/py-magic/Portfile	2016-07-08 13:28:25 UTC (rev 150007)
+++ trunk/dports/python/py-magic/Portfile	2016-07-08 13:33:35 UTC (rev 150008)
@@ -6,7 +6,7 @@
 
 name                py-magic
 version             0.4.12
-revision            0
+revision            1
 categories-append   devel
 platforms           darwin
 license             MIT
@@ -30,6 +30,12 @@
 checksums           rmd160  069b43895b328efffcfebba0de9d5c82d89613f7 \
                     sha256  a04b20900100884d4fce40a767182a16fcb9d10756c67cdc21f5fa610b7c9d3c
 
+patchfiles          patch-prefix-lib.diff
+
+post-patch {
+    reinplace -E "s:__PREFIX__:${prefix}:g" ${worksrcpath}/magic.py
+}
+
 if {${name} ne ${subport}} {
     depends_build-append \
                         port:py${python.version}-setuptools

Added: trunk/dports/python/py-magic/files/patch-prefix-lib.diff
===================================================================
--- trunk/dports/python/py-magic/files/patch-prefix-lib.diff	                        (rev 0)
+++ trunk/dports/python/py-magic/files/patch-prefix-lib.diff	2016-07-08 13:33:35 UTC (rev 150008)
@@ -0,0 +1,14 @@
+--- magic.py.orig	2016-07-08 15:21:36.000000000 +0200
++++ magic.py	2016-07-08 15:22:02.000000000 +0200
+@@ -155,10 +155,7 @@
+
+ if not libmagic or not libmagic._name:
+     windows_dlls = ['magic1.dll','cygmagic-1.dll']
+-    platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib',
+-                                  '/usr/local/lib/libmagic.dylib'] +
+-                         # Assumes there will only be one version installed
+-                         glob.glob('/usr/local/Cellar/libmagic/*/lib/libmagic.dylib'),
++    platform_to_lib = {'darwin': ['__PREFIX__/lib/libmagic.dylib'],
+                        'win32': windows_dlls,
+                        'cygwin': windows_dlls }
+     for dll in platform_to_lib.get(sys.platform, []):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160708/53f0edc3/attachment.html>