<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/03018240a75685cd8719766949b91fe0c0b3fea8">https://github.com/macports/macports-ports/commit/03018240a75685cd8719766949b91fe0c0b3fea8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 03018240a75685cd8719766949b91fe0c0b3fea8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jun 26 07:18:06 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qt5*: remove iconv dependency; only use ICU
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    ICU is preferred over iconv.
</span><span style='display:block; white-space:pre;color:#404040;'>    As of Qt 5.8, they are mutually exclusive.
</span><span style='display:block; white-space:pre;color:#404040;'>    see
</span><span style='display:block; white-space:pre;color:#404040;'>    http://lists.qt-project.org/pipermail/development/2017-January/028392.html
</span>---
 aqua/qt5/Portfile  | 9 ++++++---
 aqua/qt55/Portfile | 9 ++++++---
 aqua/qt56/Portfile | 9 ++++++---
 3 files changed, 18 insertions(+), 9 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 5fc68d0..f4517d9 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;'>@@ -142,12 +142,12 @@ array set modules {
</span>         b26efab64209d4fe5b0532690c9d3902e7a70102
         edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</span>         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 2"
</span>         "License: "
     }
     qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -926,6 +926,9 @@ foreach {module module_info} [array get modules] {
</span>             # from the configure script:
             #     NOTE: -optimized-tools is not useful in -release mode.
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            # http://lists.qt-project.org/pipermail/development/2017-January/028392.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # Prefer ICU over iconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>             # Additional options:
             configure.args-append       \
                 {-make libs}            \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -937,7 +940,7 @@ foreach {module module_info} [array get modules] {
</span>                 -no-rpath               \
                 -verbose                \
                 -cups                   \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                -iconv                  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -no-iconv               \
</span>                 -no-evdev               \
                 -no-tslib               \
                 -icu                    \
<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 20d335e..44cb816 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;'>@@ -141,12 +141,12 @@ array set modules {
</span>         ce4bccd0703aaf8d904fbecd1f334ef13d698a44
         dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</span>         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "revision 5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 6"
</span>         "License: "
     }
     qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -859,6 +859,9 @@ foreach {module module_info} [array get modules] {
</span>             # from the configure script:
             #     NOTE: -optimized-tools is not useful in -release mode.
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            # http://lists.qt-project.org/pipermail/development/2017-January/028392.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # Prefer ICU over iconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>             # Additional options:
             configure.args-append       \
                 {-make libs}            \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -871,7 +874,7 @@ foreach {module module_info} [array get modules] {
</span>                 -verbose                \
                 -nis                    \
                 -cups                   \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                -iconv                  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -no-iconv               \
</span>                 -no-evdev               \
                 -no-tslib               \
                 -icu                    \
<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 62f0b33..08eda3d 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;'>@@ -142,12 +142,12 @@ array set modules {
</span>         55b2d2d9474cb565e872eed1ab0e8e01bf5031a8
         2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787
         ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:harfbuzz"
</span>         ""
         {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
         ""
         "variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "revision 2"
</span>         "License: "
     }
     qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -871,6 +871,9 @@ foreach {module module_info} [array get modules] {
</span>             # from the configure script:
             #     NOTE: -optimized-tools is not useful in -release mode.
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            # http://lists.qt-project.org/pipermail/development/2017-January/028392.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # Prefer ICU over iconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>             # Additional options:
             configure.args-append       \
                 {-make libs}            \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -882,7 +885,7 @@ foreach {module module_info} [array get modules] {
</span>                 -no-rpath               \
                 -verbose                \
                 -cups                   \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                -iconv                  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -no-iconv               \
</span>                 -no-evdev               \
                 -no-tslib               \
                 -icu                    \
</pre><pre style='margin:0'>

</pre>