From owner-svn-ports-all@freebsd.org Sun Sep 20 01:12:10 2015 Return-Path: Delivered-To: svn-ports-all@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 43947A02282; Sun, 20 Sep 2015 01:12:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 319F71EA9; Sun, 20 Sep 2015 01:12:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8K1CApC000590; Sun, 20 Sep 2015 01:12:10 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8K1CAY8000589; Sun, 20 Sep 2015 01:12:10 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201509200112.t8K1CAY8000589@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 20 Sep 2015 01:12:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397344 - head/math/cgal X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Sep 2015 01:12:10 -0000 Author: jbeich Date: Sun Sep 20 01:12:09 2015 New Revision: 397344 URL: https://svnweb.freebsd.org/changeset/ports/397344 Log: math/cgal: minor cleanup - Convert to USE_GL - Convert to option helpers - Deduplicate GUI option Approved by: portmgr blanket Modified: head/math/cgal/Makefile (contents, props changed) Modified: head/math/cgal/Makefile ============================================================================== --- head/math/cgal/Makefile Sun Sep 20 01:11:55 2015 (r397343) +++ head/math/cgal/Makefile Sun Sep 20 01:12:09 2015 (r397344) @@ -20,26 +20,19 @@ LIB_DEPENDS= libmpfr.so:${PORTSDIR}/math USE_LDCONFIG= yes USES= cmake tar:bzip2 shebangfix +USE_QT4= corelib qmake_build moc_build rcc_build uic_build svg +CMAKE_ARGS= -DWITH_CGAL_Qt3=OFF SHEBANG_FILES= scripts/cgal_create_CMakeLists HAS_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= GUI OPTIONS_DEFAULT= GUI -GUI_DESC= Build libCGAL_ImageIO and libCGAL_Qt4 - -.include +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MGUI} -USE_QT4= corelib qmake_build moc_build rcc_build uic_build gui opengl svg -LIB_DEPENDS+= libGLU.so:${PORTSDIR}/graphics/libGLU -CMAKE_ARGS= -DWITH_CGAL_Qt3=OFF -PLIST_SUB+= GUI="" -.else -USE_QT4= corelib qmake_build moc_build rcc_build svg uic_build -CMAKE_ARGS= -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DWITH_CGAL_Qt3=OFF -PLIST_SUB+= GUI="@comment " -.endif +GUI_DESC= Build libCGAL_ImageIO and libCGAL_Qt4 +GUI_USE= GL=glu QT4=gui,opengl +GUI_CMAKE_OFF= -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF post-install: ${INSTALL_MAN} ${WRKSRC}/auxiliary/cgal_create_cmake_script.1 ${STAGEDIR}${PREFIX}/man/man1/