<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/9922d47b0e858f7cc1771dc5e1870d50cd421355">https://github.com/macports/macports-ports/commit/9922d47b0e858f7cc1771dc5e1870d50cd421355</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9922d47b0e858f7cc1771dc5e1870d50cd421355
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Nov 13 17:04:14 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> rename qt5-creator -> qt5-qtcreator
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Qt 5 ports have names qt5-qt*
</span><span style='display:block; white-space:pre;color:#404040;'> Python ports have names pyXY-py*
</span><span style='display:block; white-space:pre;color:#404040;'> This naming convention makes it easier to search for packages.
</span><span style='display:block; white-space:pre;color:#404040;'> Have Qt Creator follow the same naming convention.
</span>---
devel/qt5-creator/Portfile | 169 +--------------------
devel/{qt5-creator => qt5-qtcreator}/Portfile | 2 +-
.../files/patch-no_qtwebengine.diff | 0
.../files/patch-no_qtwebkit.diff | 0
4 files changed, 8 insertions(+), 163 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-creator/Portfile b/devel/qt5-creator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b33845..9c88ac2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt5-creator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt5-creator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,170 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
</span>
PortSystem 1.0
name qt5-creator
<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:#e0ffe0;'>+if { ${subport} eq ${name} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by qt5-qtcreator
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt5_qmake_request_no_debug 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by qt5-qtcreator-docs
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span> version 4.0.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel aqua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# from https://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The GPL license comes with two exceptions that ensure that there are no license restrictions on generated code, and that bridging to 3rd party code is still possible.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers mcalhoun openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Qt Creator is a cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://qt-project.org/wiki/Category:Tools::QtCreator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname qt-creator-opensource-src-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://download.qt.io/official_releases/qtcreator/[join [lrange [split ${version} .] 0 1] .]/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 312da42a263bc3e74b9493eb055fd6dc03736b57 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 95518a0b93d2d2fb7e5b46508fc1f59811edb2c5e05659262539dd316b8e5f4c
</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;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-qtscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-qtdeclarative \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-qttools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-qtmacextras \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-qtquickcontrols \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-qtsvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:botan
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "USE_SYSTEM_BOTAN=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not opportunistically use QtWebkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # do not opportunistically use QtWebengine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no_qtwebengine.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qtwebkit description {build with QtWebkit support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qt5-qtwebkit
</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:#ffe0e0;'>- # qtwebengine does not have a universal build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qtwebengine conflicts universal description {build with QtWebengine support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-no_qtwebkit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qt5-qtwebengine
</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:#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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # put following in post-destroot so it works with universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # sdktool is a tool located in "Qt Creator.app/Contents/Resources"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # two necessary files that sdktool creates are:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "${qt_apps_dir}/Qt Creator.app/Contents/Resources/QtProject/qtcreator/qtversion.xml"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "${qt_apps_dir}/Qt Creator.app/Contents/Resources/QtProject/qtcreator/profiles.xml"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from the installer.dat file, it seems the following are run by the binary installer of Qt Creator version 5.7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://code.qt.io/cgit/qtsdk/qtsdk.git/tree/packaging-tools/configurations/pkg_templates/pkg_57/qt.57.clang_64/meta/installscript.qs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # sdktool addQt --id qt.57.clang_64 --name "Qt %{Qt:Version} clang 64bit" --type Qt4ProjectManager.QtVersion.Desktop --qmake qmakeBinary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # sdktool addKit --id qt.57.clang_64_kit --name "Desktop Qt %{Qt:Version} clang 64bit" --toolchain x86-macos-generic-mach_o-64bit --qt qt.57.clang_64 --debuggerengine 256 --devicetype Desktop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # modify for our purposes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for unknown reason, using system instead of exec results in "QWidget: Cannot create a QWidget without QApplication"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdktool ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/sdktool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${sdktool}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addQt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --id qt.5.macports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --name "Qt %{Qt:Version} from MacPorts" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qmake "${qt_qmake_cmd}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --type Qt4ProjectManager.QtVersion.Desktop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset universal] } {
</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;'>- if { ${arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set toolchain_bit 32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_qmake_spec_arch ${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set toolchain_bit 64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_qmake_spec_arch ${qt_qmake_spec_64}
</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:#ffe0e0;'>- exec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${sdktool}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addKit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --id qt.5.macports_${arch}_kit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --name "Desktop Qt %{Qt:Version} from MacPorts ${arch}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --toolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qt qt.5.macports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --debuggerengine 256 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --devicetype Desktop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mkspec ${qt_qmake_spec_arch}
</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;'>- if { ${build_arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set toolchain_bit 32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set toolchain_bit 64
</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:#ffe0e0;'>- exec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${sdktool}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addKit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --id qt.5.macports_${build_arch}_kit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --name "Desktop Qt %{Qt:Version} from MacPorts ${build_arch}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --toolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --qt qt.5.macports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --debuggerengine 256 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --devicetype Desktop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mkspec ${qt_qmake_spec}
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # N.B. that at some point in the future, QtCreator.ini may need to be created
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to include more search locations for documentation and examples
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-docs {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:qt5-sqlite-plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</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;'>- xinstall -m 755 -d ${destroot}${qt_docs_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/doc/html ${worksrcpath}/doc/html-dev ${destroot}${qt_docs_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;'>+revision 2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://www.qt.io/download-open-source/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex qt-creator-opensource-src-(\[a-z0-9.\]+)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport qt5-creator-docs {}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-creator/Portfile b/devel/qt5-qtcreator/Portfile
</span>similarity index 99%
copy from devel/qt5-creator/Portfile
copy to devel/qt5-qtcreator/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 0b33845..04743ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt5-creator/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;'>@@ -2,7 +2,7 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name qt5-creator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name qt5-qtcreator
</span>
if { ${subport} eq ${name} } {
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-creator/files/patch-no_qtwebengine.diff b/devel/qt5-qtcreator/files/patch-no_qtwebengine.diff
</span>similarity index 100%
rename from devel/qt5-creator/files/patch-no_qtwebengine.diff
rename to devel/qt5-qtcreator/files/patch-no_qtwebengine.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-creator/files/patch-no_qtwebkit.diff b/devel/qt5-qtcreator/files/patch-no_qtwebkit.diff
</span>similarity index 100%
rename from devel/qt5-creator/files/patch-no_qtwebkit.diff
rename to devel/qt5-qtcreator/files/patch-no_qtwebkit.diff
</pre><pre style='margin:0'>
</pre>