- Update to 1.5

- Merge ampasCTL-1.4.1 and openexr_ctl-1.0.1 into ampasCTL-1.5
- Add conflict with graphics/openexr_ctl
- Add dependencies for OpenEXR, tiff and ampasACES-container
- USES cmake pkgconfig
- Support STAGEDIR
- Change pkg-descr

Approved by:	wg/pawel (mentors)

5 files changed, 71 insertions, 59 deletions

diff --git a/graphics/ampasCTL/Makefile b/graphics/ampasCTL/Makefile
index 46c445efc467..ae21c39c05fd 100644
--- a/graphics/ampasCTL/Makefile
+++ b/graphics/ampasCTL/Makefile
@@ -2,36 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	ampasCTL
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	graphics devel
-DISTNAME=	ctl-${DISTVERSION}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Color Transformation Language interpreter
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	libImath.so:${PORTSDIR}/graphics/ilmbase
+CONFLICTS=	openexr_ctl-1.[0-4].*
 
-WRKSRC=		${WRKDIR}/ampas-CTL-${GH_COMMIT}/CTL
+LIB_DEPENDS=	libImath.so:${PORTSDIR}/graphics/ilmbase \
+		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libAcesContainer.so:${PORTSDIR}/graphics/ampasACES-container
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ampas
 GH_PROJECT=	CTL
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	ca179ca
+GH_COMMIT=	9cb69b8
 
-USES=		pathfix pkgconfig
-PATHFIX_MAKEFILEIN=	 Makefile.am
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal libtool
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
 DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	AUTHORS ChangeLog NEWS README
+DOC_FILES1=	AUTHORS CHANGELOG README.md
 
 DOCSRCDIR2=	${WRKSRC}/doc
 DOCSDIR2=	${DOCSDIR}/doc
@@ -39,29 +37,25 @@ DOC_FILES2=	CtlManual.pdf CtlManual.doc
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-pre-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap)
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|CtlManual.pdf CtlManual.doc||' \
-		${WRKSRC}/doc/Makefile.am
+	@${REINPLACE_CMD} -e 's|#include <alloca.h>||' \
+		${WRKSRC}/lib/dpx/dpx_util.cc ${WRKSRC}/lib/IlmCtl/CtlExc.cpp \
+		${WRKSRC}/lib/IlmCtl/CtlTypeStorage.cpp ${WRKSRC}/ctlrender/tiff_file.cc
 
-test check:	build
-	@(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+	@${REINPLACE_CMD} -e 's|lib/CMake|lib/cmake|' \
+		-e 's|add_subdirectory(doc)||' \
+		-e 's|lib/pkgconfig|libdata/pkgconfig|' \
+		${WRKSRC}/CMakeLists.txt
 
-.if defined(PACKAGE_BUILDING)
-pre-install:	test
-.endif
+	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|' \
+		${WRKSRC}/OpenEXR_CTL/CMakeLists.txt
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
-.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/ampasCTL/distinfo b/graphics/ampasCTL/distinfo
index 5dcc818c6a76..4ef15a98fc53 100644
--- a/graphics/ampasCTL/distinfo
+++ b/graphics/ampasCTL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ctl-1.4.1.tar.gz) = 89757647d8a3b53d1cf8e356c4d01c1112f7b57f518b052829339e0a4cd5ac39
-SIZE (ctl-1.4.1.tar.gz) = 1127090
+SHA256 (ampasCTL-1.5.tar.gz) = f0509384bfb37273f433409e7412d2766748fa5a952359b072e8f7f76f218dab
+SIZE (ampasCTL-1.5.tar.gz) = 1939635
diff --git a/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc b/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc
new file mode 100644
index 000000000000..48a5ae2c7835
--- /dev/null
+++ b/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc
@@ -0,0 +1,10 @@
+--- ./lib/dpx/dpx_util.cc.orig	2013-10-12 18:55:34.000000000 +0200
++++ ./lib/dpx/dpx_util.cc	2013-10-12 18:55:55.000000000 +0200
+@@ -57,6 +57,7 @@
+ #include <stdio.h>
+ 
+ #include <string.h>
++#include <stdlib.h>
+ 
+ namespace ctl {
+ 
diff --git a/graphics/ampasCTL/pkg-descr b/graphics/ampasCTL/pkg-descr
index 698a72e4d7db..05ff5a09ab7d 100644
--- a/graphics/ampasCTL/pkg-descr
+++ b/graphics/ampasCTL/pkg-descr
@@ -1,22 +1,17 @@
-ABOUT THE CTL LIBRARIES
------------------------
-
-The CTL interpreter source code release contains the following
-C++ libraries:
-
-IlmCtl          The CTL interpreter front end and the interpreter's
-                public programming interface.
-
-IlmCtlSimd      The interpreter's SIMD back end.
-
-IlmCtlMath      Math routines that are used by IlmCtlSimd: conversions
-                between standard color spaces, 1D and 3D lookup tables,
-                3D scattered data interpolation.
-
-IlmCtlTest      Confidence tests for IlmCtl, IlmCtlSimd
-
-IlmCtlMathTest  Confidence tests for IlmCtlMath
-
-IlmCtlTest      Confidence tests for IlmImfCtl
+# The Color Transformation Language #
+ 
+The Color Transformation Language, or CTL, is a programming language for digital
+color management.
+ 
+Digital color management requires translating digital images between different
+representations or color spaces.  For example, the pixels in an image may encode
+the colors that should be seen when the image is displayed on a video monitor. 
+Printing this image on paper, or recording it on motion picture film requires
+transforming the pixels to an appropriate representation: Video, inks on paper
+and film all have different color gamuts and dynamic ranges.  Color mixing is
+additive for video, but subtractive for inks and film. Video and film typically
+use three color channels, while four or more inks are used for printing on
+paper. A color management system must transform each pixel in the original image
+to corresponding amounts of ink or film density values.
 
 WWW: https://github.com/ampas/CTL/
diff --git a/graphics/ampasCTL/pkg-plist b/graphics/ampasCTL/pkg-plist
index d319988794e7..7d37e08dcc90 100644
--- a/graphics/ampasCTL/pkg-plist
+++ b/graphics/ampasCTL/pkg-plist
@@ -1,3 +1,6 @@
+bin/ctlrender
+bin/exr_ctl_exr
+bin/exrdpx
 include/CTL/CtlAddr.h
 include/CTL/CtlAlign.h
 include/CTL/CtlColorSpace.h
@@ -14,22 +17,32 @@ include/CTL/CtlRcPtr.h
 include/CTL/CtlReadWriteAccess.h
 include/CTL/CtlSimdInterpreter.h
 include/CTL/CtlSparseMatrix.h
+include/CTL/CtlStdType.h
 include/CTL/CtlSymbolTable.h
 include/CTL/CtlSyntaxTree.h
 include/CTL/CtlTokens.h
 include/CTL/CtlType.h
+include/CTL/CtlTypeStorage.h
 include/CTL/CtlVersion.h
-lib/libIlmCtl.a
-lib/libIlmCtl.la
+include/OpenEXR/ImfCtlApplyTransforms.h
+lib/CTL/change_saturation.ctl
+lib/CTL/transform_DPX_EXR.ctl
+lib/CTL/transform_EXR_DPX.ctl
+lib/CTL/utilities.ctl
+lib/cmake/CTL/CTLConfig.cmake
+lib/cmake/CTL/CTLConfigVersion.cmake
+lib/cmake/CTL/CTLLibraryDepends.cmake
 lib/libIlmCtl.so
-lib/libIlmCtl.so.2
-lib/libIlmCtlMath.a
-lib/libIlmCtlMath.la
+lib/libIlmCtl.so.1.5.0
 lib/libIlmCtlMath.so
-lib/libIlmCtlMath.so.2
-lib/libIlmCtlSimd.a
-lib/libIlmCtlSimd.la
+lib/libIlmCtlMath.so.1.5.0
 lib/libIlmCtlSimd.so
-lib/libIlmCtlSimd.so.2
+lib/libIlmCtlSimd.so.1.5.0
+lib/libIlmImfCtl.so
 libdata/pkgconfig/CTL.pc
+libdata/pkgconfig/OpenEXR_CTL.pc
+@dirrm lib/cmake/CTL
+@dirrmtry lib/cmake
+@dirrm lib/CTL
+@dirrmtry include/OpenEXR
 @dirrm include/CTL