View | Details | Raw Unified | Return to bug 232516 | Differences between
and this patch

Collapse All | Expand All

(-)b/cad/openscad-devel/Makefile (-26 / +22 lines)
Lines 2-49 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	openscad
4
PORTNAME=	openscad
5
PORTVERSION=	2018.04.19
5
PORTVERSION=	2018.10.22
6
PORTREVISION=	5
7
CATEGORIES=	cad
6
CATEGORIES=	cad
8
PKGNAMESUFFIX=	-devel
7
PKGNAMESUFFIX=	-devel
9
DIST_SUBDIR=	${PORTNAME}
10
8
11
MAINTAINER=	mr@FreeBSD.org
9
MAINTAINER=	mr@FreeBSD.org
12
COMMENT=	Programmer's solid 3D CAD modeller
10
COMMENT=	Programmer's solid 3D CAD modeller #'
13
11
14
LICENSE=	GPLv2+
12
LICENSE=	GPLv2+
15
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
16
14
17
BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
15
LIB_DEPENDS=	libzip.so:archivers/libzip \
18
		${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
16
		libhidapi.so:comms/hidapi \
19
LIB_DEPENDS=	libgmp.so:math/gmp \
17
		libboost_regex.so:devel/boost-libs \
20
		libmpfr.so:math/mpfr \
18
		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
19
		libopencsg.so:graphics/opencsg \
21
		libCGAL.so:math/cgal \
20
		libCGAL.so:math/cgal \
22
		libqscintilla2_qt4.so:devel/qscintilla2 \
21
		libgmp.so:math/gmp \
22
		libmpfr.so:math/mpfr \
23
		libfreetype.so:print/freetype2 \
23
		libharfbuzz.so:print/harfbuzz \
24
		libharfbuzz.so:print/harfbuzz \
24
		libopencsg.so:graphics/opencsg \
25
		libfontconfig.so:x11-fonts/fontconfig
25
		libzip.so:archivers/libzip
26
26
27
CONFLICTS=	openscad
27
CONFLICTS=	openscad
28
28
29
USES=		bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
29
USES=		bison compiler:c++11-lib desktop-file-utils eigen:3 gettext \
30
		pkgconfig python:run qmake qt:4 shebangfix
30
		pkgconfig qmake qt:5 shared-mime-info
31
USE_GITHUB=	yes
31
USE_GITHUB=	yes
32
GH_ACCOUNT=	openscad
32
USE_GL=		gl glu glew
33
GH_PROJECT=	openscad
33
USE_GNOME=	glib20 libxml2
34
GH_TAGNAME=	179074dff8c23cbc0e651ce8463737df0006f4ca
34
USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
35
35
USE_XORG=	x11
36
#SHEBANG_FILES=	libraries/MCAD/get_submodules.py
36
GH_TAGNAME=	b8160eac0cca045e091fa65c3f7fbe68fdfada59
37
USE_GL=		glu glew
37
QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
38
USE_QT=		corelib gui opengl moc_build uic_build rcc_build
38
# Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
39
PLIST_SUB=	PORTVERSION=${PORTVERSION}
39
LDFLAGS+=	-Wl,--as-needed
40
QMAKE_ENV=	EIGENDIR=${LOCALBASE}/include/eigen3
41
QMAKE_ARGS+=	VERSION=${PORTVERSION} \
42
		CONFIG+="experimental" \
43
		QMAKE_LEX=${LOCALBASE}/bin/flex \
44
		QMAKE_YAC=${LOCALBASE}/bin/bison
45
40
46
post-patch:
41
post-patch:
42
	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
47
	@${REINPLACE_CMD} -e 's,share/man,man,' \
43
	@${REINPLACE_CMD} -e 's,share/man,man,' \
48
		${WRKSRC}/openscad.pro
44
		${WRKSRC}/openscad.pro
49
45
(-)b/cad/openscad-devel/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1524416781
1
TIMESTAMP = 1540263111
2
SHA256 (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 6ca736909959d72eba21a1d421fc215742d26dad5b70dabe72b37e29e025088a
2
SHA256 (openscad-openscad-2018.10.22-b8160eac0cca045e091fa65c3f7fbe68fdfada59_GH0.tar.gz) = d5692d8c617aaac58c3c14167044b7ea6220735771167280c2d372ceb93615bb
3
SIZE (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 13915669
3
SIZE (openscad-openscad-2018.10.22-b8160eac0cca045e091fa65c3f7fbe68fdfada59_GH0.tar.gz) = 13924891
(-)a/cad/openscad-devel/files/patch-openscad.pro (-13 lines)
Removed Link Here
1
--- openscad.pro.orig	2018-04-19 22:08:08 UTC
2
+++ openscad.pro
3
@@ -105,6 +106,10 @@ mingw* {
4
 CONFIG += qt
5
 QT += widgets concurrent
6
 
7
+freebsd* {
8
+   LIBS += -lcompat
9
+}
10
+
11
 netbsd* {
12
    QMAKE_LFLAGS += -L/usr/X11R7/lib
13
    QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib
(-)a/cad/openscad-devel/files/patch-src-ModuleCache.h (-10 lines)
Removed Link Here
1
--- src/ModuleCache.h.orig	2018-04-19 22:08:08 UTC
2
+++ src/ModuleCache.h
3
@@ -1,6 +1,7 @@
4
 #pragma once
5
 
6
 #include <string>
7
+#include <time.h>
8
 #include <unordered_map>
9
 
10
 /*!
(-)b/cad/openscad-devel/pkg-plist (-1 / +3 lines)
Lines 1-7 Link Here
1
bin/openscad
1
bin/openscad
2
man/man1/openscad.1.gz
2
man/man1/openscad.1.gz
3
share/appdata/openscad.appdata.xml
4
share/applications/openscad.desktop
3
share/applications/openscad.desktop
4
share/metainfo/org.openscad.OpenSCAD.appdata.xml
5
share/mime/packages/openscad.xml
5
share/mime/packages/openscad.xml
6
%%DATADIR%%/color-schemes/editor/dark-background.json
6
%%DATADIR%%/color-schemes/editor/dark-background.json
7
%%DATADIR%%/color-schemes/editor/light-background.json
7
%%DATADIR%%/color-schemes/editor/light-background.json
Lines 24-29 share/mime/packages/openscad.xml Link Here
24
%%DATADIR%%/color-schemes/render/tomorrow.json
24
%%DATADIR%%/color-schemes/render/tomorrow.json
25
%%DATADIR%%/examples/Advanced/GEB.scad
25
%%DATADIR%%/examples/Advanced/GEB.scad
26
%%DATADIR%%/examples/Advanced/animation.scad
26
%%DATADIR%%/examples/Advanced/animation.scad
27
%%DATADIR%%/examples/Advanced/assert.scad
27
%%DATADIR%%/examples/Advanced/children.scad
28
%%DATADIR%%/examples/Advanced/children.scad
28
%%DATADIR%%/examples/Advanced/children_indexed.scad
29
%%DATADIR%%/examples/Advanced/children_indexed.scad
29
%%DATADIR%%/examples/Advanced/module_recursion.scad
30
%%DATADIR%%/examples/Advanced/module_recursion.scad
Lines 41-46 share/mime/packages/openscad.xml Link Here
41
%%DATADIR%%/examples/Basics/rotate_extrude.scad
42
%%DATADIR%%/examples/Basics/rotate_extrude.scad
42
%%DATADIR%%/examples/Basics/text_on_cube.scad
43
%%DATADIR%%/examples/Basics/text_on_cube.scad
43
%%DATADIR%%/examples/COPYING-CC0.txt
44
%%DATADIR%%/examples/COPYING-CC0.txt
45
%%DATADIR%%/examples/Functions/echo.scad
44
%%DATADIR%%/examples/Functions/functions.scad
46
%%DATADIR%%/examples/Functions/functions.scad
45
%%DATADIR%%/examples/Functions/list_comprehensions.scad
47
%%DATADIR%%/examples/Functions/list_comprehensions.scad
46
%%DATADIR%%/examples/Functions/polygon_areas.scad
48
%%DATADIR%%/examples/Functions/polygon_areas.scad

Return to bug 232516