<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/75902bac3770b3c997dd2545253a947b5c58f82a">https://github.com/macports/macports-ports/commit/75902bac3770b3c997dd2545253a947b5c58f82a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 75902bac3770b3c997dd2545253a947b5c58f82a
</span>Author: Davide Liessi <davide.liessi@gmail.com>
AuthorDate: Wed Aug 8 09:35:49 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> frescobaldi: upgrade devel port; add frescobaldi2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - upgrade frescobaldi-devel to version 3 (current master)
</span><span style='display:block; white-space:pre;color:#404040;'> - add subport frescobaldi2 @2.20.0 (currently the same as frescobaldi)
</span><span style='display:block; white-space:pre;color:#404040;'> - frescobaldi-devel replaced_by frescobaldi2 where Qt 5 cannot run
</span><span style='display:block; white-space:pre;color:#404040;'> - use Python 3.7 for frescobaldi-devel and frescobaldi2
</span>---
editors/frescobaldi/Portfile | 68 +++++++++++++++++++++++++++++++++++++-------
1 file changed, 58 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/frescobaldi/Portfile b/editors/frescobaldi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d84dfaf..cef35de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/frescobaldi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/frescobaldi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span>
github.setup wbsoft frescobaldi 2.20.0 v
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts frescobaldi-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ${name}-devel ${name}2
</span> categories editors python
maintainers {gmail.com:davide.liessi @dliessi} openmaintainer
description A LilyPond sheet music text editor
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,26 +18,74 @@ homepage http://www.frescobaldi.org/
</span> platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# frescobaldi-devel points to a specific commit and not to a release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {"${name}-devel" ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
checksums rmd160 27f121545cc7efe6a2b10fa69490a5714655f729 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c3d7faab7b21ddbab98749751a94d0a848138a800b0ae744f0ec94000b459ae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c3d7faab7b21ddbab98749751a94d0a848138a800b0ae744f0ec94000b459ae4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4478977
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup wbsoft ${name} 8e43f2f01cf56803a8c10b98d8787f97015895a0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name} ${name}2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180806
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set devel_version 3.0.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport frescobaldi-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts frescobaldi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20170217
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set devel_version 2.20.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e79fb399116910fe15df5f449b495e7f0ab39165 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 38e9f0f003316b70a1d11623087bd903d4f600e46930c757cedbf572979434f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8501726
</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;'>+subport ${name}2 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name} ${name}-devel
</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;'>+# remove this block after 8 August 2019
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"${name}-devel" eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170217
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${long_description} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n\nFrescobaldi 3 requires Qt 5, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ which is not supported on your system. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You may install Frescobaldi 2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (i.e., the port ${name}2) instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"${name}2" eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # don't conflict with frescobaldi-devel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allowing replaced_by to act as expected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
depends_run-append port:portmidi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# keep Python 3.5 for frescobaldi until next version update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to avoid unnecessary building of py37-pyqt4 on user machine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (the next version of frescobaldi will depend on py37-pyqt5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_build-append port:py${python.version}-setuptools
depends_lib-append port:py${python.version}-ly
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-poppler-qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {"${name}-devel" eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:py${python.version}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-poppler-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants py${python.version}-pyqt5 webkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-poppler-qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant app description {Make application bundle} {
depends_build-append port:py${python.version}-py2app
</pre><pre style='margin:0'>
</pre>