7 files changed, 104 insertions, 99 deletions

diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 405fa769fb92..c804ae7f59f5 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -2,74 +2,68 @@
 # $FreeBSD$
 
 PORTNAME=	OpenEXR
-PORTVERSION=	1.7.1
+PORTVERSION=	2.0.1
 CATEGORIES=	graphics devel
-MASTER_SITES=	http://cloud.github.com/downloads/openexr/openexr/
-DISTNAME=	${PORTNAME:L}-${DISTVERSION}
+MASTER_SITES=	SAVANNAH/openexr/
+DISTNAME=	openexr-${DISTVERSION}
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	High dynamic-range (HDR) image file format
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	Imath:${PORTSDIR}/graphics/ilmbase
+LIB_DEPENDS=	libImath.so:${PORTSDIR}/graphics/ilmbase
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USES=		pkgconfig
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
+USES=		gmake pathfix pkgconfig
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--disable-ilmbasetest --enable-imfexamples
 USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	YES
-
-CONFIGURE_ARGS+=--enable-imfexamples
+USE_LDCONFIG=	yes
 
 # must be explicitely linked with -l{thr|pthread}
 LDFLAGS+=	${PTHREAD_LIBS}
 
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
 DOCSRCDIR1=	${WRKSRC}
 DOC_FILES1=	AUTHORS ChangeLog NEWS README
 
 DOCSRCDIR2=	${WRKSRC}/doc
-DOC_FILES2=	MultiViewOpenEXR.pdf OpenEXRFileLayout.pdf \
-		ReadingAndWritingImageFiles.pdf TechnicalIntroduction.pdf
+DOCSDIR2=	${DOCSDIR}/doc
+DOC_FILES2=	*.pdf
 
-OPTIONS_DEFINE=		LARGE_STACK
+OPTIONS_DEFINE=		DOCS EXAMPLES LARGE_STACK
 LARGE_STACK_DESC=	Enable sys-dependant large stack optimizations
 
-NO_STAGE=	yes
+OPTIONS_SUB=	yes
+
+LARGE_STACK_CONFIGURE_ENABLE=	large-stack
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MLARGE_STACK}
-CONFIGURE_ARGS+=--enable-large-stack
-.endif
+PLIST_SUB=	MAJORVER=2_0
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|examplesdir = $$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples|examplesdir = $$(prefix)/share/examples/OpenEXR|' \
+	@${REINPLACE_CMD} -e 's|$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples|$$(prefix)/share/examples/${PORTNAME}|' \
 		${WRKSRC}/IlmImfExamples/Makefile.in
-	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = $$(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|docdir=$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@|docdir = $$(datadir)/doc/OpenEXR|' \
-	-e 's|doc_DATA = $$(EXTRA_DIST)|doc_DATA =|' ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@||' \
+		-e 's|$$(EXTRA_DIST)||' \
+		${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in
+
+.if ! ${PORT_OPTIONS:MEXAMPLES}
+EXTRA_PATCHES+=${FILESDIR}/extra-patch-IlmImfExamples-Makefile.in
+.endif
 
 regression-test regression test check:	build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR}
-.endif
-
-# IlmImfTest hangs indefinitely
-#
-#.if defined(PACKAGE_BUILDING)
-#.if ${ARCH} != sparc64 || ${OSVERSION} >= 700055
-#.if ${ARCH} != amd64 || ${OSVERSION} < 800000
-#pre-install:	test
-#.endif
-#.endif
-#.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
 
 .include <bsd.port.mk>
diff --git a/graphics/OpenEXR/distinfo b/graphics/OpenEXR/distinfo
index c9c835a78ee9..691e4ab8046a 100644
--- a/graphics/OpenEXR/distinfo
+++ b/graphics/OpenEXR/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openexr-1.7.1.tar.gz) = 692ee6566d49939b2613e63b3afea2d38b871c0202cc829a7e32ced780af55c5
-SIZE (openexr-1.7.1.tar.gz) = 13554138
+SHA256 (openexr-2.0.1.tar.gz) = b9924d2f9d57376ff99234209231ad97a47f5cfebd18a5d0570db6d1a220685a
+SIZE (openexr-2.0.1.tar.gz) = 12609335
diff --git a/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in b/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in
new file mode 100644
index 000000000000..cbb7d5c3caea
--- /dev/null
+++ b/graphics/OpenEXR/files/extra-patch-IlmImfExamples-Makefile.in
@@ -0,0 +1,33 @@
+--- IlmImfExamples/Makefile.in.orig	2013-07-12 02:09:22.000000000 +0200
++++ IlmImfExamples/Makefile.in	2013-10-06 22:56:21.000000000 +0200
+@@ -356,18 +356,18 @@
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-install-examplesDATA: $(examples_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
+-	@list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \
+-	done
++#install-examplesDATA: $(examples_DATA)
++#	@$(NORMAL_INSTALL)
++#	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
++#	@list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
++#	for p in $$list; do \
++#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++#	  echo "$$d$$p"; \
++#	done | $(am__base_list) | \
++#	while read files; do \
++#	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesdir)'"; \
++#	  $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesdir)" || exit $$?; \
++#	done
+ 
+ uninstall-examplesDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/graphics/OpenEXR/files/patch-ImfAutoArray.h b/graphics/OpenEXR/files/patch-ImfAutoArray.h
deleted file mode 100644
index a5cc72c8c69f..000000000000
--- a/graphics/OpenEXR/files/patch-ImfAutoArray.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- IlmImf/ImfAutoArray.h.orig	2012-07-17 19:27:26.000000000 -0400
-+++ IlmImf/ImfAutoArray.h	2012-11-30 21:29:19.902497168 -0500
-@@ -46,6 +46,10 @@
- 
- #include "OpenEXRConfig.h"
- 
-+#if !defined (HAVE_LARGE_STACK)
-+#include <cstring>
-+#endif
-+
- namespace Imf {
- 
- 
-@@ -57,7 +61,7 @@
-     {
-       public:
- 
--	 AutoArray (): _data (new T [size]) { memset(_data, 0, size*sizeof(T)); }
-+ 	 AutoArray (): _data (new T [size]) {::std::memset(_data, 0, size * sizeof(T));}
- 	~AutoArray () {delete [] _data;}
- 
- 	operator T * ()			{return _data;}
diff --git a/graphics/OpenEXR/files/patch-exrenvmap-main.cpp b/graphics/OpenEXR/files/patch-exrenvmap-main.cpp
index 9c2f987fc2f8..a1207bb8cd70 100644
--- a/graphics/OpenEXR/files/patch-exrenvmap-main.cpp
+++ b/graphics/OpenEXR/files/patch-exrenvmap-main.cpp
@@ -1,8 +1,8 @@
---- exrenvmap/main.cpp.orig	2012-07-18 01:27:28.000000000 +0200
-+++ exrenvmap/main.cpp	2012-10-04 10:44:12.000000000 +0200
-@@ -46,6 +46,7 @@
- #include <ImfEnvmap.h>
+--- exrenvmap/main.cpp.orig	2013-06-18 21:51:40.000000000 +0200
++++ exrenvmap/main.cpp	2013-10-05 18:45:26.000000000 +0200
+@@ -47,6 +47,7 @@
  #include <ImfHeader.h>
+ 
  #include <iostream>
 +#include <cstring>
  #include <exception>
diff --git a/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp b/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp
index 4b29978b3263..b01736f2cadf 100644
--- a/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp
+++ b/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp
@@ -1,10 +1,10 @@
---- exrmaketiled/main.cpp.orig	2012-07-18 01:27:28.000000000 +0200
-+++ exrmaketiled/main.cpp	2012-10-04 10:45:18.000000000 +0200
-@@ -44,6 +44,7 @@
+--- exrmaketiled/main.cpp.orig	2013-06-18 21:51:40.000000000 +0200
++++ exrmaketiled/main.cpp	2013-10-05 18:49:14.000000000 +0200
+@@ -43,6 +43,7 @@
+ #include "makeTiled.h"
  
  #include <iostream>
- #include <exception>
 +#include <cstring>
+ #include <exception>
  #include <string>
  #include <string.h>
- #include <stdlib.h>
diff --git a/graphics/OpenEXR/pkg-plist b/graphics/OpenEXR/pkg-plist
index 1f7f3fb7bcf7..fd1ab8b00b7e 100644
--- a/graphics/OpenEXR/pkg-plist
+++ b/graphics/OpenEXR/pkg-plist
@@ -1,8 +1,8 @@
-bin/exr2aces
 bin/exrenvmap
 bin/exrheader
 bin/exrmakepreview
 bin/exrmaketiled
+bin/exrmultipart
 bin/exrmultiview
 bin/exrstdattr
 include/OpenEXR/ImfAcesFile.h
@@ -15,19 +15,35 @@ include/OpenEXR/ImfChannelList.h
 include/OpenEXR/ImfChannelListAttribute.h
 include/OpenEXR/ImfChromaticities.h
 include/OpenEXR/ImfChromaticitiesAttribute.h
+include/OpenEXR/ImfCompositeDeepScanLine.h
 include/OpenEXR/ImfCompression.h
 include/OpenEXR/ImfCompressionAttribute.h
 include/OpenEXR/ImfConvert.h
+include/OpenEXR/ImfDeepCompositing.h
+include/OpenEXR/ImfDeepFrameBuffer.h
+include/OpenEXR/ImfDeepScanLineInputFile.h
+include/OpenEXR/ImfDeepScanLineInputPart.h
+include/OpenEXR/ImfDeepScanLineOutputFile.h
+include/OpenEXR/ImfDeepScanLineOutputPart.h
+include/OpenEXR/ImfDeepTiledInputFile.h
+include/OpenEXR/ImfDeepTiledInputPart.h
+include/OpenEXR/ImfDeepTiledOutputFile.h
+include/OpenEXR/ImfDeepTiledOutputPart.h
 include/OpenEXR/ImfDoubleAttribute.h
 include/OpenEXR/ImfEnvmap.h
 include/OpenEXR/ImfEnvmapAttribute.h
+include/OpenEXR/ImfExport.h
 include/OpenEXR/ImfFloatAttribute.h
+include/OpenEXR/ImfForward.h
 include/OpenEXR/ImfFrameBuffer.h
 include/OpenEXR/ImfFramesPerSecond.h
+include/OpenEXR/ImfGenericInputFile.h
+include/OpenEXR/ImfGenericOutputFile.h
 include/OpenEXR/ImfHeader.h
 include/OpenEXR/ImfHuf.h
 include/OpenEXR/ImfIO.h
 include/OpenEXR/ImfInputFile.h
+include/OpenEXR/ImfInputPart.h
 include/OpenEXR/ImfInt64.h
 include/OpenEXR/ImfIntAttribute.h
 include/OpenEXR/ImfKeyCode.h
@@ -36,10 +52,17 @@ include/OpenEXR/ImfLineOrder.h
 include/OpenEXR/ImfLineOrderAttribute.h
 include/OpenEXR/ImfLut.h
 include/OpenEXR/ImfMatrixAttribute.h
+include/OpenEXR/ImfMisc.h
+include/OpenEXR/ImfMultiPartInputFile.h
+include/OpenEXR/ImfMultiPartOutputFile.h
 include/OpenEXR/ImfMultiView.h
 include/OpenEXR/ImfName.h
+include/OpenEXR/ImfNamespace.h
 include/OpenEXR/ImfOpaqueAttribute.h
 include/OpenEXR/ImfOutputFile.h
+include/OpenEXR/ImfOutputPart.h
+include/OpenEXR/ImfPartHelper.h
+include/OpenEXR/ImfPartType.h
 include/OpenEXR/ImfPixelType.h
 include/OpenEXR/ImfPreviewImage.h
 include/OpenEXR/ImfPreviewImageAttribute.h
@@ -56,7 +79,9 @@ include/OpenEXR/ImfThreading.h
 include/OpenEXR/ImfTileDescription.h
 include/OpenEXR/ImfTileDescriptionAttribute.h
 include/OpenEXR/ImfTiledInputFile.h
+include/OpenEXR/ImfTiledInputPart.h
 include/OpenEXR/ImfTiledOutputFile.h
+include/OpenEXR/ImfTiledOutputPart.h
 include/OpenEXR/ImfTiledRgbaFile.h
 include/OpenEXR/ImfTimeCode.h
 include/OpenEXR/ImfTimeCodeAttribute.h
@@ -65,36 +90,11 @@ include/OpenEXR/ImfVersion.h
 include/OpenEXR/ImfWav.h
 include/OpenEXR/ImfXdr.h
 include/OpenEXR/OpenEXRConfig.h
+lib/libIlmImf-Imf_%%MAJORVER%%.so
+lib/libIlmImf-Imf_%%MAJORVER%%.so.20
 lib/libIlmImf.a
 lib/libIlmImf.la
 lib/libIlmImf.so
-lib/libIlmImf.so.7
 libdata/pkgconfig/OpenEXR.pc
 share/aclocal/openexr.m4
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/MultiViewOpenEXR.pdf
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/OpenEXRFileLayout.pdf
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/ReadingAndWritingImageFiles.pdf
-%%PORTDOCS%%%%DOCSDIR%%/TechnicalIntroduction.pdf
-%%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
-%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.cpp
-%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.h
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%-1.7.1
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry include/OpenEXR