2 files changed, 19 insertions, 29 deletions

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index e3de4204841a..e14e004c907b 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	openimageio
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	https://github.com/OpenImageIO/oiio/tarball/
 DISTNAME=	Release-${PORTVERSION}
-EXTRACT_SUFX=
+EXTRACT_SUFX=	# empty
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	FreeBSD@Shaneware.biz
@@ -18,13 +19,13 @@ COMMENT=	OpenImageIO graphics library
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	openjpeg:${PORTSDIR}/graphics/openjpeg \
-		opencv_legacy.2:${PORTSDIR}/graphics/opencv \
+LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
-		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
+		hdf5:${PORTSDIR}/science/hdf5 \
+		opencv_legacy.2:${PORTSDIR}/graphics/opencv \
+		openjpeg:${PORTSDIR}/graphics/openjpeg \
 		tbb.4:${PORTSDIR}/devel/tbb \
-		webp.2:${PORTSDIR}/graphics/webp \
-		hdf5:${PORTSDIR}/science/hdf5
+		webp.2:${PORTSDIR}/graphics/webp
 
 FETCH_ARGS=	-pRr
 USE_CMAKE=	yes
@@ -32,6 +33,7 @@ CMAKE_VERBOSE=	yes
 CMAKE_OUTSOURCE=	yes
 CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
 		-DLINKSTATIC:BOOL=OFF \
+		-DUSE_PYTHON:BOOL=OFF \
 		-DUSE_TBB:BOOL=ON
 LDFLAGS+=	-ltbb
 USE_LDCONFIG=	yes
@@ -39,15 +41,14 @@ WRKSRC=		${WRKDIR}/OpenImageIO-oiio-2388ebf/src
 MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	IMAGEVIEWER "Build image viewer" on \
-		PYTHON "Python bindings"  on \
 		NOTHREADS "Disable thread support" off
 
-post-patch:
-	@${REINPLACE_CMD} 's|lib/python|lib/${PYTHON_VERSION}|' \
-		${WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.options.mk>
 
+.if defined(NOPORTDOCS)
+CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=OFF
+.endif
+
 .if defined(WITH_IMAGEVIEWER)
 USE_GL=		glew
 USE_QT_VER=	4
@@ -60,16 +61,6 @@ CMAKE_ARGS+=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
 PLIST_SUB+=	IMAGEVIEWER="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
-CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON
-USE_PYTHON=	2.6+
-LIB_DEPENDS+=	boost_python:${PORTSDIR}/devel/boost-python-libs
-PLIST_SUB+=	PYTHON_BIND=""
-.else
-CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF
-PLIST_SUB+=	PYTHON_BIND="@comment "
-.endif
-
 .if defined(WITH_NOTHREADS)
 CMAKE_ARGS+=	-DNOTHREADS:BOOL=ON
 .else
diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist
index deb64a6e7089..ae44ca36251e 100644
--- a/graphics/openimageio/pkg-plist
+++ b/graphics/openimageio/pkg-plist
@@ -14,7 +14,6 @@ include/OpenImageIO/tbb/machine/linux_intel64.h
 include/OpenImageIO/tbb/machine/mac_ppc.h
 include/OpenImageIO/tbb/machine/windows_ia32.h
 include/OpenImageIO/tbb/machine/windows_intel64.h
-@dirrmtry include/OpenImageIO/tbb/machine
 include/OpenImageIO/tbb/_tbb_windef.h
 include/OpenImageIO/tbb/aligned_space.h
 include/OpenImageIO/tbb/atomic.h
@@ -29,7 +28,6 @@ include/OpenImageIO/tbb/tbb_misc.h
 include/OpenImageIO/tbb/tbb_profiling.h
 include/OpenImageIO/tbb/tbb_stddef.h
 include/OpenImageIO/tbb/tbb_version.h
-@dirrmtry include/OpenImageIO/tbb
 include/OpenImageIO/argparse.h
 include/OpenImageIO/color.h
 include/OpenImageIO/dassert.h
@@ -59,13 +57,14 @@ include/OpenImageIO/varyingref.h
 include/OpenImageIO/pugixml.hpp
 include/OpenImageIO/pugiconfig.hpp
 include/OpenImageIO/version.h
-@dirrmtry include/OpenImageIO
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.1
 lib/libOpenImageIO.so.1.0
 lib/libOpenImageIO.so.1.0.3
-%%PYTHON_BIND%%%%PYTHON_SITELIBDIR%%/OpenImageIO.so
-share/doc/openimageio/openimageio.pdf
-share/doc/openimageio/LICENSE
-share/doc/openimageio/CHANGES
-@dirrmtry share/doc/openimageio
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/OpenImageIO/tbb/machine
+@dirrm include/OpenImageIO/tbb
+@dirrm include/OpenImageIO