Version 2.0.0

        * Bumped version to track OpenEXR
        * Numerous minor fixes, missing includes etc

6 files changed, 78 insertions, 32 deletions

diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index cf5416119fa..127cf8dd5de 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2012/10/06 14:10:59 asau Exp $
+# $NetBSD: Makefile,v 1.9 2013/05/08 17:48:33 adam Exp $
 
-DISTNAME=	ilmbase-1.0.2
-PKGREVISION=	2
+DISTNAME=	ilmbase-2.0.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://savannah.nongnu.org/download/openexr/
+MASTER_SITES=	http://download.savannah.nongnu.org/releases/openexr/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.openexr.com/
 COMMENT=	High dynamic-range (HDR) image file format library and tools
 LICENSE=	modified-bsd
 
-USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
 LIBS.SunOS=		-lm
diff --git a/graphics/ilmbase/PLIST b/graphics/ilmbase/PLIST
index 5eb64379891..a2f2edb53b2 100644
--- a/graphics/ilmbase/PLIST
+++ b/graphics/ilmbase/PLIST
@@ -1,13 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/05/08 17:48:33 adam Exp $
 include/OpenEXR/Iex.h
 include/OpenEXR/IexBaseExc.h
 include/OpenEXR/IexErrnoExc.h
+include/OpenEXR/IexExport.h
+include/OpenEXR/IexForward.h
 include/OpenEXR/IexMacros.h
 include/OpenEXR/IexMathExc.h
+include/OpenEXR/IexMathFloatExc.h
+include/OpenEXR/IexMathFpu.h
+include/OpenEXR/IexMathIeeeExc.h
+include/OpenEXR/IexNamespace.h
 include/OpenEXR/IexThrowErrnoExc.h
 include/OpenEXR/IlmBaseConfig.h
 include/OpenEXR/IlmThread.h
+include/OpenEXR/IlmThreadExport.h
+include/OpenEXR/IlmThreadForward.h
 include/OpenEXR/IlmThreadMutex.h
+include/OpenEXR/IlmThreadNamespace.h
 include/OpenEXR/IlmThreadPool.h
 include/OpenEXR/IlmThreadSemaphore.h
 include/OpenEXR/ImathBox.h
@@ -16,6 +25,8 @@ include/OpenEXR/ImathColor.h
 include/OpenEXR/ImathColorAlgo.h
 include/OpenEXR/ImathEuler.h
 include/OpenEXR/ImathExc.h
+include/OpenEXR/ImathExport.h
+include/OpenEXR/ImathForward.h
 include/OpenEXR/ImathFrame.h
 include/OpenEXR/ImathFrustum.h
 include/OpenEXR/ImathFun.h
@@ -30,6 +41,7 @@ include/OpenEXR/ImathLineAlgo.h
 include/OpenEXR/ImathMath.h
 include/OpenEXR/ImathMatrix.h
 include/OpenEXR/ImathMatrixAlgo.h
+include/OpenEXR/ImathNamespace.h
 include/OpenEXR/ImathPlane.h
 include/OpenEXR/ImathPlatform.h
 include/OpenEXR/ImathQuat.h
@@ -40,10 +52,12 @@ include/OpenEXR/ImathSphere.h
 include/OpenEXR/ImathVec.h
 include/OpenEXR/ImathVecAlgo.h
 include/OpenEXR/half.h
+include/OpenEXR/halfExport.h
 include/OpenEXR/halfFunction.h
 include/OpenEXR/halfLimits.h
 lib/libHalf.la
 lib/libIex.la
+lib/libIexMath.la
 lib/libIlmThread.la
 lib/libImath.la
 lib/pkgconfig/IlmBase.pc
diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo
index 5ee11651b95..a242112b750 100644
--- a/graphics/ilmbase/distinfo
+++ b/graphics/ilmbase/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2012/07/26 10:58:46 bsiegert Exp $
+$NetBSD: distinfo,v 1.6 2013/05/08 17:48:33 adam Exp $
 
-SHA1 (ilmbase-1.0.2.tar.gz) = fe6a910a90cde80137153e25e175e2b211beda36
-RMD160 (ilmbase-1.0.2.tar.gz) = 40aed65079ee174be8ed237e5def941ae2b761b3
-Size (ilmbase-1.0.2.tar.gz) = 496540 bytes
-SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 0cb0680bddcc80feba04ad3d5a902dcf6f25dd00
+SHA1 (ilmbase-2.0.0.tar.gz) = 0f047217d287627ddc37ed06d573a2099e67f447
+RMD160 (ilmbase-2.0.0.tar.gz) = 9fbea3895cd690d945fbcf387ec65f4aecbd9303
+Size (ilmbase-2.0.0.tar.gz) = 549714 bytes
+SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71
 SHA1 (patch-aa) = 7498a0cfafaec4f1e43dd57270f514bc5a8e7b1f
-SHA1 (patch-ab) = a4e80234beb617861d1ab01a8bcfd34e03675da4
-SHA1 (patch-ac) = af3991c83db7bece1575a29a0445016c8618e6a2
+SHA1 (patch-ab) = 9c332afdcf04e239c597546089f50b0db0b038b4
diff --git a/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp b/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp
index efabd205f50..4962aa9f22d 100644
--- a/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp
+++ b/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-Iex_IexThrowErrnoExc.cpp,v 1.1 2012/07/26 10:58:47 bsiegert Exp $
+$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
-@@ -410,7 +410,7 @@ void throwErrnoExc (const std::string &t
+@@ -419,7 +419,7 @@ void throwErrnoExc (const std::string &t
  	    throw EnametoolongExc (tmp);
        #endif
  
diff --git a/graphics/ilmbase/patches/patch-ab b/graphics/ilmbase/patches/patch-ab
index b7957e738fc..2c8ada3bad4 100644
--- a/graphics/ilmbase/patches/patch-ab
+++ b/graphics/ilmbase/patches/patch-ab
@@ -1,8 +1,56 @@
-$NetBSD: patch-ab,v 1.1 2010/12/14 09:52:51 adam Exp $
+$NetBSD: patch-ab,v 1.2 2013/05/08 17:48:33 adam Exp $
 
---- configure.orig	2010-12-14 09:46:18.000000000 +0000
+Compatibility fix.
+Disable univeral binary build on Mac OS X.
+
+--- configure.orig	2013-03-14 16:58:22.000000000 +0000
 +++ configure
-@@ -20385,23 +20385,7 @@ else
+@@ -20524,7 +20524,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
+@@ -20545,7 +20545,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
+@@ -20583,7 +20583,7 @@ _ACEOF
+ fi
+ 
+ 
+-if test "x${lib_suffix_valid}" == xyes ; then
++if test "x${lib_suffix_valid}" = xyes ; then
+ LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
+ 
+ 
+@@ -20622,7 +20622,7 @@ else
+   custom_public_namespace=no
+ fi;
+ 
+-if test "x${custom_public_namespace}" == xyes ; then
++if test "x${custom_public_namespace}" = xyes ; then
+     { echo "$as_me:$LINENO: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5
+ echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;}
+     cat >>confdefs.h <<\_ACEOF
+@@ -20640,7 +20640,7 @@ _ACEOF
+ 
+     public_namespace=""
+     custom_public_namespace=no
+-elif test "x${custom_public_namespace}" == xno ; then
++elif test "x${custom_public_namespace}" = xno ; then
+     cat >>confdefs.h <<\_ACEOF
+ #define IMATH_NAMESPACE Imath
+ _ACEOF
+@@ -20690,23 +20690,7 @@ else
  fi;
  
    if test "${osx_arch}" != default ; then
diff --git a/graphics/ilmbase/patches/patch-ac b/graphics/ilmbase/patches/patch-ac
deleted file mode 100644
index 48214aa9a39..00000000000
--- a/graphics/ilmbase/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/01/03 07:58:43 dsainty Exp $
-
-Include <cstring> to declare memset(), used from this header in inlines.
-
---- Imath/ImathMatrix.h.orig	2010-07-17 10:48:40.000000000 +1200
-+++ Imath/ImathMatrix.h	2011-01-03 20:30:27.543078712 +1300
-@@ -49,6 +49,7 @@
- #include "ImathVec.h"
- #include "ImathShear.h"
- 
-+#include <cstring>
- #include <iostream>
- #include <iomanip>
-