<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4979eb6fe62c3a97c98c3567eae643e3e647087d">https://github.com/macports/macports-ports/commit/4979eb6fe62c3a97c98c3567eae643e3e647087d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4979eb6fe62c3a97c98c3567eae643e3e647087d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Oct 1 06:36:32 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtcreator: let qt5 PG handle universal setup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In this way, qt5-qtcreator will work with any Qt version.
</span>---
devel/qt5-qtcreator/Portfile | 32 +++++++---------------
.../qt5-qtcreator/files/makefile_macports_install | 8 ++++++
2 files changed, 18 insertions(+), 22 deletions(-)
<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 a24dd33..931805e 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;'>@@ -1,15 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name qt5-qtcreator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq ${name} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> PortGroup qmake5 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+name qt5-qtcreator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> version 4.3.1
revision 1
categories devel aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,22 +59,14 @@ if { ${subport} eq ${name} } {
</span> qt5.depends_component qtwebengine qtwebchannel
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make install attempts to install command line tools into /bin, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy "${worksrcpath}/bin/Qt Creator.app" "${destroot}${qt_apps_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We should really just override destroot, but the muniversal Portgroup would override our override.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd "true"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- merger-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}-${arch}${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy "${worksrcpath}-${arch}/bin/Qt Creator.app" "${destroot}-${arch}${qt_apps_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # muniversal PG requires Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${filespath}/makefile_macports_install ${build.dir}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.cmd /usr/bin/make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -f makefile_macports_install \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_APPS_DIR=${qt_apps_dir}
</span>
# put following in post-destroot so it works with universal
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +105,7 @@ if { ${subport} eq ${name} } {
</span> }
if { [variant_isset universal] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs} {
</span> if { ${arch} eq "i386" } {
set toolchain_bit 32
set qt_qmake_spec_arch ${qt_qmake_spec_32}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-qtcreator/files/makefile_macports_install b/devel/qt5-qtcreator/files/makefile_macports_install
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0e097fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt5-qtcreator/files/makefile_macports_install
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- mode: makefile -*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INSTALL=/usr/bin/install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+DCOPY=/bin/cp -R
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -m 0775 "$(INSTALL_ROOT)$(QT_APPS_DIR)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DCOPY) "bin/Qt Creator.app" "$(INSTALL_ROOT)$(QT_APPS_DIR)"
</span></pre><pre style='margin:0'>
</pre>