<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5251d66664e312c717518ee120a5028f2866206f">https://github.com/macports/macports-ports/commit/5251d66664e312c717518ee120a5028f2866206f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5251d66664e312c717518ee120a5028f2866206f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jun 26 06:44:06 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qt5*: revamp dependencies for consistency with Qt
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See http://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules for a list
</span><span style='display:block; white-space:pre;color:#404040;'>    of Qt dependencies.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    No revbump because final build should be the same.
</span>---
 aqua/qt5/Portfile  | 48 ++++++++++++++++++++++++------------------------
 aqua/qt55/Portfile | 34 +++++++++++++++++-----------------
 aqua/qt56/Portfile | 40 ++++++++++++++++++++--------------------
 3 files changed, 61 insertions(+), 61 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57d20f2..5fc68d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,7 +131,7 @@ array set modules {
</span>         1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea
         ""
         "port:assimp"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtimageformats"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtimageformats qtgamepad"
</span>         {"Qt 3D"}
         "technology preview modules"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,7 +155,7 @@ array set modules {
</span>         a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative"
</span>         {"Qt Canvas 3D"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,7 +167,7 @@ array set modules {
</span>         85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtmultimedia"
</span>         {"Qt Charts"}
         "GPLv3 license only"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +179,7 @@ array set modules {
</span>         b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Bluetooth" "Qt NFC"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,7 +191,7 @@ array set modules {
</span>         1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns qtmultimedia"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtmultimedia"
</span>         {"Qt Data Visualization"}
         "GPLv3 license only"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,7 +203,7 @@ array set modules {
</span>         fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56
         "port:python27"
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtsvg qtxmlpatterns"
</span>         {"Qt QML" "Qt Quick" "Qt Quick Layouts" "Qt Quick Widgets"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,7 +227,7 @@ array set modules {
</span>         55fb0134d7bb26e261bbb30f674e4a88fbcc6bc17e8bb030134aa236b87bd9db
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qttools sqlite-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qttools sqlite-plugin"
</span>         {"Qt Reference Documentation"}
         "requires all documentation"
         "variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +239,7 @@ array set modules {
</span>         bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182
         ""
         "port:libsdl2"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Gamepad"}
         "technology preview module"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,7 +251,7 @@ array set modules {
</span>         2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative"
</span>         {"Qt Graphical Effects"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,7 +275,7 @@ array set modules {
</span>         f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtquickcontrols qtserialport"
</span>         {"Qt Location" "Qt Positioning"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -299,7 +299,7 @@ array set modules {
</span>         a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Multimedia" "Qt Multimedia Widgets"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,7 +323,7 @@ array set modules {
</span>         6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns qtgraphicaleffects"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtgraphicaleffects"
</span>         {"Qt Quick Controls" "Qt Quick Dialogs" "Qt Quick Extras"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -335,7 +335,7 @@ array set modules {
</span>         f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtgraphicaleffects"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtgraphicaleffects"
</span>         {"Qt Quick Controls 2"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,7 +347,7 @@ array set modules {
</span>         5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qttools"
</span>         {"Qt Script" "Qt Script Tools"}
         "deprecated in favor QJS* in Qt QML"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,7 +359,7 @@ array set modules {
</span>         9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt SCXML"}
         "technology preview module"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,7 +371,7 @@ array set modules {
</span>         ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Sensors"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,7 +383,7 @@ array set modules {
</span>         727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtserialport"
</span>         {"Qt Serial Bus"}
         "technology preview module"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -419,7 +419,7 @@ array set modules {
</span>         64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative sqlite-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Designer" "Qt Help" "Qt UI Tools"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -431,7 +431,7 @@ array set modules {
</span>         16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qttools"
</span>         {"translation files"}
         ""
         "variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,7 +443,7 @@ array set modules {
</span>         b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add
         ""
         "port:hunspell"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtsvg qtmultimedia qtquickcontrols"
</span>         {"Qt Virtual Keyboard"}
         "GPLv3 license only"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -455,7 +455,7 @@ array set modules {
</span>         63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtwebsockets qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtwebsockets"
</span>         {"Qt WebChannel"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -467,7 +467,7 @@ array set modules {
</span>         2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b
         "port:python27 port:py27-ply"
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtwebchannel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtquickcontrols qtwebchannel qtlocation"
</span>         {"Qt WebEngine"}
         "very large and relatively new; requires newer version of OS X"
         "variant overrides: ~universal"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -479,7 +479,7 @@ array set modules {
</span>         a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03
         "port:python27"
         "port:fontconfig port:icu port:leveldb port:webp port:libxml2 port:libxslt port:zlib port:sqlite3"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns"
</span>         {"Qt WebKit" "Qt WebKit Widgets"}
         "community support only (use Qt WebEngine)"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -503,7 +503,7 @@ array set modules {
</span>         b3bcf9693e0205263f5d227f2204cf12c3a3d1e200b3114723511ee3bdf2159f
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtwebengine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtwebengine"
</span>         {"Qt WebView"}
         "new in 5.6.0; requires qtwebengine"
         "variant overrides: ~universal"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da1f0eb..20d335e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +130,7 @@ array set modules {
</span>         e380906e2bcbd825dab45043bf063dd88b793c0d5fb050ee915bf4e2b58b1bf7
         ""
         "port:assimp"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtimageformats"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtimageformats"
</span>         {"Qt 3D"}
         "technology preview modules"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,7 +154,7 @@ array set modules {
</span>         759b171030d7110751943643885c1484c7900fed7737424d202e36bdeba0b080
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative"
</span>         {"Qt Canvas 3D"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,7 +166,7 @@ array set modules {
</span>         3637e6def8582fc0fb3684179b93650720ba2da1311a560d358296153f245023
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Bluetooth" "Qt NFC"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,7 +178,7 @@ array set modules {
</span>         a79936bd5b6a35aba28dd282291b28c8fa869b8d86652c62efe5e268d94defe2
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative"
</span>         {"Enginio"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,7 +190,7 @@ array set modules {
</span>         5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791
         "port:python27"
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtsvg qtxmlpatterns"
</span>         {"Qt QML" "Qt Quick" "Qt Quick Widgets"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,7 +202,7 @@ array set modules {
</span>         9f0daf55a1765f637b5d8096a195842281a49adc5a82e7ddc75e541c62e00f86
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qttools sqlite-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qttools sqlite-plugin"
</span>         {"Qt Reference Documentation"}
         "requires all documentation"
         "variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,7 +214,7 @@ array set modules {
</span>         9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative"
</span>         {"Qt Graphical Effects"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,7 +238,7 @@ array set modules {
</span>         1fe948cb87649f4450be921cf3cdefc311595a80ef6a7a7b7484901baa0d6316
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtquickcontrols qtserialport"
</span>         {"Qt Location" "Qt Positioning"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -262,7 +262,7 @@ array set modules {
</span>         7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Multimedia" "Qt Multimedia Widgets"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,7 +286,7 @@ array set modules {
</span>         1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns qtgraphicaleffects"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtgraphicaleffects"
</span>         {"Qt Quick Controls" "Qt Quick Dialogs" "Qt Quick Layouts" "Qt Quick Extras"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -298,7 +298,7 @@ array set modules {
</span>         cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qttools"
</span>         {"Qt Script" "Qt Script Tools"}
         "deprecated in favor QJS* in Qt QML"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -310,7 +310,7 @@ array set modules {
</span>         5d264fc0729a5d7679bd4eb8d7a0a9b142ed38d09fa68fc7dfe57f64afc8eeea
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Sensors"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -346,7 +346,7 @@ array set modules {
</span>         4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative sqlite-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Designer" "Qt Help" "Qt UI Tools"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -358,7 +358,7 @@ array set modules {
</span>         41f800710f0bc6ca263f1e54f1fa22be7043962999304e73ce9887ebefc7a4c6
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qttools"
</span>         {"translation files"}
         ""
         "variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -370,7 +370,7 @@ array set modules {
</span>         7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtwebsockets qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtwebsockets"
</span>         {"Qt WebChannel"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -382,7 +382,7 @@ array set modules {
</span>         7c4d328dd305991aaf0c3450615f4a8e5d80152194bee6f5925bd8d3477e2b90
         "port:python27 port:py27-ply"
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtwebchannel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtquickcontrols qtwebchannel qtlocation"
</span>         {"Qt WebEngine" "Qt WebEngine Widgets"}
         "very large and relatively new; requires newer version of OS X"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,7 +394,7 @@ array set modules {
</span>         77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69
         "port:python27"
         "port:fontconfig port:icu port:leveldb port:webp port:libxml2 port:libxslt port:zlib port:sqlite3"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns"
</span>         {"Qt WebKit" "Qt WebKit Widgets"}
         "community support only (use Qt WebEngine)"
         "variant overrides: "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3aa1037..62f0b33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,7 +131,7 @@ array set modules {
</span>         a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941
         ""
         "port:assimp"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtimageformats"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtimageformats"
</span>         {"Qt 3D"}
         "technology preview modules"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,7 +155,7 @@ array set modules {
</span>         d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative"
</span>         {"Qt Canvas 3D"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,7 +167,7 @@ array set modules {
</span>         1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Bluetooth" "Qt NFC"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +179,7 @@ array set modules {
</span>         90ffc38d214a75ab0ef90a4760843f12bc073ae49c17de24c677d1d403bddcc3
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative"
</span>         {"Enginio"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,7 +191,7 @@ array set modules {
</span>         0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da
         "port:python27"
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtsvg qtxmlpatterns"
</span>         {"Qt QML" "Qt Quick" "Qt Quick Widgets"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,7 +203,7 @@ array set modules {
</span>         f6691eeaa9954f6990c744d246f4fe5a9bdd9936aa78d187e98c12795761e868
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qttools sqlite-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qttools sqlite-plugin"
</span>         {"Qt Reference Documentation"}
         "requires all documentation"
         "variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,7 +215,7 @@ array set modules {
</span>         1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative"
</span>         {"Qt Graphical Effects"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +239,7 @@ array set modules {
</span>         7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtquickcontrols qtserialport"
</span>         {"Qt Location" "Qt Positioning"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,7 +263,7 @@ array set modules {
</span>         cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Multimedia" "Qt Multimedia Widgets"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,7 +275,7 @@ array set modules {
</span>         5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns qtgraphicaleffects"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtgraphicaleffects"
</span>         {"Qt Quick Controls" "Qt Quick Dialogs" "Qt Quick Layouts" "Qt Quick Extras"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,7 +287,7 @@ array set modules {
</span>         09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtgraphicaleffects"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtquickcontrols"
</span>         {"Qt Labs Controls"}
         "technology preview module"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -299,7 +299,7 @@ array set modules {
</span>         e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qttools"
</span>         {"Qt Script" "Qt Script Tools"}
         "deprecated in favor QJS* in Qt QML"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,7 +311,7 @@ array set modules {
</span>         a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Sensors"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,7 +323,7 @@ array set modules {
</span>         b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtserialport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtserialport"
</span>         {"Qt Serial Bus"}
         "technology preview module"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,7 +359,7 @@ array set modules {
</span>         db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative sqlite-plugin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative"
</span>         {"Qt Designer" "Qt Help" "Qt UI Tools"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,7 +371,7 @@ array set modules {
</span>         7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qttools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qttools"
</span>         {"translation files"}
         ""
         "variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,7 +383,7 @@ array set modules {
</span>         700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtwebsockets qtdeclarative"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtwebsockets"
</span>         {"Qt WebChannel"}
         ""
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -395,7 +395,7 @@ array set modules {
</span>         2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740
         "port:python27 port:py27-ply"
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtwebchannel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtquickcontrols qtwebchannel qtlocation"
</span>         {"Qt WebEngine"}
         "very large and relatively new; requires newer version of OS X"
         "variant overrides: ~universal"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -407,7 +407,7 @@ array set modules {
</span>         528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966
         "port:python27"
         "port:fontconfig port:icu port:leveldb port:webp port:libxml2 port:libxslt port:zlib port:sqlite3"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtxmlpatterns qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtbase qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns"
</span>         {"Qt WebKit" "Qt WebKit Widgets"}
         "community support only (use Qt WebEngine)"
         "variant overrides: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -431,7 +431,7 @@ array set modules {
</span>         5a7a36cedcbb5f737357d11b7e856d69f7f3dea11a3636bd413cf47038e951d6
         ""
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "qtbase qtdeclarative qtwebengine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "qtdeclarative qtwebengine"
</span>         {"Qt WebView"}
         "new in 5.6.0; requires qtwebengine"
         "variant overrides: ~universal"
</pre><pre style='margin:0'>

</pre>