Attachment 186210 Details for Bug 222177 – cgal 4.9 move QT5 as an option

[patch] cgal 4.9 move QT5 as an option

cgal-4.9_6.diff (text/plain), 3.88 KB, created by Loïc Bartoletti on 2017-09-09 21:56:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2017-09-09 21:56:58 UTC

Size: 3.88 KB

patch

obsolete

>Index: /usr/local/poudriere/ports/default/math/cgal/Makefile
>===================================================================
>--- /usr/local/poudriere/ports/default/math/cgal/Makefile	(rÃ©vision 449473)
>+++ /usr/local/poudriere/ports/default/math/cgal/Makefile	(copie de travail)
>@@ -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 @@
> 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
> 
>+USES=		cmake shebangfix tar:xz
> USE_LDCONFIG=	yes
>-USES=		cmake shebangfix tar:xz
>-USE_QT5=	buildtools_build core gui opengl qmake_build widgets
> 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 <bsd.port.options.mk>
> 
>-.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 <bsd.port.mk>
>Index: /usr/local/poudriere/ports/default/math/cgal/distinfo
>===================================================================
>--- /usr/local/poudriere/ports/default/math/cgal/distinfo	(rÃ©vision 449473)
>+++ /usr/local/poudriere/ports/default/math/cgal/distinfo	(copie de travail)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1476253394
>+TIMESTAMP = 1504965804
> SHA256 (CGAL-4.9.tar.xz) = 63ac5df71f912f34f2f0f2e54a303578df51f4ec2627db593a65407d791f9039
> SIZE (CGAL-4.9.tar.xz) = 13749292
>Index: /usr/local/poudriere/ports/default/math/cgal/pkg-plist
>===================================================================
>--- /usr/local/poudriere/ports/default/math/cgal/pkg-plist	(rÃ©vision 449473)
>+++ /usr/local/poudriere/ports/default/math/cgal/pkg-plist	(copie de travail)
>@@ -2509,7 +2509,6 @@
> 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_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_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

Actions: View | Diff

Attachments on bug 222177: 186210