Update to latest version 1.5.2; this now includes openexr-ctl, which will be

removed.

ok zhuk@

graphics/ctl/Makefile

@@ -1,28 +1,33 @@
-# $OpenBSD: Makefile,v 1.8 2015/03/16 18:07:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.9 2015/09/22 18:38:10 pascal Exp $
 
 COMMENT =		Color Transformation Language interpreter
 
-DISTNAME =		ctl-1.4.1
-REVISION =		1
+V =			1.5.2
+DISTNAME =		ctl-$V
 
-SHARED_LIBS +=  IlmCtl               0.0      # .2.0
-SHARED_LIBS +=  IlmCtlMath           0.0      # .2.0
-SHARED_LIBS +=  IlmCtlSimd           0.0      # .2.0
+SHARED_LIBS +=  IlmCtl               1.0      # .2.0
+SHARED_LIBS +=  IlmCtlMath           1.0      # .2.0
+SHARED_LIBS +=  IlmCtlSimd           1.0      # .2.0
+SHARED_LIBS +=  IlmImfCtl            1.0      # 1.5
 
 CATEGORIES =		graphics lang
-HOMEPAGE =		http://www.oscars.org/science-technology/council/projects/ctl.html
+HOMEPAGE =		https://github.com/ampas/CTL/
 
 # 3-clause BSD license
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB =		m stdc++ Half Iex IlmThread Imath pthread
+WANTLIB += Half Iex IexMath IlmImf IlmThread Imath c m pthread
+WANTLIB += stdc++ tiff
 
-MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=ampasctl/}
+GH_ACCOUNT =		ampas
+GH_PROJECT =		ctl
+GH_TAGNAME =		ctl-${V}
+MASTER_SITES =		${MASTER_SITES_GITHUB}
 
-LIB_DEPENDS =		graphics/ilmbase
+MODULES =		devel/cmake
+LIB_DEPENDS =		graphics/openexr \
+			graphics/tiff
 
-SEPARATE_BUILD =	Yes
-
-CONFIGURE_STYLE =	gnu
+WRKDIST =		${WRKDIR}/CTL-ctl-$V
 
 .include <bsd.port.mk>

graphics/ctl/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ctl-1.4.1.tar.gz) = sgLZVS7rgfPe1mpnhnGfbhE4+k4xyGZ5mx761u96n5o=
-SIZE (ctl-1.4.1.tar.gz) = 996923
+SHA256 (ctl-1.5.2.tar.gz) = 1/rBQ5MyxNhKvDwoWzZWMKzyDqBBAzsVSqMCvv0l4L0=
+SIZE (ctl-1.5.2.tar.gz) = 1411871

graphics/ctl/patches/patch-CMakeLists_txt

@@ -0,0 +1,17 @@
+$OpenBSD: patch-CMakeLists_txt,v 1.1 2015/09/22 18:38:10 pascal Exp $
+--- CMakeLists.txt.orig	Tue Jun  3 03:11:24 2014
++++ CMakeLists.txt	Fri Sep 11 13:31:58 2015
+@@ -10,11 +10,11 @@ set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERS
+ set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" )
+ set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" )
+ set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" )
+-set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" )
++set( INSTALL_DOC_DIR share/doc CACHE PATH "Install directory for documentation" )
+ if( WIN32 AND NOT CYGWIN )
+   set(DEF_INSTALL_CMAKE_DIR CMake)
+ else()
+-  set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL)
++  set(DEF_INSTALL_CMAKE_DIR lib/cmake/CTL)
+ endif()
+ set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" )
+ 

graphics/ctl/patches/patch-IlmCtl_CtlInterpreter_cpp

@@ -1,11 +0,0 @@
-$OpenBSD: patch-IlmCtl_CtlInterpreter_cpp,v 1.1.1.1 2009/11/12 12:31:44 jasper Exp $
---- IlmCtl/CtlInterpreter.cpp.orig	Sun Oct 18 16:20:30 2009
-+++ IlmCtl/CtlInterpreter.cpp	Sun Oct 18 16:20:55 2009
-@@ -64,6 +64,7 @@
- #include <fstream>
- #include <algorithm>
- #include <cassert>
-+#include <unistd.h>
- 
- #ifdef WIN32
-     #include <io.h>

graphics/ctl/patches/patch-config_OpenEXR_CTL_pc_in

@@ -0,0 +1,24 @@
+$OpenBSD: patch-config_OpenEXR_CTL_pc_in,v 1.1 2015/09/22 18:38:10 pascal Exp $
+--- config/OpenEXR_CTL.pc.in.orig	Tue Jun  3 03:11:24 2014
++++ config/OpenEXR_CTL.pc.in	Fri Sep 11 14:47:59 2015
+@@ -1,11 +1,12 @@
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
+-OpenEXR_includedir=@includedir@/OpenEXR
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=@INSTALL_BIN_DIR@
++libdir=@INSTALL_LIB_DIR@
++includedir=@INSTALL_INCLUDE_DIR@
++OpenEXR_includedir=@INSTALL_INCLUDE_DIR@/OpenEXR
++CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL
+ 
+ Name: OpenEXR_CTL
+ Description: Simplified OpenEXR interface to CTL
+-Version: @OPENEXR_CTL_VERSION@
+-Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@
+-Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir}
++Version: @CTL_VERSION@
++Libs: -L${libdir} -lIlmImfCtl -lIlmImf -lImath -lHalf -lIex -lIexMath -lIlmThread -lIlmCtlSimd -lIlmCtlMath -lIlmCtl -pthread
++Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir} -I${CTL_includedir}

graphics/ctl/patches/patch-configure_cmake

@@ -0,0 +1,11 @@
+$OpenBSD: patch-configure_cmake,v 1.1 2015/09/22 18:38:10 pascal Exp $
+--- configure.cmake.orig	Fri Sep 11 13:22:14 2015
++++ configure.cmake	Fri Sep 11 13:22:35 2015
+@@ -1,6 +1,6 @@
+ # Until we get some of these modules into the upstream packages, put them here
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake")
++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/cmake")
+ 
+ find_package( PkgConfig QUIET )
+ 

graphics/ctl/patches/patch-doc_CMakeLists_txt

@@ -0,0 +1,6 @@
+$OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2015/09/22 18:38:10 pascal Exp $
+--- doc/CMakeLists.txt.orig	Fri Sep 11 13:41:18 2015
++++ doc/CMakeLists.txt	Fri Sep 11 13:41:25 2015
+@@ -1 +1 @@
+-install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL )
++install( FILES CtlManual.pdf CtlManual.doc DESTINATION share/doc/CTL )

graphics/ctl/patches/patch-lib_IlmImfCtl_CMakeLists_txt

@@ -0,0 +1,15 @@
+$OpenBSD: patch-lib_IlmImfCtl_CMakeLists_txt,v 1.1 2015/09/22 18:38:10 pascal Exp $
+--- lib/IlmImfCtl/CMakeLists.txt.orig	Fri Sep 11 14:04:30 2015
++++ lib/IlmImfCtl/CMakeLists.txt	Fri Sep 11 14:04:45 2015
+@@ -7,6 +7,11 @@ add_library( IlmImfCtl ${DO_SHARED}
+   ImfCtlCopyFunctionArg.cpp
+ )
+ 
++set_target_properties( IlmImfCtl PROPERTIES
++  VERSION ${CTL_VERSION}
++  SOVERSION ${CTL_VERSION}
++)
++
+ target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half )
+ 
+ install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR )

graphics/ctl/patches/patch-lib_dpx_dpx_raw_hh

@@ -0,0 +1,20 @@
+$OpenBSD: patch-lib_dpx_dpx_raw_hh,v 1.1 2015/09/22 18:38:10 pascal Exp $
+--- lib/dpx/dpx_raw.hh.orig	Fri Sep 11 13:13:47 2015
++++ lib/dpx/dpx_raw.hh	Fri Sep 11 13:17:18 2015
+@@ -55,6 +55,16 @@
+ #if !defined(CTL_DPX_RAW_INTERNAL_INCLUDE)
+ #define CRL_DPX_RAW_INTERNAL_INCLUDE
+ 
++#ifdef swap64
++#undef swap64
++#endif
++#ifdef swap32
++#undef swap32
++#endif
++#ifdef swap16
++#undef swap16
++#endif
++
+ namespace ctl {
+ 
+ namespace dpxi {

graphics/ctl/pkg/PLIST

@@ -1,4 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:46 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2015/09/22 18:38:10 pascal Exp $
+@pkgpath graphics/openexr-ctl
+@conflict openexr-ctl-*
+@bin bin/ctlrender
+@bin bin/exr_ctl_exr
+@bin bin/exrdpx
 include/CTL/
 include/CTL/CtlAddr.h
 include/CTL/CtlAlign.h
@@ -16,21 +21,31 @@ 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/
+include/OpenEXR/ImfCtlApplyTransforms.h
+lib/CTL/
+lib/CTL/change_saturation.ctl
+lib/CTL/transform_DPX_EXR.ctl
+lib/CTL/transform_EXR_DPX.ctl
+lib/CTL/utilities.ctl
+lib/cmake/
+lib/cmake/CTL/
+lib/cmake/CTL/CTLConfig.cmake
+lib/cmake/CTL/CTLConfigVersion.cmake
+lib/cmake/CTL/CTLLibraryDepends.cmake
 @lib lib/libIlmCtl.so.${LIBIlmCtl_VERSION}
-lib/libIlmCtlMath.a
-lib/libIlmCtlMath.la
 @lib lib/libIlmCtlMath.so.${LIBIlmCtlMath_VERSION}
-lib/libIlmCtlSimd.a
-lib/libIlmCtlSimd.la
 @lib lib/libIlmCtlSimd.so.${LIBIlmCtlSimd_VERSION}
+@lib lib/libIlmImfCtl.so.${LIBIlmImfCtl_VERSION}
 lib/pkgconfig/CTL.pc
-share/doc/CTL-1.4.1/
-share/doc/CTL-1.4.1/CtlManual.doc
-share/doc/CTL-1.4.1/CtlManual.pdf
+lib/pkgconfig/OpenEXR_CTL.pc
+share/doc/CTL/
+share/doc/CTL/CtlManual.doc
+share/doc/CTL/CtlManual.pdf