<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/f782c1373eece04abfcad9a5511c42ed39f0a731">https://github.com/macports/macports-ports/commit/f782c1373eece04abfcad9a5511c42ed39f0a731</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f782c13 qt5*: find correct location of Rez binary
</span>f782c13 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f782c1373eece04abfcad9a5511c42ed39f0a731
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Nov 5 08:15:06 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: find correct location of Rez binary
</span>---
aqua/qt5/Portfile | 11 ++++++++++-
aqua/qt5/files/patch-find_rez.diff | 22 ++++++++++++++++++++++
aqua/qt55/Portfile | 11 ++++++++++-
aqua/qt55/files/patch-find_rez.diff | 22 ++++++++++++++++++++++
aqua/qt56/Portfile | 11 ++++++++++-
aqua/qt56/files/patch-find_rez.diff | 22 ++++++++++++++++++++++
aqua/qt57/Portfile | 11 ++++++++++-
aqua/qt57/files/patch-find_rez.diff | 22 ++++++++++++++++++++++
aqua/qt58/Portfile | 11 ++++++++++-
aqua/qt58/files/patch-find_rez.diff | 22 ++++++++++++++++++++++
10 files changed, 160 insertions(+), 5 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 782ea40..6702b8c 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;'>@@ -145,7 +145,7 @@ array set modules {
</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;'>@@ -758,6 +758,15 @@ foreach {module module_info} [array get modules] {
</span> # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=11764
patchfiles-append patch-qualified_reference.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find the Rez program
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_Rez__|[exec xcrun --find Rez]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/common/mac.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/features/mac/rez.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-find_rez.diff b/aqua/qt5/files/patch-find_rez.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c0b7e14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/mac.conf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/mac.conf 2017-11-04 22:43:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(unix.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_RESOURCE = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_RESOURCE = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_EXTENSION_SHLIB = dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LIBDIR =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/rez.prf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/rez.prf 2017-11-04 22:44:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #global defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_REZ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_REZ = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_REZ = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(REZ_DIR):REZ_DIR = .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_EXT_REZ):QMAKE_EXT_REZ = .rsrc
</span><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 010c80c..3d6cac3 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;'>@@ -143,7 +143,7 @@ array set modules {
</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 11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 12"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -668,6 +668,15 @@ foreach {module module_info} [array get modules] {
</span> # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=11764
patchfiles-append patch-qualified_reference.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find the Rez program
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_Rez__|[exec xcrun --find Rez]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/common/mac.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/features/mac/rez.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-find_rez.diff b/aqua/qt55/files/patch-find_rez.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fc96d8d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/mac.conf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/mac.conf 2017-11-04 22:43:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_PLATFORM += mac darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_RESOURCE = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_RESOURCE = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_EXTENSION_SHLIB = dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LIBDIR =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/rez.prf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/rez.prf 2017-11-04 22:44:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #global defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_REZ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_REZ = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_REZ = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(REZ_DIR):REZ_DIR = .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_EXT_REZ):QMAKE_EXT_REZ = .rsrc
</span><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 655e2ff..39e728a 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;'>@@ -149,7 +149,7 @@ array set modules {
</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 4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 5"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -706,6 +706,15 @@ foreach {module module_info} [array get modules] {
</span> # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=11764
patchfiles-append patch-qualified_reference.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find the Rez program
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_Rez__|[exec xcrun --find Rez]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/common/mac.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/features/mac/rez.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-find_rez.diff b/aqua/qt56/files/patch-find_rez.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b44bffa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/mac.conf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/mac.conf 2017-11-04 22:43:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(unix.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_RESOURCE = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_RESOURCE = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_EXTENSION_SHLIB = dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LIBDIR =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/rez.prf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/rez.prf 2017-11-04 22:44:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #global defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_REZ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_REZ = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_REZ = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(REZ_DIR):REZ_DIR = .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_EXT_REZ):QMAKE_EXT_REZ = .rsrc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 63f36fe..0d53970 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +149,7 @@ array set modules {
</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 4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 5"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -757,6 +757,15 @@ foreach {module module_info} [array get modules] {
</span> # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=11764
patchfiles-append patch-qualified_reference.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find the Rez program
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_Rez__|[exec xcrun --find Rez]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/common/mac.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/features/mac/rez.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-find_rez.diff b/aqua/qt57/files/patch-find_rez.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e65c5ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/mac.conf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/mac.conf 2017-11-04 22:43:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_RESOURCE = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_RESOURCE = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_EXTENSION_SHLIB = dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LIBDIR =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/rez.prf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/rez.prf 2017-11-04 22:44:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #global defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_REZ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_REZ = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_REZ = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(REZ_DIR):REZ_DIR = .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_EXT_REZ):QMAKE_EXT_REZ = .rsrc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2000601..e4f11ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +149,7 @@ array set modules {
</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 3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 4"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -770,6 +770,15 @@ foreach {module module_info} [array get modules] {
</span> # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=11764
patchfiles-append patch-qualified_reference.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find the Rez program
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_Rez__|[exec xcrun --find Rez]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/common/mac.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/features/mac/rez.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/files/patch-find_rez.diff b/aqua/qt58/files/patch-find_rez.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c0b7e14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/files/patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/common/mac.conf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/common/mac.conf 2017-11-04 22:43:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(unix.conf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_RESOURCE = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_RESOURCE = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_EXTENSION_SHLIB = dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LIBDIR =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/mac/rez.prf.orig 2015-10-12 21:35:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/mac/rez.prf 2017-11-04 22:44:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #global defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_REZ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_REZ = /Developer/Tools/Rez
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_REZ = __MACPORTS_Rez__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(REZ_DIR):REZ_DIR = .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_EXT_REZ):QMAKE_EXT_REZ = .rsrc
</span></pre><pre style='margin:0'>
</pre>