Unbreak openscad by not fetching hidapi. MODQMAKE_ARGS +=CONFIG-=hidapi
doesn't work here so I disabled by removing the CONFIG line in
openscad_pro.
While here:
- Switch to HTTPS
- Regen WANTLIB
- Remove math/double-conversion from BUILD_DEPENDS because it's in
LIB_DEPENDS.
- Remove base-gcc from COMPILER. We need a C++11 compiler to build
openscad
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/openscad/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile 17 Oct 2019 20:04:04 -0000 1.30
+++ Makefile 6 Nov 2019 08:20:21 -0000
@@ -5,21 +5,24 @@ BROKEN-sparc64= SIGILL on src/cgalutils.
V = 2019.05
DISTNAME = openscad-${V}
+REVISION = 0
CATEGORIES = cad
-HOMEPAGE = http://www.openscad.org/
+HOMEPAGE = https://www.openscad.org/
# GPLv2+ with CGAL exception
PERMIT_PACKAGE = Yes
-WANTLIB += CGAL GL GLEW GLU ICE SM X11 Xext Xi Xinerama Xrender
+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 += boost_system-mt boost_thread-mt c double-conversion fontconfig
-WANTLIB += freetype glib-2.0 gmp harfbuzz iconv intl m mpfr opencsg pthread
-WANTLIB += qscintilla2_qt4 ${COMPILER_LIBCXX} z lib/qt4/QtGui lib/qt4/QtOpenGL
+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
-COMPILER = base-clang ports-gcc base-gcc
+# C++11
+COMPILER = base-clang ports-gcc
MASTER_SITES = http://files.openscad.org/
DISTFILES = ${DISTNAME}.src.tar.gz
@@ -27,7 +30,6 @@ DISTFILES = ${DISTNAME}.src.tar.gz
MODULES = devel/qmake \
x11/qt4
BUILD_DEPENDS = devel/bison \
- math/double-conversion \
devel/gettext,-tools \
math/eigen3
LIB_DEPENDS = devel/boost \
Index: patches/patch-openscad_pro
===================================================================
RCS file: /cvs/ports/cad/openscad/patches/patch-openscad_pro,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-openscad_pro
--- patches/patch-openscad_pro 17 Oct 2019 20:04:04 -0000 1.2
+++ patches/patch-openscad_pro 6 Nov 2019 08:20:21 -0000
@@ -3,6 +3,7 @@ $OpenBSD: patch-openscad_pro,v 1.2 2019/
- remove unsupported compiler flag (that is NOT ignored)
- don't use bundled Liberation fonts, use RDEP on fonts/liberation-fonts
instead
- fix manpage installation dir
+- disable hidapi support, it doesn't compile
Index: openscad.pro
--- openscad.pro.orig
@@ -15,6 +16,15 @@ Index: openscad.pro
# Disable attributes warnings on MSYS/MXE due to gcc bug spamming the logs:
Issue #2771
win* | CONFIG(mingw-cross-env)|CONFIG(mingw-cross-env-shared) {
+@@ -192,7 +191,7 @@ CONFIG += lib3mf
+ CONFIG += gettext
+ CONFIG += libxml2
+ CONFIG += libzip
+-CONFIG += hidapi
++#CONFIG += hidapi
+ CONFIG += spnav
+ CONFIG += double-conversion
+
@@ -716,10 +715,6 @@ libraries.path = "$$PREFIX/share/$${FULLNAME}/librarie
libraries.files = libraries/*
INSTALLS += libraries
