<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/c8fc7c86c4c48219f513e4d39ca4090868416318">https://github.com/macports/macports-ports/commit/c8fc7c86c4c48219f513e4d39ca4090868416318</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c8fc7c86c4c48219f513e4d39ca4090868416318
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 5 15:23:26 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qt5-qtcreator: surround sdktool call with catch
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    As of 4.2.0, sdktool causes Tcl to register an error when asked to
</span><span style='display:block; white-space:pre;color:#404040;'>    create a file.
</span>---
 devel/qt5-qtcreator/Portfile | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-qtcreator/Portfile b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9779d5..6f16189 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,8 +89,12 @@ if { ${subport} eq ${name}  } {
</span>         # modify for our purposes
         #
         # for unknown reason, using system instead of exec results in "QWidget: Cannot create a QWidget without QApplication"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # surround sdktool with catch since, as of 4.2.0, sdktool causes Tcl to register an error when asked to create a file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        #
</span>         set sdktool ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/sdktool
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        if { [catch {
</span>         exec                                             \
             "${sdktool}"                                 \
             addQt                                        \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,6 +102,12 @@ if { ${subport} eq ${name}  } {
</span>             --name  "Qt %{Qt:Version} from MacPorts"     \
             --qmake "${qt_qmake_cmd}"                    \
             --type  Qt4ProjectManager.QtVersion.Desktop
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        } msg] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { ![file exists ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/QtProject/qtcreator/qtversion.xml] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_error ${msg}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                return -code error "sdktool failure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span> 
         if { [variant_isset universal] } {
             foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,6 +119,7 @@ if { ${subport} eq ${name}  } {
</span>                     set qt_qmake_spec_arch ${qt_qmake_spec_64}
                 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                if { [catch {
</span>                 exec                                                                   \
                     "${sdktool}"                                                       \
                     addKit                                                             \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,6 +130,12 @@ if { ${subport} eq ${name}  } {
</span>                     --debuggerengine 256                                               \
                     --devicetype Desktop                                               \
                     --mkspec     ${qt_qmake_spec_arch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                } msg] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if { ![file exists ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/QtProject/qtcreator/profiles.xml] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ui_error ${msg}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        return -code error "sdktool failure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span>             }
         } else {
             if { ${build_arch} eq "i386" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,6 +144,7 @@ if { ${subport} eq ${name}  } {
</span>                 set toolchain_bit 64
             }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { [catch {
</span>             exec                                                                         \
                 "${sdktool}"                                                             \
                 addKit                                                                   \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,6 +156,12 @@ if { ${subport} eq ${name}  } {
</span>                 --devicetype     Desktop                                                 \
                 --mkspec         ${qt_qmake_spec}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            } msg] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if { ![file exists ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/QtProject/qtcreator/profiles.xml] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ui_error ${msg}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    return -code error "sdktool failure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span>         }
 
         # N.B. that at some point in the future, QtCreator.ini may need to be created
</pre><pre style='margin:0'>

</pre>