Index: head/graphics/ilmbase/Makefile
===================================================================
--- head/graphics/ilmbase/Makefile	(revision 522705)
+++ head/graphics/ilmbase/Makefile	(revision 522706)
@@ -1,67 +1,62 @@
 # Created by: nork@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	ilmbase
 PORTVERSION=	2.4.0
 CATEGORIES=	graphics devel
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex
 
 LICENSE=	BSD3CLAUSE
 
 # there are some systems that have a static /bin/bash, so
 # in order to make BUILD_DEPENDS effective, use the same absolute
 # path we will pass down through CONFIGURE_SHELL below.
 BUILD_DEPENDS=	${BASH_CMD}:shells/bash
 
 USES=		cmake compiler:c++14-lang pkgconfig libtool
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_TUPLE=	AcademySoftwareFoundation:openexr:v2.4.0
 WRKSRC_SUBDIR=	IlmBase
 
-# libtool links C++ libraries with -nostdlib, which prevents -pthread from
-# having an effect (at least with clang). Make sure we also pass -lpthread so
-# we do link against libthr.so.
-TEST_TARGET=	check
-
 PORTDOCS=	README.md
 OPTIONS_DEFINE=		DOCS LARGE_STACK
 LARGE_STACK_DESC=	Enable sys-dependent large stack optimizations
 LARGE_STACK_CONFIGURE_ENABLE=	large-stack
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX=${PREFIX} --target install
 
 BASH_CMD=	${LOCALBASE}/bin/bash
 
 OPTIONS_SUB=	yes
 
 MAJORVER=	2_4
 VER=		24
 
 PLIST_SUB=	MAJORVER=${MAJORVER}
 PLIST_SUB+=	VER=${VER}
 
 HALF_BIN=	eLut toFloat
 
-regression-test regression check::
+test regression-test regression check::
 	cd ${BUILD_WRKSRC} && ctest
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf-${MAJORVER}.so
 	${RM} ${STAGEDIR}${PREFIX}/lib/*.la
 .for l in libHalf libIex libIexMath libImath libIlmThread
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so
 	${LN} -s ${l}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${l}.so || :
 .endfor
 
 .for e in ${HALF_BIN}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/Half/${e} ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/ilmbase/files/patch-CMakeLists.txt
===================================================================
--- head/graphics/ilmbase/files/patch-CMakeLists.txt	(revision 522705)
+++ head/graphics/ilmbase/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,24 +0,0 @@
-From fe2fccde18bc35db11895718d0b77d3f23d427b5 Mon Sep 17 00:00:00 2001
-From: Kimball Thurston <kdt3rd@gmail.com>
-Date: Tue, 5 Nov 2019 21:42:45 +1300
-Subject: [PATCH] Fix #595 and others, issue with pkgconfig generation under
- cmake
-
-autoconf seems to automatically insert the ${prefix} variable reference
-when emitting the pkg-config file. Make cmake rules conform to that
-pattern.
---- config/CMakeLists.txt.orig	2019-09-18 01:02:06 UTC
-+++ config/CMakeLists.txt
-@@ -71,9 +71,9 @@ if(ILMBASE_INSTALL_PKG_CONFIG)
-   # use a helper function to avoid variable pollution, but pretty simple
-   function(ilmbase_pkg_config_help pcinfile)
-     set(prefix ${CMAKE_INSTALL_PREFIX})
--    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
--    set(libdir ${CMAKE_INSTALL_LIBDIR})
--    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
-+    set(exec_prefix "\${prefix}")
-+    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-+    set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-     set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX})
-     if(TARGET Threads::Threads)
-       # hrm, can't use properties as they end up as generator expressions

Property changes on: head/graphics/ilmbase/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/ilmbase/files/patch-config_CMakeLists.txt
===================================================================
--- head/graphics/ilmbase/files/patch-config_CMakeLists.txt	(nonexistent)
+++ head/graphics/ilmbase/files/patch-config_CMakeLists.txt	(revision 522706)
@@ -0,0 +1,24 @@
+From fe2fccde18bc35db11895718d0b77d3f23d427b5 Mon Sep 17 00:00:00 2001
+From: Kimball Thurston <kdt3rd@gmail.com>
+Date: Tue, 5 Nov 2019 21:42:45 +1300
+Subject: [PATCH] Fix #595 and others, issue with pkgconfig generation under
+ cmake
+
+autoconf seems to automatically insert the ${prefix} variable reference
+when emitting the pkg-config file. Make cmake rules conform to that
+pattern.
+--- config/CMakeLists.txt.orig	2019-09-18 01:02:06 UTC
++++ config/CMakeLists.txt
+@@ -71,9 +71,9 @@ if(ILMBASE_INSTALL_PKG_CONFIG)
+   # use a helper function to avoid variable pollution, but pretty simple
+   function(ilmbase_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+-    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(exec_prefix "\${prefix}")
++    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
++    set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+     set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX})
+     if(TARGET Threads::Threads)
+       # hrm, can't use properties as they end up as generator expressions

Property changes on: head/graphics/ilmbase/files/patch-config_CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/ilmbase/files/patch-config_IlmBaseSetup.cmake
===================================================================
--- head/graphics/ilmbase/files/patch-config_IlmBaseSetup.cmake	(nonexistent)
+++ head/graphics/ilmbase/files/patch-config_IlmBaseSetup.cmake	(revision 522706)
@@ -0,0 +1,13 @@
+--- config/IlmBaseSetup.cmake.orig	2019-09-18 01:02:06 UTC
++++ config/IlmBaseSetup.cmake
+@@ -48,10 +48,6 @@ set(ILMBASE_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destin
+ # but is pretty harmless to set globally
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ 
+-# Suffix for debug configuration libraries
+-# (if you should choose to install those)
+-set(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Suffix for debug builds")
+-
+ # Usual cmake option to build shared libraries or not
+ option(BUILD_SHARED_LIBS "Build shared library" ON)
+ # This allows a "double library" setup, where we compile both

Property changes on: head/graphics/ilmbase/files/patch-config_IlmBaseSetup.cmake
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/ilmbase/files/patch-config_LibraryDefine.cmake
===================================================================
--- head/graphics/ilmbase/files/patch-config_LibraryDefine.cmake	(nonexistent)
+++ head/graphics/ilmbase/files/patch-config_LibraryDefine.cmake	(revision 522706)
@@ -0,0 +1,11 @@
+--- config/LibraryDefine.cmake.orig	2019-09-18 01:02:06 UTC
++++ config/LibraryDefine.cmake
+@@ -100,8 +100,6 @@ function(ILMBASE_DEFINE_LIBRARY libname)
+   if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL ""))
+     set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+     set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX})
+-    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+-    install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
+     set(verlibname)
+     set(baselibname)
+   endif()

Property changes on: head/graphics/ilmbase/files/patch-config_LibraryDefine.cmake
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property