graphics/opencolorio: update to 2.1.1 release (+)

Split docs into separate plist so they can be used for this as well as python ports.
Docs need to be enabled to get python docstrings

PR:		253491
Sponsored by:	Netzkommune GmbH.

17 files changed, 358 insertions, 254 deletions

diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 293188ec9a0c..e61d49a49892 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -1,103 +1,119 @@
-# Created by: Shane Ambler <FreeBSD@Shaneware.biz>
-
 PORTNAME=	opencolorio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.1
-PORTREVISION?=	2
+DISTVERSION=	2.1.1
+# PORTREVISION must be set with ?= so as not to stomp over
+# py-opencolorio's PORTREVISION.
+# Also, just to be on the safe side, when resetting,
+# best keep PORTREVISION?=	0.
+PORTREVISION?=	0
 CATEGORIES=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
 COMMENT?=	Complete color management solution
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		alias cmake compiler:c++11-lang localbase:ldflags pkgconfig \
-		shebangfix
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libImath.so:math/Imath \
+		libpystring.so:devel/pystring \
+		libyaml-cpp.so:devel/yaml-cpp
+USES=		alias cmake compiler:c++14-lang localbase:ldflags \
+		pkgconfig
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	imageworks
+GH_ACCOUNT=	AcademySoftwareFoundation
 GH_PROJECT=	OpenColorIO
 
-CMAKE_ON=	USE_EXTERNAL_TINYXML USE_EXTERNAL_YAML
-CMAKE_OFF=	OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE OCIO_BUILD_STATIC \
-		OCIO_BUILD_DOCS
+CMAKE_OFF=	OCIO_BUILD_JAVA OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE \
+		OCIO_BUILD_TESTS OCIO_BUILD_GPU_TESTS
+
+OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFAULT=	DOCS
+OPTIONS_SUB=		yes
 
-CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
-CXXFLAGS_gcc=	-Wno-unused-function -Wno-error
-CXXFLAGS_clang=	-Wno-deprecated-register
+DOCS_CMAKE_BOOL=	OCIO_BUILD_DOCS
+DOCS_BUILD_DEPENDS=	doxygen>0:devel/doxygen
 
-SHEBANG_FILES=	share/sphinx/ExtractRstFromSourceCPP.py \
-		share/sphinx/ExtractRstFromSourceSimple.py \
-		src/pyglue/createPyDocH.py
+PLIST_SUB=	SHL3=${PORTVERSION} SHL2=${PORTVERSION:R}
 
-PLIST_SUB+=		LIBVERS=${PORTVERSION}
+.include <bsd.port.options.mk>
 
-.if ${MACHINE_CPU:Msse2}
+.if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2})
 CMAKE_ON+=	OCIO_USE_SSE
 .else
 CMAKE_OFF+=	OCIO_USE_SSE
 .endif
 
-.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOCS}
+# master and pymodule use these
+# DOCS needs to be enabled for python docstrings to be generated
+# py module can still be used without
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}breathe>=0:devel/py-breathe@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}recommonmark>=0:textproc/py-recommonmark@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx_press_theme>=0:textproc/py-sphinx_press_theme@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx-tabs>0:textproc/py-sphinx-tabs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}testresources>=0:devel/py-testresources@${PY_FLAVOR}
+.endif
 
 .if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
-LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
+LIB_DEPENDS+=	liblcms2.so:graphics/lcms2 \
+		libOpenColorIO.so:graphics/opencolorio \
 		libOpenImageIO.so:graphics/openimageio \
-		libOpenColorIO.so:graphics/opencolorio
+		libopencv_core.so:graphics/opencv \
+		libOpenEXR.so:graphics/openexr
 CMAKE_ON+=	OCIO_BUILD_APPS USE_EXTERNAL_LCMS
-CMAKE_OFF+=	OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
-LDFLAGS+=	-lOpenColorIO
+CMAKE_OFF+=	BUILD_SHARED_LIBS OCIO_BUILD_DOCS \
+		OCIO_BUILD_PYGLUE OCIO_BUILD_PYTHON
+CMAKE_ARGS+=	-DCMAKE_CXX_STANDARD=14
+LDFLAGS+=	-lOpenImageIO_Util
 USES+=		gl xorg
-USE_GL=		gl glu glut glew
+USE_GL=		egl gl glu glut glew
 USE_XORG=	xi xmu
 PLIST=		${PKGDIR}/pkg-plist-tools
-EXTRA_PATCHES=	${PATCHDIR}/tools
+
 .elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
-LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
-		libOpenColorIO.so:graphics/opencolorio
-USES+=		python:3.6+
-USE_PYTHON=	flavors
+BUILD_DEPENDS+=	pybind11>0:devel/pybind11
+LIB_DEPENDS+=	libOpenColorIO.so:graphics/opencolorio
+# textproc/py-sphinx_press_theme doesn't support py3.6
+USES+=		python:3.7+
 LDFLAGS+=	-lOpenColorIO
-CMAKE_ON+=	OCIO_BUILD_PYGLUE OCIO_PYGLUE_LINK
-CMAKE_OFF+=	OCIO_BUILD_APPS OCIO_BUILD_SHARED
-CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD}
+CMAKE_ON+=	OCIO_BUILD_PYTHON
+CMAKE_OFF+=	OCIO_BUILD_APPS BUILD_SHARED_LIBS OCIO_BUILD_DOCS \
+		OCIO_BUILD_TESTS OCIO_BUILD_GPU_TESTS
+CMAKE_ARGS+=	-DOCIO_PYTHON_VERSION=${PYTHON_VER}
 PLIST=		${PKGDIR}/pkg-plist-pyglue
+# concurrent allows docs to not collide with master port
+USE_PYTHON=	concurrent flavors
+
 .else # master port
-LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
-		libyaml-cpp03.so:devel/yaml-cpp03
-USES+=		python:3.6+,build
-USE_LDCONFIG=	yes
-CMAKE_ON+=	OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
-CMAKE_OFF+=	OCIO_BUILD_APPS
-CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD}
 # we enable pyglue in master port. This makes the python module
 # available when generating docs, we leave the python header in place
 # but only install the python module with the py-opencolorio port
 # this makes it easier to allow multiple python versions installed
-PLIST=		${PKGDIR}/pkg-plist
-EXTRA_PATCHES=	${PATCHDIR}/libs
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
-		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e '/YAML_CPP_INCLUDE_DIR/ s|yaml-cpp|&03|' \
-		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e '/YAML_CPP_LIBRARY/ s|yaml-cpp|&03|' \
-		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.cpp
-.if ${SLAVE_PORT} == yes
-	@${FIND} ${WRKSRC}/src/apps -name main.cpp | ${XARGS} \
-		${REINPLACE_CMD} '/namespace OIIO/d'
+BUILD_DEPENDS+=	pybind11>0:devel/pybind11
+CMAKE_ON+=	BUILD_SHARED_LIBS OCIO_BUILD_PYGLUE OCIO_BUILD_PYTHON
+CMAKE_OFF+=	OCIO_BUILD_APPS
+CMAKE_ARGS+=	-DOCIO_PYTHON_VERSION=${PYTHON_VER}
+USES+=		gl python:build xorg
+USE_GL=		gl glu glut glew
+USE_XORG=	xi xmu
+USE_LDCONFIG=	yes
+PLIST=		${PKGDIR}/pkg-plist ${PKGDIR}/pkg-plist-docs
 .endif
 
-.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
-do-install:
-	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-	${INSTALL_LIB} ${BUILD_WRKSRC}/src/pyglue/PyOpenColorIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
-.elif !defined(OCIO_SLAVE)
 post-install:
-	@${RM} -R ${STAGEDIR}${PYTHON_LIBDIR}
+	@cd ${STAGEDIR}${PREFIX} && ${RM} -r share/ocio
+.if defined(OCIO_SLAVE)
+	@cd ${STAGEDIR}${PREFIX} && ${RM} -r include libdata lib/cmake lib/libOpenColorIO.a
 .endif
+.if !defined(OCIO_SLAVE) || (defined(OCIO_SLAVE) && ${OCIO_SLAVE} != pymodule)
+	@cd ${STAGEDIR}${PREFIX} && ${RM} -r lib/libOpenColorIO*.a lib/python*
+.endif
+
+post-install-DOCS-on:
+	@cd ${STAGEDIR}${PREFIX}/share/doc && ${MV} OpenColorIO ${PKGNAMEPREFIX}${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/graphics/opencolorio/distinfo b/graphics/opencolorio/distinfo
index cb537c0218a8..eae851f65574 100644
--- a/graphics/opencolorio/distinfo
+++ b/graphics/opencolorio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557638944
-SHA256 (imageworks-OpenColorIO-v1.1.1_GH0.tar.gz) = c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
-SIZE (imageworks-OpenColorIO-v1.1.1_GH0.tar.gz) = 13828483
+TIMESTAMP = 1642947913
+SHA256 (AcademySoftwareFoundation-OpenColorIO-v2.1.1_GH0.tar.gz) = 16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c
+SIZE (AcademySoftwareFoundation-OpenColorIO-v2.1.1_GH0.tar.gz) = 11013141
diff --git a/graphics/opencolorio/files/libs/patch-CMakeLists.txt b/graphics/opencolorio/files/libs/patch-CMakeLists.txt
deleted file mode 100644
index a7dba8317111..000000000000
--- a/graphics/opencolorio/files/libs/patch-CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
-+++ ./CMakeLists.txt
-@@ -596,7 +599,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
diff --git a/graphics/opencolorio/files/libs/patch-src_core_CMakeLists.txt b/graphics/opencolorio/files/libs/patch-src_core_CMakeLists.txt
deleted file mode 100644
index b598b621f1f4..000000000000
--- a/graphics/opencolorio/files/libs/patch-src_core_CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/core/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
-+++ src/core/CMakeLists.txt
-@@ -90,4 +90,4 @@ message(STATUS "Create OpenColorIO.pc fr
- configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
-     ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
--    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
-+    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/libdata/pkgconfig/)
diff --git a/graphics/opencolorio/files/patch-CMakeLists.txt b/graphics/opencolorio/files/patch-CMakeLists.txt
index 612d07718e4a..ad41d235cf6d 100644
--- a/graphics/opencolorio/files/patch-CMakeLists.txt
+++ b/graphics/opencolorio/files/patch-CMakeLists.txt
@@ -1,32 +1,26 @@
---- CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
+--- CMakeLists.txt.orig	2021-12-16 19:19:03 UTC
 +++ CMakeLists.txt
-@@ -3,6 +3,10 @@ set(OCIO_VERSION_MAJOR 1)
- set(OCIO_VERSION_MINOR 1)
- set(OCIO_VERSION_PATCH 0)
+@@ -132,8 +132,7 @@ option(OCIO_BUILD_FROZEN_DOCS "Specify whether to buil
+ option(OCIO_BUILD_DOCS "Specify whether to build documentation" ${OCIO_BUILD_FROZEN_DOCS})
  
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
-+
- cmake_minimum_required(VERSION 2.8)
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/share/cmake)
- if(NOT DEFINED CMAKE_FIRST_RUN)
-@@ -218,8 +222,7 @@ else(USE_EXTERNAL_TINYXML)
-         ## => great news when build staticaly since we do not want another client project have to link also with tinyxml when he want to use this project
-         ## => could be problematic if the client project use another version of tinyxml... In this case build tinyxml as shared lib with all projects could be a solution
-         ## => TODO: so maybe provide a simple cmake way to build 3rdParty as shared and auto install with this project ?
--        set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-DTIXML_USE_STL -fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
--        add_definitions(-DTIXML_USE_STL) ## needed to build correctly, and also need to be propagated in child projects (client projects)
-+        set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
-         list(APPEND EXTERNAL_OBJECTS $<TARGET_OBJECTS:TINYXML_LIB>)
-     else()
-         find_package(Git REQUIRED) ## in order to apply patch (for crossplateform compatibility)
-@@ -384,7 +387,7 @@ else()
-     set(OCIO_INLINES_HIDDEN OFF)
- endif()
+ option(OCIO_BUILD_PYTHON "Specify whether to build python bindings" ON)
+-set (OCIO_PYTHON_VERSION "" CACHE STRING
+-     "Preferred Python version (if any) in case multiple are available")
++option(OCIO_PYTHON_VERSION "Preferred Python version (if any) in case multiple are available" 3.8)
+ 
+ option(OCIO_BUILD_JAVA "Specify whether to build java bindings" OFF)
+ 
+@@ -276,7 +275,6 @@ add_subdirectory(tests)
+ add_subdirectory(src)
+ add_subdirectory(ext)
  
--set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
-+set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
+-
+ ###############################################################################
+ # Configure env script
+ 
+@@ -329,4 +327,5 @@ install(
+     FILES "${OCIO_PROJECT_CONFIG}" "${OCIO_VERSION_CONFIG}"
+     DESTINATION "${OCIO_CONFIG_INSTALL_DIR}"
+ )
++
  
- set(EXTERNAL_LINK_FLAGS "")
- set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
diff --git a/graphics/opencolorio/files/patch-docs_CMakeLists.txt b/graphics/opencolorio/files/patch-docs_CMakeLists.txt
deleted file mode 100644
index f87ba3dcb976..000000000000
--- a/graphics/opencolorio/files/patch-docs_CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- docs/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
-+++ docs/CMakeLists.txt
-@@ -110,12 +115,11 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx) 
- 
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/opencolorio
-         PATTERN .* EXCLUDE
- )
- 
--find_package(LATEX)
--if(PDFLATEX_COMPILER)
-+if(0)
-     
-     add_custom_target(latex
-         COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
diff --git a/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake b/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake
deleted file mode 100644
index 9edaa87e95ed..000000000000
--- a/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
---- share/cmake/OCIOMacros.cmake.orig	2019-03-28 05:12:57 UTC
-+++ share/cmake/OCIOMacros.cmake
-@@ -96,27 +96,6 @@ MACRO(OCIOFindOpenImageIO)
-         set(OIIO_FOUND TRUE)
-         message(STATUS "Found OIIO library ${OIIO_LIBRARIES}")
-         message(STATUS "Found OIIO includes ${OIIO_INCLUDES}")
--
--        # Unfortunately, OIIO hides a dependency to Ilmbase includes
--
--        if(ILMBASE_PATH)
--            message(STATUS "Ilmbase path explicitly specified: ${ILMBASE_PATH}")
--        endif()
--
--        FIND_PATH( ILMBASE_INCLUDES OpenEXR/half.h
--            ${ILMBASE_PATH}/include/
--            /usr/include
--            /usr/local/include
--            /sw/include
--            /opt/local/include
--            DOC "The directory where OpenEXR/half.h resides")
--
--        if(ILMBASE_INCLUDES)
--            message(STATUS "Found Ilmbase includes ${ILMBASE_INCLUDES}")
--        else()
--            set(OIIO_FOUND FALSE)
--            message(STATUS "Ilmbase not found. Specify ILMBASE_PATH to locate it")
--        endif()
-     else()
-         set(OIIO_FOUND FALSE)
-         message(STATUS "OIIO not found. Specify OIIO_PATH to locate it")
-@@ -222,7 +201,7 @@ MACRO(OCIOFindPython)
-         file(TO_CMAKE_PATH "${PYTHON_LIBRARY_DIRS_RAW}" PYTHON_LIBRARY_DIRS)
- 
-         FIND_LIBRARY(PYTHON_LIBRARY
--            NAMES "python${PYTHON_VERSION}"
-+            NAMES "${PYTHON_VERSION}${PYTHON_ABIVER}"
-             PATHS ${PYTHON_LIBRARY_DIRS}
-             NO_DEFAULT_PATH # Don't be "helpful" and randomly grab library from /usr/lib etc
-         )
diff --git a/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake b/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake
new file mode 100644
index 000000000000..2ce58be89de1
--- /dev/null
+++ b/graphics/opencolorio/files/patch-share_cmake_modules_FindExtPackages.cmake
@@ -0,0 +1,11 @@
+--- share/cmake/modules/FindExtPackages.cmake.orig	2021-08-31 10:54:04 UTC
++++ share/cmake/modules/FindExtPackages.cmake
+@@ -107,7 +107,7 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS)
+     endif()
+ 
+     # Python
+-    find_package(Python ${OCIO_PYTHON_VERSION} REQUIRED
++    find_package(Python ${OCIO_PYTHON_VERSION} EXACT
+                  COMPONENTS ${_Python_COMPONENTS})
+ 
+     if(OCIO_BUILD_PYTHON)
diff --git a/graphics/opencolorio/files/patch-share_cmake_modules_FindSphinx.cmake b/graphics/opencolorio/files/patch-share_cmake_modules_FindSphinx.cmake
new file mode 100644
index 000000000000..8e9305b792ed
--- /dev/null
+++ b/graphics/opencolorio/files/patch-share_cmake_modules_FindSphinx.cmake
@@ -0,0 +1,11 @@
+--- share/cmake/modules/FindSphinx.cmake.orig	2021-12-05 07:24:43 UTC
++++ share/cmake/modules/FindSphinx.cmake
+@@ -24,7 +24,7 @@ endif()
+ # Find sphinx-build
+ find_program(Sphinx_EXECUTABLE 
+     NAMES 
+-        sphinx-build
++        sphinx-build-${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}
+     HINTS
+         ${Sphinx_ROOT}
+         ${_Python_SCRIPTS_DIR}
diff --git a/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake b/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake
new file mode 100644
index 000000000000..35c8f565d7f7
--- /dev/null
+++ b/graphics/opencolorio/files/patch-share_cmake_modules_Findyaml-cpp.cmake
@@ -0,0 +1,13 @@
+--- share/cmake/modules/Findyaml-cpp.cmake.orig	2021-12-02 22:09:04 UTC
++++ share/cmake/modules/Findyaml-cpp.cmake
+@@ -32,8 +32,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
+         # Search for yaml-cpp-config.cmake
+         find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET)
+     endif()
+-
+-    if(yaml-cpp_FOUND)
++    # while yaml-cpp.cmake finds yaml-cpp the LIBRARY fails to be set for 0.7.0??
++    if(NOT yaml-cpp_FOUND)
+         get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
+     else()
+ 
diff --git a/graphics/opencolorio/files/patch-src_apps_ociodisplay_CMakeLists.txt b/graphics/opencolorio/files/patch-src_apps_ociodisplay_CMakeLists.txt
deleted file mode 100644
index 8fe811eb1290..000000000000
--- a/graphics/opencolorio/files/patch-src_apps_ociodisplay_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/apps/ociodisplay/CMakeLists.txt.orig	2019-03-28 05:12:57 UTC
-+++ src/apps/ociodisplay/CMakeLists.txt
-@@ -13,7 +13,7 @@ if (OIIO_FOUND)
- 
-     # set_target_properties(ociodisplay PROPERTIES INSTALL_RPATH ${OIIO_LIBRARIES} )
-     set_target_properties(ociodisplay PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
--    target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES})
-+    target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${GLUT_LIBRARIES} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES})
-     target_link_OCIO(ociodisplay)
- 
-     install(TARGETS ociodisplay EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
diff --git a/graphics/opencolorio/files/patch-src_core_Config.cpp b/graphics/opencolorio/files/patch-src_core_Config.cpp
deleted file mode 100644
index bc5f727a585f..000000000000
--- a/graphics/opencolorio/files/patch-src_core_Config.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/Config.cpp.orig	2018-09-04 18:15:21 UTC
-+++ src/core/Config.cpp
-@@ -324,7 +324,7 @@ OCIO_NAMESPACE_ENTER
-                 sanitytext_ = rhs.sanitytext_;
-                 
-                 cacheids_ = rhs.cacheids_;
--                cacheidnocontext_ = cacheidnocontext_;
-+                cacheidnocontext_ = rhs.cacheidnocontext_;
-             }
-             return *this;
-         }
diff --git a/graphics/opencolorio/files/tools/patch-CMakeLists.txt b/graphics/opencolorio/files/tools/patch-CMakeLists.txt
deleted file mode 100644
index eaeb072797a6..000000000000
--- a/graphics/opencolorio/files/tools/patch-CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
-+++ ./CMakeLists.txt
-@@ -457,7 +460,7 @@ endif()
- ###############################################################################
- ### APPS ###
- 
--if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
-+if(OCIO_BUILD_APPS)
- 
-     # Try to find OpenImageIO (OIIO) and OpenGL stuff
-     OCIOFindOpenImageIO()
-@@ -531,7 +534,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+#INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -596,7 +595,7 @@ if(TARGET OpenColorIO_STATIC)
-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
-     endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+#install(EXPORT OpenColorIO DESTINATION cmake)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-     "
-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+#install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
diff --git a/graphics/opencolorio/files/tools/patch-src_core_CMakeLists.txt b/graphics/opencolorio/files/tools/patch-src_core_CMakeLists.txt
deleted file mode 100644
index 1845054ea11c..000000000000
--- a/graphics/opencolorio/files/tools/patch-src_core_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/core/CMakeLists.txt.orig	2018-02-05 14:07:04 UTC
-+++ src/core/CMakeLists.txt
-@@ -105,15 +105,3 @@ macro(target_link_OCIO target)
-         set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS OpenColorIO_STATIC)
-     endif()
- endmacro()
--
--
--# public interface
--install(FILES ${core_export_headers}
--    DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/)
--
--# pkg-config
--message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in")
--configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
--    ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
--    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
diff --git a/graphics/opencolorio/pkg-plist b/graphics/opencolorio/pkg-plist
index 0929e1af7fab..9faa4705b7e1 100644
--- a/graphics/opencolorio/pkg-plist
+++ b/graphics/opencolorio/pkg-plist
@@ -1,13 +1,13 @@
 include/OpenColorIO/OpenColorABI.h
+include/OpenColorIO/OpenColorAppHelpers.h
 include/OpenColorIO/OpenColorIO.h
 include/OpenColorIO/OpenColorTransforms.h
 include/OpenColorIO/OpenColorTypes.h
-include/PyOpenColorIO/PyOpenColorIO.h
+lib/cmake/OpenColorIO/OpenColorIOConfig.cmake
+lib/cmake/OpenColorIO/OpenColorIOConfigVersion.cmake
+lib/cmake/OpenColorIO/OpenColorIOTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/OpenColorIO/OpenColorIOTargets.cmake
 lib/libOpenColorIO.so
-lib/libOpenColorIO.so.1
-lib/libOpenColorIO.so.%%LIBVERS%%
+lib/libOpenColorIO.so.%%SHL2%%
+lib/libOpenColorIO.so.%%SHL3%%
 libdata/pkgconfig/OpenColorIO.pc
-share/cmake/Modules/OpenColorIOConfig.cmake
-share/cmake/Modules/OpenColorIO-release.cmake
-share/cmake/Modules/OpenColorIO.cmake
-share/ocio/setup_ocio.sh
diff --git a/graphics/opencolorio/pkg-plist-docs b/graphics/opencolorio/pkg-plist-docs
new file mode 100644
index 000000000000..759084795a98
--- /dev/null
+++ b/graphics/opencolorio/pkg-plist-docs
@@ -0,0 +1,211 @@
+%%PORTDOCS%%%%DOCSDIR%%/html/CHANGELOG.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CMakeLists.html
+%%PORTDOCS%%%%DOCSDIR%%/html/INSTALL.html
+%%PORTDOCS%%%%DOCSDIR%%/html/README.html
+%%PORTDOCS%%%%DOCSDIR%%/html/V2_DOC_README.html
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/gn10_to_linear_light.jpeg
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/gnf_to_linear_light.jpeg
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/lg10_to_linear_light.jpeg
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/lg8_to_vd8.jpeg
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/lgf_to_linear_light.jpeg
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/psicc_itworks.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/psicc_open_current_profile.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/psicc_proof_setup.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/psicc_reveal_profile.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/psicc_select_profile.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/CHANGELOG.md.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/CMakeLists.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/INSTALL.md.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/README.md.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/V2_DOC_README.md.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/_index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/apphelpers.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/baker.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/colorspace.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/config.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/constants.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/context.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/dynamicproperty.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/enums.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/exceptions.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/formatmetadata.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/global.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/grading_transforms.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/imagedesc.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/look.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/namedtransform.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/processors.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/rules.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/shaders.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/systemmonitors.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/transforms.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/api/viewtransform.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/aswf/_index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/aswf/aswf_docker.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/aswf/charter.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/aswf/cla_dco.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/aswf/license.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/concepts/_index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/concepts/overview/configuration_files.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/concepts/overview/glossary.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/concepts/overview/internal_architecture.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/concepts/overview/introduction.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/concepts/overview/overview.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/concepts/publications/publications.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/_index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/aces_1.0.3.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/nuke_default.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/ocio_v2_demo.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/spi_anim.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/configurations/spi_vfx.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/_index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/allocation_vars.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/authoring.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/colorspaces.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/contexts.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/displays_views.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/looks.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/looks_example.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/overview.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/rules.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/authoring/transforms.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/architectural_notes.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/coding_style_guide.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/contributing.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/documentation_guidelines.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/doxygen_style_guide.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/getting_started.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/issues.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/repository_structure.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/submitting_changes.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/contributing/unit_tests.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/developing/app_helpers.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/developing/developing.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/developing/usage_examples.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/using_ocio/compatible_software.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/using_ocio/faq.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/using_ocio/tool_overview.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/guides/using_ocio/using_ocio.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/_index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/downloads.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/for_artists.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/for_config_authors.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/for_contributors.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/for_devs.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/quick_start/installation.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/requirements.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/toc_redirect.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/tutorials/_index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/tutorials/baking_luts.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/tutorials/contributing.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/upgrading_v2/_index.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/upgrading_v2/how_to.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/OpenColorIO_withText.svg
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/documentation_options.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.5.1.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/language_data.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/ocio_b.svg
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/sphinx_press_theme.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/tabs.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/tabs.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/theme-vendors.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/theme.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/theme.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.13.1.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js
+%%PORTDOCS%%%%DOCSDIR%%/html/api/_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/apphelpers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/baker.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/colorspace.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/config.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/constants.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/context.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/dynamicproperty.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/enums.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/formatmetadata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/global.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/grading_transforms.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/imagedesc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/look.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/namedtransform.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/processors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/rules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/shaders.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/systemmonitors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/transforms.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/viewtransform.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aswf/_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aswf/aswf_docker.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aswf/charter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aswf/cla_dco.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aswf/license.html
+%%PORTDOCS%%%%DOCSDIR%%/html/concepts/_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/concepts/overview/configuration_files.html
+%%PORTDOCS%%%%DOCSDIR%%/html/concepts/overview/glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/html/concepts/overview/internal_architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/html/concepts/overview/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/concepts/overview/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/concepts/publications/publications.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configurations/_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configurations/aces_1.0.3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configurations/nuke_default.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configurations/ocio_v2_demo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configurations/spi_anim.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configurations/spi_vfx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/allocation_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/authoring.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/colorspaces.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/contexts.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/displays_views.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/looks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/looks_example.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/rules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/authoring/transforms.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/architectural_notes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/coding_style_guide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/contributing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/documentation_guidelines.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/doxygen_style_guide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/getting_started.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/issues.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/repository_structure.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/submitting_changes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/contributing/unit_tests.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/developing/app_helpers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/developing/developing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/developing/usage_examples.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/using_ocio/compatible_software.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/using_ocio/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/using_ocio/tool_overview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guides/using_ocio/using_ocio.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
+%%PORTDOCS%%%%DOCSDIR%%/html/quick_start/_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quick_start/downloads.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quick_start/for_artists.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quick_start/for_config_authors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quick_start/for_contributors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quick_start/for_devs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quick_start/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/requirements.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search.html
+%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
+%%PORTDOCS%%%%DOCSDIR%%/html/toc_redirect.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorials/_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorials/baking_luts.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorials/contributing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/upgrading_v2/_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/upgrading_v2/how_to.html
diff --git a/graphics/opencolorio/pkg-plist-tools b/graphics/opencolorio/pkg-plist-tools
index 3f3b88901ee0..8cd85e818959 100644
--- a/graphics/opencolorio/pkg-plist-tools
+++ b/graphics/opencolorio/pkg-plist-tools
@@ -3,3 +3,7 @@ bin/ociocheck
 bin/ocioconvert
 bin/ociodisplay
 bin/ociolutimage
+bin/ociochecklut
+bin/ociomakeclf
+bin/ocioperf
+bin/ociowrite