<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4cdf837fd160bc40a0cd87307d2f33354b0edc53">https://github.com/macports/macports-ports/commit/4cdf837fd160bc40a0cd87307d2f33354b0edc53</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4cdf837fd160bc40a0cd87307d2f33354b0edc53
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Nov 8 22:30:47 2023 +0800

<span style='display:block; white-space:pre;color:#404040;'>    kdiff3: switch to Qt5 on newer OS, fixes aarch64
</span>---
 devel/kdiff3/Portfile | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kdiff3/Portfile b/devel/kdiff3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8533981060f..ba3ace391d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/kdiff3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kdiff3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> 
 name                kdiff3
 version             0.9.98
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            5
</span> categories          devel
 maintainers         nomaintainer
 license             GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,22 +26,29 @@ checksums           rmd160  17fc05df3fd8f052e2010834ba8efe2481e4f434 \
</span> variant kde description {Build the KDE version} {}
 
 if {[variant_isset kde]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    PortGroup kde4 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup               kde4 1.1
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:kdelibs4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:kdelibs4
</span>     post-destroot {
         ln -s ${applications_dir}/KDE4/${name}.app/Contents/MacOS/kdiff3 ${destroot}${prefix}/bin
     }
 } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    PortGroup           xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    PortGroup           qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PortGroup           qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PortGroup           xcodeversion 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    qt4.debug_variant   no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set worksrcpath     ${worksrcpath}/src-QT4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        qt4.debug_variant   no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        minimum_xcodeversions {9 3.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PortGroup           qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        qt5.debug_variant   no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    minimum_xcodeversions {9 3.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Naming here is inconsequential:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set worksrcpath         ${worksrcpath}/src-QT4
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   patch-src-QT4-kdiff3.pro.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append       patch-src-QT4-kdiff3.pro.diff
</span> 
     post-patch {
         reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/kdiff3.pro
</pre><pre style='margin:0'>

</pre>