4 files changed, 48 insertions, 20 deletions

diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 6959395f848b..9a3463c20df0 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	OpenEXR
-PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTVERSION=	1.2.1
+PORTREVISION=	0
 CATEGORIES=	graphics devel
-MASTER_SITES=	http://www.openexr.com/downloads/
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	openexr
 
 MAINTAINER=	nork@FreeBSD.org
-COMMENT=	OpenEXR, a high dynamic-range (HDR) image file format developed by ILM
+COMMENT=	A high dynamic-range (HDR) image file format
 
 USE_LIBTOOL_VER=13
 GNU_CONFIGURE=	YES
+USE_GMAKE=	yes
 INSTALLS_SHLIB=	YES
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/OpenEXR/distinfo b/graphics/OpenEXR/distinfo
index e748e9cc2792..c47ee6c5f537 100644
--- a/graphics/OpenEXR/distinfo
+++ b/graphics/OpenEXR/distinfo
@@ -1,2 +1,2 @@
-MD5 (OpenEXR-1.0.7.tar.gz) = fb55c7e71124162e718472b2a872c881
-SIZE (OpenEXR-1.0.7.tar.gz) = 8687652
+MD5 (OpenEXR-1.2.1.tar.gz) = cb931247581764730fae630f79f4832a
+SIZE (OpenEXR-1.2.1.tar.gz) = 8986320
diff --git a/graphics/OpenEXR/files/patch-configure b/graphics/OpenEXR/files/patch-configure
index c14e76926814..5ae9831b18bf 100644
--- a/graphics/OpenEXR/files/patch-configure
+++ b/graphics/OpenEXR/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Jan 21 17:47:43 2003
-+++ configure	Mon Jan 27 15:03:50 2003
-@@ -1559,10 +1559,12 @@
+--- configure.orig	Wed Jun  9 16:49:46 2004
++++ configure	Wed Jun  9 16:52:42 2004
+@@ -1610,10 +1610,12 @@
  
  # The aliases save the names the user supplied, while $host etc.
  # will get canonicalized.
@@ -12,8 +12,8 @@
 +fi
  
  OPENEXR_MAJOR_VERSION=1
- OPENEXR_MINOR_VERSION=0
-@@ -8302,6 +8304,7 @@
+ OPENEXR_MINOR_VERSION=2
+@@ -19068,6 +19070,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -21,11 +21,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10533,7 +10536,6 @@
+@@ -20326,7 +20329,7 @@
  echo "$as_me:$LINENO: checking for gcc optimization flags" >&5
  echo $ECHO_N "checking for gcc optimization flags... $ECHO_C" >&6
  old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -O2 -funroll-loops -pipe"
+-CFLAGS="$CFLAGS -pipe"
++#CFLAGS="$CFLAGS -pipe"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
+ _ACEOF
diff --git a/graphics/OpenEXR/pkg-plist b/graphics/OpenEXR/pkg-plist
index 6dae0abc4c59..3348ccf8c8d2 100644
--- a/graphics/OpenEXR/pkg-plist
+++ b/graphics/OpenEXR/pkg-plist
@@ -1,21 +1,25 @@
+bin/exrenvmap
 bin/exrheader
+bin/exrmakepreview
+bin/exrmaketiled
+bin/exrstdattr
 %%WITH_FLTK%%bin/exrdisplay
 lib/libHalf.a
 lib/libHalf.la
 lib/libHalf.so
-lib/libHalf.so.0
+lib/libHalf.so.2
 lib/libIex.a
 lib/libIex.la
 lib/libIex.so
-lib/libIex.so.0
+lib/libIex.so.2
 lib/libIlmImf.a
 lib/libIlmImf.la
 lib/libIlmImf.so
-lib/libIlmImf.so.0
+lib/libIlmImf.so.2
 lib/libImath.a
 lib/libImath.la
 lib/libImath.so
-lib/libImath.so.0
+lib/libImath.so.2
 include/OpenEXR/Iex.h
 include/OpenEXR/IexBaseExc.h
 include/OpenEXR/IexErrnoExc.h
@@ -48,6 +52,9 @@ include/OpenEXR/ImathRandom.h
 include/OpenEXR/ImathRoots.h
 include/OpenEXR/ImathShear.h
 include/OpenEXR/ImathSphere.h
+include/OpenEXR/ImathTMatrix.h
+include/OpenEXR/ImathTMatrixAlgo.h
+include/OpenEXR/ImathTMatrixBase.h
 include/OpenEXR/ImathVec.h
 include/OpenEXR/ImathVecAlgo.h
 include/OpenEXR/ImfArray.h
@@ -62,12 +69,15 @@ include/OpenEXR/ImfCompression.h
 include/OpenEXR/ImfCompressionAttribute.h
 include/OpenEXR/ImfConvert.h
 include/OpenEXR/ImfDoubleAttribute.h
+include/OpenEXR/ImfEnvmap.h
+include/OpenEXR/ImfEnvmapAttribute.h
 include/OpenEXR/ImfFloatAttribute.h
 include/OpenEXR/ImfFrameBuffer.h
 include/OpenEXR/ImfHeader.h
 include/OpenEXR/ImfHuf.h
 include/OpenEXR/ImfIO.h
 include/OpenEXR/ImfInputFile.h
+include/OpenEXR/ImfInt64.h
 include/OpenEXR/ImfIntAttribute.h
 include/OpenEXR/ImfLineOrder.h
 include/OpenEXR/ImfLineOrderAttribute.h
@@ -79,9 +89,17 @@ include/OpenEXR/ImfOutputFile.h
 include/OpenEXR/ImfPixelType.h
 include/OpenEXR/ImfPreviewImage.h
 include/OpenEXR/ImfPreviewImageAttribute.h
+include/OpenEXR/ImfRgba.h
 include/OpenEXR/ImfRgbaFile.h
+include/OpenEXR/ImfRgbaYca.h
 include/OpenEXR/ImfStandardAttributes.h
 include/OpenEXR/ImfStringAttribute.h
+include/OpenEXR/ImfTestFile.h
+include/OpenEXR/ImfTileDescription.h
+include/OpenEXR/ImfTileDescriptionAttribute.h
+include/OpenEXR/ImfTiledInputFile.h
+include/OpenEXR/ImfTiledOutputFile.h
+include/OpenEXR/ImfTiledRgbaFile.h
 include/OpenEXR/ImfVecAttribute.h
 include/OpenEXR/ImfVersion.h
 include/OpenEXR/ImfWav.h
@@ -89,15 +107,22 @@ include/OpenEXR/ImfXdr.h
 include/OpenEXR/half.h
 include/OpenEXR/halfFunction.h
 include/OpenEXR/halfLimits.h
+@dirrm include/OpenEXR
 libdata/pkgconfig/OpenEXR.pc
 share/aclocal/openexr.m4
 %%EXAMPLESDIR%%/drawImage.cpp
 %%EXAMPLESDIR%%/drawImage.h
 %%EXAMPLESDIR%%/generalInterfaceExamples.cpp
 %%EXAMPLESDIR%%/generalInterfaceExamples.h
+%%EXAMPLESDIR%%/generalInterfaceTiledExamples.cpp
+%%EXAMPLESDIR%%/generalInterfaceTiledExamples.h
+%%EXAMPLESDIR%%/lowLevelIoExamples.cpp
+%%EXAMPLESDIR%%/lowLevelIoExamples.h
 %%EXAMPLESDIR%%/main.cpp
+%%EXAMPLESDIR%%/previewImageExamples.cpp
+%%EXAMPLESDIR%%/previewImageExamples.h
 %%EXAMPLESDIR%%/rgbaInterfaceExamples.cpp
 %%EXAMPLESDIR%%/rgbaInterfaceExamples.h
-@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
-@dirrm include/OpenEXR
+%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.cpp
+%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.h
 @dirrm %%EXAMPLESDIR%%