Index: head/cad/openscad/Makefile =================================================================== --- head/cad/openscad/Makefile (revision 564821) +++ head/cad/openscad/Makefile (revision 564822) @@ -1,54 +1,53 @@ # Created by: Michael Reifenberger # $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 #' LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= cgal>0:math/cgal LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ libboost_regex.so:devel/boost-libs \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libopencsg.so:graphics/opencsg \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ 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 USE_GITHUB= yes 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 post-patch: @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf @${REINPLACE_CMD} -e 's,share/man,man,' \ ${WRKSRC}/openscad.pro .include Index: head/cad/openscad/distinfo =================================================================== --- head/cad/openscad/distinfo (revision 564821) +++ head/cad/openscad/distinfo (revision 564822) @@ -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 Index: head/cad/openscad/pkg-plist =================================================================== --- head/cad/openscad/pkg-plist (revision 564821) +++ head/cad/openscad/pkg-plist (revision 564822) @@ -1,113 +1,126 @@ 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 %%DATADIR%%/color-schemes/editor/light-background.json %%DATADIR%%/color-schemes/editor/monokai.json %%DATADIR%%/color-schemes/editor/solarized-dark.json %%DATADIR%%/color-schemes/editor/solarized-light.json %%DATADIR%%/color-schemes/editor/tomorrow-night.json %%DATADIR%%/color-schemes/editor/tomorrow.json %%DATADIR%%/color-schemes/editor/visualstudio.json %%DATADIR%%/color-schemes/readme.txt %%DATADIR%%/color-schemes/render/beforedawn.json %%DATADIR%%/color-schemes/render/deepocean.json %%DATADIR%%/color-schemes/render/metallic.json %%DATADIR%%/color-schemes/render/monotone.json %%DATADIR%%/color-schemes/render/nature.json %%DATADIR%%/color-schemes/render/solarized.json %%DATADIR%%/color-schemes/render/starnight.json %%DATADIR%%/color-schemes/render/sunset.json %%DATADIR%%/color-schemes/render/tomorrow-night.json %%DATADIR%%/color-schemes/render/tomorrow.json %%DATADIR%%/examples/Advanced/GEB.scad %%DATADIR%%/examples/Advanced/animation.scad %%DATADIR%%/examples/Advanced/assert.scad %%DATADIR%%/examples/Advanced/children.scad %%DATADIR%%/examples/Advanced/children_indexed.scad %%DATADIR%%/examples/Advanced/module_recursion.scad %%DATADIR%%/examples/Advanced/offset.scad %%DATADIR%%/examples/Advanced/surface_image.png %%DATADIR%%/examples/Advanced/surface_image.scad %%DATADIR%%/examples/Basics/CSG-modules.scad %%DATADIR%%/examples/Basics/CSG.scad %%DATADIR%%/examples/Basics/LetterBlock.scad %%DATADIR%%/examples/Basics/linear_extrude.scad %%DATADIR%%/examples/Basics/logo.scad %%DATADIR%%/examples/Basics/logo_and_text.scad %%DATADIR%%/examples/Basics/projection.scad %%DATADIR%%/examples/Basics/projection.stl %%DATADIR%%/examples/Basics/rotate_extrude.scad %%DATADIR%%/examples/Basics/text_on_cube.scad %%DATADIR%%/examples/COPYING-CC0.txt %%DATADIR%%/examples/Functions/echo.scad %%DATADIR%%/examples/Functions/functions.scad %%DATADIR%%/examples/Functions/list_comprehensions.scad %%DATADIR%%/examples/Functions/polygon_areas.scad %%DATADIR%%/examples/Functions/recursion.scad %%DATADIR%%/examples/Old/example001.scad %%DATADIR%%/examples/Old/example002.scad %%DATADIR%%/examples/Old/example003.scad %%DATADIR%%/examples/Old/example004.scad %%DATADIR%%/examples/Old/example005.scad %%DATADIR%%/examples/Old/example006.scad %%DATADIR%%/examples/Old/example007.dxf %%DATADIR%%/examples/Old/example007.scad %%DATADIR%%/examples/Old/example008.dxf %%DATADIR%%/examples/Old/example008.scad %%DATADIR%%/examples/Old/example009.dxf %%DATADIR%%/examples/Old/example009.scad %%DATADIR%%/examples/Old/example010.dat %%DATADIR%%/examples/Old/example010.scad %%DATADIR%%/examples/Old/example011.scad %%DATADIR%%/examples/Old/example012.scad %%DATADIR%%/examples/Old/example012.stl %%DATADIR%%/examples/Old/example013.dxf %%DATADIR%%/examples/Old/example013.scad %%DATADIR%%/examples/Old/example014.scad %%DATADIR%%/examples/Old/example015.scad %%DATADIR%%/examples/Old/example016.scad %%DATADIR%%/examples/Old/example016.stl %%DATADIR%%/examples/Old/example017.scad %%DATADIR%%/examples/Old/example018.scad %%DATADIR%%/examples/Old/example019.scad %%DATADIR%%/examples/Old/example020.scad %%DATADIR%%/examples/Old/example021.scad %%DATADIR%%/examples/Old/example022.scad %%DATADIR%%/examples/Old/example023.scad %%DATADIR%%/examples/Old/example024.scad %%DATADIR%%/examples/Parametric/candleStand.json %%DATADIR%%/examples/Parametric/candleStand.scad %%DATADIR%%/examples/Parametric/sign.json %%DATADIR%%/examples/Parametric/sign.scad %%DATADIR%%/examples/examples.json %%DATADIR%%/fonts/05-osx-fonts.conf %%DATADIR%%/fonts/10-liberation.conf %%DATADIR%%/fonts/Liberation-2.00.1/AUTHORS %%DATADIR%%/fonts/Liberation-2.00.1/ChangeLog %%DATADIR%%/fonts/Liberation-2.00.1/LICENSE %%DATADIR%%/fonts/Liberation-2.00.1/README %%DATADIR%%/fonts/Liberation-2.00.1/TODO %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf %%DATADIR%%/locale/cs/LC_MESSAGES/openscad.mo %%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 Index: head/cad/openscad-devel/Makefile =================================================================== --- head/cad/openscad-devel/Makefile (revision 564821) +++ head/cad/openscad-devel/Makefile (revision 564822) @@ -1,52 +1,51 @@ # Created by: Michael Reifenberger # $FreeBSD$ PORTNAME= openscad -PORTVERSION= 2020.01.04 -PORTREVISION= 5 +PORTVERSION= 2021.02.09 #PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel #PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ #PATCHFILES+= b6c170cc5dd1.patch:-p1 MAINTAINER= mr@FreeBSD.org COMMENT= Programmer's solid 3D CAD modeller #' LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= cgal>0:math/cgal LIB_DEPENDS= libzip.so:archivers/libzip \ libhidapi.so:comms/hidapi \ libboost_regex.so:devel/boost-libs \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libopencsg.so:graphics/opencsg \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig \ libdouble-conversion.so:devel/double-conversion CONFLICTS= openscad USES= bison compiler:c++14-lang desktop-file-utils eigen:3 gettext \ gl gnome pkgconfig qmake qt:5 shared-mime-info xorg USE_GITHUB= yes 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 post-patch: @${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf @${REINPLACE_CMD} -e 's,share/man,man,' \ ${WRKSRC}/openscad.pro .include Index: head/cad/openscad-devel/distinfo =================================================================== --- head/cad/openscad-devel/distinfo (revision 564821) +++ head/cad/openscad-devel/distinfo (revision 564822) @@ -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 Index: head/cad/openscad-devel/pkg-plist =================================================================== --- head/cad/openscad-devel/pkg-plist (revision 564821) +++ head/cad/openscad-devel/pkg-plist (revision 564822) @@ -1,124 +1,126 @@ 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 %%DATADIR%%/color-schemes/editor/light-background.json %%DATADIR%%/color-schemes/editor/monokai.json %%DATADIR%%/color-schemes/editor/solarized-dark.json %%DATADIR%%/color-schemes/editor/solarized-light.json %%DATADIR%%/color-schemes/editor/tomorrow-night.json %%DATADIR%%/color-schemes/editor/tomorrow.json %%DATADIR%%/color-schemes/editor/visualstudio.json %%DATADIR%%/color-schemes/readme.txt %%DATADIR%%/color-schemes/render/beforedawn.json %%DATADIR%%/color-schemes/render/deepocean.json %%DATADIR%%/color-schemes/render/metallic.json %%DATADIR%%/color-schemes/render/monotone.json %%DATADIR%%/color-schemes/render/nature.json %%DATADIR%%/color-schemes/render/solarized.json %%DATADIR%%/color-schemes/render/starnight.json %%DATADIR%%/color-schemes/render/sunset.json %%DATADIR%%/color-schemes/render/tomorrow-night.json %%DATADIR%%/color-schemes/render/tomorrow.json %%DATADIR%%/examples/Advanced/GEB.scad %%DATADIR%%/examples/Advanced/animation.scad %%DATADIR%%/examples/Advanced/assert.scad %%DATADIR%%/examples/Advanced/children.scad %%DATADIR%%/examples/Advanced/children_indexed.scad %%DATADIR%%/examples/Advanced/module_recursion.scad %%DATADIR%%/examples/Advanced/offset.scad %%DATADIR%%/examples/Advanced/surface_image.png %%DATADIR%%/examples/Advanced/surface_image.scad %%DATADIR%%/examples/Basics/CSG-modules.scad %%DATADIR%%/examples/Basics/CSG.scad %%DATADIR%%/examples/Basics/LetterBlock.scad %%DATADIR%%/examples/Basics/linear_extrude.scad %%DATADIR%%/examples/Basics/logo.scad %%DATADIR%%/examples/Basics/logo_and_text.scad %%DATADIR%%/examples/Basics/projection.scad %%DATADIR%%/examples/Basics/projection.stl %%DATADIR%%/examples/Basics/rotate_extrude.scad %%DATADIR%%/examples/Basics/text_on_cube.scad %%DATADIR%%/examples/COPYING-CC0.txt %%DATADIR%%/examples/Functions/echo.scad %%DATADIR%%/examples/Functions/functions.scad %%DATADIR%%/examples/Functions/list_comprehensions.scad %%DATADIR%%/examples/Functions/polygon_areas.scad %%DATADIR%%/examples/Functions/recursion.scad %%DATADIR%%/examples/Old/example001.scad %%DATADIR%%/examples/Old/example002.scad %%DATADIR%%/examples/Old/example003.scad %%DATADIR%%/examples/Old/example004.scad %%DATADIR%%/examples/Old/example005.scad %%DATADIR%%/examples/Old/example006.scad %%DATADIR%%/examples/Old/example007.dxf %%DATADIR%%/examples/Old/example007.scad %%DATADIR%%/examples/Old/example008.dxf %%DATADIR%%/examples/Old/example008.scad %%DATADIR%%/examples/Old/example009.dxf %%DATADIR%%/examples/Old/example009.scad %%DATADIR%%/examples/Old/example010.dat %%DATADIR%%/examples/Old/example010.scad %%DATADIR%%/examples/Old/example011.scad %%DATADIR%%/examples/Old/example012.scad %%DATADIR%%/examples/Old/example012.stl %%DATADIR%%/examples/Old/example013.dxf %%DATADIR%%/examples/Old/example013.scad %%DATADIR%%/examples/Old/example014.scad %%DATADIR%%/examples/Old/example015.scad %%DATADIR%%/examples/Old/example016.scad %%DATADIR%%/examples/Old/example016.stl %%DATADIR%%/examples/Old/example017.scad %%DATADIR%%/examples/Old/example018.scad %%DATADIR%%/examples/Old/example019.scad %%DATADIR%%/examples/Old/example020.scad %%DATADIR%%/examples/Old/example021.scad %%DATADIR%%/examples/Old/example022.scad %%DATADIR%%/examples/Old/example023.scad %%DATADIR%%/examples/Old/example024.scad %%DATADIR%%/examples/Parametric/candleStand.json %%DATADIR%%/examples/Parametric/candleStand.scad %%DATADIR%%/examples/Parametric/sign.json %%DATADIR%%/examples/Parametric/sign.scad %%DATADIR%%/examples/examples.json %%DATADIR%%/fonts/05-osx-fonts.conf %%DATADIR%%/fonts/10-liberation.conf %%DATADIR%%/fonts/Liberation-2.00.1/AUTHORS %%DATADIR%%/fonts/Liberation-2.00.1/ChangeLog %%DATADIR%%/fonts/Liberation-2.00.1/LICENSE %%DATADIR%%/fonts/Liberation-2.00.1/README %%DATADIR%%/fonts/Liberation-2.00.1/TODO %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf %%DATADIR%%/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf %%DATADIR%%/locale/cs/LC_MESSAGES/openscad.mo %%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 %%DATADIR%%/templates/module.json %%DATADIR%%/templates/rotate.json %%DATADIR%%/templates/translate.json @dir %%DATADIR%%/libraries/MCAD