<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/1921cfe9d77150b79409d72cf8fdac3bd423ac0c">https://github.com/macports/macports-ports/commit/1921cfe9d77150b79409d72cf8fdac3bd423ac0c</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 1921cfe9d77 hugin-app: fix lint issues; cleanup
</span>1921cfe9d77 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 1921cfe9d77150b79409d72cf8fdac3bd423ac0c
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Aug 19 11:34:44 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    hugin-app: fix lint issues; cleanup
</span>---
 graphics/hugin-app/Portfile                      | 59 ++++++++++++------------
 graphics/hugin-app/files/patch-huginApp.cpp.diff |  2 +-
 2 files changed, 31 insertions(+), 30 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 88a290f29fb..f77e61e5638 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;'>@@ -41,7 +41,7 @@ checksums               rmd160  0c661e3754dee747284af07d4f2b477f48759ad6 \
</span> 
 linalg.setup            noveclibfort
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove deployment target. Make detecting MacPorts more robust through flag to 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove deployment target. Make detecting MacPorts more robust through flag to
</span> # support non-standard install location.
 patchfiles-append       patch-CMakeLists.txt.diff
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,23 @@ patchfiles-append       patch-CMakeLists.txt.diff
</span> # Fix icons which were not getting installed for PTBatcherGUI.app and
 # HuginStitchProject.app.  No icon supplied for calibrate_lens_gui.app.
 patchfiles-append       patch-icns.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Change finite() -> isfinite().  finite() deprecated since C99 and no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# no longer in my libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       patch-compiler.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Corrects path for launching PTBatcherGUI.app from Hugin.app by removing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MAC_SELF_CONTAINED_BUNDLE from #if condition.  Existing code seems to work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       patch-PanoPanel.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update search path in Hugin.app (i.e. for cpfind, etc.).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append       patch-huginApp.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # fix file perms; tarball contents deny world read
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "find ${worksrcpath} -type d -print0 | xargs -0 chmod a+rx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "find ${worksrcpath} -type f -print0 | xargs -0 chmod a+r"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     # icon files have strange permissions
     system "chmod 0644 ${worksrcpath}/src/hugin1/hugin/*.icns"
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,40 +86,25 @@ post-extract {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Change finite() -> isfinite().  finite() deprecated since C99 and no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# no longer in my libraries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append       patch-compiler.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Corrects path for launching PTBatcherGUI.app from Hugin.app by removing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# MAC_SELF_CONTAINED_BUNDLE from #if condition.  Existing code seems to work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append       patch-PanoPanel.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# In RunStichPanel.cpp adjust exe path. Solves problem with PTBatcherGUI.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# finding nona.  Otherwise path is set to bundle exe dir which only contains
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PTBatcherGUI exe.
</span> post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # In RunStichPanel.cpp adjust exe path. Solves problem with PTBatcherGUI.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # finding nona.  Otherwise path is set to bundle exe dir which only contains
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # PTBatcherGUI exe.
</span>     reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    "s|exePath(wxStandardPaths::Get().GetExecutablePath())|exePath(\"${prefix}/bin/\")|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ${worksrcpath}/src/hugin1/base_wx/RunStitchPanel.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "s|exePath(wxStandardPaths::Get().GetExecutablePath())|exePath(\"${prefix}/bin/\")|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/src/hugin1/base_wx/RunStitchPanel.cpp
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# In hugin_executor.cpp adjust exe path. I am not sure what this affects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (didn't solve PTBatcherGUI nona problem) but similar to above patch.  Might
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# affect HuginStitchProject.app which I haven't used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # In hugin_executor.cpp adjust exe path. I am not sure what this affects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # (didn't solve PTBatcherGUI nona problem) but similar to above patch.  Might
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # affect HuginStitchProject.app which I haven't used.
</span>     reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    "s|exePath(wxStandardPaths::Get().GetExecutablePath())|exePath(\"${prefix}/bin/\")|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ${worksrcpath}/src/hugin1/executor/hugin_executor.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "s|exePath(wxStandardPaths::Get().GetExecutablePath())|exePath(\"${prefix}/bin/\")|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/src/hugin1/executor/hugin_executor.cpp
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Update search path in Hugin.app (i.e. for cpfind, etc.).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append       patch-huginApp.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Adjust search path above if non-standard MacPorts install location.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Adjust search path above if non-standard MacPorts install location.
</span>     reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    "s|MACPORTS_BIN_PATH \"/opt/local/bin\"|MACPORTS_BIN_PATH \"${prefix}/bin\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ${worksrcpath}/src/hugin1/hugin/huginApp.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "s|@@MACPORTS_BIN_PATH@@|${prefix}/bin|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/src/hugin1/hugin/huginApp.cpp
</span> }
 
 # do not find freeglut if installed
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-huginApp.cpp.diff b/graphics/hugin-app/files/patch-huginApp.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3574bd6341d..10afb8ad173 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/files/patch-huginApp.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/hugin-app/files/patch-huginApp.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> +    // Append the standard MacPorts bin location so functions like cpfind can be
 +    // found.  The environment path gets used in AutoCtrlPointCreator.cpp method
 +    // AutoCtrlPointCreator::automatch(...).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    #define MACPORTS_BIN_PATH "/opt/local/bin"  /* Portfile may adjust */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    #define MACPORTS_BIN_PATH "@@MACPORTS_BIN_PATH@@"  /* Portfile may adjust */
</span> +    wxString env_path;
 +    wxGetEnv("PATH", &env_path);
 +    env_path += ":";
</pre><pre style='margin:0'>

</pre>