From owner-svn-ports-head@freebsd.org Wed Sep 13 07:38:41 2017 Return-Path: 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 E41E1E11FCC; Wed, 13 Sep 2017 07:38:41 +0000 (UTC) (envelope-from wen@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 BFA7A7737E; Wed, 13 Sep 2017 07:38:41 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8D7ce4r084818; Wed, 13 Sep 2017 07:38:40 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8D7ceVf084815; Wed, 13 Sep 2017 07:38:40 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201709130738.v8D7ceVf084815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Wed, 13 Sep 2017 07:38:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449755 - head/math/cgal X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: head/math/cgal X-SVN-Commit-Revision: 449755 X-SVN-Commit-Repository: ports 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Sep 2017 07:38:42 -0000 Author: wen Date: Wed Sep 13 07:38:40 2017 New Revision: 449755 URL: https://svnweb.freebsd.org/changeset/ports/449755 Log: - Move QT5 as an option - Add missing DEPENDS PR: 222177 Submitted by: lbartoletti@tuxfamily.org Modified: head/math/cgal/Makefile head/math/cgal/distinfo head/math/cgal/pkg-plist Modified: head/math/cgal/Makefile ============================================================================== --- head/math/cgal/Makefile Wed Sep 13 05:34:57 2017 (r449754) +++ head/math/cgal/Makefile Wed Sep 13 07:38:40 2017 (r449755) @@ -3,10 +3,10 @@ PORTNAME= cgal PORTVERSION= 4.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math -MASTER_SITES= https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9/ -DISTNAME= CGAL-${PORTVERSION} +MASTER_SITES= https://github.com/${PORTNAME:tu}/${PORTNAME}/releases/download/releases/${DISTNAME}/ +DISTNAME= ${PORTNAME:tu}-${PORTVERSION} MAINTAINER= wen@FreeBSD.org COMMENT= Computational geometry library @@ -14,26 +14,37 @@ COMMENT= Computational geometry library LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi -BUILD_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs -RUN_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs -LIB_DEPENDS= libmpfr.so:math/mpfr \ +BROKEN_sparc64= does not build: fails to compile all_files.cpp + +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \ + ${LOCALBASE}/lib/libntl.a:math/ntl +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libmpfr.so:math/mpfr \ libgmp.so:math/gmp -BROKEN_sparc64= does not build: fails to compile all_files.cpp +#TODO math/mpfi, math/rs, graphics/qglviewer +#Not yet in ports -USE_LDCONFIG= yes USES= cmake shebangfix tar:xz -USE_QT5= buildtools_build core gui opengl qmake_build widgets +USE_LDCONFIG= yes SHEBANG_FILES= scripts/cgal_create_CMakeLists \ scripts/cgal_create_cmake_script +OPTIONS_DEFINE= VISUALIZATION QT5 +VISUALIZATION_IMPLIES= QT5 +OPTIONS_SUB= yes + +VISUALIZATION_DESC= Visualization Required for most demos (Qt5 Geomview) +VISUALIZATION_LIB_DEPENDS= libgeomview.so:graphics/geomview + .include -.if ${ARCH} == i386 && ${OPSYS} == FreeBSD && ((${OSVERSION} >= 1100000 && ${OSVERSION} < 1100508) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200017)) -# clang internal error in clang 3.8 -BUILD_DEPENDS+= clang39:devel/llvm39 -CC= clang39 -CXX= clang++39 +.if ${PORT_OPTIONS:MQT5} +CMAKE_ARGS+= -DWITH_CGAL_Qt5=ON +USE_QT5+= core gui opengl widgets svg buildtools_build qmake_build +USE_GL+= gl glu +.else +CMAKE_ARGS+= -DWITH_CGAL_Qt5=OFF .endif .include Modified: head/math/cgal/distinfo ============================================================================== --- head/math/cgal/distinfo Wed Sep 13 05:34:57 2017 (r449754) +++ head/math/cgal/distinfo Wed Sep 13 07:38:40 2017 (r449755) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476253394 +TIMESTAMP = 1505311637 SHA256 (CGAL-4.9.tar.xz) = 63ac5df71f912f34f2f0f2e54a303578df51f4ec2627db593a65407d791f9039 SIZE (CGAL-4.9.tar.xz) = 13749292 Modified: head/math/cgal/pkg-plist ============================================================================== --- head/math/cgal/pkg-plist Wed Sep 13 05:34:57 2017 (r449754) +++ head/math/cgal/pkg-plist Wed Sep 13 07:38:40 2017 (r449755) @@ -2509,7 +2509,6 @@ include/CGAL/compiler_config.h include/CGAL/compute_average_spacing.h include/CGAL/compute_outer_frame_margin.h include/CGAL/config.h -include/CGAL/config.h.orig include/CGAL/connect_holes.h include/CGAL/constant.h include/CGAL/constructions/Polygon_offset_cons_ftC2.h @@ -2912,6 +2911,9 @@ lib/CGAL/CGAL_ImageIOExports.cmake lib/CGAL/CGAL_ImageIOLibConfig.cmake lib/CGAL/CGAL_Locate_CGAL_TAUCS.cmake lib/CGAL/CGAL_Macros.cmake +%%QT5%%lib/CGAL/CGAL_Qt5Exports-%%CMAKE_BUILD_TYPE%%.cmake +%%QT5%%lib/CGAL/CGAL_Qt5Exports.cmake +%%QT5%%lib/CGAL/CGAL_Qt5LibConfig.cmake lib/CGAL/CGAL_SCM.cmake lib/CGAL/CGAL_SetupBoost.cmake lib/CGAL/CGAL_SetupDependencies.cmake @@ -2967,4 +2969,7 @@ lib/libCGAL_Core.so.12.0.0 lib/libCGAL_ImageIO.so lib/libCGAL_ImageIO.so.12 lib/libCGAL_ImageIO.so.12.0.0 +%%QT5%%lib/libCGAL_Qt5.so +%%QT5%%lib/libCGAL_Qt5.so.12 +%%QT5%%lib/libCGAL_Qt5.so.12.0.0 man/man1/cgal_create_cmake_script.1.gz