6 files changed, 19 insertions, 15 deletions

diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 262046363ccb..ea6e9737e0ce 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	OpenEXR
-PORTVERSION=	2.2.0
-PORTREVISION=	8
+PORTVERSION=	2.2.1
+PORTREVISION=	0
 CATEGORIES=	graphics devel
 MASTER_SITES=	SAVANNAH/openexr/:dist \
 		LOCAL/mandree/:test
@@ -14,13 +14,10 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:dist \
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	High dynamic-range (HDR) image file format
 
-DEPRECATED=	Vulnerable with no upstream support
-EXPIRATION_DATE=2017-12-31
-
 LICENSE=	BSD3CLAUSE
 
 # exact version required to avoid hard-to-debug issues
-LIB_DEPENDS=	libImath-2_2.so.12:graphics/ilmbase
+LIB_DEPENDS=	libImath-2_2.so.23:graphics/ilmbase
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
@@ -58,7 +55,7 @@ USE_GCC=	yes
 .endif
 
 MAJORVER=	2_2
-VER=		22
+VER=		23
 
 PLIST_SUB=	MAJORVER=${MAJORVER}
 PLIST_SUB+=	VER=${VER}
diff --git a/graphics/OpenEXR/distinfo b/graphics/OpenEXR/distinfo
index 9f7c9212c2c1..efe479cfde4f 100644
--- a/graphics/OpenEXR/distinfo
+++ b/graphics/OpenEXR/distinfo
@@ -1,4 +1,5 @@
-SHA256 (openexr-2.2.0.tar.gz) = 36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231
-SIZE (openexr-2.2.0.tar.gz) = 14489661
+TIMESTAMP = 1512081871
+SHA256 (openexr-2.2.1.tar.gz) = 8f9a5af6131583404261931d9a5c83de0a425cb4b8b25ddab2b169fbf113aecd
+SIZE (openexr-2.2.1.tar.gz) = 18176639
 SHA256 (openexr-2.2.0-comp_dwa-test-images.tar.xz) = bbb8ff547e9b68f0dfb1e8804a7ad984978c2b15897988399cc68176e99dd63a
 SIZE (openexr-2.2.0-comp_dwa-test-images.tar.xz) = 653768
diff --git a/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in b/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
index 5e7f8e875e73..1a11b076bd4a 100644
--- a/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
+++ b/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
@@ -1,6 +1,12 @@
---- IlmImfUtil/Makefile.in.orig	2014-08-10 04:48:23 UTC
+--- IlmImfUtil/Makefile.in.orig	2017-12-01 01:20:37 UTC
 +++ IlmImfUtil/Makefile.in
-@@ -265,10 +265,11 @@ libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFL
+@@ -375,15 +375,16 @@ libIlmImfUtil_la_SOURCES = \
+ 	ImfImageDataWindow.h ImfImageDataWindow.cpp \
+ 	ImfImageChannelRenaming.h
+ 
+-libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info \
++libIlmImfUtil_la_LDFLAGS = -L$(top_builddir)/IlmImf @ILMBASE_LDFLAGS@ -version-info \
+ 	@LIBTOOL_VERSION@ -no-undefined $(am__append_1)
  libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf
  libIlmImfUtilincludedir = $(includedir)/OpenEXR
  EXTRA_DIST = CMakeLists.txt
diff --git a/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp b/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
index ee84d88dcb84..dd3b73fe83cb 100644
--- a/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
+++ b/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
@@ -1,4 +1,4 @@
---- IlmImf/ImfFastHuf.cpp.orig	2014-08-10 04:23:56 UTC
+--- IlmImf/ImfFastHuf.cpp.orig	2017-11-17 23:00:24 UTC
 +++ IlmImf/ImfFastHuf.cpp
 @@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder
      for (int i = 0; i <= MAX_CODE_LEN; ++i)
diff --git a/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp b/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp
index db0fa88a2cc6..74e5054a3175 100644
--- a/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp
+++ b/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp
@@ -1,4 +1,4 @@
---- IlmImf/ImfSystemSpecific.cpp.orig	2014-08-10 04:23:57 UTC
+--- IlmImf/ImfSystemSpecific.cpp.orig	2017-11-17 23:00:24 UTC
 +++ IlmImf/ImfSystemSpecific.cpp
 @@ -44,11 +44,23 @@ namespace {
      // Helper functions for gcc + SSE enabled
diff --git a/graphics/OpenEXR/pkg-plist b/graphics/OpenEXR/pkg-plist
index fb485e0a4bca..a61636a1cf0e 100644
--- a/graphics/OpenEXR/pkg-plist
+++ b/graphics/OpenEXR/pkg-plist
@@ -96,8 +96,8 @@ lib/libIlmImf-%%MAJORVER%%.so.%%VER%%
 lib/libIlmImf-%%MAJORVER%%.so.%%VER%%.0.0
 lib/libIlmImf.a
 lib/libIlmImf.so
-lib/libIlmImfUtil-%%MAJORVER%%.so.22
-lib/libIlmImfUtil-%%MAJORVER%%.so.22.0.0
+lib/libIlmImfUtil-%%MAJORVER%%.so.%%VER%%
+lib/libIlmImfUtil-%%MAJORVER%%.so.%%VER%%.0.0
 lib/libIlmImfUtil.a
 lib/libIlmImfUtil.so
 libdata/pkgconfig/OpenEXR.pc