Update to 1.6.0.

7 files changed, 47 insertions, 106 deletions

diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 1ce4b490f464..4bc26e788ec4 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -6,43 +6,24 @@
 #
 
 PORTNAME=	OpenEXR
-PORTVERSION=	1.4.0
+PORTVERSION=	1.6.0
 PORTREVISION=	0
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}${DISTVERSIONSUFFIX}
-DISTVERSIONSUFFIX=a
+DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 CATEGORIES=	graphics devel
-#MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,g}
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
 
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	A high dynamic-range (HDR) image file format
 
-USE_AUTOTOOLS=	libtool:15
-GNU_CONFIGURE=	YES
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
-INSTALLS_SHLIB=	YES
-
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${PORTVERSION}
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	YES
 
-CONFIGURE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS} \
-		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
+CONFIGURE_ARGS+=--enable-imfexamples
 
 WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-#.if !defined(WITHOUT_X11) && defined(WITH_FLTK)
-#CONFIGURE_ARGS+=--with-fltk-config=${X11BASE}/bin/fltk-config
-#CFLAGS+=	${PTHREAD_CFLAGS}
-#LDFLAGS+=	${PTHREAD_LIBS}
-#PLIST_SUB+=	WITH_FLTK=
-#LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads \
-#		glut.4:${PORTSDIR}/graphics/libglut
-#.else
-CONFIGURE_ARGS+=--with-fltk-config=${FALSE} --without-x
-PLIST_SUB+=	WITH_FLTK="@comment "
-#.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/OpenEXR/distinfo b/graphics/OpenEXR/distinfo
index 1ada3f212f32..8ee9f3131b4f 100644
--- a/graphics/OpenEXR/distinfo
+++ b/graphics/OpenEXR/distinfo
@@ -1,3 +1,3 @@
-MD5 (openexr-1.4.0a.tar.gz) = d0a4b9a930c766fa51561b05fb204afe
-SHA256 (openexr-1.4.0a.tar.gz) = 5d8a7327bd28eeb5d3064640d8eb32c3cd8c5a15999c70b0afa9f8af851936d1
-SIZE (openexr-1.4.0a.tar.gz) = 9673041
+MD5 (openexr-1.6.0.tar.gz) = 2a5cd9002f8ec6055bf5ba13b6d57668
+SHA256 (openexr-1.6.0.tar.gz) = 043bcbb2829e51ac09018226d86bc036f14d716e5096ac067946c835b7e2eb57
+SIZE (openexr-1.6.0.tar.gz) = 13629247
diff --git a/graphics/OpenEXR/files/patch-IlmImfExamples-Makeilfe.in b/graphics/OpenEXR/files/patch-IlmImfExamples-Makeilfe.in
new file mode 100644
index 000000000000..d07038d9440b
--- /dev/null
+++ b/graphics/OpenEXR/files/patch-IlmImfExamples-Makeilfe.in
@@ -0,0 +1,11 @@
+--- IlmImfExamples/Makefile.in.orig	2007-08-04 05:07:13.000000000 +0900
++++ IlmImfExamples/Makefile.in	2007-10-08 02:22:15.000000000 +0900
+@@ -225,7 +225,7 @@
+ 		      rgbaInterfaceTiledExamples.h \
+ 		      lowLevelIoExamples.h previewImageExamples.h
+ 
+-examplesdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples
++examplesdir = $(prefix)/share/examples/OpenEXR
+ examples_DATA = $(imfexamples_SOURCES)
+ imfexamplesdir = $(examplesdir)
+ all: all-am
diff --git a/graphics/OpenEXR/files/patch-IlmImfExamples::Makeilfe.in b/graphics/OpenEXR/files/patch-IlmImfExamples::Makeilfe.in
deleted file mode 100644
index 9a668eef4bea..000000000000
--- a/graphics/OpenEXR/files/patch-IlmImfExamples::Makeilfe.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- IlmImfExamples/Makefile.in.orig	Thu Mar 10 10:29:28 2005
-+++ IlmImfExamples/Makefile.in	Sun Oct  9 05:41:42 2005
-@@ -174,7 +174,7 @@
- 		      lowLevelIoExamples.h previewImageExamples.h
- 
- 
--examplesdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples
-+examplesdir = $(datadir)/examples/OpenEXR-@OPENEXR_VERSION@
- examples_DATA = $(imfexamples_SOURCES)
- 
- imfexamplesdir = $(examplesdir)
diff --git a/graphics/OpenEXR/files/patch-Makefile.in b/graphics/OpenEXR/files/patch-Makefile.in
index cf28e8cc9010..6dc8bcf5d12e 100644
--- a/graphics/OpenEXR/files/patch-Makefile.in
+++ b/graphics/OpenEXR/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig	Wed Aug  9 14:45:53 2006
-+++ Makefile.in	Sun Mar 11 12:53:52 2007
-@@ -210,7 +210,7 @@
- EXTRA_DIST = bootstrap README.win32 README.OSX README.CVS LICENSE openexr.m4 \
- 	     config.windows/OpenEXRConfig.h
+--- Makefile.in.orig	2007-08-04 05:07:15.000000000 +0900
++++ Makefile.in	2007-10-08 02:14:58.000000000 +0900
+@@ -214,7 +214,7 @@
+ 	openexr.m4 \
+ 	config.windows/OpenEXRConfig.h
  
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/graphics/OpenEXR/files/patch-doc-Makefile.in b/graphics/OpenEXR/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..b7b6bed4d6bb
--- /dev/null
+++ b/graphics/OpenEXR/files/patch-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	2007-08-04 05:07:14.000000000 +0900
++++ doc/Makefile.in	2007-10-08 02:19:31.000000000 +0900
+@@ -177,7 +177,7 @@
+ 	TechnicalIntroduction.pdf \
+ 	OpenEXRFileLayout.pdf
+ 
+-docdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@
++docdir = $(datadir)/doc/OpenEXR
+ doc_DATA = $(EXTRA_DIST)
+ all: all-am
+ 
diff --git a/graphics/OpenEXR/pkg-plist b/graphics/OpenEXR/pkg-plist
index 227de005cd14..e9a19efb4346 100644
--- a/graphics/OpenEXR/pkg-plist
+++ b/graphics/OpenEXR/pkg-plist
@@ -3,67 +3,13 @@ bin/exrheader
 bin/exrmakepreview
 bin/exrmaketiled
 bin/exrstdattr
-%%WITH_FLTK%%bin/exrdisplay
-lib/libHalf.a
-lib/libHalf.la
-lib/libHalf.so
-lib/libHalf.so.4
-lib/libIex.a
-lib/libIex.la
-lib/libIex.so
-lib/libIex.so.4
 lib/libIlmImf.a
 lib/libIlmImf.la
 lib/libIlmImf.so
-lib/libIlmImf.so.4
-lib/libImath.a
-lib/libImath.la
-lib/libImath.so
-lib/libImath.so.4
-lib/libIlmThread.a
-lib/libIlmThread.la
-lib/libIlmThread.so
-lib/libIlmThread.so.4
-include/OpenEXR/Iex.h
-include/OpenEXR/IexBaseExc.h
-include/OpenEXR/IexErrnoExc.h
-include/OpenEXR/IexMacros.h
-include/OpenEXR/IexMathExc.h
-include/OpenEXR/IexThrowErrnoExc.h
-include/OpenEXR/IlmThread.h
-include/OpenEXR/IlmThreadMutex.h
-include/OpenEXR/IlmThreadPool.h
-include/OpenEXR/IlmThreadSemaphore.h
-include/OpenEXR/ImathBox.h
-include/OpenEXR/ImathBoxAlgo.h
-include/OpenEXR/ImathColor.h
-include/OpenEXR/ImathColorAlgo.h
-include/OpenEXR/ImathEuler.h
-include/OpenEXR/ImathExc.h
-include/OpenEXR/ImathFrame.h
-include/OpenEXR/ImathFrustum.h
-include/OpenEXR/ImathFun.h
-include/OpenEXR/ImathGL.h
-include/OpenEXR/ImathGLU.h
-include/OpenEXR/ImathHalfLimits.h
-include/OpenEXR/ImathInterval.h
-include/OpenEXR/ImathLimits.h
-include/OpenEXR/ImathLine.h
-include/OpenEXR/ImathLineAlgo.h
-include/OpenEXR/ImathMath.h
-include/OpenEXR/ImathMatrix.h
-include/OpenEXR/ImathMatrixAlgo.h
-include/OpenEXR/ImathPlane.h
-include/OpenEXR/ImathPlatform.h
-include/OpenEXR/ImathQuat.h
-include/OpenEXR/ImathRandom.h
-include/OpenEXR/ImathRoots.h
-include/OpenEXR/ImathShear.h
-include/OpenEXR/ImathSphere.h
-include/OpenEXR/ImathVec.h
-include/OpenEXR/ImathVecAlgo.h
+lib/libIlmImf.so.6
 include/OpenEXR/ImfArray.h
 include/OpenEXR/ImfAttribute.h
+include/OpenEXR/ImfB44Compressor.h
 include/OpenEXR/ImfBoxAttribute.h
 include/OpenEXR/ImfCRgbaFile.h
 include/OpenEXR/ImfChannelList.h
@@ -78,6 +24,7 @@ include/OpenEXR/ImfEnvmap.h
 include/OpenEXR/ImfEnvmapAttribute.h
 include/OpenEXR/ImfFloatAttribute.h
 include/OpenEXR/ImfFrameBuffer.h
+include/OpenEXR/ImfFramesPerSecond.h
 include/OpenEXR/ImfHeader.h
 include/OpenEXR/ImfHuf.h
 include/OpenEXR/ImfIO.h
@@ -96,6 +43,8 @@ include/OpenEXR/ImfOutputFile.h
 include/OpenEXR/ImfPixelType.h
 include/OpenEXR/ImfPreviewImage.h
 include/OpenEXR/ImfPreviewImageAttribute.h
+include/OpenEXR/ImfRational.h
+include/OpenEXR/ImfRationalAttribute.h
 include/OpenEXR/ImfRgba.h
 include/OpenEXR/ImfRgbaFile.h
 include/OpenEXR/ImfRgbaYca.h
@@ -115,12 +64,11 @@ include/OpenEXR/ImfVersion.h
 include/OpenEXR/ImfWav.h
 include/OpenEXR/ImfXdr.h
 include/OpenEXR/OpenEXRConfig.h
-include/OpenEXR/half.h
-include/OpenEXR/halfFunction.h
-include/OpenEXR/halfLimits.h
 libdata/pkgconfig/OpenEXR.pc
 share/aclocal/openexr.m4
-@dirrm include/OpenEXR
+%%DOCSDIR%%/ReadingAndWritingImageFiles.pdf
+%%DOCSDIR%%/TechnicalIntroduction.pdf
+%%DOCSDIR%%/OpenEXRFileLayout.pdf
 %%EXAMPLESDIR%%/drawImage.cpp
 %%EXAMPLESDIR%%/drawImage.h
 %%EXAMPLESDIR%%/generalInterfaceExamples.cpp
@@ -137,3 +85,4 @@ share/aclocal/openexr.m4
 %%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.cpp
 %%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.h
 @dirrm %%EXAMPLESDIR%%
+@dirrm %%DOCSDIR%%