Mon May 15 13:53:42 2017 UTC ()
Bump PKGREVISON

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


(ryoon)
diff -r1.17 -r1.18 pkgsrc/graphics/ilmbase/Makefile
diff -r1.13 -r1.14 pkgsrc/graphics/ilmbase/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/ilmbase/patches/patch-ab
cvs diff -r1.17 -r1.18 pkgsrc/graphics/ilmbase/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ilmbase/Attic/Makefile 2017/05/14 00:16:36 1.17
+++ pkgsrc/graphics/ilmbase/Attic/Makefile 2017/05/15 13:53:42 1.18
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.17 2017/05/14 00:16:36 ryoon Exp $ 1# $NetBSD: Makefile,v 1.18 2017/05/15 13:53:42 ryoon Exp $
2 2
3DISTNAME= ilmbase-2.2.0 3DISTNAME= ilmbase-2.2.0
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://download.savannah.nongnu.org/releases/openexr/ 6MASTER_SITES= http://download.savannah.nongnu.org/releases/openexr/
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://www.openexr.com/ 9HOMEPAGE= http://www.openexr.com/
10COMMENT= High dynamic-range (HDR) image file format library and tools 10COMMENT= High dynamic-range (HDR) image file format library and tools
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= ksh gmake 15USE_TOOLS+= bash gmake
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17TEST_TARGET= check 17TEST_TARGET= check
18LIBS.SunOS= -lm 18LIBS.SunOS= -lm
19CONFIG_SHELL= ksh 19CONFIG_SHELL= bash
20 20
21PKGCONFIG_OVERRIDE= IlmBase.pc.in 21PKGCONFIG_OVERRIDE= IlmBase.pc.in
22PTHREAD_OPTS= require 22PTHREAD_OPTS= require
23 23
24CONFLICTS= openexr<1.6 24CONFLICTS= openexr<1.6
25 25
26BUILDLINK_TRANSFORM+= rm:-Wno-long-double 26BUILDLINK_TRANSFORM+= rm:-Wno-long-double
27 27
28.include "../../mk/pthread.buildlink3.mk" 28.include "../../mk/pthread.buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/graphics/ilmbase/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ilmbase/Attic/distinfo 2015/11/03 21:34:03 1.13
+++ pkgsrc/graphics/ilmbase/Attic/distinfo 2017/05/15 13:53:42 1.14
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.13 2015/11/03 21:34:03 agc Exp $ 1$NetBSD: distinfo,v 1.14 2017/05/15 13:53:42 ryoon Exp $
2 2
3SHA1 (ilmbase-2.2.0.tar.gz) = 70d864bc704f276942cb10479f2cb98646ce6ad4 3SHA1 (ilmbase-2.2.0.tar.gz) = 70d864bc704f276942cb10479f2cb98646ce6ad4
4RMD160 (ilmbase-2.2.0.tar.gz) = b1adb0c96eff6b3554ddaf8f8bafe2cba8c114e3 4RMD160 (ilmbase-2.2.0.tar.gz) = b1adb0c96eff6b3554ddaf8f8bafe2cba8c114e3
5SHA512 (ilmbase-2.2.0.tar.gz) = 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1 5SHA512 (ilmbase-2.2.0.tar.gz) = 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1
6Size (ilmbase-2.2.0.tar.gz) = 525289 bytes 6Size (ilmbase-2.2.0.tar.gz) = 525289 bytes
7SHA1 (patch-Iex_IexBaseExc.cpp) = 5bf551e1eacffa8dc3ec1c5643e5bfd5f8fc5701 7SHA1 (patch-Iex_IexBaseExc.cpp) = 5bf551e1eacffa8dc3ec1c5643e5bfd5f8fc5701
8SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71 8SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71
9SHA1 (patch-Imath_ImathFun.h) = 79ab60ada8cecd52e5b16fadbded82492d79a1df 9SHA1 (patch-Imath_ImathFun.h) = 79ab60ada8cecd52e5b16fadbded82492d79a1df
10SHA1 (patch-aa) = 97e7c7347cc6b4f3e11e7d0692c78b7322e06a7f 10SHA1 (patch-aa) = 97e7c7347cc6b4f3e11e7d0692c78b7322e06a7f
11SHA1 (patch-ab) = 1e39351d9513e10e3745c188612f9daf41253234 11SHA1 (patch-ab) = 352603443c59184c2cedc8762a406cd58e6ebd23
cvs diff -r1.4 -r1.5 pkgsrc/graphics/ilmbase/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/ilmbase/patches/Attic/patch-ab 2013/07/31 18:25:28 1.4
+++ pkgsrc/graphics/ilmbase/patches/Attic/patch-ab 2017/05/15 13:53:42 1.5
@@ -1,76 +1,70 @@ @@ -1,76 +1,70 @@
1$NetBSD: patch-ab,v 1.4 2013/07/31 18:25:28 adam Exp $ 1$NetBSD: patch-ab,v 1.5 2017/05/15 13:53:42 ryoon Exp $
2 2
3Disable ucontext.h detection, which leads to problems on some platforms. 3Disable ucontext.h detection, which leads to problems on some platforms.
4Shell portabibility fix. 
5Disable univeral binary build on Mac OS X. 4Disable univeral binary build on Mac OS X.
6 5
7--- configure.orig 2013-06-18 19:55:25.000000000 +0000 6--- configure.orig 2014-08-10 04:37:26.000000000 +0000
8+++ configure 7+++ configure
9@@ -16437,7 +16437,7 @@ fi 8@@ -16433,7 +16433,7 @@ fi
10  9
11  10
12  11
13-for ac_header in limits.h unistd.h ucontext.h 12-for ac_header in limits.h unistd.h ucontext.h
14+for ac_header in limits.h unistd.h 13+for ac_header in limits.h unistd.h
15 do 14 do
16 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 15 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
17 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 16 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
18@@ -17212,7 +17212,7 @@ LIB_SUFFIX="" 17@@ -17208,7 +17208,7 @@ LIB_SUFFIX=""
19 lib_suffix_valid="no" 18 lib_suffix_valid="no"
20  19
21 lib_namespace="" 20 lib_namespace=""
22-if test "x${library_namespace_versioning}" == xyes ; then 21-if test "x${library_namespace_versioning}" == xyes ; then
23+if test "x${library_namespace_versioning}" = xyes ; then 22+if test "x${library_namespace_versioning}" = xyes ; then
24 cat >>confdefs.h <<_ACEOF 23 cat >>confdefs.h <<_ACEOF
25 #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API} 24 #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API}
26 _ACEOF 25 _ACEOF
27@@ -17233,7 +17233,7 @@ _ACEOF 26@@ -17229,7 +17229,7 @@ _ACEOF
28 lib_namespace="${ILMBASE_VERSION_API}" 27 lib_namespace="${ILMBASE_VERSION_API}"
29 LIB_SUFFIX="${ILMBASE_VERSION_API}" 28 LIB_SUFFIX="${ILMBASE_VERSION_API}"
30 lib_suffix_valid="yes" 29 lib_suffix_valid="yes"
31-elif test "x${library_namespace_versioning}" == xno ; then 30-elif test "x${library_namespace_versioning}" == xno ; then
32+elif test "x${library_namespace_versioning}" = xno ; then 31+elif test "x${library_namespace_versioning}" = xno ; then
33 cat >>confdefs.h <<_ACEOF 32 cat >>confdefs.h <<_ACEOF
34 #define IMATH_INTERNAL_NAMESPACE Imath 33 #define IMATH_INTERNAL_NAMESPACE Imath
35 _ACEOF 34 _ACEOF
36@@ -17271,7 +17271,7 @@ _ACEOF 35@@ -17267,7 +17267,7 @@ _ACEOF
37 fi 36 fi
38  37
39  38
40-if test "x${lib_suffix_valid}" == xyes ; then 39-if test "x${lib_suffix_valid}" == xyes ; then
41+if test "x${lib_suffix_valid}" = xyes ; then 40+if test "x${lib_suffix_valid}" = xyes ; then
42 LIB_SUFFIX_DASH="-${LIB_SUFFIX}" 41 LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
43  42
44 if true; then 43 if true; then
45@@ -17306,7 +17306,7 @@ else 44@@ -17302,7 +17302,7 @@ else
46 fi 45 fi
47  46
48  47
49-if test "x${custom_public_namespace}" == xyes ; then 48-if test "x${custom_public_namespace}" == xyes ; then
50+if test "x${custom_public_namespace}" = xyes ; then 49+if test "x${custom_public_namespace}" = xyes ; then
51 { $as_echo "$as_me:$LINENO: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5 50 { $as_echo "$as_me:$LINENO: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5
52 $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;} 51 $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;}
53 cat >>confdefs.h <<\_ACEOF 52 cat >>confdefs.h <<\_ACEOF
54@@ -17324,7 +17324,7 @@ _ACEOF 53@@ -17320,7 +17320,7 @@ _ACEOF
55  54
56 public_namespace="" 55 public_namespace=""
57 custom_public_namespace=no 56 custom_public_namespace=no
58-elif test "x${custom_public_namespace}" == xno ; then 57-elif test "x${custom_public_namespace}" == xno ; then
59+elif test "x${custom_public_namespace}" = xno ; then 58+elif test "x${custom_public_namespace}" = xno ; then
60 cat >>confdefs.h <<\_ACEOF 59 cat >>confdefs.h <<\_ACEOF
61 #define IMATH_NAMESPACE Imath 60 #define IMATH_NAMESPACE Imath
62 _ACEOF 61 _ACEOF
63@@ -17373,12 +17373,10 @@ else 62@@ -17369,7 +17369,7 @@ else
64 fi 63 fi
65  64
66  65
67- if test "${osx_arch}" != default ; then 66- if test "${osx_arch}" != default ; then
68- osx_arch_flags="-arch ${osx_arch// / -arch }" 
69+ if false ; then 67+ if false ; then
 68 osx_arch_flags="-arch ${osx_arch// / -arch }"
70 CXXFLAGS="$CXXFLAGS $osx_arch_flags" 69 CXXFLAGS="$CXXFLAGS $osx_arch_flags"
71  70
72 if test "$enable_dependency_tracking" != no ; then 
73- osx_arch_array=( ${osx_arch} ) 
74 if test ${#osx_arch_array[@]} -gt 1 ; then 
75 { { $as_echo "$as_me:$LINENO: error: building multiple OS X architectures requires --disable-dependency-tracking. 
76 Please re-run configure with these options: