From owner-svn-ports-head@freebsd.org  Sat Oct  1 13:26:25 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E17E6C0444B;
 Sat,  1 Oct 2016 13:26:25 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B1E271BB9;
 Sat,  1 Oct 2016 13:26:25 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u91DQOVG011992;
 Sat, 1 Oct 2016 13:26:24 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u91DQOE2011991;
 Sat, 1 Oct 2016 13:26:24 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201610011326.u91DQOE2011991@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 1 Oct 2016 13:26:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423061 - head/graphics/opencv
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Oct 2016 13:26:26 -0000

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