svn commit: r349036 - in head/graphics/ilmbase: . files

[Rusmir Dusko]

Author: nemysis
Date: Mon Mar 24 17:49:30 2014
New Revision: 349036
URL: http://svnweb.freebsd.org/changeset/ports/349036
QAT: https://qat.redports.org/buildarchive/r349036/

Log:
  - Change license BSD to BSD3CLAUSE
  - Add MAJORVER, VER
  - Strip libraries
  - Recreate patches with make makepatch

Added:
  head/graphics/ilmbase/files/patch-IexMath__IexMathFpu.cpp   (contents, props changed)
  head/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp   (contents, props changed)
  head/graphics/ilmbase/files/patch-ImathTest__testShear.cpp   (contents, props changed)
  head/graphics/ilmbase/files/patch-Imath__ImathFun.cpp   (contents, props changed)
Deleted:
  head/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp
  head/graphics/ilmbase/files/patch-Imath-ImathFun.cpp
  head/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp
  head/graphics/ilmbase/files/patch-ImathTest-testShear.cpp
Modified:
  head/graphics/ilmbase/Makefile

Modified: head/graphics/ilmbase/Makefile
==============================================================================
--- head/graphics/ilmbase/Makefile	Mon Mar 24 17:46:54 2014	(r349035)
+++ head/graphics/ilmbase/Makefile	Mon Mar 24 17:49:30 2014	(r349036)
@@ -10,7 +10,7 @@ DISTNAME=	ilmbase-${PORTVERSION}
 MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		pathfix pkgconfig
 GNU_CONFIGURE=	yes
@@ -36,8 +36,11 @@ CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREA
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 .endif
 
-PLIST_SUB=	MAJORVER=2_1
-PLIST_SUB+=	VER=11
+MAJORVER=	2_1
+VER=	11
+
+PLIST_SUB=	MAJORVER=${MAJORVER}
+PLIST_SUB+=	VER=${VER}
 
 regression-test regression test check:	build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
@@ -48,6 +51,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' ${WRKSRC}/configure
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf.so.${VER}
+.for l in libIex libIexMath libImath libIlmThread
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so.${VER}
+.endfor
+
 .for e in ${BIN}
 	${INSTALL_PROGRAM} ${WRKSRC}/Half/${e} ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor

Added: head/graphics/ilmbase/files/patch-IexMath__IexMathFpu.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-IexMath__IexMathFpu.cpp	Mon Mar 24 17:49:30 2014	(r349036)
@@ -0,0 +1,11 @@
+--- ./IexMath/IexMathFpu.cpp.orig	2013-06-18 21:51:38.000000000 +0200
++++ ./IexMath/IexMathFpu.cpp	2014-01-29 13:16:44.000000000 +0100
+@@ -53,7 +53,7 @@
+ #endif
+ 
+ 
+-#ifdef HAVE_UCONTEXT_H
++#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
+ 
+ 
+ #include <ucontext.h>

Added: head/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp	Mon Mar 24 17:49:30 2014	(r349036)
@@ -0,0 +1,11 @@
+--- ./ImathTest/testBoxAlgo.cpp.orig	2013-06-18 21:51:38.000000000 +0200
++++ ./ImathTest/testBoxAlgo.cpp	2014-01-29 13:16:44.000000000 +0100
+@@ -356,7 +356,7 @@
+ 	Box3f ()
+     };
+ 
+-    for (int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
++    for (unsigned int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
+ 	testEntryAndExitPoints (boxes[i]);
+ }
+ 

Added: head/graphics/ilmbase/files/patch-ImathTest__testShear.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-ImathTest__testShear.cpp	Mon Mar 24 17:49:30 2014	(r349036)
@@ -0,0 +1,10 @@
+--- ./ImathTest/testShear.cpp.orig	2013-06-18 21:51:38.000000000 +0200
++++ ./ImathTest/testShear.cpp	2014-01-29 13:16:44.000000000 +0100
+@@ -54,7 +54,6 @@
+ 
+     const float         epsilon = IMATH_INTERNAL_NAMESPACE::limits< float >::epsilon();
+ 
+-    float    	        array[6] = { 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F };
+     IMATH_INTERNAL_NAMESPACE::Shear6f    	testConstructor1;
+     IMATH_INTERNAL_NAMESPACE::Shear6f    	testConstructor2( testConstructor1 );
+ 

Added: head/graphics/ilmbase/files/patch-Imath__ImathFun.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-Imath__ImathFun.cpp	Mon Mar 24 17:49:30 2014	(r349036)
@@ -0,0 +1,44 @@
+--- ./Imath/ImathFun.cpp.orig	2013-10-11 20:40:29.000000000 +0200
++++ ./Imath/ImathFun.cpp	2014-01-29 13:16:44.000000000 +0100
+@@ -33,6 +33,7 @@
+ ///////////////////////////////////////////////////////////////////////////
+ 
+ 
++#include <inttypes.h>
+ #include "ImathFun.h"
+ 
+ IMATH_INTERNAL_NAMESPACE_SOURCE_ENTER
+@@ -41,14 +42,14 @@
+ float
+ succf (float f)
+ {
+-    union {float f; int i;} u;
++    union {float f; int32_t i;} u;
+     u.f = f;
+ 
+     if ((u.i & 0x7f800000) == 0x7f800000)
+     {
+         // Nan or infinity; don't change value.
+     }
+-    else if (u.i == 0x00000000 || u.i == 0x80000000)
++    else if (u.i == (int32_t)0x00000000 || u.i == (int32_t)0x80000000)
+     {
+         // Plus or minus zero.
+ 
+@@ -76,14 +77,14 @@
+ float
+ predf (float f)
+ {
+-    union {float f; int i;} u;
++    union {float f; int32_t i;} u;
+     u.f = f;
+ 
+     if ((u.i & 0x7f800000) == 0x7f800000)
+     {
+         // Nan or infinity; don't change value.
+     }
+-    else if (u.i == 0x00000000 || u.i == 0x80000000)
++    else if (u.i == (int32_t)0x00000000 || u.i == (int32_t)0x80000000)
+     {
+         // Plus or minus zero.
+