I was wondering what the version check hack was about in graphics/vigra
for graphics/hugin. Looks like there was a fix commited to vigra just
after the last update. So lift the fix and revert the hack.

Also while here..

- Clean out the OpenEXR workarounds which are no longer necessary
- g/c some version guards which are no longer necessary
- The ONLY_FOR_ARCHS is redundant
- Sort the WANTLIB


Index: graphics/hugin/Makefile
===================================================================
RCS file: /cvs/ports/graphics/hugin/Makefile,v
retrieving revision 1.100
diff -u -p -u -p -r1.100 Makefile
--- graphics/hugin/Makefile	22 Sep 2026 19:14:37 -0000	1.100
+++ graphics/hugin/Makefile	10 Oct 2026 06:53:53 -0000
@@ -3,7 +3,7 @@ BROKEN-hppa =	run dep on enblend-enfuse 
 COMMENT =	panorama image stitcher
 
 DISTNAME =	hugin-2025.0.1
-REVISION =	1
+REVISION =	2
 
 EXTRACT_SUFX =	.tar.bz2
 
@@ -49,13 +49,13 @@ RUN_DEPENDS =		devel/desktop-file-utils 
 			x11/gtk+4,-guic
 RUN_DEPENDS +=		x11/py-wxPython # required for launching python scripts
 
-LIB_DEPENDS =		graphics/exiv2>=0.12 \
+LIB_DEPENDS =		graphics/exiv2 \
 			graphics/lcms2 \
-			graphics/libpano13>=2.9.19 \
+			graphics/libpano13 \
 			graphics/lensfun \
-			graphics/vigra \
+			graphics/vigra>=1.12.4p2 \
 			math/flann \
-			x11/wxWidgets>=3.0.4
+			x11/wxWidgets
 
 MODULES =		devel/cmake lang/python
 
@@ -67,9 +67,6 @@ CONFIGURE_ARGS +=	-DBUILD_HSI=ON \
 			-DBUILD_WITH_EPOXY=ON \
 			-Wno-dev
 NO_TEST =		Yes
-
-# Fix build with OpeEXR>=3 (Imath split)
-CXXFLAGS +=		-I${LOCALBASE}/include/Imath
 
 MODPY_ADJ_FILES =	src/hugin_script_interface/hpi.py \
 			src/hugin_script_interface/plugins/shooting_pattern.py \
Index: graphics/hugin/patches/patch-CMakeModules_FindVIGRA_cmake
===================================================================
RCS file: graphics/hugin/patches/patch-CMakeModules_FindVIGRA_cmake
diff -N graphics/hugin/patches/patch-CMakeModules_FindVIGRA_cmake
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ graphics/hugin/patches/patch-CMakeModules_FindVIGRA_cmake	10 Oct 2026 06:53:53 -0000
@@ -0,0 +1,24 @@
+- Fixes parsing of version number in vigra/config_version.hxx
+  5dad0e83e6c58dc2425ca3d56659f4c229761870
+
+Index: CMakeModules/FindVIGRA.cmake
+--- CMakeModules/FindVIGRA.cmake.orig
++++ CMakeModules/FindVIGRA.cmake
+@@ -53,8 +53,15 @@ IF (VIGRA_FOUND)
+   IF(NOT VIGRA_CONFIG_VERSION_HXX)
+     MESSAGE(FATAL_ERROR "Could not find vigra/configVersion.hxx or vigra/config_version.hxx. Your vigra installation seems to be corrupt.")
+   ENDIF()
+-  FILE(STRINGS "${VIGRA_CONFIG_VERSION_HXX}" VIGRA_VERSION_HXX REGEX ".*#define +VIGRA_VERSION +\"")
+-  STRING(REGEX REPLACE ".*#define +VIGRA_VERSION +\"([.0-9]+).*" "\\1" VIGRA_VERSION "${VIGRA_VERSION_HXX}")
++  FILE(STRINGS "${VIGRA_CONFIG_VERSION_HXX}" VIGRA_VERSION_HXX REGEX ".*#define +VIGRA_VERSION_(MAJOR|MINOR|PATCH)")
++  STRING(REGEX REPLACE ".*#define +VIGRA_VERSION_MAJOR +([0-9]+).*" "\\1" VIGRA_VERSION_MAJOR "${VIGRA_VERSION_HXX}")
++  STRING(REGEX REPLACE ".*#define +VIGRA_VERSION_MINOR +([0-9]+).*" "\\1" VIGRA_VERSION_MINOR "${VIGRA_VERSION_HXX}")
++  STRING(REGEX REPLACE ".*#define +VIGRA_VERSION_PATCH +([0-9]+).*" "\\1" VIGRA_VERSION_PATCH "${VIGRA_VERSION_HXX}")
++  IF(VIGRA_VERSION_MAJOR AND VIGRA_VERSION_MINOR AND VIGRA_VERSION_PATCH)
++    SET(VIGRA_VERSION "${VIGRA_VERSION_MAJOR}.${VIGRA_VERSION_MINOR}.${VIGRA_VERSION_PATCH}")
++  ELSE()
++    MESSAGE(FATAL_ERROR "Cooud not parse vigra version number from vigra/config_version.hxx")
++  ENDIF()
+   IF(${VIGRA_VERSION} VERSION_EQUAL VIGRA_FIND_VERSION OR ${VIGRA_VERSION} VERSION_GREATER VIGRA_FIND_VERSION)
+     SET(VIGRA_VERSION_CHECK TRUE)
+     MESSAGE(STATUS "VIGRA version: ${VIGRA_VERSION}")
Index: graphics/hugin/patches/patch-src_hugin_base_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/hugin/patches/patch-src_hugin_base_CMakeLists_txt,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-src_hugin_base_CMakeLists_txt
--- graphics/hugin/patches/patch-src_hugin_base_CMakeLists_txt	11 Mar 2022 19:22:31 -0000	1.7
+++ graphics/hugin/patches/patch-src_hugin_base_CMakeLists_txt	10 Oct 2026 06:53:53 -0000
@@ -6,7 +6,7 @@ correct command line options for threadi
 Index: src/hugin_base/CMakeLists.txt
 --- src/hugin_base/CMakeLists.txt.orig
 +++ src/hugin_base/CMakeLists.txt
-@@ -152,6 +152,8 @@ vigra_ext/utils.h
+@@ -151,6 +151,8 @@ vigra_ext/utils.h
  vigra_ext/VignettingCorrection.h
  )
  
@@ -14,4 +14,4 @@ Index: src/hugin_base/CMakeLists.txt
 +
  IF (${HUGIN_SHARED_LIBS})
    add_library(huginbase SHARED ${HUGIN_BASE_SRC} ${HUGIN_BASE_HEADER})
-   target_link_libraries(huginbase ${Boost_LIBRARIES} Threads::Threads ${X11_X11_LIB})
+   target_link_libraries(huginbase Threads::Threads ${X11_X11_LIB})
Index: graphics/vigra/Makefile
===================================================================
RCS file: /cvs/ports/graphics/vigra/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- graphics/vigra/Makefile	22 Sep 2026 19:14:37 -0000	1.30
+++ graphics/vigra/Makefile	10 Oct 2026 06:53:53 -0000
@@ -1,12 +1,11 @@
 COMMENT =		image processing and analysis library
-ONLY_FOR_ARCHS =	${CXX11_ARCHS}
 
 V = 			1-12-4
 GH_ACCOUNT =		ukoethe
 GH_PROJECT =		vigra
 GH_TAGNAME =		Version-${V}
 DISTNAME =		vigra-${V:S/-/./g}
-REVISION =		1
+REVISION =		2
 
 SHARED_LIBS =		vigraimpex 0.0 # 5.1
 
@@ -20,8 +19,8 @@ MAINTAINER =		Kirill Bychkov <kirby@open
 PERMIT_PACKAGE =	Yes
 
 WANTLIB += Iex-3_5 IlmThread-3_5 Imath-3_2 OpenEXR-3_5 OpenEXRCore-3_5
-WANTLIB += boost_chrono-mt boost_date_time-mt boost_atomic-mt
-WANTLIB += boost_thread-mt fftw3 jpeg m png tiff boost_container-mt
+WANTLIB += boost_atomic-mt boost_chrono-mt  boost_container-mt
+WANTLIB += boost_date_time-mt boost_thread-mt fftw3 jpeg m png tiff
 WANTLIB += z ${COMPILER_LIBCXX}
 
 # C++11
@@ -46,9 +45,6 @@ CONFIGURE_ARGS =	-DBUILD_DOCS=0 \
 			-DAUTOEXEC_TESTS:BOOL=OFF \
 			-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes \
 			-Wno-dev
-
-# Fix build with OpenEXR>=3 (Imath split)
-CXXFLAGS += 		-I${LOCALBASE}/include/Imath
 
 # Actually, there are tests, but they do work only on GCC.
 # If you want to play, just add -DAUTOBUILD_TESTS=ON to CONFIGURE_ARGS.
Index: graphics/vigra/patches/patch-config_FindOpenEXR_cmake
===================================================================
RCS file: graphics/vigra/patches/patch-config_FindOpenEXR_cmake
diff -N graphics/vigra/patches/patch-config_FindOpenEXR_cmake
--- graphics/vigra/patches/patch-config_FindOpenEXR_cmake	11 Mar 2022 19:23:30 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-Fix build with OpenEXR>=3
-
-Index: config/FindOpenEXR.cmake
---- config/FindOpenEXR.cmake.orig
-+++ config/FindOpenEXR.cmake
-@@ -27,7 +27,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFI
- 
- FOREACH(V "" -2_2 -2_1 -2_0 -1_7)
-     if(NOT OPENEXR_ILMIMF_LIBRARY)
--        FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf${V})
-+        FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES OpenEXR${V}) 
-         if(OPENEXR_ILMIMF_LIBRARY)
-             set(OPENEXR_VERSION ${V})
-         endif()
-@@ -37,7 +37,7 @@ ENDFOREACH(V)
- FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath${OPENEXR_VERSION})
- FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex${OPENEXR_VERSION})
- FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread${OPENEXR_VERSION})
--FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half)
-+FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Imath)
- 
- INCLUDE(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
Index: graphics/vigra/patches/patch-include_vigra_config_version_hxx
===================================================================
RCS file: graphics/vigra/patches/patch-include_vigra_config_version_hxx
diff -N graphics/vigra/patches/patch-include_vigra_config_version_hxx
--- graphics/vigra/patches/patch-include_vigra_config_version_hxx	15 May 2026 14:41:59 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: include/vigra/config_version.hxx
---- include/vigra/config_version.hxx.orig
-+++ include/vigra/config_version.hxx
-@@ -40,6 +40,7 @@
-     #define VIGRA_VERSION_MAJOR 1
-     #define VIGRA_VERSION_MINOR 12
-     #define VIGRA_VERSION_PATCH 4
-+    #define VIGRA_VERSION "1.12.4"
- 
-     #define VIGRA_VERSION_STRINGIFY_HELPER(x) #x
-     #define VIGRA_VERSION_STRINGIFY(x) VIGRA_VERSION_STRINGIFY_HELPER(x)