<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9d9342e929226e2b5055a3c5825276565aa34eed">https://github.com/macports/macports-ports/commit/9d9342e929226e2b5055a3c5825276565aa34eed</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 9d9342e9292 swi-prolog, swi-prolog-devel: fix building and location of the qt5 app
</span>9d9342e9292 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9d9342e929226e2b5055a3c5825276565aa34eed
</span>Author: kamischi <karl-michael.schindler@web.de>
AuthorDate: Fri Jan 6 19:21:56 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> swi-prolog, swi-prolog-devel: fix building and location of the qt5 app
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix the warning by moving the app from ${prefix} to the MacPorts application directory.
</span>---
lang/swi-prolog-devel/Portfile | 16 ++++++++++++++--
lang/swi-prolog/Portfile | 16 ++++++++++++++--
2 files changed, 28 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/swi-prolog-devel/Portfile b/lang/swi-prolog-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3287b12647f..84fa7620b8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/swi-prolog-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/swi-prolog-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ name swi-prolog-devel
</span> conflicts swi-prolog
epoch 20051223
version 9.1.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories lang
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,19 @@ cmake.generator Ninja
</span> configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INCLUDE_PATH=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_LIBRARY_PATH=/usr/lib:${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_LIBRARY_PATH=/usr/lib:${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSWIPL_PACKAGES_QT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 description {Add Qt5 GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qt5-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-delete -DSWIPL_PACKAGES_QT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}/${prefix}/swipl-win.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
test.run yes
test.cmd ctest --output-on-failure
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/swi-prolog/Portfile b/lang/swi-prolog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 554d044999c..f52ac7b1be6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/swi-prolog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/swi-prolog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ name swi-prolog
</span> conflicts swi-prolog-devel
epoch 20051223
version 9.0.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories lang
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,8 @@ cmake.generator Ninja
</span> configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INCLUDE_PATH=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_LIBRARY_PATH=/usr/lib:${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_LIBRARY_PATH=/usr/lib:${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSWIPL_PACKAGES_QT=OFF
</span>
platform darwin 21 {
if {[vercmp ${version} 8.4.2] < 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +70,17 @@ platform darwin 21 {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 description {Add Qt5 GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qt5-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-delete -DSWIPL_PACKAGES_QT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}/${prefix}/swipl-win.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.cmd ctest --output-on-failure
</pre><pre style='margin:0'>
</pre>