CVS commit: pkgsrc/graphics/ilmbase

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon May 15 13:53:42 UTC 2017

Modified Files:
        pkgsrc/graphics/ilmbase: Makefile distinfo
        pkgsrc/graphics/ilmbase/patches: patch-ab

Log Message:
Bump PKGREVISON

* Remove an incorrect POSIX shell portability fix
  and use bash as configure shell


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/ilmbase/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/ilmbase/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/ilmbase/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ilmbase/Makefile
diff -u pkgsrc/graphics/ilmbase/Makefile:1.17 pkgsrc/graphics/ilmbase/Makefile:1.18
--- pkgsrc/graphics/ilmbase/Makefile:1.17       Sun May 14 00:16:36 2017
+++ pkgsrc/graphics/ilmbase/Makefile    Mon May 15 13:53:42 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2017/05/14 00:16:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.18 2017/05/15 13:53:42 ryoon Exp $
 
 DISTNAME=      ilmbase-2.2.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  http://download.savannah.nongnu.org/releases/openexr/
 
@@ -12,11 +12,11 @@ LICENSE=    modified-bsd
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-USE_TOOLS+=            ksh gmake
+USE_TOOLS+=            bash gmake
 GNU_CONFIGURE=         yes
 TEST_TARGET=           check
 LIBS.SunOS=            -lm
-CONFIG_SHELL=          ksh
+CONFIG_SHELL=          bash
 
 PKGCONFIG_OVERRIDE=    IlmBase.pc.in
 PTHREAD_OPTS=          require

Index: pkgsrc/graphics/ilmbase/distinfo
diff -u pkgsrc/graphics/ilmbase/distinfo:1.13 pkgsrc/graphics/ilmbase/distinfo:1.14
--- pkgsrc/graphics/ilmbase/distinfo:1.13       Tue Nov  3 21:34:03 2015
+++ pkgsrc/graphics/ilmbase/distinfo    Mon May 15 13:53:42 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 21:34:03 agc Exp $
+$NetBSD: distinfo,v 1.14 2017/05/15 13:53:42 ryoon Exp $
 
 SHA1 (ilmbase-2.2.0.tar.gz) = 70d864bc704f276942cb10479f2cb98646ce6ad4
 RMD160 (ilmbase-2.2.0.tar.gz) = b1adb0c96eff6b3554ddaf8f8bafe2cba8c114e3
@@ -8,4 +8,4 @@ SHA1 (patch-Iex_IexBaseExc.cpp) = 5bf551
 SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71
 SHA1 (patch-Imath_ImathFun.h) = 79ab60ada8cecd52e5b16fadbded82492d79a1df
 SHA1 (patch-aa) = 97e7c7347cc6b4f3e11e7d0692c78b7322e06a7f
-SHA1 (patch-ab) = 1e39351d9513e10e3745c188612f9daf41253234
+SHA1 (patch-ab) = 352603443c59184c2cedc8762a406cd58e6ebd23

Index: pkgsrc/graphics/ilmbase/patches/patch-ab
diff -u pkgsrc/graphics/ilmbase/patches/patch-ab:1.4 pkgsrc/graphics/ilmbase/patches/patch-ab:1.5
--- pkgsrc/graphics/ilmbase/patches/patch-ab:1.4        Wed Jul 31 18:25:28 2013
+++ pkgsrc/graphics/ilmbase/patches/patch-ab    Mon May 15 13:53:42 2017
@@ -1,12 +1,11 @@
-$NetBSD: patch-ab,v 1.4 2013/07/31 18:25:28 adam Exp $
+$NetBSD: patch-ab,v 1.5 2017/05/15 13:53:42 ryoon 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-06-18 19:55:25.000000000 +0000
+--- configure.orig     2014-08-10 04:37:26.000000000 +0000
 +++ configure
-@@ -16437,7 +16437,7 @@ fi
+@@ -16433,7 +16433,7 @@ fi
  
  
  
@@ -15,7 +14,7 @@ Disable univeral binary build on Mac OS 
  do
  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=""
+@@ -17208,7 +17208,7 @@ LIB_SUFFIX=""
  lib_suffix_valid="no"
  
  lib_namespace=""
@@ -24,7 +23,7 @@ Disable univeral binary build on Mac OS 
      cat >>confdefs.h <<_ACEOF
  #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API}
  _ACEOF
-@@ -17233,7 +17233,7 @@ _ACEOF
+@@ -17229,7 +17229,7 @@ _ACEOF
      lib_namespace="${ILMBASE_VERSION_API}"
      LIB_SUFFIX="${ILMBASE_VERSION_API}"
      lib_suffix_valid="yes"
@@ -33,7 +32,7 @@ Disable univeral binary build on Mac OS 
      cat >>confdefs.h <<_ACEOF
  #define IMATH_INTERNAL_NAMESPACE Imath
  _ACEOF
-@@ -17271,7 +17271,7 @@ _ACEOF
+@@ -17267,7 +17267,7 @@ _ACEOF
  fi
  
  
@@ -42,7 +41,7 @@ Disable univeral binary build on Mac OS 
  LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
  
   if true; then
-@@ -17306,7 +17306,7 @@ else
+@@ -17302,7 +17302,7 @@ else
  fi
  
  
@@ -51,7 +50,7 @@ Disable univeral binary build on Mac OS 
      { $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
-@@ -17324,7 +17324,7 @@ _ACEOF
+@@ -17320,7 +17320,7 @@ _ACEOF
  
      public_namespace=""
      custom_public_namespace=no
@@ -60,17 +59,12 @@ Disable univeral binary build on Mac OS 
      cat >>confdefs.h <<\_ACEOF
  #define IMATH_NAMESPACE Imath
  _ACEOF
-@@ -17373,12 +17373,10 @@ else
+@@ -17369,7 +17369,7 @@ else
  fi
  
  
 -  if test "${osx_arch}" != default ; then
--          osx_arch_flags="-arch ${osx_arch// / -arch }"
 +  if false ; then
+           osx_arch_flags="-arch ${osx_arch// / -arch }"
       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
-           { { $as_echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking.
- Please re-run configure with these options: