Here is an diff to update graphics/opencsg, math/cgal and switch
openscad from Qt4 to Qt5.
Some notes:
- All ports switched from Qt4 to Qt5.
- opencsg has no consumers left except openscad
- Besides openscad, cgal has geo/pgrouting as consumer. Build tested.
- openscad run-time tested on amd64
Ok?
Index: cad/openscad/Makefile
===================================================================
RCS file: /cvs/ports/cad/openscad/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- cad/openscad/Makefile 30 Dec 2019 22:04:13 -0000 1.33
+++ cad/openscad/Makefile 1 Feb 2020 13:25:58 -0000
@@ -5,8 +5,7 @@ BROKEN-sparc64= SIGILL on src/cgalutils.
V = 2019.05
DISTNAME = openscad-${V}
-EXTRACT_SUFX = .src.tar.gz
-REVISION = 0
+REVISION = 1
CATEGORIES = cad
@@ -15,29 +14,29 @@ HOMEPAGE = https://www.openscad.org/
# GPLv2+ with CGAL exception
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} CGAL GL GLEW GLU ICE lib/qt4/QtGui lib/qt4/QtMultimedia
-WANTLIB += lib/qt4/QtNetwork lib/qt4/QtOpenGL SM X11 Xext Xi Xinerama Xrender
-WANTLIB += boost_filesystem-mt boost_program_options-mt boost_regex-mt
+WANTLIB += ${COMPILER_LIBCXX} CGAL GL GLEW GLU Qt5Concurrent Qt5Core
+WANTLIB += Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport Qt5Widgets
+WANTLIB += X11 boost_filesystem-mt boost_program_options-mt boost_regex-mt
WANTLIB += boost_system-mt boost_thread-mt c double-conversion
WANTLIB += fontconfig freetype glib-2.0 gmp harfbuzz intl m mpfr
-WANTLIB += opencsg qscintilla2_qt4 xml2 z
-
-# C++11
-COMPILER = base-clang ports-gcc
+WANTLIB += opencsg qscintilla2_qt5 xml2 z
MASTER_SITES = https://files.openscad.org/
+EXTRACT_SUFX = .src.tar.gz
MODULES = devel/qmake \
- x11/qt4
+ x11/qt5
+
BUILD_DEPENDS = devel/bison \
devel/gettext,-tools \
math/eigen3
+
LIB_DEPENDS = devel/boost \
math/double-conversion \
devel/gmp \
devel/harfbuzz \
devel/mpfr \
- editors/qscintilla \
+ editors/qscintilla,qt5 \
graphics/glew \
graphics/opencsg \
math/cgal
Index: cad/openscad/pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/openscad/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- cad/openscad/pkg/PLIST 17 Oct 2019 20:04:04 -0000 1.8
+++ cad/openscad/pkg/PLIST 1 Feb 2020 13:25:58 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2019/10/17 20:04:04 rsadowski Exp $
@bin bin/openscad
@man man/man1/openscad.1
-share/applications/
share/applications/openscad.desktop
share/metainfo/
share/metainfo/org.openscad.OpenSCAD.appdata.xml
Index: graphics/opencsg/Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencsg/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- graphics/opencsg/Makefile 12 Jul 2019 20:47:04 -0000 1.12
+++ graphics/opencsg/Makefile 1 Feb 2020 13:26:10 -0000
@@ -2,12 +2,11 @@
COMMENT = constructive solid geometry rendering library
-V = 1.3.2
+V = 1.4.2
DISTNAME = OpenCSG-${V}
PKGNAME = opencsg-${V}
-REVISION = 1
-SHARED_LIBS = opencsg 0.0
+SHARED_LIBS = opencsg 1.0
CATEGORIES = graphics
@@ -16,17 +15,18 @@ HOMEPAGE = http://www.opencsg.org/
# GPLv2 with CGAL exception
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLEW lib/qt4/QtGui m ${COMPILER_LIBCXX} pthread
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
+WANTLIB += ${COMPILER_LIBCXX} GL GLEW m
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES = http://www.opencsg.org/
+
+MODULES = devel/qmake \
+ x11/qt5
+
+MODQT_DEPS = No
-MODULES = devel/qmake x11/qt4
SEPARATE_BUILD = No
LIB_DEPENDS = graphics/glew
-
-MASTER_SITES = http://www.opencsg.org/
WRKSRC = ${WRKDIST}/src
Index: graphics/opencsg/distinfo
===================================================================
RCS file: /cvs/ports/graphics/opencsg/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- graphics/opencsg/distinfo 8 Mar 2013 01:34:19 -0000 1.2
+++ graphics/opencsg/distinfo 1 Feb 2020 13:26:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (OpenCSG-1.3.2.tar.gz) = x5DJKZj3ETyzXN6CX4HFUydVkIoKP0PDw8jfIyazuSU=
-SIZE (OpenCSG-1.3.2.tar.gz) = 744712
+SHA256 (OpenCSG-1.4.2.tar.gz) = 2VLsXTouRqMAGcIQlj/N3/ZoE+/JwpYDty+VU63/Svs=
+SIZE (OpenCSG-1.4.2.tar.gz) = 933135
Index: graphics/opencsg/patches/patch-src_src_pro
===================================================================
RCS file: /cvs/ports/graphics/opencsg/patches/patch-src_src_pro,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_src_pro
--- graphics/opencsg/patches/patch-src_src_pro 8 Mar 2013 01:34:19 -0000 1.2
+++ graphics/opencsg/patches/patch-src_src_pro 1 Feb 2020 13:26:10 -0000
@@ -1,17 +1,12 @@
$OpenBSD: patch-src_src_pro,v 1.2 2013/03/08 01:34:19 brad Exp $
---- src/src.pro.orig Fri Jan 18 12:31:07 2013
-+++ src/src.pro Fri Jan 18 12:31:55 2013
-@@ -1,10 +1,11 @@
- TEMPLATE = lib
- TARGET = opencsg
--VERSION = 1.3.2
-+VERSION = ${LIBopencsg_VERSION}
- DESTDIR = ../lib
+Index: src/src.pro
+--- src/src.pro.orig
++++ src/src.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE = lib
+ TARGET = opencsg
+-VERSION = 1.4.2
++VERSION = ${LIBopencsg_VERSION}
- CONFIG += opengl warn_on release
--INCLUDEPATH += ../include ../glew/include ../
-+INCLUDEPATH += ../include ../
-+LIBS += -lGLEW
-
- HEADERS = ../include/opencsg.h \
- opencsgConfig.h \
+ isEmpty(INSTALLDIR) {
+ INSTALLDIR = /usr/local
Index: math/cgal/Makefile
===================================================================
RCS file: /cvs/ports/math/cgal/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- math/cgal/Makefile 12 Jul 2019 20:47:40 -0000 1.24
+++ math/cgal/Makefile 1 Feb 2020 13:26:13 -0000
@@ -4,54 +4,44 @@ BROKEN-mips64 = ICE on Interval_nt.h:98
COMMENT = Computational Geometry Algorithms Library
-# when updating this port, don't just change the version number here.
-# MASTER_SITES needs to be adapted for every new tarball.
-# See https://gforge.inria.fr/frs/?group_id=52 for files index.
-DISTNAME = CGAL-4.6.3
-MASTER_SITES = https://gforge.inria.fr/frs/download.php/file/35139/
+DISTNAME = CGAL-4.14.2
PKGNAME = ${DISTNAME:L}
-REVISION = 5
EPOCH = 0
-SHARED_LIBS = CGAL 1.0 \
- CGAL_Core 1.0 \
- CGAL_ImageIO 1.0 \
- CGAL_Qt4 1.0
+SHARED_LIBS += CGAL 2.0 # 13.0.3
+SHARED_LIBS += CGAL_Core 2.0 # 14.0.3
+SHARED_LIBS += CGAL_ImageIO 2.0 # 14.0.0
+SHARED_LIBS += CGAL_Qt5 2.0 # 14.0.0
CATEGORIES = math
-HOMEPAGE = http://www.cgal.org/
+HOMEPAGE = https://www.cgal.org/
-# mix of LGPLv2.1 and QPL; see http://www.cgal.org/license.html
+# mix of LGPLv2.1 and QPL; see https://www.cgal.org/license.html
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU boost_system-mt boost_thread-mt gmp m mpfr pthread
-WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
-WANTLIB += ${COMPILER_LIBCXX} z lib/qt4/QtGui lib/qt4/QtOpenGL lib/qt4/QtSvg
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
+WANTLIB += Qt5Xml gmp m mpfr z
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES = https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.14.2/
EXTRACT_SUFX = .tar.xz
MODULES = devel/cmake \
- x11/qt4
-BIULD_DEPENDS = math/eigen3
-LIB_DEPENDS = devel/boost \
- devel/gmp \
+ x11/qt5
+
+BIULD_DEPENDS = math/eigen3 \
+ devel/boost
+
+LIB_DEPENDS = devel/gmp \
devel/mpfr
CXXFLAGS += -I${X11BASE}/include
CONFIGURE_ARGS += -DCGAL_INSTALL_MAN_DIR="man/man1" \
-DCGAL_INSTALL_DOC_DIR="share/doc/cgal"
-CONFIGURE_ENV = LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ENV += LDFLAGS="-L${X11BASE}/lib"
NO_TEST = Yes
-
-post-extract:
- rm ${WRKSRC}/cmake/modules/FindBLAS.cmake \
- ${WRKSRC}/cmake/modules/FindLAPACK.cmake \
- ${WRKSRC}/cmake/modules/FindOpenGL.cmake \
- ${WRKSRC}/scripts/cgal_make_macosx_app
.include <bsd.port.mk>
Index: math/cgal/distinfo
===================================================================
RCS file: /cvs/ports/math/cgal/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- math/cgal/distinfo 7 Dec 2015 07:51:26 -0000 1.4
+++ math/cgal/distinfo 1 Feb 2020 13:26:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (CGAL-4.6.3.tar.xz) = 4zgCe4dnwKem5P2GeRgtG4O1saDaCh/kVG58DKCU/CE=
-SIZE (CGAL-4.6.3.tar.xz) = 12017952
+SHA256 (CGAL-4.14.2.tar.xz) = gZtoY2FO5lqw7cmL9wMhtstl4LQLjUD+e9c37uC4mSI=
+SIZE (CGAL-4.14.2.tar.xz) = 15617164
Index: math/cgal/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/math/cgal/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- math/cgal/patches/patch-CMakeLists_txt 7 Dec 2015 07:51:26 -0000 1.2
+++ math/cgal/patches/patch-CMakeLists_txt 1 Feb 2020 13:26:13 -0000
@@ -2,10 +2,11 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 201
add workaround from https://bugs.kde.org/show_bug.cgi?id=304111
---- CMakeLists.txt.orig Sat Sep 5 21:00:16 2015
-+++ CMakeLists.txt Sun Dec 6 14:16:32 2015
-@@ -357,6 +357,8 @@ set( CGAL_MODULES_DIR ${CGAL_INSTALLATION_PACKAGE_
- include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -391,6 +391,8 @@ include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
+ include(${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake)
cgal_setup_module_path()
+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
Index: math/cgal/patches/patch-include_CGAL_config_h
===================================================================
RCS file: math/cgal/patches/patch-include_CGAL_config_h
diff -N math/cgal/patches/patch-include_CGAL_config_h
--- math/cgal/patches/patch-include_CGAL_config_h 23 Jan 2017 21:56:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-include_CGAL_config_h,v 1.1 2017/01/23 21:56:32 jca Exp $
---- include/CGAL/config.h.orig Mon Jan 23 22:25:28 2017
-+++ include/CGAL/config.h Mon Jan 23 22:33:03 2017
-@@ -236,27 +236,14 @@
- // Big endian or little endian machine.
- // ====================================
-
--#if defined (__GLIBC__)
--# include <endian.h>
--# if (__BYTE_ORDER == __LITTLE_ENDIAN)
--# define CGAL_LITTLE_ENDIAN
--# elif (__BYTE_ORDER == __BIG_ENDIAN)
--# define CGAL_BIG_ENDIAN
--# else
--# error Unknown endianness
--# endif
--#elif defined(__sparc) || defined(__sparc__) \
-- || defined(_POWER) || defined(__powerpc__) \
-- || defined(__ppc__) || defined(__hppa) \
-- || defined(_MIPSEB) || defined(_POWER) \
-- || defined(__s390__)
--# define CGAL_BIG_ENDIAN
--#elif defined(__i386__) || defined(__alpha__) \
-- || defined(__x86_64) || defined(__x86_64__) \
-- || defined(__ia64) || defined(__ia64__) \
-- || defined(_M_IX86) || defined(_M_IA64) \
-- || defined(_M_ALPHA) || defined(_WIN64)
-+#include <endian.h>
-+#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) || !defined(BIG_ENDIAN)
-+# error Unknown endianness
-+
No comments:
Post a Comment