<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/c36298ace06b0432e079e9b9244138f4767977b4">https://github.com/macports/macports-ports/commit/c36298ace06b0432e079e9b9244138f4767977b4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c36298ace06b0432e079e9b9244138f4767977b4
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Aug 20 11:25:18 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> hugin-app: group apps in subfolder
</span><span style='display:block; white-space:pre;color:#404040;'> - Also remove defunct patch for OpenMP
</span>---
graphics/hugin-app/Portfile | 18 +++++++++---------
graphics/hugin-app/files/patch-CMakeLists.txt.diff | 13 +++++++------
graphics/hugin-app/files/patch-find_openmp.diff | 20 --------------------
3 files changed, 16 insertions(+), 35 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 10d13a995f3..b8e4d8b84af 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;'>@@ -10,7 +10,7 @@ PortGroup boost 1.0
</span>
name hugin-app
version 2021.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
maintainers {mcalhoun @MarcusCalhoun-Lopez} {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,18 +41,13 @@ checksums rmd160 0c661e3754dee747284af07d4f2b477f48759ad6 \
</span>
linalg.setup noveclibfort
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Since there are multiple apps, group together in separate folder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set applications_dir ${applications_dir}/Hugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Remove deployment target. Make detecting MacPorts more robust through flag to
# support non-standard install location.
patchfiles-append patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# change how we look for OpenMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#patchfiles-append patch-find_openmp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# "s|___MACPORTS_FIND_OPENMP__|set(OPENMP_FOUND FALSE)|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#e0e0e0;'>@@ -105,6 +100,11 @@ post-patch {
</span> reinplace \
"s|@@MACPORTS_BIN_PATH@@|${prefix}/bin|" \
${worksrcpath}/src/hugin1/hugin/huginApp.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Adjust Applications path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@MACPORTS_APP_PATH@@|${applications_dir}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CMakeLists.txt
</span> }
# do not find freeglut if installed
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-CMakeLists.txt.diff b/graphics/hugin-app/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d2eb6076580..d0669d0474c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/hugin-app/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2022-02-09 13:12:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2022-02-09 13:16:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2022-08-20 11:09:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2022-08-20 11:10:17.000000000 -0400
</span> @@ -16,7 +16,7 @@
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if(APPLE)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
+ #set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> set(CMAKE_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/include ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/bin)
@@ -425,12 +425,12 @@
ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Check for OpenMP
-IF(APPLE)
+#IF(APPLE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +34,9 @@
</span> - IF (CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
+ IF (MACPORTS)
# MacPorts
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(INSTALL_OSX_BUNDLE_DIR /Applications/MacPorts CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(INSTALL_OSX_BUNDLE_DIR /Applications/MacPorts CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
</span> - ELSE(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(INSTALL_OSX_BUNDLE_DIR @@MACPORTS_APP_PATH@@ CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
</span> + ELSE(MACPORTS)
# fink or other custom system.
SET(INSTALL_OSX_BUNDLE_DIR ${CMAKE_INSTALL_PREFIX}/Applications CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +46,7 @@
</span> ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
ENDIF (APPLE)
@@ -973,4 +973,3 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/hugin-app/files/patch-find_openmp.diff b/graphics/hugin-app/files/patch-find_openmp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4d2025ad860..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/hugin-app/files/patch-find_openmp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2017-07-30 07:51:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2017-07-30 07:52:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -412,12 +412,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for OpenMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IF(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#IF(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #we need a special search routine for mac, see changes in file CMakeModules/FindOpenMPMac.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FIND_PACKAGE(OpenMPMac)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FIND_PACKAGE(OpenMP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #FIND_PACKAGE(OpenMPMac)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ___MACPORTS_FIND_OPENMP__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(OPENMP_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Compiler supports OpenMP. Activating support for it.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_COMPILE_OPTIONS(${OpenMP_CXX_FLAGS})
</span></pre><pre style='margin:0'>
</pre>