diff -Nru openimageio.orig/Makefile openimageio/Makefile --- openimageio.orig/Makefile 2017-12-17 01:17:17.555732000 +1030 +++ openimageio/Makefile 2017-12-17 01:13:32.802188000 +1030 @@ -4,7 +4,7 @@ PORTNAME= openimageio PORTVERSION= 1.7.17 DISTVERSIONPREFIX= Release- -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz @@ -92,14 +92,33 @@ USE_LDCONFIG= yes CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \ -DOIIO_BUILD_TOOLS:BOOL=ON -.else -LIB_DEPENDS+= libOpenImageIO.so:graphics/openimageio \ - libboost_python.so:devel/boost-python-libs +.else # slave port is py-openimageio +LIB_DEPENDS+= libOpenImageIO.so:graphics/openimageio PLIST= ${PKGDIR}/pkg-plist-pybind -#while oiio supports py3, ports doesn't have py3 support for boost-python yet -USES+= python:2 -CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \ - -DOIIO_BUILD_TOOLS:BOOL=OFF -DUSE_FFMPEG:BOOL=OFF +USES+= python +USE_PYTHON= flavors +CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -DOIIO_BUILD_TOOLS:BOOL=OFF \ + -DUSE_FFMPEG:BOOL=OFF +.endif + +.include + +.if ${SLAVE_PORT} == yes +# we need to do this here to get PYTHON_MAJOR_VER +# this is related to adding USES+=python in the first slave test +.if ${PYTHON_MAJOR_VER} == 2 +LIB_DEPENDS+= libboost_python.so:devel/boost-python-libs +CMAKE_ARGS+= -DUSE_PYTHON3:BOOL=OFF +do-install: + @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} + ${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} +.else +LIB_DEPENDS+= libboost_python3.so:devel/boost-python3-libs +CMAKE_ARGS+= -DUSE_PYTHON3:BOOL=ON +do-install: + @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} + ${INSTALL_LIB} ${BUILD_WRKSRC}/src/python3/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} +.endif .endif post-patch: @@ -117,4 +136,4 @@ do-test-TEST-on: @cd ${BUILD_WRKSRC} && ${MAKE_CMD} ARGS=-V test -.include +.include diff -Nru py-openimageio.orig/Makefile py-openimageio/Makefile --- py-openimageio.orig/Makefile 2017-12-17 01:16:52.174561000 +1030 +++ py-openimageio/Makefile 2017-12-17 01:15:44.934067000 +1030 @@ -1,17 +1,13 @@ # Created by: Shane Ambler # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= graphics multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= OpenImageIO python bindings MASTERDIR= ${.CURDIR}/../openimageio -OPTIONS_EXCLUDE=${OPTIONS_DEFINE} - -do-install: - @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} - ${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} +# we need to use the same options as the main port +OPTIONS_NAME= graphics_openimageio .include "${MASTERDIR}/Makefile"