<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/143252e38c7371084ab162712f7ef4d967503c17">https://github.com/macports/macports-ports/commit/143252e38c7371084ab162712f7ef4d967503c17</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 143252e38c7371084ab162712f7ef4d967503c17
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Oct 16 13:01:39 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> notmuch: Add optional build deps
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> notmuch looks for bash-completion, doxygen, and texinfo at configure
</span><span style='display:block; white-space:pre;color:#404040;'> time, building and installing extra files if they're present, so add
</span><span style='display:block; white-space:pre;color:#404040;'> those deps.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix python version. This ensures that sphinx is available to the build,
</span><span style='display:block; white-space:pre;color:#404040;'> which causes the manpages to be built and installed. So that the python
</span><span style='display:block; white-space:pre;color:#404040;'> version of the deps and the python version used by the build can't get
</span><span style='display:block; white-space:pre;color:#404040;'> out of sync again, define a python version variable that's used
</span><span style='display:block; white-space:pre;color:#404040;'> everywhere.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Disable installation of desktop file. The desktop file would have been
</span><span style='display:block; white-space:pre;color:#404040;'> installed opportunistically if the desktop-file-utils port was active.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since the installed files change, increase revision.
</span>---
mail/notmuch/Portfile | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/notmuch/Portfile b/mail/notmuch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc3110a56e3..bd4f8daa605 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/notmuch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/notmuch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,8 @@ PortGroup conflicts_build 1.0
</span>
name notmuch
version 0.31
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories mail
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,16 +26,22 @@ checksums rmd160 fb81323f925597cd6dbcb7bc555138d4ed492e40 \
</span> sha256 571fa0e1539c86612b1f2b2c80a398e08ecfef52e27ef7e48cf8e3b84fa18394 \
size 713144
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-cffi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sphinx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sphinxcontrib-applehelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sphinxcontrib-devhelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sphinxcontrib-htmlhelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sphinxcontrib-jsmath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sphinxcontrib-qthelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-sphinxcontrib-serializinghtml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. {}} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:bash-completion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-cffi \
</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}-sphinxcontrib-applehelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-sphinxcontrib-devhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-sphinxcontrib-htmlhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-sphinxcontrib-jsmath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-sphinxcontrib-qthelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-sphinxcontrib-serializinghtml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texinfo
</span>
depends_lib port:gmime3 \
port:gpgme \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,14 +52,15 @@ depends_lib port:gmime3 \
</span> conflicts_build ${name} xcbuild
configure.args --with-docs \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-desktop \
</span> --without-emacs \
--without-ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${python_branch}
</span>
# Add path to sphinx-build
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=${frameworks_dir}/Python.framework/Versions/3.7/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/bin:$env(PATH) \
</span> TMPDIR=/tmp
build.env-append {*}${configure.env}
destroot.env-append {*}${configure.env}
</pre><pre style='margin:0'>
</pre>