<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2a8a83e59e4c3fe34d3cad98ece85f9e2f5e4c52">https://github.com/macports/macports-ports/commit/2a8a83e59e4c3fe34d3cad98ece85f9e2f5e4c52</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2a8a83e59e4c3fe34d3cad98ece85f9e2f5e4c52
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Sep 26 15:14:27 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> gramps: add py310; drop py37
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62216
</span>---
genealogy/gramps/Portfile | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/genealogy/gramps/Portfile b/genealogy/gramps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cb6d8d89a26..8d604b54008 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/genealogy/gramps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/genealogy/gramps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup python 1.0
</span> PortGroup app 1.1
github.setup gramps-project gramps 5.1.5 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> github.tarball_from archive
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,12 +29,12 @@ depends_build-append \
</span> port:intltool
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/dot:graphviz \
</span> port:desktop-file-utils \
port:geocode-glib \
port:gexiv2 \
port:ghostscript \
port:goocanvas2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/dot:graphviz \
</span> path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
port:gtkspell3 \
port:osm-gps-map \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,29 +50,36 @@ patchfiles-append \
</span> proc py_setup {py_ver} {
python.default_version \
${py_ver}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append \
port:py${py_ver}-bsddb3 \
port:py${py_ver}-gobject3 \
port:py${py_ver}-Pillow \
port:py${py_ver}-pyicu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python38 python39 description {Use Python 3.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- py_setup 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver}-jsonschema \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver}-lxml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python37 python39 description {Use Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python39 python310 description {Use Python 3.8} {
</span> py_setup 38
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python37 python38 description {Use Python 3.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python38 python310 description {Use Python 3.9} {
</span> py_setup 39
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python37] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python38] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python39]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python38 python39 description {Use Python 3.10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup 310
</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;background:#e0ffe0;'>+if {![variant_isset python38] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python39] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python310
</span> }
# Dummy variants, to ensure user's choice cascades to dependencies
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,6 +99,7 @@ if {![variant_isset quartz] && ![variant_isset x11]} {
</span> post-destroot {
reinplace "s|${destroot}${python.prefix}|${prefix}|" \
${destroot}${python.pkgd}/gramps/gen/utils/resource-path
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> delete ${destroot}${prefix}/share
move ${destroot}${python.prefix}/share ${destroot}${prefix}
}
</pre><pre style='margin:0'>
</pre>