<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1df385197c556eb70cfa7158e99041751c002c91">https://github.com/macports/macports-ports/commit/1df385197c556eb70cfa7158e99041751c002c91</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1df385197c556eb70cfa7158e99041751c002c91
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun May 28 18:18:19 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> hugin-app: portfile cleanup
</span>---
graphics/hugin-app/Portfile | 69 +++++++++++++++++++++++----------------------
1 file changed, 35 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/Portfile b/graphics/hugin-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f16b934d3c..c8a1f44861c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/hugin-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,8 +108,8 @@ post-patch {
</span> }
# do not find freeglut if installed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_FIND_FRAMEWORK=LAST \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_FIND_FRAMEWORK=LAST \
</span> -DCMAKE_FIND_FRAMEWORK=FIRST
# see https://trac.macports.org/ticket/58484
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,29 +129,30 @@ configure.cppflags-append \
</span> -Wno-deprecated-declarations \
-Wno-deprecated-register
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
# see http://wiki.panotools.org/Development_of_Open_Source_tools#Dependencies
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpano13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:imath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openexr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vigra \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:exiv2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:glew \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpano13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:imath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vigra \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:exiv2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glew \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span> port:fftw-3
require_active_variants glew "" x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flann \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lcms2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flann \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span> port:sqlite3
# Note: 'lz4' needed for 'flann':
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,14 +166,14 @@ depends_lib-append \
</span> configure.ldflags-append \
-llz4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:enblend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:enblend \
</span> port:p${perl5.major}-image-exiftool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DINSTALL_OSX_BUNDLE_DIR=${applications_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_HSI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINSTALL_OSX_BUNDLE_DIR=${applications_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_HSI=OFF \
</span> -DENABLE_LAPACK=ON
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,21 +193,21 @@ foreach v ${pythons_versions} {
</span> set p python${s}
set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_prefix ${frameworks_dir}/Python.framework/Versions/${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_prefix ${frameworks_dir}/Python.framework/Versions/${v}
</span> variant ${p} description "Build Python Scripting Interface with Python ${v}" conflicts {*}${c} "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${p} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${p} \
</span> port:swig-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${python_prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${python_prefix}/bin/python${v}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${python_prefix}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${python_prefix}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${python_prefix}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${python_prefix}/Headers \
</span> -DPYTHON_LIBRARY=${python_prefix}/Python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_HSI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_HSI=OFF \
</span> -DBUILD_HSI=ON
"
if {[variant_isset python${s}]} {
</pre><pre style='margin:0'>
</pre>