<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/42fdf5dee911635e5b8d7877e03cbd06c2512fe4">https://github.com/macports/macports-ports/commit/42fdf5dee911635e5b8d7877e03cbd06c2512fe4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 42fdf5dee911635e5b8d7877e03cbd06c2512fe4
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jan 14 05:45:40 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5* PG: move destdir change to correct PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/commit/520094a8a5e5be2ab04c15fb93989666d7e61ea9
</span><span style='display:block; white-space:pre;color:#404040;'> put code in the wrong Qt PortGroup.
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 3 +++
_resources/port1.0/group/qt5-1.0.tcl | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1953560..2a6ffdd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,6 +180,9 @@ pre-configure {
</span> close ${cache}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/53186
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir "INSTALL_ROOT=${destroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # add debug variant if one does not exist and one is requested via qt5.debug_variant
# variant is added in eval_variants so that qt5.debug_variant can be set anywhere in the Portfile
rename ::eval_variants ::real_qmake5_eval_variants
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2846df4..72cc142 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,9 +327,6 @@ pre-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/53186
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir "INSTALL_ROOT=${destroot}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {![info exists building_qt5]} {
pre-configure {
set qt_installed_name ""
</pre><pre style='margin:0'>
</pre>