ilmbase/openexr: updated to 2.3.0

OpenEXR v2.3.0 has been released and is available for download.

Features/Improvements:
ThreadPool overhead improvements, enable custom thread pool to be registered via ThreadPoolProvider class
Fixes to enable custom namespaces for Iex, Imf
Improve read performance for deep/zipped data, and SIMD-accelerated uncompress support
Added rawPixelDataToBuffer() function for access to compressed scanlines
Iex::BaseExc no longer derived from std::string.
Imath throw() specifiers removed
Initial Support for Python 3

Bugs:
25+ various bug fixes (see detailed Release Notes for the full list)

Build Fixes:
Various fixes to the cmake and autoconf build infrastructures
Various changes to support compiling for C++11 / C++14 / C++17 and GCC 6.3.1
Various fixes to address Windows build issues
60+ total build-related fixes (see detailed Release Notes for the full list)

14 files changed, 304 insertions, 302 deletions

diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index 4588fb234dd..395111e4dd3 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2018/01/10 10:10:10 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/10/02 12:05:35 adam Exp $
 
-DISTNAME=	ilmbase-2.2.1
+DISTNAME=	ilmbase-2.3.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://download.savannah.nongnu.org/releases/openexr/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=openexr/}
+GITHUB_PROJECT=	openexr
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.openexr.com/
diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo
index 7af5404702d..e7feb5a4675 100644
--- a/graphics/ilmbase/distinfo
+++ b/graphics/ilmbase/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2018/01/10 10:10:10 wiz Exp $
+$NetBSD: distinfo,v 1.16 2018/10/02 12:05:35 adam Exp $
 
-SHA1 (ilmbase-2.2.1.tar.gz) = 87df9e235eff0d10e171f15ad0e63cba05e16bce
-RMD160 (ilmbase-2.2.1.tar.gz) = 0abe57b5c8a82e20be500a490d335816f654625c
-SHA512 (ilmbase-2.2.1.tar.gz) = a08ddd9069b34a93612445a445a2ddf80c0e22349bcf221a3cc6e9f5575180b08a8b597009dacabf072360e7162e15964988bc79e8ec82cf3da6507148a75320
-Size (ilmbase-2.2.1.tar.gz) = 573073 bytes
+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-aa) = 97e7c7347cc6b4f3e11e7d0692c78b7322e06a7f
-SHA1 (patch-ab) = 75ee78ef689728ad748fd873c7ef1882f95a4639
+SHA1 (patch-bootstrap) = 16e655c408fdb0d275d8da8f77b83cebca132637
+SHA1 (patch-configure) = 5f20c43310a099b3ce888db7f39cdc33127b4d24
diff --git a/graphics/ilmbase/patches/patch-ab b/graphics/ilmbase/patches/patch-ab
deleted file mode 100644
index eed41fc03ab..00000000000
--- a/graphics/ilmbase/patches/patch-ab
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2018/01/10 10:10:10 wiz Exp $
-
-Disable ucontext.h detection, which leads to problems on some platforms.
-Disable univeral binary build on Mac OS X.
-
---- configure.orig	2017-11-17 23:05:28.000000000 +0000
-+++ configure
-@@ -15851,7 +15851,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"
-@@ -16172,7 +16172,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
-@@ -16191,7 +16191,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
-@@ -16227,7 +16227,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
-@@ -16262,7 +16262,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
-@@ -16274,7 +16274,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
-@@ -16315,7 +16315,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/ilmbase/patches/patch-aa b/graphics/ilmbase/patches/patch-bootstrap
index 39bc862ca34..647c5f9d7b8 100644
--- a/graphics/ilmbase/patches/patch-aa
+++ b/graphics/ilmbase/patches/patch-bootstrap
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2013/12/09 11:39:20 adam Exp $
+$NetBSD: patch-bootstrap,v 1.1 2018/10/02 12:05:35 adam Exp $
 
-Shell portability fix: see https://savannah.nongnu.org/bugs/index.php?22222
+Portability fix.
 
---- bootstrap.orig	2013-11-12 17:26:32.000000000 +0000
+--- bootstrap.orig	2018-08-10 01:34:57.000000000 +0000
 +++ bootstrap
 @@ -1,7 +1,7 @@
- #! /bin/sh
+ #!/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
diff --git a/graphics/ilmbase/patches/patch-configure b/graphics/ilmbase/patches/patch-configure
new file mode 100644
index 00000000000..fa4965768b7
--- /dev/null
+++ b/graphics/ilmbase/patches/patch-configure
@@ -0,0 +1,121 @@
+$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 11e62c1941e..783f8048059 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2018/01/28 19:58:17 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2018/10/02 12:05:35 adam Exp $
 
-DISTNAME=	openexr-2.2.1
+DISTNAME=	openexr-2.3.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://download.savannah.nongnu.org/releases/openexr/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=openexr/}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.openexr.com/
diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST
index 7aa04a02789..319fc2dcc78 100644
--- a/graphics/openexr/PLIST
+++ b/graphics/openexr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2014/08/11 19:42:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/10/02 12:05:35 adam Exp $
 bin/exrenvmap
 bin/exrheader
 bin/exrmakepreview
@@ -75,6 +75,7 @@ include/OpenEXR/ImfRgba.h
 include/OpenEXR/ImfRgbaFile.h
 include/OpenEXR/ImfRgbaYca.h
 include/OpenEXR/ImfStandardAttributes.h
+include/OpenEXR/ImfStdIO.h
 include/OpenEXR/ImfStringAttribute.h
 include/OpenEXR/ImfStringVectorAttribute.h
 include/OpenEXR/ImfTestFile.h
@@ -97,25 +98,25 @@ lib/libIlmImf.la
 lib/libIlmImfUtil.la
 lib/pkgconfig/OpenEXR.pc
 share/aclocal/openexr.m4
-share/doc/OpenEXR-${PKGVERSION}/MultiViewOpenEXR.pdf
-share/doc/OpenEXR-${PKGVERSION}/OpenEXRFileLayout.pdf
-share/doc/OpenEXR-${PKGVERSION}/ReadingAndWritingImageFiles.pdf
-share/doc/OpenEXR-${PKGVERSION}/InterpretingDeepPixels.pdf
-share/doc/OpenEXR-${PKGVERSION}/TechnicalIntroduction.pdf
-share/doc/OpenEXR-${PKGVERSION}/TheoryDeepPixels.pdf
-share/doc/OpenEXR-${PKGVERSION}/examples/drawImage.cpp
-share/doc/OpenEXR-${PKGVERSION}/examples/drawImage.h
-share/doc/OpenEXR-${PKGVERSION}/examples/generalInterfaceExamples.cpp
-share/doc/OpenEXR-${PKGVERSION}/examples/generalInterfaceExamples.h
-share/doc/OpenEXR-${PKGVERSION}/examples/generalInterfaceTiledExamples.cpp
-share/doc/OpenEXR-${PKGVERSION}/examples/generalInterfaceTiledExamples.h
-share/doc/OpenEXR-${PKGVERSION}/examples/lowLevelIoExamples.cpp
-share/doc/OpenEXR-${PKGVERSION}/examples/lowLevelIoExamples.h
-share/doc/OpenEXR-${PKGVERSION}/examples/main.cpp
-share/doc/OpenEXR-${PKGVERSION}/examples/namespaceAlias.h
-share/doc/OpenEXR-${PKGVERSION}/examples/previewImageExamples.cpp
-share/doc/OpenEXR-${PKGVERSION}/examples/previewImageExamples.h
-share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceExamples.cpp
-share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceExamples.h
-share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceTiledExamples.cpp
-share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceTiledExamples.h
+share/doc/openexr/InterpretingDeepPixels.pdf
+share/doc/openexr/MultiViewOpenEXR.pdf
+share/doc/openexr/OpenEXRFileLayout.pdf
+share/doc/openexr/ReadingAndWritingImageFiles.pdf
+share/doc/openexr/TechnicalIntroduction.pdf
+share/doc/openexr/TheoryDeepPixels.pdf
+share/doc/openexr/examples/drawImage.cpp
+share/doc/openexr/examples/drawImage.h
+share/doc/openexr/examples/generalInterfaceExamples.cpp
+share/doc/openexr/examples/generalInterfaceExamples.h
+share/doc/openexr/examples/generalInterfaceTiledExamples.cpp
+share/doc/openexr/examples/generalInterfaceTiledExamples.h
+share/doc/openexr/examples/lowLevelIoExamples.cpp
+share/doc/openexr/examples/lowLevelIoExamples.h
+share/doc/openexr/examples/main.cpp
+share/doc/openexr/examples/namespaceAlias.h
+share/doc/openexr/examples/previewImageExamples.cpp
+share/doc/openexr/examples/previewImageExamples.h
+share/doc/openexr/examples/rgbaInterfaceExamples.cpp
+share/doc/openexr/examples/rgbaInterfaceExamples.h
+share/doc/openexr/examples/rgbaInterfaceTiledExamples.cpp
+share/doc/openexr/examples/rgbaInterfaceTiledExamples.h
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index 79036aa9b14..bc4c7552f14 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.30 2018/01/28 19:58:17 wiz Exp $
+$NetBSD: distinfo,v 1.31 2018/10/02 12:05:35 adam Exp $
 
-SHA1 (openexr-2.2.1.tar.gz) = 585cf77cdc3dc0d9d71531dfa747c4a11c5ec9e8
-RMD160 (openexr-2.2.1.tar.gz) = eb2fbbefe1399d87a4a60807cb7386ed3b300eaa
-SHA512 (openexr-2.2.1.tar.gz) = 192100c6ac47534f3a93c55327d2ab90b07a8265156855086b326184328c257dcde12991b3f3f1831e2df4226fe884adcfe481c2f02a157c715aee665e89a480
-Size (openexr-2.2.1.tar.gz) = 18176639 bytes
-SHA1 (patch-IlmImf_ImfFastHuf.cpp) = bf583b5e0efb1af6e00d671b07d4cc154e13ac44
+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) = f36d049085e42beabcf5f7af5354009391a1f9f2
-SHA1 (patch-IlmImf_dwaLookups.cpp) = 7bcc32f3de10cea5467d054f1b1aa0fd12d49d46
-SHA1 (patch-aa) = a969c6df4af16d84630e4b36cd1c718cd9d8db76
-SHA1 (patch-ab) = 0efe7155350e1976d1d7bad9da8b1a037fd84572
+SHA1 (patch-IlmImf_ImfSystemSpecific.h) = 25671307ed19503039fe6fc5ef7cc45ce7d523f1
+SHA1 (patch-bootstrap) = 9e8718727c571f48df9f213a016fe24ea3141c21
+SHA1 (patch-configure) = f46aeb70c0dc85b07be5608ffc923c7bda9f1a66
diff --git a/graphics/openexr/patches/patch-IlmImf_ImfFastHuf.cpp b/graphics/openexr/patches/patch-IlmImf_ImfFastHuf.cpp
deleted file mode 100644
index d74e6a298d3..00000000000
--- a/graphics/openexr/patches/patch-IlmImf_ImfFastHuf.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-IlmImf_ImfFastHuf.cpp,v 1.1 2014/08/13 19:23:09 tron Exp $
-
-Fix build on 32bit systems.
-
---- IlmImf/ImfFastHuf.cpp.orig	2014-08-10 05:23:56.000000000 +0100
-+++ IlmImf/ImfFastHuf.cpp	2014-08-13 19:36:21.000000000 +0100
-@@ -107,7 +107,7 @@
-     for (int i = 0; i <= MAX_CODE_LEN; ++i)
-     {
-         codeCount[i] = 0;
--        base[i]      = 0xffffffffffffffffL;
-+        base[i]      = 0xffffffffffffffffULL;
-         offset[i]    = 0;
-     }
- 
-@@ -352,7 +352,7 @@
- 
-     for (int i = 0; i <= MAX_CODE_LEN; ++i)
-     {
--        if (base[i] != 0xffffffffffffffffL)
-+        if (base[i] != 0xffffffffffffffffULL)
-         {
-             _ljBase[i] = base[i] << (64 - i);
-         }
-@@ -362,7 +362,7 @@
-             // Unused code length - insert dummy values
-             //
- 
--            _ljBase[i] = 0xffffffffffffffffL;
-+            _ljBase[i] = 0xffffffffffffffffULL;
-         }
-     }
- 
-@@ -417,7 +417,7 @@
- 
-     int minIdx = TABLE_LOOKUP_BITS;
- 
--    while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL)
-+    while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL)
-         minIdx--;
- 
-     if (minIdx < 0)
-@@ -427,7 +427,7 @@
-         // Set the min value such that the table is never tested.
-         //
- 
--        _tableMin = 0xffffffffffffffffL;
-+        _tableMin = 0xffffffffffffffffULL;
-     }
-     else
-     {
diff --git a/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.h b/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.h
index 9d2760bf1c6..bdd70ab8f14 100644
--- a/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.h
+++ b/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.h
@@ -1,20 +1,15 @@
-$NetBSD: patch-IlmImf_ImfSystemSpecific.h,v 1.1 2013/07/04 06:25:23 dholland Exp $
+$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~	2013-04-09 17:08:02.000000000 +0000
+--- IlmImf/ImfSystemSpecific.h.orig	2018-08-10 01:34:58.000000000 +0000
 +++ IlmImf/ImfSystemSpecific.h
-@@ -60,9 +60,13 @@ static bool GLOBAL_SYSTEM_LITTLE_ENDIAN 
- 
- static void* EXRAllocAligned(size_t size, size_t alignment)
- {
-+#ifdef __sun
+@@ -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
+ #else
      void* ptr = 0;
      posix_memalign(&ptr, alignment, size);
-     return ptr;
-+#endif
- }
- 
- 
diff --git a/graphics/openexr/patches/patch-IlmImf_dwaLookups.cpp b/graphics/openexr/patches/patch-IlmImf_dwaLookups.cpp
deleted file mode 100644
index 174dde57bf5..00000000000
--- a/graphics/openexr/patches/patch-IlmImf_dwaLookups.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-IlmImf_dwaLookups.cpp,v 1.1 2016/08/26 17:19:49 joerg Exp $
-
---- IlmImf/dwaLookups.cpp.orig	2016-06-06 22:42:15.936629432 +0000
-+++ IlmImf/dwaLookups.cpp
-@@ -436,6 +436,7 @@ generateToNonlinear()
- int
- cpuCount()
- {
-+    return 1; // Semi-reliably crashes in bulk builds
-     if (!IlmThread::supportsThreads()) return 1;
- 
-     int cpuCount = 1;
diff --git a/graphics/openexr/patches/patch-aa b/graphics/openexr/patches/patch-aa
deleted file mode 100644
index eb03796f12b..00000000000
--- a/graphics/openexr/patches/patch-aa
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2018/01/28 19:58:17 wiz Exp $
-
-Shell portability fix: see
-https://savannah.nongnu.org/bugs/index.php?22222
-Ensure asm instructions are checked correctly.
-
---- configure.orig	2017-11-17 23:09:24.000000000 +0000
-+++ configure
-@@ -15484,7 +15484,7 @@ else
- fi
- 
- 
--if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
-+if test x$PKG_CONFIG = xno && test "x${multithread}" != xno ; then
- 
- 
- 
-@@ -16579,10 +16579,10 @@ main ()
-                  int n   = 0;
-                  int eax = 0;
-                  int edx = 0;
--                 __asm__(
-+                 __asm__ volatile (
-                      "xgetbv     \n"
-                      "vzeroupper  "
--                     : "=a"(eax), "=d"(edx) : "c"(n) : );
-+                     : "=a"(eax), "=d"(edx) : "c"(n) );
-              #else
-                  #error No GCC style inline asm supported for AVX instructions
-              #endif
-@@ -16605,7 +16605,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_inline_asm_avx" >&5
- $as_echo "$gcc_inline_asm_avx" >&6; }
--if test "x${gcc_inline_asm_avx}" == xyes ; then
-+if test "x${gcc_inline_asm_avx}" = xyes ; then
-     $as_echo "#define OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 1" >>confdefs.h
- 
- fi
-@@ -16636,7 +16636,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
- 
- fi
-@@ -16750,7 +16750,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}
- _ACEOF
-@@ -16761,7 +16761,7 @@ _ACEOF
-     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
- _ACEOF
-@@ -16782,7 +16782,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
-@@ -16817,7 +16817,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;}
-     cat >>confdefs.h <<_ACEOF
-@@ -16825,7 +16825,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
- _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
- _ACEOF
-@@ -19539,7 +19539,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 "
diff --git a/graphics/openexr/patches/patch-ab b/graphics/openexr/patches/patch-bootstrap
index 719ef01acd9..d2f2b780b7f 100644
--- a/graphics/openexr/patches/patch-ab
+++ b/graphics/openexr/patches/patch-bootstrap
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.4 2013/12/09 11:39:20 adam Exp $
+$NetBSD: patch-bootstrap,v 1.1 2018/10/02 12:05:35 adam Exp $
 
-Shell portability fix: see https://savannah.nongnu.org/bugs/index.php?22222
+Portability fix.
 
---- bootstrap.orig	2013-11-25 19:53:00.000000000 +0000
+--- bootstrap.orig	2018-08-10 01:34:59.000000000 +0000
 +++ bootstrap
 @@ -1,7 +1,7 @@
- #! /bin/sh
+ #!/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
diff --git a/graphics/openexr/patches/patch-configure b/graphics/openexr/patches/patch-configure
new file mode 100644
index 00000000000..265e3c753da
--- /dev/null
+++ b/graphics/openexr/patches/patch-configure
@@ -0,0 +1,119 @@
+$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 "