graphics/opensubdiv: fix some port issues

Reported by:	jbeich
Pointyhat to:	swills

2 files changed, 29 insertions, 35 deletions

diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile
index 779602788b4d..ea9d301e79ec 100644
--- a/graphics/opensubdiv/Makefile
+++ b/graphics/opensubdiv/Makefile
@@ -1,12 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	opensubdiv
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3_3_0
 CATEGORIES?=	graphics
 
 MAINTAINER=	FreeBSD@Shaneware.biz
-COMMENT=	OpenSubdiv graphics library
+COMMENT=	High performance subdivision surface libraries
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -20,7 +21,6 @@ GH_ACCOUNT=	PixarAnimationStudios
 GH_PROJECT=	OpenSubdiv
 
 USE_GL=		gl glu glew
-CMAKE_VERBOSE=	yes
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DNO_CUDA:BOOL=ON \
 		-DNO_DX:BOOL=ON \
@@ -30,20 +30,17 @@ OPTIONS_DEFINE=		DOCS EXAMPLES OPENCL PTEX TBB TEST TUTORIALS
 OPTIONS_DEFAULT=	TBB
 OPTIONS_SUB=		yes
 
-DOCS_CMAKE_ON=		-DNO_DOC:BOOL=OFF
-DOCS_CMAKE_OFF=		-DNO_DOC:BOOL=ON
+DOCS_CMAKE_BOOL_OFF=	NO_DOC
 DOCS_BUILD_DEPENDS=	rst2html.py:textproc/py-docutils \
 			doxygen>=1.8.4:devel/doxygen
 
-EXAMPLES_CMAKE_ON=	-DNO_EXAMPLES:BOOL=OFF
-EXAMPLES_CMAKE_OFF=	-DNO_EXAMPLES:BOOL=ON
+EXAMPLES_CMAKE_BOOL_OFF=	NO_EXAMPLES
 EXAMPLES_USE=		xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm
 EXAMPLES_LIB_DEPENDS=	libglfw.so:graphics/glfw
 
-OPENCL_CMAKE_ON=	-DNO_OPENCL:BOOL=OFF
-OPENCL_CMAKE_OFF=	-DNO_OPENCL:BOOL=ON
+OPENCL_CMAKE_BOOL_OFF=	NO_OPENCL
+
 OPENCL_CFLAGS=		-pthread
-OPENCL_CXXFLAGS=	-pthread
 OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/cl.h:devel/opencl
 OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 
@@ -54,27 +51,24 @@ PTEX_CMAKE_OFF=		-DNO_PTEX:BOOL=ON
 PTEX_LIB_DEPENDS=	libPtex.so:graphics/ptex
 
 TBB_DESC=		Intel threading building blocks
-TBB_CMAKE_ON=		-DNO_TBB:BOOL=OFF
-TBB_CMAKE_OFF=		-DNO_TBB:BOOL=ON
+TBB_CMAKE_BOOL_OFF=	NO_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
 
-TEST_CMAKE_ON=		-DNO_REGRESSION:BOOL=OFF -DNO_TESTS:BOOL=OFF -DNO_GLTESTS:BOOL=OFF
-TEST_CMAKE_OFF=		-DNO_REGRESSION:BOOL=ON -DNO_TESTS:BOOL=ON -DNO_GLTESTS:BOOL=ON
+TEST_CMAKE_BOOL_OFF=	NO_REGRESSION NO_TESTS NO_GL_TESTS
 TEST_LIB_DEPENDS=	libglfw.so:graphics/glfw
 TEST_USE=		xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm
 
 TUTORIALS_DESC=		Install tutorial programs
-TUTORIALS_CMAKE_ON=	-DNO_TUTORIALS:BOOL=OFF
-TUTORIALS_CMAKE_OFF=	-DNO_TUTORIALS:BOOL=ON
+TUTORIALS_CMAKE_BOOL_OFF=	NO_TUTORIALS
 
 PLIST_SUB+=		LIBVERS=${PORTVERSION}
 
 post-patch:
-	${FIND} ${WRKSRC}/tutorials -name CMakeLists.txt | ${XARGS} ${REINPLACE_CMD} \
-	-e 's|{CMAKE_BINDIR_BASE}/tutorials|{CMAKE_INSTALL_PREFIX}/share/${PORTNAME}/tutorials|g'
-	${FIND} ${WRKSRC}/examples -name CMakeLists.txt | ${XARGS} ${REINPLACE_CMD} \
-	-e 's|{CMAKE_BINDIR_BASE}|{CMAKE_INSTALL_PREFIX}/share/${PORTNAME}/examples|g'
-	${FIND} ${WRKSRC}/regression -name CMakeLists.txt | ${XARGS} ${REINPLACE_CMD} \
-	-e 's|{CMAKE_BINDIR_BASE}|{CMAKE_INSTALL_PREFIX}/share/${PORTNAME}/test|g'
+	${FIND} ${WRKSRC}/tutorials -name CMakeLists.txt -exec \
+		${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}/tutorials|{CMAKE_INSTALL_PREFIX}/${DATADIR_REL}/tutorials|g' {} \+
+	${FIND} ${WRKSRC}/examples -name CMakeLists.txt -exec \
+		${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}|{CMAKE_INSTALL_PREFIX}/${EXAMPLESDIR_REL}|g' {} \+
+	${FIND} ${WRKSRC}/regression -name CMakeLists.txt -exec \
+		${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}|{CMAKE_INSTALL_PREFIX}/tests/${PORTNAME}|g' {} \+
 
 .include <bsd.port.mk>
diff --git a/graphics/opensubdiv/pkg-plist b/graphics/opensubdiv/pkg-plist
index 5a144798ac26..ca78afeb1698 100644
--- a/graphics/opensubdiv/pkg-plist
+++ b/graphics/opensubdiv/pkg-plist
@@ -79,20 +79,20 @@ lib/libosdCPU.so.%%LIBVERS%%
 lib/libosdGPU.a
 lib/libosdGPU.so
 lib/libosdGPU.so.%%LIBVERS%%
-%%EXAMPLES%%%%DATADIR%%/examples/farViewer
-%%EXAMPLES%%%%DATADIR%%/examples/glEvalLimit
-%%EXAMPLES%%%%DATADIR%%/examples/glFVarViewer
-%%EXAMPLES%%%%DATADIR%%/examples/glImaging
-%%EXAMPLES%%%%DATADIR%%/examples/glPaintTest
-%%EXAMPLES%%%%PTEX%%%%DATADIR%%/examples/glPtexViewer
-%%EXAMPLES%%%%DATADIR%%/examples/glShareTopology
-%%EXAMPLES%%%%DATADIR%%/examples/glStencilViewer
-%%EXAMPLES%%%%DATADIR%%/examples/glViewer
-%%TEST%%%%DATADIR%%/test/far_perf
-%%TEST%%%%DATADIR%%/test/far_regression
-%%TEST%%%%DATADIR%%/test/hbr_baseline
-%%TEST%%%%DATADIR%%/test/hbr_regression
-%%TEST%%%%DATADIR%%/test/osd_regression
+%%EXAMPLES%%%%EXAMPLESDIR%%/farViewer
+%%EXAMPLES%%%%EXAMPLESDIR%%/glEvalLimit
+%%EXAMPLES%%%%EXAMPLESDIR%%/glFVarViewer
+%%EXAMPLES%%%%EXAMPLESDIR%%/glImaging
+%%EXAMPLES%%%%EXAMPLESDIR%%/glPaintTest
+%%EXAMPLES%%%%PTEX%%%%EXAMPLESDIR%%/glPtexViewer
+%%EXAMPLES%%%%EXAMPLESDIR%%/glShareTopology
+%%EXAMPLES%%%%EXAMPLESDIR%%/glStencilViewer
+%%EXAMPLES%%%%EXAMPLESDIR%%/glViewer
+%%TEST%%tests/opensubdiv/far_perf
+%%TEST%%tests/opensubdiv/far_regression
+%%TEST%%tests/opensubdiv/hbr_baseline
+%%TEST%%tests/opensubdiv/hbr_regression
+%%TEST%%tests/opensubdiv/osd_regression
 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_0
 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_1
 %%TUTORIALS%%%%DATADIR%%/tutorials/far_tutorial_2