<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e83d2120c3dd3ba75adae4be3902a9659a04b92b">https://github.com/macports/macports-ports/commit/e83d2120c3dd3ba75adae4be3902a9659a04b92b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e83d212 py-libnacl: use full path to libsodium
</span>e83d212 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e83d2120c3dd3ba75adae4be3902a9659a04b92b
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 8 14:22:56 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> py-libnacl: use full path to libsodium
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://lists.macports.org/pipermail/macports-dev/2019-February/040098.html
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also simplify portfile a bit.
</span>---
python/py-libnacl/Portfile | 16 +++++++++-------
python/py-libnacl/files/libsodium-path.patch | 11 +++++++++++
2 files changed, 20 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-libnacl/Portfile b/python/py-libnacl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cb7fbfc..58022bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-libnacl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-libnacl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,16 +11,14 @@ platforms darwin
</span> maintainers nomaintainer
license Apache-2
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# changing distname is not necessary, remove next version
</span> distname v1.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Libnacl is a Python binding for the libsodium NaCl crypto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Python binding for libsodium
</span>
long_description Libnacl is a Python binding for the libsodium NaCl crypto \
library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://github.com/saltstack/libnacl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> python.versions 27 34 35 36
checksums rmd160 573c6d621926268a478518c0c03080d58cccf8ae \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +26,11 @@ checksums rmd160 573c6d621926268a478518c0c03080d58cccf8ae \
</span>
if {${name} ne ${subport}} {
depends_lib port:py${python.version}-setuptools \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-six
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsodium
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:libsodium
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles libsodium-path.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/libnacl/__init__.py
</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;color:#808080;'>diff --git a/python/py-libnacl/files/libsodium-path.patch b/python/py-libnacl/files/libsodium-path.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e9169df
</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-libnacl/files/libsodium-path.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libnacl/__init__.py.orig 2014-11-03 16:03:12.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libnacl/__init__.py 2019-02-08 14:09:29.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise OSError(msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif sys.platform.startswith('darwin'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return ctypes.cdll.LoadLibrary('libsodium.dylib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ctypes.cdll.LoadLibrary('__PREFIX__/lib/libsodium.dylib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except OSError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span></pre><pre style='margin:0'>
</pre>