o Update to 1.4.0

o Chase libraries version bump to depending on this port.

[NOTE]
I disabled FLTK support, so you can't use OpenEXR's applications.
Because I'm validating FLTK support.

Spotted by:	Nikolaj Thygesen <nikolaj.thygesen <@> diamondbox.dk>
Obtained from:	Florian Kainz <kainz <@> ilm.com>
Committed at:	AsiaBSDCon 2007 in Tokyo, Japan
Memorial Committing with:
		bushman, kuriyama, hrs, gnn, nobutaka, nyan, motoyuki, metal,
		simokawa, akiyama, ume, rwatson, pjd, mckusick, takawata,
		murray, cjh, brooks, daichi, delphij, ups, rrs

4 files changed, 41 insertions, 24 deletions

diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index b35677d..c1d5a8f 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -6,8 +6,10 @@
 #
 
 PORTNAME=	OpenEXR
-PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTVERSION=	1.4.0
+PORTREVISION=	0
+DISTNAME=	${PORTNAME:L}-${PORTVERSION}${DISTVERSIONSUFFIX}
+DISTVERSIONSUFFIX=a
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	openexr
@@ -23,18 +25,23 @@ INSTALLS_SHLIB=	YES
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${PORTVERSION}
 
+CONFIGURE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS} \
+		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
+
+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
+#.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
+#.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/OpenEXR/distinfo b/graphics/OpenEXR/distinfo
index 6d324d3..1ada3f2 100644
--- a/graphics/OpenEXR/distinfo
+++ b/graphics/OpenEXR/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenEXR-1.2.2.tar.gz) = a2e56af78dc47c7294ff188c8f78394b
-SHA256 (OpenEXR-1.2.2.tar.gz) = 77e6e93cb40d5f6d69b26c05ca9738cdcc3978753e0053c9115026d7adaefc8d
-SIZE (OpenEXR-1.2.2.tar.gz) = 9324108
+MD5 (openexr-1.4.0a.tar.gz) = d0a4b9a930c766fa51561b05fb204afe
+SHA256 (openexr-1.4.0a.tar.gz) = 5d8a7327bd28eeb5d3064640d8eb32c3cd8c5a15999c70b0afa9f8af851936d1
+SIZE (openexr-1.4.0a.tar.gz) = 9673041
diff --git a/graphics/OpenEXR/files/patch-Makefile.in b/graphics/OpenEXR/files/patch-Makefile.in
index d34842d..cf28e8c 100644
--- a/graphics/OpenEXR/files/patch-Makefile.in
+++ b/graphics/OpenEXR/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Thu Mar 10 10:29:29 2005
-+++ Makefile.in	Sun Oct  9 05:42:44 2005
-@@ -158,7 +158,7 @@
- 
- EXTRA_DIST = bootstrap README.win32 README.OSX README.CVS LICENSE openexr.m4
+--- 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
  
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = OpenEXR.pc
- 
  m4datadir = $(datadir)/aclocal
+ m4data_DATA = openexr.m4
diff --git a/graphics/OpenEXR/pkg-plist b/graphics/OpenEXR/pkg-plist
index d9d762f..227de00 100644
--- a/graphics/OpenEXR/pkg-plist
+++ b/graphics/OpenEXR/pkg-plist
@@ -7,25 +7,33 @@ bin/exrstdattr
 lib/libHalf.a
 lib/libHalf.la
 lib/libHalf.so
-lib/libHalf.so.2
+lib/libHalf.so.4
 lib/libIex.a
 lib/libIex.la
 lib/libIex.so
-lib/libIex.so.2
+lib/libIex.so.4
 lib/libIlmImf.a
 lib/libIlmImf.la
 lib/libIlmImf.so
-lib/libIlmImf.so.2
+lib/libIlmImf.so.4
 lib/libImath.a
 lib/libImath.la
 lib/libImath.so
-lib/libImath.so.2
+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
@@ -94,6 +102,7 @@ include/OpenEXR/ImfRgbaYca.h
 include/OpenEXR/ImfStandardAttributes.h
 include/OpenEXR/ImfStringAttribute.h
 include/OpenEXR/ImfTestFile.h
+include/OpenEXR/ImfThreading.h
 include/OpenEXR/ImfTileDescription.h
 include/OpenEXR/ImfTileDescriptionAttribute.h
 include/OpenEXR/ImfTiledInputFile.h
@@ -105,6 +114,7 @@ include/OpenEXR/ImfVecAttribute.h
 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