Version 2.0.1

        * Bumped version to track OpenEXR

4 files changed, 33 insertions, 43 deletions

diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index e07c25eac0d..0dc58f9a929 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/05/09 07:59:46 adam Exp $
+# $NetBSD: Makefile,v 1.12 2013/07/31 18:25:28 adam Exp $
 
-DISTNAME=	ilmbase-2.0.0
+DISTNAME=	ilmbase-2.0.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.savannah.nongnu.org/releases/openexr/
 
diff --git a/graphics/ilmbase/buildlink3.mk b/graphics/ilmbase/buildlink3.mk
index 2de32b7d3d6..5542069a198 100644
--- a/graphics/ilmbase/buildlink3.mk
+++ b/graphics/ilmbase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2013/05/09 07:39:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2013/07/31 18:25:28 adam Exp $
 
 BUILDLINK_TREE+=	ilmbase
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ilmbase
 ILMBASE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ilmbase+=	ilmbase>=1.0.1
-BUILDLINK_ABI_DEPENDS.ilmbase?=	ilmbase>=2.0.0
+BUILDLINK_ABI_DEPENDS.ilmbase+=	ilmbase>=2.0.0
 BUILDLINK_PKGSRCDIR.ilmbase?=	../../graphics/ilmbase
 .endif # ILMBASE_BUILDLINK3_MK
 
diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo
index 2b53cb675e2..0a569988251 100644
--- a/graphics/ilmbase/distinfo
+++ b/graphics/ilmbase/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2013/05/09 06:40:26 adam Exp $
+$NetBSD: distinfo,v 1.8 2013/07/31 18:25:28 adam Exp $
 
-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 (ilmbase-2.0.1.tar.gz) = bfa62519094413f686c6f08c5923b47a10eea180
+RMD160 (ilmbase-2.0.1.tar.gz) = a17bce323d3025ddb971c254bef31a7c230b4b20
+Size (ilmbase-2.0.1.tar.gz) = 555828 bytes
 SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71
 SHA1 (patch-aa) = 7498a0cfafaec4f1e43dd57270f514bc5a8e7b1f
-SHA1 (patch-ab) = 38a672bec75bb299dba4578552020ad42be501c0
+SHA1 (patch-ab) = 1e39351d9513e10e3745c188612f9daf41253234
diff --git a/graphics/ilmbase/patches/patch-ab b/graphics/ilmbase/patches/patch-ab
index 51cbdfb8c1f..8f65aadd813 100644
--- a/graphics/ilmbase/patches/patch-ab
+++ b/graphics/ilmbase/patches/patch-ab
@@ -1,21 +1,21 @@
-$NetBSD: patch-ab,v 1.3 2013/05/09 06:40:27 adam Exp $
+$NetBSD: patch-ab,v 1.4 2013/07/31 18:25:28 adam Exp $
 
 Disable ucontext.h detection, which leads to problems on some platforms.
 Shell portabibility fix.
 Disable univeral binary build on Mac OS X.
 
---- configure.orig	2013-03-14 16:58:22.000000000 +0000
+--- configure.orig	2013-06-18 19:55:25.000000000 +0000
 +++ configure
-@@ -19773,7 +19773,7 @@ fi
+@@ -16437,7 +16437,7 @@ fi
  
  
  
 -for ac_header in limits.h unistd.h ucontext.h
 +for ac_header in limits.h unistd.h
  do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -20524,7 +20524,7 @@ LIB_SUFFIX=""
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -17212,7 +17212,7 @@ LIB_SUFFIX=""
  lib_suffix_valid="no"
  
  lib_namespace=""
@@ -24,7 +24,7 @@ Disable univeral binary build on Mac OS X.
      cat >>confdefs.h <<_ACEOF
  #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API}
  _ACEOF
-@@ -20545,7 +20545,7 @@ _ACEOF
+@@ -17233,7 +17233,7 @@ _ACEOF
      lib_namespace="${ILMBASE_VERSION_API}"
      LIB_SUFFIX="${ILMBASE_VERSION_API}"
      lib_suffix_valid="yes"
@@ -33,7 +33,7 @@ Disable univeral binary build on Mac OS X.
      cat >>confdefs.h <<_ACEOF
  #define IMATH_INTERNAL_NAMESPACE Imath
  _ACEOF
-@@ -20583,7 +20583,7 @@ _ACEOF
+@@ -17271,7 +17271,7 @@ _ACEOF
  fi
  
  
@@ -41,17 +41,17 @@ Disable univeral binary build on Mac OS X.
 +if test "x${lib_suffix_valid}" = xyes ; then
  LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
  
+  if true; then
+@@ -17306,7 +17306,7 @@ else
+ fi
  
-@@ -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;}
+     { $as_echo "$as_me:$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;}
      cat >>confdefs.h <<\_ACEOF
-@@ -20640,7 +20640,7 @@ _ACEOF
+@@ -17324,7 +17324,7 @@ _ACEOF
  
      public_namespace=""
      custom_public_namespace=no
@@ -60,27 +60,17 @@ Disable univeral binary build on Mac OS X.
      cat >>confdefs.h <<\_ACEOF
  #define IMATH_NAMESPACE Imath
  _ACEOF
-@@ -20690,23 +20690,7 @@ else
- fi;
+@@ -17373,12 +17373,10 @@ else
+ fi
+ 
  
-   if test "${osx_arch}" != default ; then
+-  if test "${osx_arch}" != default ; then
 -          osx_arch_flags="-arch ${osx_arch// / -arch }"
++  if false ; then
       CXXFLAGS="$CXXFLAGS $osx_arch_flags"
--
--          if test "$enable_dependency_tracking" != no ; then
--        osx_arch_array=( ${osx_arch} )
--        if test ${#osx_arch_array[@]} -gt 1 ; then
--          { { echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking.
--Please re-run configure with these options:
--  --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking
--  		  " >&5
--echo "$as_me: error: building multiple OS X architectures requires --disable-dependency-tracking.
--Please re-run configure with these options:
--  --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking
--  		  " >&2;}
--   { (exit 1); exit 1; }; }
--        fi
--     fi
-   fi
  
-     # Check whether --enable-osx-sdk or --disable-osx-sdk was given.
+           if test "$enable_dependency_tracking" != no ; then
+-        osx_arch_array=( ${osx_arch} )
+         if test ${#osx_arch_array[@]} -gt 1 ; then
+           { { $as_echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking.
+ Please re-run configure with these options: