Update openscad to 2021.01 and openscad-devel to the latest commit

6 files changed, 32 insertions, 29 deletions

diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 377cbc441e36..e1f1af834f02 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openscad
-PORTVERSION=	2020.01.04
-PORTREVISION=	5
+PORTVERSION=	2021.02.09
 #PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
@@ -39,7 +38,7 @@ USE_GL=		gl glu glew
 USE_GNOME=	glib20 libxml2
 USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
 USE_XORG=	x11
-GH_TAGNAME=	552643c03e90ff47ae905c06f1d1afbbdb808966
+GH_TAGNAME=	63a7c77740030c63d646eb0684ba6947eecb0db7
 QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed
diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo
index 27eb51b20e8a..b6a606af691d 100644
--- a/cad/openscad-devel/distinfo
+++ b/cad/openscad-devel/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1578852249
-SHA256 (openscad-openscad-2020.01.04-552643c03e90ff47ae905c06f1d1afbbdb808966_GH0.tar.gz) = 2c10fe63676957c1bb52f071d2ffce2c4fba79f536d5b768a84d77300620e608
-SIZE (openscad-openscad-2020.01.04-552643c03e90ff47ae905c06f1d1afbbdb808966_GH0.tar.gz) = 15292063
-SHA256 (b6c170cc5dd1.patch) = 635d1bddee1b79d4a022b167c48ce173cf447467721b69827136cfeb921ae0e4
-SIZE (b6c170cc5dd1.patch) = 681
+TIMESTAMP = 1612905122
+SHA256 (openscad-openscad-2021.02.09-63a7c77740030c63d646eb0684ba6947eecb0db7_GH0.tar.gz) = 18342253697115d16a6d81ff9b05d8128cf8aac3138ac4d339fb722869113e4d
+SIZE (openscad-openscad-2021.02.09-63a7c77740030c63d646eb0684ba6947eecb0db7_GH0.tar.gz) = 15687873
diff --git a/cad/openscad-devel/pkg-plist b/cad/openscad-devel/pkg-plist
index 520a1559964d..51e407c2a8d5 100644
--- a/cad/openscad-devel/pkg-plist
+++ b/cad/openscad-devel/pkg-plist
@@ -111,10 +111,12 @@ share/mime/packages/openscad.xml
 %%DATADIR%%/locale/de/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/es/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/fr/LC_MESSAGES/openscad.mo
+%%DATADIR%%/locale/hy/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/pl/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/uk/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/zh_CN/LC_MESSAGES/openscad.mo
+%%DATADIR%%/locale/zh_TW/LC_MESSAGES/openscad.mo
 %%DATADIR%%/templates/difference.json
 %%DATADIR%%/templates/for.json
 %%DATADIR%%/templates/function.json
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 38af5bb05d15..39e81b5aa655 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	openscad
-PORTVERSION=	2019.05.10
-PORTREVISION=	9
+PORTVERSION=	2021.01.01
 #PORTREVISION=	1
 CATEGORIES=	cad
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	b6c170cc5dd1.patch:-p1 \
-		15acf6700674.patch:-p1 \
-		9c4d5ae7ab05.patch:-p1 \
-		07a56df933a3.patch:-p1
+#PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+#PATCHFILES+=	b6c170cc5dd1.patch:-p1 \
+#		15acf6700674.patch:-p1 \
+#		9c4d5ae7ab05.patch:-p1 \
+#		07a56df933a3.patch:-p1
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Programmer's solid 3D CAD modeller #'
@@ -32,7 +31,7 @@ LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libdouble-conversion.so:devel/double-conversion
 
-CONFLICTS=	openscad
+#CONFLICTS=	openscad-devel
 
 USES=		bison compiler:c++14-lang desktop-file-utils eigen:3 gettext \
 		gl gnome pkgconfig qmake qt:5 shared-mime-info xorg
@@ -41,7 +40,7 @@ USE_GL=		gl glu glew
 USE_GNOME=	glib20 libxml2
 USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
 USE_XORG=	x11
-GH_TAGNAME=	0f6d569b57112b79f657a82b0809dc420fbff163
+GH_TAGNAME=	41f58fe57c03457a3a8b4dc541ef5654ec3e8c78
 QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
 # Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
 LDFLAGS+=	-Wl,--as-needed
diff --git a/cad/openscad/distinfo b/cad/openscad/distinfo
index 836a73cad5d3..09f8e0e423c5 100644
--- a/cad/openscad/distinfo
+++ b/cad/openscad/distinfo
@@ -1,11 +1,3 @@
-TIMESTAMP = 1587474068
-SHA256 (openscad-openscad-2019.05.10-0f6d569b57112b79f657a82b0809dc420fbff163_GH0.tar.gz) = 0ddccc2acbf529926110d5504088472b203d064f9b22bafeb55ee3f44473d3c6
-SIZE (openscad-openscad-2019.05.10-0f6d569b57112b79f657a82b0809dc420fbff163_GH0.tar.gz) = 14602475
-SHA256 (b6c170cc5dd1.patch) = 635d1bddee1b79d4a022b167c48ce173cf447467721b69827136cfeb921ae0e4
-SIZE (b6c170cc5dd1.patch) = 681
-SHA256 (15acf6700674.patch) = 960a3edf2fd16acd9b1f976373107033ca99d17521e8ca49464a894a61c469da
-SIZE (15acf6700674.patch) = 1826
-SHA256 (9c4d5ae7ab05.patch) = d65a1733ed9476f02706115f7b2c765e49312c7cd085a2f2ca2a62a82e0f7f56
-SIZE (9c4d5ae7ab05.patch) = 2281
-SHA256 (07a56df933a3.patch) = c746be0de2f3e548fad8af2eef078030f12a822ed22d186d2da58dc3fb064bac
-SIZE (07a56df933a3.patch) = 760
+TIMESTAMP = 1612904882
+SHA256 (openscad-openscad-2021.01.01-41f58fe57c03457a3a8b4dc541ef5654ec3e8c78_GH0.tar.gz) = e8f94682dc3331c86d1cdc8d8bb0088a9910f1d1694ff9310524ca2d11e37ccc
+SIZE (openscad-openscad-2021.01.01-41f58fe57c03457a3a8b4dc541ef5654ec3e8c78_GH0.tar.gz) = 15656495
diff --git a/cad/openscad/pkg-plist b/cad/openscad/pkg-plist
index a38e3807a65d..51e407c2a8d5 100644
--- a/cad/openscad/pkg-plist
+++ b/cad/openscad/pkg-plist
@@ -1,6 +1,11 @@
 bin/openscad
 man/man1/openscad.1.gz
 share/applications/openscad.desktop
+share/icons/hicolor/128x128/apps/openscad.png
+share/icons/hicolor/256x256/apps/openscad.png
+share/icons/hicolor/48x48/apps/openscad.png
+share/icons/hicolor/512x512/apps/openscad.png
+share/icons/hicolor/64x64/apps/openscad.png
 share/metainfo/org.openscad.OpenSCAD.appdata.xml
 share/mime/packages/openscad.xml
 %%DATADIR%%/color-schemes/editor/dark-background.json
@@ -106,8 +111,16 @@ share/mime/packages/openscad.xml
 %%DATADIR%%/locale/de/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/es/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/fr/LC_MESSAGES/openscad.mo
+%%DATADIR%%/locale/hy/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/pl/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo
 %%DATADIR%%/locale/uk/LC_MESSAGES/openscad.mo
-share/pixmaps/openscad.png
+%%DATADIR%%/locale/zh_CN/LC_MESSAGES/openscad.mo
+%%DATADIR%%/locale/zh_TW/LC_MESSAGES/openscad.mo
+%%DATADIR%%/templates/difference.json
+%%DATADIR%%/templates/for.json
+%%DATADIR%%/templates/function.json
+%%DATADIR%%/templates/module.json
+%%DATADIR%%/templates/rotate.json
+%%DATADIR%%/templates/translate.json
 @dir %%DATADIR%%/libraries/MCAD