Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Sep 2015 01:12:10 +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: r397344 - head/math/cgal
Message-ID:  <201509200112.t8K1CAY8000589@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
+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/



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