Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Oct 2016 13:26:24 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423061 - head/graphics/opencv
Message-ID:  <201610011326.u91DQOE2011991@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Oct  1 13:26:24 2016
New Revision: 423061
URL: https://svnweb.freebsd.org/changeset/ports/423061

Log:
  graphics/opencv: convert to option helpers (nested)

Modified:
  head/graphics/opencv/Makefile   (contents, props changed)

Modified: head/graphics/opencv/Makefile
==============================================================================
--- head/graphics/opencv/Makefile	Sat Oct  1 13:26:08 2016	(r423060)
+++ head/graphics/opencv/Makefile	Sat Oct  1 13:26:24 2016	(r423061)
@@ -90,6 +90,8 @@ NONFREE_CMAKE_BOOL=	BUILD_opencv_nonfree
 OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
 
+OPENGL_LIB_DEPENDS=	${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,}
+OPENGL_USE=		${PORT_OPTIONS:MQT4:S,$,=opengl,}
 OPENGL_CMAKE_BOOL=	WITH_OPENGL
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
@@ -121,14 +123,6 @@ TBB_DESC=		TBB support
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MOPENGL}
-LIB_DEPENDS+=		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
-.endif
-
-.if ${PORT_OPTIONS:MQT4} && ${PORT_OPTIONS:MOPENGL}
-USE_QT4+=		opengl
-.endif
-
 .if ${PORT_OPTIONS:MSIMD}
 . if ${MACHINE_CPU:Msse}
 CMAKE_ARGS+=	-DENABLE_SSE:BOOL=On



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610011326.u91DQOE2011991>