Hi, I have tested this also with couple models and everything worked just fine.
-- Henri Järvinen On Thu, Sep 05, 2019 at 08:54:27PM +0200, Paco Esteban wrote: > Hi ports@, > > This is an update for cad/openscad to the latest version that came out > recently after some years. > > You can see the new features here: > > https://github.com/openscad/openscad/releases/tag/openscad-2019.05 > > It has a new dependency (https://github.com/google/double-conversion/) > that was not in ports. I sent a tarball for it on another email. > > I've ported the existing patches to the new version and added one > (patch-scripts_translation-update_sh) because that script tried to use > 'unlink' which is not in base. I just changed it for 'rm'. Let me know > if that is correct or there's a better solution. > > I've tested it with some models I had and all works fine at least on my > workflow (including STL exports) on amd64. > > Cheers, > Paco. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/cad/openscad/Makefile,v > retrieving revision 1.29 > diff -u -p -r1.29 Makefile > --- Makefile 12 Jul 2019 20:43:45 -0000 1.29 > +++ Makefile 5 Sep 2019 18:53:43 -0000 > @@ -3,9 +3,8 @@ > COMMENT = the programmer's solid 3D CAD modeller#' > BROKEN-sparc64= SIGILL on src/cgalutils.cc with CGAL-4.6.3 > > -V = 2015.03-2 > -DISTNAME = openscad-${V:S/-/./} > -REVISION = 9 > +V = 2019.05 > +DISTNAME = openscad-${V} > > CATEGORIES = cad > > @@ -16,21 +15,23 @@ PERMIT_PACKAGE = Yes > > WANTLIB += CGAL GL GLEW GLU ICE 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 fontconfig freetype glib-2.0 > -WANTLIB += gmp harfbuzz iconv intl m mpfr opencsg pthread qscintilla2_qt4 > -WANTLIB += ${COMPILER_LIBCXX} z lib/qt4/QtGui lib/qt4/QtOpenGL > +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 > > COMPILER = base-clang ports-gcc base-gcc > > MASTER_SITES = http://files.openscad.org/ > -DISTFILES = openscad-${V}.src.tar.gz > +DISTFILES = ${DISTNAME}.src.tar.gz > > MODULES = devel/qmake \ > x11/qt4 > BUILD_DEPENDS = devel/bison \ > + devel/double-conversion \ > devel/gettext,-tools \ > math/eigen3 > LIB_DEPENDS = devel/boost \ > + devel/double-conversion \ > devel/gmp \ > devel/harfbuzz \ > devel/mpfr \ > Index: distinfo > =================================================================== > RCS file: /cvs/ports/cad/openscad/distinfo,v > retrieving revision 1.5 > diff -u -p -r1.5 distinfo > --- distinfo 7 Dec 2015 07:52:32 -0000 1.5 > +++ distinfo 5 Sep 2019 18:53:43 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (openscad-2015.03-2.src.tar.gz) = > olNbueJ9luEOHhkmillhVRZMcSnUEKDH+W7cLQlAAIM= > -SIZE (openscad-2015.03-2.src.tar.gz) = 13307974 > +SHA256 (openscad-2019.05.src.tar.gz) = > ChbEJjzlI4CBndkcYJpxnTjxL2uMTaDoKNy+W3CZb1k= > +SIZE (openscad-2019.05.src.tar.gz) = 14604881 > Index: patches/patch-boost_pri > =================================================================== > RCS file: patches/patch-boost_pri > diff -N patches/patch-boost_pri > --- patches/patch-boost_pri 7 Dec 2015 07:52:32 -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-boost_pri,v 1.3 2015/12/07 07:52:32 jasper Exp $ > ---- boost.pri.orig Thu Mar 5 17:25:10 2015 > -+++ boost.pri Sun Dec 6 14:04:47 2015 > -@@ -71,7 +71,7 @@ boost { > - > - isEmpty(BOOST_LINK_FLAGS) { > - unix|macx { > -- BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options > -lboost_filesystem -lboost_system -lboost_regex > -+ BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt > -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt > - } > - } > - > Index: patches/patch-features_boost_prf > =================================================================== > RCS file: patches/patch-features_boost_prf > diff -N patches/patch-features_boost_prf > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-features_boost_prf 5 Sep 2019 18:53:43 -0000 > @@ -0,0 +1,14 @@ > +$OpenBSD$ > + > +Index: features/boost.prf > +--- features/boost.prf.orig > ++++ features/boost.prf > +@@ -71,7 +71,7 @@ isEmpty(BOOST_LINK_FLAGS) { > + > + isEmpty(BOOST_LINK_FLAGS) { > + unix|macx { > +- BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options > -lboost_filesystem -lboost_system -lboost_regex > ++ BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt > -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt > + } > + } > + > Index: patches/patch-openscad_pro > =================================================================== > RCS file: /cvs/ports/cad/openscad/patches/patch-openscad_pro,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-openscad_pro > --- patches/patch-openscad_pro 7 Dec 2015 07:52:32 -0000 1.1 > +++ patches/patch-openscad_pro 5 Sep 2019 18:53:43 -0000 > @@ -4,17 +4,18 @@ $OpenBSD: patch-openscad_pro,v 1.1 2015/ > - don't use bundled Liberation fonts, use RDEP on fonts/liberation-fonts > instead > - fix manpage installation dir > > ---- openscad.pro.orig Mon Nov 16 06:13:56 2015 > -+++ openscad.pro Sun Dec 6 16:26:28 2015 > -@@ -173,7 +173,6 @@ netbsd* { > +Index: openscad.pro > +--- openscad.pro.orig > ++++ openscad.pro > +@@ -149,7 +149,6 @@ netbsd* { > # See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs. > *g++* { > QMAKE_CXXFLAGS *= -fno-strict-aliasing > - QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs # ignored before 4.8 > - } > > - *clang* { > -@@ -561,10 +560,6 @@ libraries.path = "$$PREFIX/share/$${FULLNAME}/librarie > + # 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) { > +@@ -716,10 +715,6 @@ libraries.path = "$$PREFIX/share/$${FULLNAME}/librarie > libraries.files = libraries/* > INSTALLS += libraries > > @@ -25,7 +26,7 @@ $OpenBSD: patch-openscad_pro,v 1.1 2015/ > colorschemes.path = "$$PREFIX/share/$${FULLNAME}/color-schemes/" > colorschemes.files = color-schemes/* > INSTALLS += colorschemes > -@@ -585,6 +580,6 @@ icons.path = $$PREFIX/share/pixmaps > +@@ -740,7 +735,7 @@ icons.path = $$PREFIX/share/pixmaps > icons.extra = test -f icons/$${FULLNAME}.png && cp -f > icons/$${FULLNAME}.png \"\$(INSTALL_ROOT)$${icons.path}/\" || cp -f > icons/openscad.png \"\$(INSTALL_ROOT)$${icons.path}/$${FULLNAME}.png\" > INSTALLS += icons > > @@ -33,3 +34,4 @@ $OpenBSD: patch-openscad_pro,v 1.1 2015/ > +man.path = $$PREFIX/man/man1 > man.extra = cp -f doc/openscad.1 > \"\$(INSTALL_ROOT)$${man.path}/$${FULLNAME}.1\" > INSTALLS += man > + > Index: patches/patch-scripts_translation-update_sh > =================================================================== > RCS file: patches/patch-scripts_translation-update_sh > diff -N patches/patch-scripts_translation-update_sh > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-scripts_translation-update_sh 5 Sep 2019 18:53:43 > -0000 > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +OpenBSD does not have unlink in base > + > +Index: scripts/translation-update.sh > +--- scripts/translation-update.sh.orig > ++++ scripts/translation-update.sh > +@@ -100,7 +100,7 @@ updatemo() > + > + # clean the mess > + for LANGCODE in `cat locale/LINGUAS | grep -v "#"`; do > +- unlink ./locale/$LANGCODE/LC_MESSAGES/$LANGCODE.mo > ++ rm ./locale/$LANGCODE/LC_MESSAGES/$LANGCODE.mo > + done > + else > + if [ x"$(uname -s)" = x"Linux" ]; then > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/cad/openscad/pkg/PLIST,v > retrieving revision 1.7 > diff -u -p -r1.7 PLIST > --- pkg/PLIST 1 Jul 2018 18:33:35 -0000 1.7 > +++ pkg/PLIST 5 Sep 2019 18:53:43 -0000 > @@ -1,9 +1,12 @@ > @comment $OpenBSD: PLIST,v 1.7 2018/07/01 18:33:35 espie Exp $ > @bin bin/openscad > @man man/man1/openscad.1 > -share/appdata/ > -share/appdata/openscad.appdata.xml > +share/applications/ > share/applications/openscad.desktop > +share/metainfo/ > +share/metainfo/org.openscad.OpenSCAD.appdata.xml > +share/mime/ > +share/mime/packages/ > share/mime/packages/openscad.xml > share/openscad/ > share/openscad/color-schemes/ > @@ -32,6 +35,7 @@ share/openscad/examples/ > share/openscad/examples/Advanced/ > share/openscad/examples/Advanced/GEB.scad > share/openscad/examples/Advanced/animation.scad > +share/openscad/examples/Advanced/assert.scad > share/openscad/examples/Advanced/children.scad > share/openscad/examples/Advanced/children_indexed.scad > share/openscad/examples/Advanced/module_recursion.scad > @@ -51,6 +55,7 @@ share/openscad/examples/Basics/rotate_ex > share/openscad/examples/Basics/text_on_cube.scad > share/openscad/examples/COPYING-CC0.txt > share/openscad/examples/Functions/ > +share/openscad/examples/Functions/echo.scad > share/openscad/examples/Functions/functions.scad > share/openscad/examples/Functions/list_comprehensions.scad > share/openscad/examples/Functions/polygon_areas.scad > @@ -87,15 +92,18 @@ share/openscad/examples/Old/example021.s > share/openscad/examples/Old/example022.scad > share/openscad/examples/Old/example023.scad > share/openscad/examples/Old/example024.scad > +share/openscad/examples/Parametric/ > +share/openscad/examples/Parametric/candleStand.json > +share/openscad/examples/Parametric/candleStand.scad > +share/openscad/examples/Parametric/sign.json > +share/openscad/examples/Parametric/sign.scad > share/openscad/examples/examples.json > share/openscad/libraries/ > share/openscad/libraries/MCAD/ > share/openscad/libraries/MCAD/2Dshapes.scad > share/openscad/libraries/MCAD/3d_triangle.scad > share/openscad/libraries/MCAD/README.markdown > -share/openscad/libraries/MCAD/SolidPython/ > share/openscad/libraries/MCAD/TODO > -share/openscad/libraries/MCAD/ThingDoc/ > share/openscad/libraries/MCAD/__init__.py > share/openscad/libraries/MCAD/bearing.scad > share/openscad/libraries/MCAD/bitmap/ > @@ -110,7 +118,6 @@ share/openscad/libraries/MCAD/constants. > share/openscad/libraries/MCAD/curves.scad > share/openscad/libraries/MCAD/fonts.scad > share/openscad/libraries/MCAD/gears.scad > -share/openscad/libraries/MCAD/get_submodules.py > share/openscad/libraries/MCAD/gridbeam.scad > share/openscad/libraries/MCAD/hardware.scad > share/openscad/libraries/MCAD/involute_gears.scad > @@ -154,9 +161,15 @@ share/openscad/locale/es/LC_MESSAGES/ope > share/openscad/locale/fr/ > share/openscad/locale/fr/LC_MESSAGES/ > share/openscad/locale/fr/LC_MESSAGES/openscad.mo > +share/openscad/locale/pl/ > +share/openscad/locale/pl/LC_MESSAGES/ > +share/openscad/locale/pl/LC_MESSAGES/openscad.mo > share/openscad/locale/ru/ > share/openscad/locale/ru/LC_MESSAGES/ > share/openscad/locale/ru/LC_MESSAGES/openscad.mo > +share/openscad/locale/uk/ > +share/openscad/locale/uk/LC_MESSAGES/ > +share/openscad/locale/uk/LC_MESSAGES/openscad.mo > share/pixmaps/ > share/pixmaps/openscad.png > @tag update-desktop-database > >
