<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bed4e19f335bae5945d3f7eb8646fb4298735211">https://github.com/macports/macports-ports/commit/bed4e19f335bae5945d3f7eb8646fb4298735211</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new bed4e19f335 qt6: update to 6.2.4
</span>bed4e19f335 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit bed4e19f335bae5945d3f7eb8646fb4298735211
</span>Author: jhoyt4 <john.hoyt@gmail.com>
AuthorDate: Sun Nov 27 23:43:42 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    qt6: update to 6.2.4
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - add new subports for qtcharts, qtmultimedia, and qtshadertools
</span><span style='display:block; white-space:pre;color:#404040;'>    - qtlocation is deprecated and replaced with qtpositioning
</span><span style='display:block; white-space:pre;color:#404040;'>    - remove SDK 12 patch now that it is incorporated into 6.2.4
</span><span style='display:block; white-space:pre;color:#404040;'>    - update qt6_variables to include all subports
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/66019
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/66020
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/65030
</span>---
 _resources/port1.0/group/qt6_variables-1.0.tcl | 128 +++++++++++++-
 aqua/qt6/Portfile                              | 236 ++++++++++++++-----------
 2 files changed, 256 insertions(+), 108 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt6_variables-1.0.tcl b/_resources/port1.0/group/qt6_variables-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d67f41eecc6..4cddbafe62c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt6_variables-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt6_variables-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,11 +97,19 @@ set qt_qmake_cmd        ${qt_dir}/bin/qmake
</span> 
 # standard moc command location
 global qt_moc_cmd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set qt_moc_cmd          ${qt_dir}/moc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_moc_cmd          ${qt_dir}/bin/moc
</span> 
 # standard uic command location
 global qt_uic_cmd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set qt_uic_cmd          ${qt_dir}/uic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_uic_cmd          ${qt_dir}/bin/uic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# standard lrelease command location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global qt_lrelease_cmd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_lrelease_cmd     ${qt_dir}/bin/lrelease
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# standard lupdate command location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global qt_lupdate_cmd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set qt_lupdate_cmd     ${qt_dir}/bin/lupdate
</span> 
 namespace eval qt6pg {
     ###############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,38 +126,140 @@ namespace eval qt6pg {
</span>     #
     ###############################################################################
     array set qt6_component_lib {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        qt3d {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt63DCore
</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;'>+        qt5compat {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6Core5Compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>         qtbase {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            libexec/qt6/lib/QtCore.framework/Versions/A/QtCore
</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;'>+        qtcharts {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6Charts
</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;'>+        qtconnectivity {
</span>             6.2
             7.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            lib/pkgconfig/Qt6Core.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            libexec/qt6/lib/QtBluetooth.framework/Versions/A/QtBluetooth
</span>             ""
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        qttools {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        qtdeclarative {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6Qml/Qt6QmlMacros.cmake
</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;'>+        qtimageformats {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6/FindLibmng.cmake
</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;'>+        qtmultimedia {
</span>             6.2
             7.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            lib/cmake/Qt6Designer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6Multimedia
</span>             ""
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        qttranslations {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        qtnetworkauth {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            libexec/qt6/lib/QtNetworkAuth.framework/Versions/A/QtNetworkAuth
</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;'>+        qtpositioning {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6Positioning
</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;'>+        qtremoteobjects {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6RemoteObjects
</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;'>+        qtsensors {
</span>             6.2
             7.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6Sensors
</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;'>+        qtserialbus {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6SerialBus
</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;'>+        qtserialport {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            libexec/qt6/lib/QtSerialPort.framework/Versions/A/QtSerialPort
</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;'>+        qtshadertools {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            libexec/qt6/lib/QtShaderTools.framework/Versions/A/QtShaderTools
</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;'>+        qtsvg {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            libexec/qt6/lib/QtSvgWidgets.framework/Versions/A/QtSvgWidgets
</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;'>+        qttools {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            libexec/qt6/lib/QtUiTools.framework/Versions/A/QtUiTools
</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;'>+        qttranslations {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span>             libexec/qt6/translations/qt_ar.qm
             ""
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        sqlite-plugin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        qtwebchannel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6WebChannel
</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;'>+        qtwebsockets {
</span>             6.2
             7.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            lib/cmake/Qt6WebSockets
</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;'>+        sqlite-plugin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7.0
</span>             lib/cmake/Qt6Sql/Qt6Sql_QSQLiteDriverPlugin.cmake
             "-plugin"
         }
         psql-plugin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span>             7.0
             lib/cmake/Qt6Sql/Qt6Sql_QPSQLDriverPlugin.cmake
             "-plugin"
         }
         mysql-plugin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            6.0
</span>             7.0
             lib/cmake/Qt6Sql/Qt6Sql_QMYSQLDriverPlugin.cmake
             "-plugin"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 125e82a0ecf..a541d65ebe2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ license             {LGPL-3 GPL-3 OpenSSLException}
</span> 
 homepage            https://www.qt.io
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             6.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             6.2.4
</span> set middle_name     everywhere
 
 PortGroup qt6_variables 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,13 +103,13 @@ set llvm_version 14
</span> array set modules {
     qt3d {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            18887bc685306ad2f2a1213a98763c5babb619b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            730c0e8e1a1a59c4acbeca68e206bab14ef770f5dacb94b84103a82243cfeeb3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            104023248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            0fbdabb59466c03bc622ce996a97e43bc9ea5d8f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ff4478d32c0fc0999690b73418b26974b723d5520abf4035b330002d962c1523
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            104021044
</span>         }
         ""
         "port:assimp"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtimageformats"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtmultimedia qtshadertools"
</span>         {"Qt 3D"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,24 +118,24 @@ array set modules {
</span>     }
     qt5compat {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            5f539c3eeda04b63124b1d14ee45c2ea28f9fb44 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            3865c031450a3c2616de1e20104ca9470ac5447adf51faa918f8b01a2c425de7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            8198156
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        cb840056d1fabef6145ac68c9a2ed1efb67eefbb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        5de2b9e25bf7de161fbb88ecdd468ed1788bc899392fc05ed80aa590ebb352fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        8198524
</span>         }
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "path:lib/pkgconfig/icu-uc.pc:icu"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ""
</span>         "qtbase qtdeclarative"
         {"Qt5 Compatibility"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 0"
</span>         "License: "
     }
     qtbase {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            5f790b52b28e90e762929bc9c3a66ccd8953722a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            2c5f07b5c3ea27d3fc1a46686ea3fb6724f94dddf1fb007de3eb0bdb87429079
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            46641424
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            041294e299236903695a4f35449b0e59c758396a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            46541252
</span>         }
         "port:ninja port:pkgconfig"
         "port:assimp port:brotli path:bin/cmake:cmake path:bin/dbus-daemon:dbus port:double-conversion port:freetype
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,14 +149,29 @@ array set modules {
</span>          "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "revision 8"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 0"
</span>         "License: "
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    qtcharts {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1b7bc3b8323489e967c928ff29204e0cb8a638d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            3c2e6267ef0fb5345c7737e3a12e09ce9ec09117792e78af9a8617f828b2249a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            4391060
</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;'>+        "qtbase qtdeclarative qtmultimedia"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {"Qt Charts"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "GPLv3 license only"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "License: GPL-3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     qtconnectivity {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            c15218f42ec48aad9633d82a6b5594d46e533c44 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            8dcc366b0f5f124b20bf25e1b207a5ae4b75e45c62d2cc1f4dce138075c2714e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1072208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            766c472112aa7bc89a40177e6d5da2caf588b602 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5db8c8de26c8561e8e349ad9650307bf7e08af4f00668447c53f3a8f7bd15d97
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1087096
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,9 +184,9 @@ array set modules {
</span>     }
     qtdeclarative {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            13849d151710f3c8078c5b09ad1fc5f8a0c313d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5aeb841a5665f79672a302569754ea7d541c69102c551707e43489e797213c71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            29764804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2a50253c159a837046d1a33c65c986f1988a74c3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            fa6a8b5bfe43203daf022b7949c7874240ec28b9c4b7ebc52b2e5ea440e6e94f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            29475416
</span>         }
         "port:python310"
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,39 +199,39 @@ array set modules {
</span>     }
     qtimageformats {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            d7fc2ceddb89495a67644233feb47f3bf9fe70a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            df61dc1a517988bfa123117c78a7dbeda859cbb6d9cbd080ce60058277bca3df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1845284
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            5df81b2f5becde04c8accb0e9101ba697f7a8d83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ee22e84866ed3fb39bdaf88f533851658919ee92dad56eb6da3d31c311a97e5c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1846040
</span>         }
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "port:jasper port:libmng port:tiff port:webp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "path:lib/pkgconfig/jasper.pc:jasper port:libmng port:tiff port:webp"
</span>         "qtbase"
         {"Qt Image Formats"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 0"
</span>         "License: "
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    qtlocation {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    qtmultimedia {
</span>         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            438885e8a07f1a307cc278c95bb9b461533641d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            a99e92c762d45b17e14685cd8a3c1564a3da0ce1cfd1a68ffd5b3fd7c409dcad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            6675600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            cdca1e04909cf8c9efde2033f7159739586249a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ea703487c21613fcc55dd0c3fb2dc8e1ae77003ae6212a60c85d5210b64832b6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            3795508
</span>         }
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "path:lib/pkgconfig/icu-uc.pc:icu port:zlib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtserialport"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        {"Qt Location" "Qt Positioning"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtshadertools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {"Qt Multimedia" "Qt Multimedia Widgets"}
</span>         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 0"
</span>         "License: "
     }
     qtnetworkauth {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            56547cc10525dbf557c151a8455ac2055d680bb7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            8027f85095a9c56d8cada988527454f786a5f8dd4157206db4f21299016d1c9e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            144292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            7203e279bcb4b2eb65791c1c9407a1f31db266d6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            53e96704d34403e89b05ef8b46edb039cd2bb3dc85d62bffc5ac0856ecee0dcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            146148
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,11 +242,26 @@ array set modules {
</span>         "revision 0"
         "License: "
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    qtpositioning {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            e831cc791a9ec8b75cd59fb76f51e78f28664835 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            075eb22c86c05fd2367bcdc34a29aec8871dd8463d7b73f2a77bf27384c885ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1492336 
</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;'>+        "qtbase qtdeclarative qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {"Provides the ability to determine a position by using a variety of possible sources"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "License: {GPL-3}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     qtremoteobjects {
        {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-           94d3e5037e083243c7df9ef25c628ed8b3ad63e8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           76681b03bb63e1cafa38a1bfde23c194f232aaff4b010d5f58c065fdcc0b379f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           358628
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            892fad53e65bd6a439b4702e5bf00a4a52ab9da5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            d23ab298d2ebf5b8437b0794af47266bb3048b0f4b733e0db1335a09fc18d883
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            367336
</span>        }
        ""
        ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,9 +274,9 @@ array set modules {
</span>     }
     qtsensors {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            d7f061244537b3b483529e8b5766198a978c502c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5f55c972c52848f5c828148fded1b30de32955f7ee04867568c559991214739a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            2045476
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            718054cf865c7de873ad29083584a286280a55a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            79d43e38431c93996f803c6f946856c5ab35a60f9c9438ccceaa312bdb4a6a06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2109744
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,9 +289,9 @@ array set modules {
</span>     }
     qtserialbus {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            00c46347f19928501a798a6f73a6a35af7c9a457 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            15e7a0a578dc9ed306ff2598edb9822081902ef1a4b52b20f1d2dd6461239f85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            378596
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            2b0764da4ae9d8c7c4a68305eaf3f2c9a61dfb3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            33c15752f8e7f99cc49b9d3bf9eabd857bfcd649e37ada8bffceedc5a66a8a64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            380088
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -274,9 +304,9 @@ array set modules {
</span>     }
     qtserialport {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            13b54c9622e90aa17dbba118eba214882ffeddc8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ec77f4c9d6096588f3e735315f873976103479be453985b27f27fe8994e0776a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            318916
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            17d011c970ef8d353ef9023f43d0b6cffa470eec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            8fdbfbb2aeee0e6400c90406927a784d3790bb0dfa7e5d7b9da7b2ded52bb744
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            320492
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,11 +317,26 @@ array set modules {
</span>         "revision 0"
         "License: "
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    qtshadertools {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            0513ce360d99dc01609ddb327f6bf9c4b7f91602 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            20881824cba0c1396c0fe6b27d0f995a261070b68fa3629b1a188147d58933cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            987564
</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;'>+        "qtbase"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        {"Qt ShaderTools"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "variant overrides: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "License: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     qtsvg {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            dea5b2492dd16c71a30714c75ab3b3864063fffa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            86e27e005c2421052ca90e619c8d13f1bd19c6bf1a7b84dd4e0f7855fc884fd7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1717684
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            812b8590980228f96a861e674e4b993590beb1e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            23ec4c14259d799bb6aaf1a07559d6b1bd2cf6d0da3ac439221ebf9e46ff3fd2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1727160
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,9 +349,9 @@ array set modules {
</span>     }
     qttools {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            a2afeabfe2037491631891333d8d226db4479548 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            5a856d3d3d5fe6e15dc3f1af707a0ef1df2e687850403fc94af635edb9312bfb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            8668512
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            47864565591ba588c9eb7f44a974661fa90c535d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            17f40689c4a1706a1b7db22fa92f6ab79f7b698a89e100cab4d10e19335f8267
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            8664772
</span>         }
         ""
         "port:clang-${llvm_version}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,14 +359,14 @@ array set modules {
</span>         {"Qt Designer" "Qt Help" "Qt UI Tools"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 0"
</span>         "License: "
     }
     qttranslations {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            623817eb7f3967fe3911aad89f537d48dc2d291c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            3f680b520da585697fc725697a52c7d2074a6a728f6830366b491a6f8b9183c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            1444712
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            467b490bbddc8114a2d71aaeb7a0e82649b1e089 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            bd1aac74a892c60b2f147b6d53bb5b55ab7a6409e63097d38198933f8024fa51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            1446208
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -334,9 +379,9 @@ array set modules {
</span>     }
     qtwebchannel {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            88773d8e3904df163d9593c04c5e9262412bad0d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            035ba2e9a0e9de0baddd40f9d50014e6eb5f0b4ec741e9aec1b434e7c9e4e9c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            211188
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            a1ba285374474a4b1c242493b4783ca7289f6682 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            20ce2bbc21b6f1fb665d37887d4af7e761baa3a1c1b9cc0f550ede212a8d296d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            213476
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,9 +394,9 @@ array set modules {
</span>     }
     qtwebsockets {
         {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            da59cdb38216ad2fd8a563b39bb6b697fe1399d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            23344e21e96a839697abed7bf7931a8c08a752f08bf25edf240748501aba3816
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            258064
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            11718a93bc62e904d69d0ee9759136a02a9ea7bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            702f1e3248b256045d76898875bca51e70d8c452cbbff243e16c0ae5b962f964
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            265912
</span>         }
         ""
         ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -522,7 +567,7 @@ foreach {module module_info} [array get modules] {
</span>             depends_lib-append port:${name}-${qtdeps}
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        description       Tools and Module(s) for Qt Tool Kit ${qt_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        description     Tools and Module(s) for Qt Tool Kit ${qt_major}
</span> 
         set modules_provided_list [lindex ${module_info} 4]
         if { [llength ${modules_provided_list}] == 1 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,10 +642,6 @@ foreach {module module_info} [array get modules] {
</span>             # respect MacPorts build variables
             patchfiles-append patch-mkspecs.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # Backported upstream patch to build with the macOS 12 SDK.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # https://github.com/qt/qtbase/commit/dece6f5840463ae2ddf927d65eb1b3680e34a547
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            patchfiles-append patch-qiosurfacegraphicsbuffer.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>             # respect configure.compiler
             if { ${configure.compiler} eq "clang" } {
                 # let xargs find correct compiler (default behaviour)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -650,7 +691,7 @@ foreach {module module_info} [array get modules] {
</span>                     "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \
                     ${worksrcpath}/mkspecs/common/macx.conf
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                #respect configure.optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # respect configure.optflags
</span>                 reinplace \
                     "s|__MACPORTS_OPTFLAGS__|${configure.optflags}|g" \
                     ${worksrcpath}/mkspecs/common/gcc-base.conf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -901,27 +942,32 @@ foreach {module module_info} [array get modules] {
</span>             default_variants-append +openssl
 
         } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>             # these subports use qt-cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            PortGroup                    qt6 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            PortGroup                    active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            PortGroup   qt6 1.0
</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;'>+            depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:bin/cmake:cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:ninja
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # We need to use qt-cmake to configure the build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.cmd                ${qt_configure_module_cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # use "qt-configure-module" to configure the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.cmd   ${qt_configure_module_cmd}
</span> 
             # Attempting to match module configure instructions from here: https://www.qt.io/blog/qt-6-build-system
             # --prefix is not recognized.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.pre_args-delete    --prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.pre_args-append    ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.dir                ${workpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.dir   ${workpath}/build
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # Qt suggests using Ninja to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            depends_build-append         port:ninja
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            build.cmd                    ninja
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            build.post_args-append       -v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            build.dir                    ${workpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.pre_args-delete   --prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.pre_args-append   ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # build using using cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.dir       ${workpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.cmd       cmake --build ${build.dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            destroot.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            destroot.cmd    cmake --install ${build.dir}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            destroot.target install
</span>             # ninja needs the DESTDIR argument in the environment
             destroot.destdir
             destroot.env-append DESTDIR=${destroot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1040,14 +1086,6 @@ foreach {module module_info} [array get modules] {
</span>             ###############################################################################
             # Special Cases
             ###############################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # special case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { ${module} eq "qtlocation" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                PortGroup       conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # do not allow ${prefix}/include/boost to conflict with bundled boost (in bundled mapbox-gl-native)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                conflicts_build boost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</span>         }
     }
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1080,7 +1118,7 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span>         set isSQL_module             true
         cmake.install_prefix         ${qt_dir}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # We need to use qt-cmake to configure the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # use "qt-configure-module" to configure the build
</span>         configure.cmd                ${qt_cmake_cmd}
         configure.dir                ${workpath}/build
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1162,7 +1200,7 @@ foreach {sql_names sql_info} [array get sql_plugins] {
</span> if { ${subport} eq ${name} } {
     # the main port is Meta-port to install various modules
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision    0
</span> 
     description         Qt Tool Kit ${qt_major}
     long_description    Qt Tool Kit: A cross-platform framework \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1171,17 +1209,17 @@ if { ${subport} eq ${name} } {
</span> 
     master_sites
     distfiles
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    use_configure     no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    supported_archs   noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    installs_libs     no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    use_configure       no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    supported_archs     noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    installs_libs       no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    universal_variant   no
</span> 
     build {}
 
     # create a dummy file so the port can be successfully activated
     destroot {
         xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        set docfile   [open ${destroot}${prefix}/share/doc/${subport}/README.txt "w"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set docfile [open ${destroot}${prefix}/share/doc/${subport}/README.txt "w"]
</span>         puts ${docfile} "Meta-port for ${name}"
         puts ${docfile} "${long_description}"
         close ${docfile}
</pre><pre style='margin:0'>

</pre>