<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/0a8fe0080cfb7650928310b8ab43ebde348acb2e">https://github.com/macports/macports-ports/commit/0a8fe0080cfb7650928310b8ab43ebde348acb2e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0a8fe0080cfb7650928310b8ab43ebde348acb2e
</span>Author: Sebastian Hegler <sebastian@broken-by-design.com>
AuthorDate: Sat Jul 4 11:28:54 2020 +0200

<span style='display:block; white-space:pre;color:#404040;'>    aqbanking5* , gwenhywfar4* : remove -devel variants
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    aqbanking5 and gwenhywfar4 are in maintenance mode.
</span>---
 devel/aqbanking5/Portfile  | 64 +++++++++++-----------------------------------
 devel/gwenhywfar4/Portfile | 51 ++++++++++++------------------------
 2 files changed, 31 insertions(+), 84 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/aqbanking5/Portfile b/devel/aqbanking5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc212a3d3d4..cc8a0ab7647 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/aqbanking5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/aqbanking5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,14 @@
</span> PortSystem        1.0
 
 name              aqbanking5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This port offers the latest stable version (also as a gtk subport)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as well as the latest beta version as aqbanking5-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             5.8.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this is specific to this port and *version* for downloading it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set release         107
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  ce40afdce3d98a6cae7e709582399a28f761e97f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  93ca523fe175e72042db75f8c3fc6255ab058cf82caf52796e15f030809fb15e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    3824997
</span> 
 
 categories        devel net finance
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +28,7 @@ long_description  aqbanking is a generic online banking interface mainly \
</span> 
 homepage          https://aquamaniac.de/rdm/projects/aqbanking
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts         aqbanking5 aqbanking5-devel aqbanking5-gtk aqbanking5-gtk-devel aqbanking5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts         aqbanking5 aqbanking5-gtk aqbanking5
</span> 
 depends_lib       port:ktoblzcheck \
                   port:libofx \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,53 +46,20 @@ if {$subport == $name} {
</span>                         port:qt4-mac
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport aqbanking5-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:gwenhywfar4-devel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:qt4-mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport aqbanking5-gtk {
     depends_lib-append  port:gwenhywfar4-gtk
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport aqbanking5-gtk-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:gwenhywfar4-gtk-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport aqbanking5-gtk3 {
     depends_lib-append  port:gwenhywfar4-gtk3
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport aqbanking5-gtk3-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:gwenhywfar4-gtk3-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles        patch-aqbanking-config.cmake.in.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# There isn't currently a newer devel version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {![string match "*-devel" $subport]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version             5.8.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision            1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # this is specific to this port and *version* for downloading it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set release         107
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160  ce40afdce3d98a6cae7e709582399a28f761e97f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  93ca523fe175e72042db75f8c3fc6255ab058cf82caf52796e15f030809fb15e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    3824997
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append port:gwenhywfar4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # version             5.7.6beta
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # # this is specific to this port and *version* for downloading it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # set release         215
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # checksums           rmd160  3923a8b166a7a67c239fa7ddce3196657a04dd39 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    #                     sha256  f9420d8b34c2eee703a7d26dd71a849700fdb2d7372b7649a3488b5a69f55565
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append port:gwenhywfar4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 
 master_sites      https://aquamaniac.de/rdm/attachments/download/${release}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,23 +87,16 @@ use_parallel_build no
</span> 
 # Allow gtk3 version to replace any gtk2 version if it is installed
 # This will conflicts during gnucash upgrade.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport == "aqbanking5-gtk3" || $subport == "aqbanking5-gtk3-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts-delete aqbanking5-gtk aqbanking5-gtk-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport == "aqbanking5-gtk3" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts-delete aqbanking5-gtk
</span>     pre-activate {
         if { ![catch {set vers [lindex [registry_active aqbanking5-gtk] 0]}] } {
             registry_deactivate_composite aqbanking5-gtk "" [list ports_nodepcheck 1]
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if { ![catch {set vers [lindex [registry_active aqbanking5-gtk-devel] 0]}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            registry_deactivate_composite aqbanking5-gtk-devel "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span>     }
 }
 
 livecheck.type    regex
 livecheck.url     https://aquamaniac.de/rdm/projects/aqbanking/files
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match "*-devel" $subport]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.regex   aqbanking-(\[0-9.\]*(beta)?)\\.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.regex   aqbanking-(\[0-9.\]*)\\.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex   aqbanking-(\[0-9.\]*)\\.tar
</span> 
<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 3dcbcbd2266..2ce5555b997 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;'>@@ -1,11 +1,16 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # kate: backspace-indents true; indent-pasted-text true; indent-width 4; keep-extra-spaces true; remove-trailing-spaces modified; replace-tabs true; replace-tabs-save true; syntax Tcl/Tk; tab-indents true; tab-width 4;
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem        1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem          1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name              gwenhywfar4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This port offers the latest stable version (also as a gtk subport)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as well as the latest beta version as gwenhywfar4-devel!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name                gwenhywfar4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             4.20.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this is specific to this port and *version* for downloading it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set release         108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  e8530ab018e28ca48d3947466e75f471ca793c50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  0f4fd92351c8a11f053aa482fc5c459499db3dc78dd8bb469e878890ef3d3270 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    2350327
</span> 
 categories        devel net finance
 maintainers       {dports @drkp} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +22,7 @@ long_description  {*}${description}
</span> 
 homepage          https://www.aquamaniac.de/rdm/projects/gwenhywfar
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts         gwenhywfar4 gwenhywfar4-devel gwenhywfar4-gtk gwenhywfar4-gtk-devel gwenhywfar4-gtk3 gwenhywfar4-gtk3-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts         gwenhywfar4 gwenhywfar4-gtk gwenhywfar4-gtk3
</span> 
 depends_lib       path:lib/libssl.dylib:openssl \
                   port:libgcrypt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,30 +37,14 @@ configure.args    --enable-static
</span> 
 conflicts-delete  $subport
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Usually the port has a different version than the *-devel subports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (but right now it doesn't)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if {$subport eq $name || $subport eq "gwenhywfar4-gtk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version                 4.20.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # this is specific to this port and *version* for downloading it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set release             108
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums           rmd160  e8530ab018e28ca48d3947466e75f471ca793c50 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  0f4fd92351c8a11f053aa482fc5c459499db3dc78dd8bb469e878890ef3d3270 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    2350327
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport gwenhywfar4-gtk {}
 subport gwenhywfar4-gtk3 {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport gwenhywfar4-devel {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport gwenhywfar4-gtk-devel {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport gwenhywfar4-gtk3-devel {}
</span> 
 patchfiles      patch-gwenhywfar-config.cmake.in.diff \
                 patch-gwengui-qt4-config.cmake.in.diff \
                 patch-gwengui-cpp-config.cmake.in.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport eq $name || $subport eq "gwenhywfar4-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span>     # the correct way to depend on Qt4:
     PortGroup               qt4 1.0
     configure.args-append   --with-qt4-libs=${qt_libs_dir} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,28 +57,24 @@ if {$subport eq $name || $subport eq "gwenhywfar4-devel"} {
</span> master_sites      https://www.aquamaniac.de/rdm/attachments/download/${release}/
 distname          gwenhywfar-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport == "gwenhywfar4-gtk" || $subport == "gwenhywfar4-gtk-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport == "gwenhywfar4-gtk"} {
</span>     depends_lib-append      port:gtk2
     configure.args-append   --with-guis="gtk2 cpp" --disable-qt4
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport == "gwenhywfar4-gtk3" || $subport == "gwenhywfar4-gtk3-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport == "gwenhywfar4-gtk3"} {
</span>     depends_lib-append      port:gtk3
     configure.args-append   --with-guis="gtk3 cpp" --disable-qt4
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Allow gtk3 version to replace any gtk2 version if it is installed
 # This will conflicts during gnucash upgrade.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport == "gwenhywfar4-gtk3" || $subport == "gwenhywfar4-gtk3-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts-delete gwenhywfar4-gtk gwenhywfar4-gtk-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport == "gwenhywfar4-gtk3"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts-delete gwenhywfar4-gtk
</span>     pre-activate {
         if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk] 0]}] } {
             registry_deactivate_composite gwenhywfar4-gtk "" [list ports_nodepcheck 1]
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if { ![catch {set vers [lindex [registry_active gwenhywfar4-gtk-devel] 0]}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            registry_deactivate_composite gwenhywfar4-gtk-devel "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,8 +90,4 @@ configure.args-append   --disable-dependency-tracking --disable-silent-rules
</span> 
 livecheck.type    regex
 livecheck.url     https://www.aquamaniac.de/rdm/projects/gwenhywfar/files
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match "*-devel" $subport]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.regex   gwenhywfar-(\[0-9.\]*(beta)?)\\.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.regex   gwenhywfar-(\[0-9.\]*)\\.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex   gwenhywfar-(\[0-9.\]*)\\.tar
</span></pre><pre style='margin:0'>

</pre>