<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f78024168c684d8cab9e3f91e4e40990ca899555">https://github.com/macports/macports-ports/commit/f78024168c684d8cab9e3f91e4e40990ca899555</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f78024168c684d8cab9e3f91e4e40990ca899555
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Thu May 10 18:21:40 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gwenhywfar4: update to v4.20.0 and add gtk3 subports
</span>---
devel/gwenhywfar4/Portfile | 39 ++++++++++++++++++++++++++++++---------
1 file changed, 30 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gwenhywfar4/Portfile b/devel/gwenhywfar4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ffdc3d4..712fe19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gwenhywfar4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gwenhywfar4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,6 @@
</span> PortSystem 1.0
name gwenhywfar4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span> # This port offers the latest stable version (also as a gtk subport)
# as well as the latest beta version as gwenhywfar4-devel!
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +15,9 @@ license {LGPL-2.1 OpenSSLException}
</span> description a utility library required by aqbanking and related software
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www2.aquamaniac.de/sites/aqbanking/index.php
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.aquamaniac.de/sites/aqbanking/index.php
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts gwenhywfar4 gwenhywfar4-devel gwenhywfar4-gtk gwenhywfar4-gtk-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts gwenhywfar4 gwenhywfar4-devel gwenhywfar4-gtk gwenhywfar4-gtk-devel gwenhywfar4-gtk3 gwenhywfar4-gtk3-devel
</span>
depends_lib path:lib/libssl.dylib:openssl \
port:libgcrypt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,17 +36,19 @@ conflicts-delete $subport
</span> # Usually the port has a different version than the *-devel subports
# (but right now it doesn't)
#if {$subport eq $name || $subport eq "gwenhywfar4-gtk"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 4.18.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 4.20.0
</span> # this is specific to this port and *version* for downloading it
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set release 206
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set release 208
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1e0ed3b99e05afe15988987cc165c42edc35b7cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6915bba42d8b7f0213cee186a944296e5e5e97cdbde5b539a924261af03086ca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 fae887264c9655206630656f32131e42d9a6ffd5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5a88daabba1388f9528590aab5de527a12dd44a7da4572ce48469a29911b0fb0
</span> #}
subport gwenhywfar4-gtk {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gwenhywfar4-gtk3 {}
</span> subport gwenhywfar4-devel {}
subport gwenhywfar4-gtk-devel {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gwenhywfar4-gtk3-devel {}
</span>
patchfiles patch-gwenhywfar-config.cmake.in.diff \
patch-gwengui-qt4-config.cmake.in.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,14 +64,34 @@ if {$subport eq $name || $subport eq "gwenhywfar4-devel"} {
</span> --with-guis="qt4 cpp cocoa"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www2.aquamaniac.de/sites/download/download.php?package=01&release=${release}&file=01&dummy=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://www.aquamaniac.de/sites/download/download.php?package=01&release=${release}&file=02&dummy=
</span> distname gwenhywfar-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match "gwenhywfar4-gtk*" $subport]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport == "gwenhywfar4-gtk" || $subport == "gwenhywfar4-gtk-devel"} {
</span> depends_lib-append port:gtk2
configure.args-append --with-guis="gtk2 cpp" --disable-qt4
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport == "gwenhywfar4-gtk3" || $subport == "gwenhywfar4-gtk3-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-guis="gtk3 cpp" --disable-qt4
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Allow gtk3 version to replace any gtk2 version if it is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This will conflicts during gnucash upgrade.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport == "gwenhywfar4-gtk3" || $subport == "gwenhywfar4-gtk3-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-delete gwenhywfar4-gtk gwenhywfar4-gtk-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk] 0]}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite gwenhywfar4-gtk "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk-devel] 0]}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite gwenhywfar4-gtk-devel "" [list ports_nodepcheck 1]
</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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant enable_local_install description "Enable local installation mode (plugins, data, locale and config are located relatively to the binary)" {
configure.args-append --enable-local-install
}
</pre><pre style='margin:0'>
</pre>