<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/fa21d920b477c3003e6ebbce7575e9cbc3cea06d">https://github.com/macports/macports-ports/commit/fa21d920b477c3003e6ebbce7575e9cbc3cea06d</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 fa21d92 borgbackup: update to 1.1.6, fix build issues
</span>fa21d92 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fa21d920b477c3003e6ebbce7575e9cbc3cea06d
</span>Author: Loic Pefferkorn <loic-github@loicp.eu>
AuthorDate: Fri Jul 27 11:43:34 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> borgbackup: update to 1.1.6, fix build issues
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update from 1.0.11 to 1.1.6
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix build issue with Python msgpack using unreleased patch
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix documentation build issue (use existing Sphinx theme)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55383
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56868
</span>---
sysutils/borgbackup/Portfile | 26 ++++++++++++++++++--------
sysutils/borgbackup/files/patch-msgpack.diff | 12 ++++++++++++
2 files changed, 30 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/borgbackup/Portfile b/sysutils/borgbackup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fcf3b8..5554a5a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/borgbackup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/borgbackup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name borgbackup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.6
</span> categories sysutils
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,29 +23,39 @@ long_description BorgBackup (short: Borg) is a deduplicating backup \
</span> homepage https://borgbackup.github.io/
master_sites pypi:b/borgbackup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cd2391b7a3d6fe1c9e096047063caea76739cd46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fc6efd2d19454625532e0defac90cd8e8737665e10ae59edb15356ee5a99d291
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f13b9a2428980b60c329431bb6c6a1170b1a0db2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a1d2e474c85d3ad3d59b3f8209b5549653c88912082ea0159d27a2e80c910930 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3441523
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# borgbackup requires Python 3 >= 3.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-msgpack.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 36
</span>
depends_build-append port:py${python.version}-setuptools_scm \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sphinx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sphinx_rtd_theme
</span> depends_lib-append path:lib/libssl.dylib:openssl \
port:lz4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-llfuse \
</span> port:py${python.version}-msgpack \
port:py${python.version}-setuptools
post-build {
reinplace "s|sphinx-build|sphinx-build-${python.branch}|g" \
${worksrcpath}/docs/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "make -C ${worksrcpath}/docs man READTHEDOCS=True"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|guzzle_sphinx_theme|sphinx_rtd_theme|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/docs/conf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|sphinx_rtd_theme.html_theme_path()|sphinx_rtd_theme.get_html_theme_path()|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/docs/conf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "make -C ${worksrcpath}/docs man singlehtml"
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${destroot}${prefix}/share/doc/${name}/html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xinstall -m 0644 ${worksrcpath}/docs/_build/man/borg.1 \
${destroot}${prefix}/share/man/man1/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy {*}[glob ${workpath}/${distname}/docs/_build/singlehtml/*] ${docdir}
</span> }
livecheck.type pypi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/borgbackup/files/patch-msgpack.diff b/sysutils/borgbackup/files/patch-msgpack.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..89c0b60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/borgbackup/files/patch-msgpack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we are rather picky about msgpack versions, because a good working msgpack is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # very important for borg, see https://github.com/borgbackup/borg/issues/3753
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # best versions seem to be 0.4.6, 0.4.7, 0.4.8 and 0.5.6:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'msgpack-python >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.5',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'msgpack-python >=0.4.6, <0.5;python_version=="3.4"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'msgpack >=0.5.6;python_version >="3.5"',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if you can't satisfy the above requirement, these are versions that might
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # also work ok, IF you make sure to use the COMPILED version of msgpack-python,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOT the PURE PYTHON fallback implementation: ==0.5.1, ==0.5.4
</span></pre><pre style='margin:0'>
</pre>