openexr: Update to 2.4.0

Summary of changes:

    All code compiles without warnings on gcc, clang, msvc
    Cleanup of license and copyright notices
    floating-point exception handling is disabled by default
    New Slice::Make method to reliably compute base pointer for a slice.
    Miscellaneous bug fixes

This version fixes the following security vulnerabilities:

    CVE-2018-18444 Issue #351 Out of Memory
    CVE-2018-18443 Issue #350 heap-buffer-overflow

17 files changed, 85 insertions, 464 deletions

diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index e6704db06d9..edeca8d048a 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -1,31 +1,17 @@
-# $NetBSD: Makefile,v 1.22 2019/07/08 10:36:27 nia Exp $
+# $NetBSD: Makefile,v 1.23 2019/09/21 21:34:44 nia Exp $
 
-DISTNAME=	ilmbase-2.3.0
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GITHUB:=openexr/}
-GITHUB_PROJECT=	openexr
-GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+.include "../../graphics/openexr/Makefile.common"
 
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	https://www.openexr.com/
-COMMENT=	High dynamic-range (HDR) image file format library and tools
-LICENSE=	modified-bsd
+PKGNAME=	${DISTNAME:S/openexr/ilmbase/}
 
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		bash gmake
-GNU_CONFIGURE=		yes
-GCC_REQD+=		6
-TEST_TARGET=		check
-LIBS.SunOS=		-lm
-CONFIG_SHELL=		bash
+CONFIGURE_DIRS=	IlmBase
+BUILD_DIRS=	IlmBase
 
 PKGCONFIG_OVERRIDE=	IlmBase.pc.in
-PTHREAD_OPTS=		require
 
 CONFLICTS=		openexr<1.6
 
-BUILDLINK_TRANSFORM+=	rm:-Wno-long-double
+pre-configure:
+	cd ${WRKSRC}/IlmBase && ./bootstrap
 
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ilmbase/PLIST b/graphics/ilmbase/PLIST
index f30b188f345..ce7b65d38ec 100644
--- a/graphics/ilmbase/PLIST
+++ b/graphics/ilmbase/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/12/09 11:39:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/09/21 21:34:44 nia Exp $
 include/OpenEXR/Iex.h
 include/OpenEXR/IexBaseExc.h
 include/OpenEXR/IexErrnoExc.h
@@ -12,6 +12,7 @@ include/OpenEXR/IexMathIeeeExc.h
 include/OpenEXR/IexNamespace.h
 include/OpenEXR/IexThrowErrnoExc.h
 include/OpenEXR/IlmBaseConfig.h
+include/OpenEXR/IlmBaseConfigInternal.h
 include/OpenEXR/IlmThread.h
 include/OpenEXR/IlmThreadExport.h
 include/OpenEXR/IlmThreadForward.h
diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo
index e7feb5a4675..4e8d1484276 100644
--- a/graphics/ilmbase/distinfo
+++ b/graphics/ilmbase/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.16 2018/10/02 12:05:35 adam Exp $
+$NetBSD: distinfo,v 1.17 2019/09/21 21:34:44 nia Exp $
 
-SHA1 (ilmbase-2.3.0.tar.gz) = 1cddb28b14b60025b1e1604d5616540ed038cb16
-RMD160 (ilmbase-2.3.0.tar.gz) = bd60ebfdc114e186db87f8c8b92c4f031b17e0d9
-SHA512 (ilmbase-2.3.0.tar.gz) = db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-Size (ilmbase-2.3.0.tar.gz) = 595490 bytes
-SHA1 (patch-Iex_IexBaseExc.cpp) = 5bf551e1eacffa8dc3ec1c5643e5bfd5f8fc5701
-SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71
-SHA1 (patch-Imath_ImathFun.h) = 79ab60ada8cecd52e5b16fadbded82492d79a1df
-SHA1 (patch-bootstrap) = 16e655c408fdb0d275d8da8f77b83cebca132637
-SHA1 (patch-configure) = 5f20c43310a099b3ce888db7f39cdc33127b4d24
+SHA1 (openexr-2.4.0.tar.gz) = 0b9a24b8fa6b3f7f1d8813e91234308d3e43d10f
+RMD160 (openexr-2.4.0.tar.gz) = 5e7c5612c3b4a7d40d2fc9c3d45f0a46ebc738f9
+SHA512 (openexr-2.4.0.tar.gz) = b544b1fc9d785cad029f35388894d1e9dae278dfda3c80d5615280386206f2af5c94b72c17e1e1d1514f73a7151b5be0f166a4be5b74abefc2f27fdf0500dfe8
+Size (openexr-2.4.0.tar.gz) = 26806627 bytes
+SHA1 (patch-IlmBase_configure.ac) = 02d03927d37703c4e9919b445afa8245b0c2da85
diff --git a/graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp b/graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp
deleted file mode 100644
index 4a4f3706c35..00000000000
--- a/graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Iex_IexBaseExc.cpp,v 1.1 2013/12/26 15:59:27 tron Exp $
-
-Fix build with C compilers other GCC.
-
---- Iex/IexBaseExc.cpp.orig	2013-10-15 23:55:09.000000000 +0100
-+++ Iex/IexBaseExc.cpp	2013-12-26 15:17:54.000000000 +0000
-@@ -149,8 +149,10 @@
- void
- iex_debugTrap()
- {
-+#ifdef __GNUC__
-     // how to in Linux?
-     if (0 != ::getenv("IEXDEBUGTHROW"))
-         __builtin_trap();
-+#endif
- }
- #endif
diff --git a/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp b/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp
deleted file mode 100644
index 4962aa9f22d..00000000000
--- a/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Iex_IexThrowErrnoExc.cpp,v 1.2 2013/05/08 17:48:33 adam Exp $
-
---- Iex/IexThrowErrnoExc.cpp.orig	Thu Jul 26 10:46:21 2012
-+++ Iex/IexThrowErrnoExc.cpp
-@@ -419,7 +419,7 @@ void throwErrnoExc (const std::string &t
- 	    throw EnametoolongExc (tmp);
-       #endif
- 
--      #if defined (EOVERFLOW)
-+      #if defined (EOVERFLOW) && EOVERFLOW != ERANGE
- 	  case EOVERFLOW:
- 	    throw EoverflowExc (tmp);
-       #endif
diff --git a/graphics/ilmbase/patches/patch-Imath_ImathFun.h b/graphics/ilmbase/patches/patch-Imath_ImathFun.h
deleted file mode 100644
index f378525dbe7..00000000000
--- a/graphics/ilmbase/patches/patch-Imath_ImathFun.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Imath_ImathFun.h,v 1.1 2013/12/02 23:39:09 bsiegert Exp $
-
---- Imath/ImathFun.h.orig	Thu Sep 19 17:07:20 2013
-+++ Imath/ImathFun.h
-@@ -48,6 +48,8 @@
- #include "ImathInt64.h"
- #include "ImathNamespace.h"
- 
-+#undef abs
-+
- IMATH_INTERNAL_NAMESPACE_HEADER_ENTER
- 
- template <class T>
diff --git a/graphics/ilmbase/patches/patch-bootstrap b/graphics/ilmbase/patches/patch-bootstrap
deleted file mode 100644
index 647c5f9d7b8..00000000000
--- a/graphics/ilmbase/patches/patch-bootstrap
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bootstrap,v 1.1 2018/10/02 12:05:35 adam Exp $
-
-Portability fix.
-
---- bootstrap.orig	2018-08-10 01:34:57.000000000 +0000
-+++ bootstrap
-@@ -1,7 +1,7 @@
- #!/bin/bash
- # If we're on OS X, use glibtoolize instead of toolize when available
- HOSTTYPE=`uname`
--if [ "$HOSTTYPE" == "Darwin" ] && $(which glibtoolize > /dev/null 2>&1) ; then
-+if [ "$HOSTTYPE" = "Darwin" ] && $(which glibtoolize > /dev/null 2>&1) ; then
-         LIBTOOLIZE=glibtoolize
- else
-         LIBTOOLIZE=libtoolize
diff --git a/graphics/ilmbase/patches/patch-configure b/graphics/ilmbase/patches/patch-configure
deleted file mode 100644
index fa4965768b7..00000000000
--- a/graphics/ilmbase/patches/patch-configure
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2018/10/02 12:05:35 adam Exp $
-
-Portablity fixes.
-Disable ucontext.h detection, which leads to problems on some platforms.
-Disable univeral binary build on Mac OS X.
-
---- configure.orig	2018-08-10 01:35:09.000000000 +0000
-+++ configure
-@@ -15253,7 +15253,7 @@ else
- fi
- 
- 
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
-       ax_cxx_compile_alternatives="17 1z"    ax_cxx_compile_cxx17_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -16966,7 +16966,7 @@ $as_echo "$as_me: WARNING: C++17 is not 
- 
- 	CXXFLAGS="$CXXFLAGS -std=c++17"
- else
--  if test "${cxxstd}" == 14 ; then
-+  if test "${cxxstd}" = 14 ; then
-         ax_cxx_compile_alternatives="14 1y"    ax_cxx_compile_cxx14_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -17874,7 +17874,7 @@ $as_echo "#define HAVE_CXX14 1" >>confde
- 
-   	CXXFLAGS="$CXXFLAGS -std=c++14"
-   else
--    if test "${cxxstd}" == 11 ; then
-+    if test "${cxxstd}" = 11 ; then
-         ax_cxx_compile_alternatives="11 0x"    ax_cxx_compile_cxx11_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -18542,7 +18542,7 @@ $as_echo "#define HAVE_CXX11 1" >>confde
- 
-       CXXFLAGS="$CXXFLAGS -std=c++11"
-     else
--      if test "${cxxstd}" == 03 ; then
-+      if test "${cxxstd}" = 03 ; then
-         $as_echo "#define ILMBASE_FORCE_CXX03 1" >>confdefs.h
- 
-         CXXFLAGS="$CXXFLAGS -std=c++03"
-@@ -21827,11 +21827,11 @@ $as_echo "#define HAVE_CXX17 1" >>confde
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&5
- $as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&2;}
- 
--        if test "$HAVE_CXX14" == 1 ; then
-+        if test "$HAVE_CXX14" = 1 ; then
-   	      CXXFLAGS="$CXXFLAGS -std=c++14"
-           cxxstd = 14
-         else
--          if test "$HAVE_CXX11" == 1 ; then
-+          if test "$HAVE_CXX11" = 1 ; then
-   	        CXXFLAGS="$CXXFLAGS -std=c++11"
-             cxxstd = 11
-           fi
-@@ -22447,7 +22447,7 @@ $as_echo "#define STDC_HEADERS 1" >>conf
- 
- fi
- 
--for ac_header in limits.h unistd.h ucontext.h
-+for ac_header in limits.h unistd.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-@@ -22768,7 +22768,7 @@ LIB_SUFFIX=""
- lib_suffix_valid="no"
- 
- lib_namespace=""
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
-     cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API}
- _ACEOF
-@@ -22787,7 +22787,7 @@ _ACEOF
-     lib_namespace="${ILMBASE_VERSION_API}"
-     LIB_SUFFIX="${ILMBASE_VERSION_API}"
-     lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
-     cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath
- _ACEOF
-@@ -22823,7 +22823,7 @@ _ACEOF
- fi
- 
- 
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
- 
-  if true; then
-@@ -22858,7 +22858,7 @@ else
- fi
- 
- 
--if test "x${custom_public_namespace}" == xyes ; then
-+if test "x${custom_public_namespace}" = xyes ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5
- $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;}
-     $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
-@@ -22870,7 +22870,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
- 
-     public_namespace=""
-     custom_public_namespace=no
--elif test "x${custom_public_namespace}" == xno ; then
-+elif test "x${custom_public_namespace}" = xno ; then
-     $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
- 
-     $as_echo "#define IEX_NAMESPACE Iex" >>confdefs.h
-@@ -22911,7 +22911,7 @@ else
- fi
- 
- 
--  if test "${osx_arch}" != default ; then
-+  if false ; then
-           osx_arch_flags="-arch ${osx_arch// / -arch }"
-      CXXFLAGS="$CXXFLAGS $osx_arch_flags"
- 
diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 3e45c6127e4..0a242b50023 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,34 +1,20 @@
-# $NetBSD: Makefile,v 1.39 2018/11/20 08:59:29 maya Exp $
+# $NetBSD: Makefile,v 1.40 2019/09/21 21:34:44 nia Exp $
 
-DISTNAME=	openexr-2.3.0
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GITHUB:=openexr/}
-GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+.include "Makefile.common"
 
-MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.openexr.com/
-COMMENT=	High dynamic-range (HDR) image file format library and tools
-LICENSE=	modified-bsd
+CONFIGURE_DIRS=	OpenEXR
+BUILD_DIRS=	OpenEXR
 
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake pkg-config
-GNU_CONFIGURE=		yes
-GCC_REQD+=		6
-PKGCONFIG_OVERRIDE=	OpenEXR.pc.in
-TEST_TARGET=		check
-
-
-.include "../../mk/bsd.prefs.mk"
+USE_TOOLS+=	pkg-config
 
-PTHREAD_OPTS+=		require
 LIBS.IRIX+=		-lmx
-LIBS.SunOS+=		-lm
 
-BUILDLINK_TRANSFORM+=	rm:-Wno-long-double
+PKGCONFIG_OVERRIDE=	OpenEXR.pc.in
+
+pre-configure:
+	cd ${WRKSRC}/OpenEXR && ./bootstrap
 
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.ilmbase+=	ilmbase>=1.0.2nb1
 .include "../../graphics/ilmbase/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openexr/Makefile.common b/graphics/openexr/Makefile.common
new file mode 100644
index 00000000000..3a91bcdf74b
--- /dev/null
+++ b/graphics/openexr/Makefile.common
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile.common,v 1.1 2019/09/21 21:34:44 nia Exp $
+# used by graphics/ilmbase/Makefile
+# used by graphics/opencv/Makefile
+
+DISTNAME=	openexr-2.4.0
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_GITHUB:=openexr/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+
+MAINTAINER=	adam@NetBSD.org
+HOMEPAGE=	https://www.openexr.com/
+COMMENT=	High dynamic-range (HDR) image file format library and tools
+LICENSE=	modified-bsd
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+USE_TOOLS+=	autoconf automake aclocal
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++14
+USE_LIBTOOL=	yes
+TEST_TARGET=	check
+
+# C++14
+GCC_REQD+=	6
+
+LIBS.SunOS+=	-lm
+
+PTHREAD_OPTS=	require
+
+# Compatibility
+CONFIGURE_ARGS+=	--disable-namespaceversioning
+
+BUILDLINK_TRANSFORM+=	rm:-Wno-long-double
+
+CHECK_PORTABILITY_SKIP+=	Contrib/DtexToExr/bootstrap
+
+.include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST
index 319fc2dcc78..17c0f93a64b 100644
--- a/graphics/openexr/PLIST
+++ b/graphics/openexr/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2018/10/02 12:05:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/09/21 21:34:44 nia Exp $
+bin/exr2aces
 bin/exrenvmap
 bin/exrheader
 bin/exrmakepreview
@@ -37,6 +38,7 @@ include/OpenEXR/ImfEnvmap.h
 include/OpenEXR/ImfEnvmapAttribute.h
 include/OpenEXR/ImfExport.h
 include/OpenEXR/ImfFloatAttribute.h
+include/OpenEXR/ImfFloatVectorAttribute.h
 include/OpenEXR/ImfForward.h
 include/OpenEXR/ImfFrameBuffer.h
 include/OpenEXR/ImfFramesPerSecond.h
@@ -94,6 +96,7 @@ include/OpenEXR/ImfVersion.h
 include/OpenEXR/ImfWav.h
 include/OpenEXR/ImfXdr.h
 include/OpenEXR/OpenEXRConfig.h
+include/OpenEXR/OpenEXRConfigInternal.h
 lib/libIlmImf.la
 lib/libIlmImfUtil.la
 lib/pkgconfig/OpenEXR.pc
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index bc4c7552f14..c9bd7306a95 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.31 2018/10/02 12:05:35 adam Exp $
+$NetBSD: distinfo,v 1.32 2019/09/21 21:34:44 nia Exp $
 
-SHA1 (openexr-2.3.0.tar.gz) = 67c4f9c2b4ab7c5922671536f93827ecb966969f
-RMD160 (openexr-2.3.0.tar.gz) = 3444fe1aa647be9ab2e6ea1638e27ea97c3f6688
-SHA512 (openexr-2.3.0.tar.gz) = 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
-Size (openexr-2.3.0.tar.gz) = 18412067 bytes
-SHA1 (patch-IlmImf_ImfSystemSpecific.cpp) = 79bf644181650fa7dc13c04dfeb68142bde6a2b6
-SHA1 (patch-IlmImf_ImfSystemSpecific.h) = 25671307ed19503039fe6fc5ef7cc45ce7d523f1
-SHA1 (patch-bootstrap) = 9e8718727c571f48df9f213a016fe24ea3141c21
-SHA1 (patch-configure) = f46aeb70c0dc85b07be5608ffc923c7bda9f1a66
+SHA1 (openexr-2.4.0.tar.gz) = 0b9a24b8fa6b3f7f1d8813e91234308d3e43d10f
+RMD160 (openexr-2.4.0.tar.gz) = 5e7c5612c3b4a7d40d2fc9c3d45f0a46ebc738f9
+SHA512 (openexr-2.4.0.tar.gz) = b544b1fc9d785cad029f35388894d1e9dae278dfda3c80d5615280386206f2af5c94b72c17e1e1d1514f73a7151b5be0f166a4be5b74abefc2f27fdf0500dfe8
+Size (openexr-2.4.0.tar.gz) = 26806627 bytes
+SHA1 (patch-OpenEXR_IlmImf_ImfSystemSpecific.h) = a07e8ba50084e642a2f53371cdc53738b3e75995
diff --git a/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp b/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp
deleted file mode 100644
index 2e4549d5150..00000000000
--- a/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-IlmImf_ImfSystemSpecific.cpp,v 1.2 2014/08/19 13:34:42 joerg Exp $
-
-Rework cpuid function to use gnuc __get_cpuid (requiring at least gcc 4.3)
-This get's over issues such as encountered with PIC builds.
-Upstream issue : https://github.com/openexr/openexr/issues/128
-
---- IlmImf/ImfSystemSpecific.cpp.orig	2014-08-10 04:23:57.000000000 +0000
-+++ IlmImf/ImfSystemSpecific.cpp
-@@ -40,21 +40,30 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EN
- 
- namespace {
- #if defined(IMF_HAVE_SSE2) &&  defined(__GNUC__)
--
-     // Helper functions for gcc + SSE enabled
--    void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
-+    void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
-+					unsigned int &ecx, unsigned int &edx)
-     {
-+#ifdef __i386__
-+        __asm__ __volatile__ (
-+            "pushl %%ebx; cpuid; movl %%ebx, %0; popl %%ebx"
-+            : /* Output  */ "=m"(ebx), "=a"(eax), "=c"(ecx), "=d"(edx) 
-+            : /* Input   */ "a"(n)
-+            : /* Clobber */);
-+#else
-         __asm__ __volatile__ (
-             "cpuid"
-             : /* Output  */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) 
-             : /* Input   */ "a"(n)
-             : /* Clobber */);
-+#endif
-     }
- 
- #else // IMF_HAVE_SSE2 && __GNUC__
- 
-     // Helper functions for generic compiler - all disabled
--    void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
-+    void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
-+					unsigned int &ecx, unsigned int &edx)
-     {
-         eax = ebx = ecx = edx = 0;
-     }
-@@ -64,7 +73,7 @@ namespace {
- 
- #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
- 
--    void xgetbv(int n, int &eax, int &edx)
-+    void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
-     {
-         __asm__ __volatile__ (
-             "xgetbv"
-@@ -75,7 +84,7 @@ namespace {
- 
- #else //  OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
- 
--    void xgetbv(int n, int &eax, int &edx)
-+    void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
-     {
-         eax = edx = 0;
-     }
-@@ -94,8 +103,8 @@ CpuId::CpuId():
-     f16c(false)
- {
-     bool osxsave = false;
--    int  max     = 0;
--    int  eax, ebx, ecx, edx;
-+    unsigned int  max     = 0;
-+    unsigned int  eax, ebx, ecx, edx;
- 
-     cpuid(0, max, ebx, ecx, edx);
-     if (max > 0)
diff --git a/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.h b/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.h
deleted file mode 100644
index bdd70ab8f14..00000000000
--- a/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-IlmImf_ImfSystemSpecific.h,v 1.2 2018/10/02 12:05:35 adam Exp $
-
-Work around lack of posix_memalign() on (some?) Solaris, from PR 47867.
-
---- IlmImf/ImfSystemSpecific.h.orig	2018-08-10 01:34:58.000000000 +0000
-+++ IlmImf/ImfSystemSpecific.h
-@@ -65,6 +65,8 @@ static void* EXRAllocAligned(size_t size
-     // GNUC is used for things like mingw to (cross-)compile for windows
- #ifdef _WIN32
-     return _aligned_malloc(size, alignment);
-+#elif defined(_sun)
-+    return memalign(alignment, size);
- #else
-     void* ptr = 0;
-     posix_memalign(&ptr, alignment, size);
diff --git a/graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h b/graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h
new file mode 100644
index 00000000000..c88e6ab1ab1
--- /dev/null
+++ b/graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-OpenEXR_IlmImf_ImfSystemSpecific.h,v 1.1 2019/09/21 21:34:44 nia Exp $
+
+Work around lack of posix_memalign() on (some?) Solaris, from PR 47867.
+
+--- OpenEXR/IlmImf/ImfSystemSpecific.h.orig	2019-09-18 01:02:06.000000000 +0000
++++ OpenEXR/IlmImf/ImfSystemSpecific.h
+@@ -59,6 +59,8 @@ EXRAllocAligned (size_t size, size_t ali
+     return _aligned_malloc (size, alignment);
+ #elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
+     return _mm_malloc (size, alignment);
++#elif defined(__sun)
++    return memalign(alignment, size);
+ #elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L)
+     void* ptr = 0;
+     // With fortify_source on, just doing the (void) cast trick
diff --git a/graphics/openexr/patches/patch-bootstrap b/graphics/openexr/patches/patch-bootstrap
deleted file mode 100644
index d2f2b780b7f..00000000000
--- a/graphics/openexr/patches/patch-bootstrap
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bootstrap,v 1.1 2018/10/02 12:05:35 adam Exp $
-
-Portability fix.
-
---- bootstrap.orig	2018-08-10 01:34:59.000000000 +0000
-+++ bootstrap
-@@ -1,7 +1,7 @@
- #!/bin/bash
- # If we're on OS X, use glibtoolize instead of toolize when available
- HOSTTYPE=`uname`
--if [ "$HOSTTYPE" == "Darwin" ] && $(which glibtoolize > /dev/null 2>&1) ; then
-+if [ "$HOSTTYPE" = "Darwin" ] && $(which glibtoolize > /dev/null 2>&1) ; then
-         LIBTOOLIZE=glibtoolize
- else
- 	LIBTOOLIZE=libtoolize
diff --git a/graphics/openexr/patches/patch-configure b/graphics/openexr/patches/patch-configure
deleted file mode 100644
index 265e3c753da..00000000000
--- a/graphics/openexr/patches/patch-configure
+++ /dev/null
@@ -1,119 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2018/10/02 12:05:35 adam Exp $
-
-Portability fixes.
-
---- configure.orig	2018-08-10 01:37:40.000000000 +0000
-+++ configure
-@@ -15910,7 +15910,7 @@ else
- fi
- 
- 
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
-       ax_cxx_compile_alternatives="17 1z"    ax_cxx_compile_cxx17_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -17623,7 +17623,7 @@ $as_echo "$as_me: WARNING: C++17 is not 
- 
- 	CXXFLAGS="$CXXFLAGS -std=c++17"
- else
--  if test "${cxxstd}" == 14 ; then
-+  if test "${cxxstd}" = 14 ; then
-         ax_cxx_compile_alternatives="14 1y"    ax_cxx_compile_cxx14_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -18531,7 +18531,7 @@ $as_echo "#define HAVE_CXX14 1" >>confde
- 
-   	CXXFLAGS="$CXXFLAGS -std=c++14"
-   else
--    if test "${cxxstd}" == 11 ; then
-+    if test "${cxxstd}" = 11 ; then
-         ax_cxx_compile_alternatives="11 0x"    ax_cxx_compile_cxx11_required=true
-   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -19199,7 +19199,7 @@ $as_echo "#define HAVE_CXX11 1" >>confde
- 
-       CXXFLAGS="$CXXFLAGS -std=c++11"
-     else
--      if test "${cxxstd}" == 03 ; then
-+      if test "${cxxstd}" = 03 ; then
-         CXXFLAGS="$CXXFLAGS -std=c++03"
-       else
-                   ax_cxx_compile_alternatives="11 0x"    ax_cxx_compile_cxx11_required=false
-@@ -22482,11 +22482,11 @@ $as_echo "#define HAVE_CXX17 1" >>confde
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&5
- $as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&2;}
- 
--        if test "$HAVE_CXX14" == 1 ; then
-+        if test "$HAVE_CXX14" = 1 ; then
-   	      CXXFLAGS="$CXXFLAGS -std=c++14"
-           cxxstd = 14
-         else
--          if test "$HAVE_CXX11" == 1 ; then
-+          if test "$HAVE_CXX11" = 1 ; then
-   	        CXXFLAGS="$CXXFLAGS -std=c++11"
-             cxxstd = 11
-           fi
-@@ -23399,7 +23399,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sysconf_nproc" >&5
- $as_echo "$sysconf_nproc" >&6; }
--if test "x${sysconf_nproc}" == xyes ; then
-+if test "x${sysconf_nproc}" = xyes ; then
- 
- $as_echo "#define OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN 1" >>confdefs.h
- 
-@@ -23511,7 +23511,7 @@ LIB_SUFFIX=""
- lib_suffix_valid="no"
- 
- lib_namespace="Imf"
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
- 
- cat >>confdefs.h <<_ACEOF
- #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf_${OPENEXR_VERSION_API}
-@@ -23524,7 +23524,7 @@ $as_echo "#define OPENEXR_IMF_INTERNAL_N
-     lib_namespace="Imf_${OPENEXR_VERSION_API}"
-     LIB_SUFFIX="${OPENEXR_VERSION_API}"
-     lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
- 
- cat >>confdefs.h <<_ACEOF
- #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf
-@@ -23548,7 +23548,7 @@ $as_echo "#define OPENEXR_IMF_INTERNAL_N
- fi
- 
- 
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
- 
-  if true; then
-@@ -23583,7 +23583,7 @@ else
- fi
- 
- 
--if test "x${custom_usr_namespace}" == xyes ; then
-+if test "x${custom_usr_namespace}" = xyes ; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&5
- $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&2;}
- 
-@@ -23592,7 +23592,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
-     usr_namespace="Imf"
--elif test "x${custom_usr_namespace}" == xno ; then
-+elif test "x${custom_usr_namespace}" = xno ; then
- 
- cat >>confdefs.h <<_ACEOF
- #define OPENEXR_IMF_NAMESPACE Imf
-@@ -26309,7 +26311,7 @@ enable large stack optimizations        
- internal library namespace                      $lib_namespace
- user-client namespace                           $usr_namespace" >&6; }
- 
--if test "x$build_osxuniversal" == xyes; then
-+if test "x$build_osxuniversal" = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
- build OS X universal binaries                   $build_osxuniversal" >&5
- $as_echo "