Date: Sat, 9 Mar 2019 21:11:35 +0000 (UTC) From: Michael Reifenberger <mr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495203 - in head/cad/openscad: . files Message-ID: <201903092111.x29LBZeC094162@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mr Date: Sat Mar 9 21:11:35 2019 New Revision: 495203 URL: https://svnweb.freebsd.org/changeset/ports/495203 Log: Update to the 2019.03.03 pre-release and switch to QT5 so that the port doesn't get deleted during QT4 wipeout. Deleted: head/cad/openscad/files/ Modified: head/cad/openscad/Makefile head/cad/openscad/distinfo head/cad/openscad/pkg-plist Modified: head/cad/openscad/Makefile ============================================================================== --- head/cad/openscad/Makefile Sat Mar 9 21:05:22 2019 (r495202) +++ head/cad/openscad/Makefile Sat Mar 9 21:11:35 2019 (r495203) @@ -2,52 +2,46 @@ # $FreeBSD$ PORTNAME= openscad -PORTVERSION= 2015.03 -PORTREVISION= 25 +PORTVERSION= 2019.03.03 +#PORTREVISION= 1 CATEGORIES= cad -MASTER_SITES= http://files.openscad.org/ -DISTNAME= openscad-${PORTVERSION}.src MAINTAINER= mr@FreeBSD.org -COMMENT= Programmer's solid 3D CAD modeller +COMMENT= Programmer's solid 3D CAD modeller #' LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \ - ${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs -LIB_DEPENDS= libgmp.so:math/gmp \ - libmpfr.so:math/mpfr \ +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 \ libCGAL.so:math/cgal \ - libqscintilla2_qt4.so:devel/qscintilla2 \ + libgmp.so:math/gmp \ + libmpfr.so:math/mpfr \ + libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ - libopencsg.so:graphics/opencsg + libfontconfig.so:x11-fonts/fontconfig \ + devel/double-conversion -CONFLICTS= openscad-devel +CONFLICTS= openscad -USES= bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \ - pkgconfig python:run qmake qt:4 shebangfix -SHEBANG_FILES= libraries/MCAD/get_submodules.py -USE_GL= glu glew -USE_QT= corelib gui opengl moc_build uic_build rcc_build -PLIST_SUB= PORTVERSION=${PORTVERSION} -QMAKE_ENV= EIGENDIR=${LOCALBASE}/include/eigen3 -QMAKE_ARGS+= VERSION=${PORTVERSION} \ - QMAKE_LEX=${LOCALBASE}/bin/flex \ - QMAKE_YAC=${LOCALBASE}/bin/bison -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USES= bison compiler:c++11-lib desktop-file-utils eigen:3 gettext \ + pkgconfig qmake qt:5 shared-mime-info +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= 40379b3f5c1675c59714cebbbb6a8803d8d6460e +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 <bsd.port.options.mk> -# -#.if ${ARCH} == i386 -#USE_GCC= yes -#.endif .include <bsd.port.mk> Modified: head/cad/openscad/distinfo ============================================================================== --- head/cad/openscad/distinfo Sat Mar 9 21:05:22 2019 (r495202) +++ head/cad/openscad/distinfo Sat Mar 9 21:11:35 2019 (r495203) @@ -1,2 +1,3 @@ -SHA256 (openscad-2015.03.src.tar.gz) = 68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182 -SIZE (openscad-2015.03.src.tar.gz) = 12748351 +TIMESTAMP = 1552164393 +SHA256 (openscad-openscad-2019.03.03-40379b3f5c1675c59714cebbbb6a8803d8d6460e_GH0.tar.gz) = 71f79838540dea191ae272a4b59dbfaa797a46f9ba6eeb22b6193cae51cfea41 +SIZE (openscad-openscad-2019.03.03-40379b3f5c1675c59714cebbbb6a8803d8d6460e_GH0.tar.gz) = 14598920 Modified: head/cad/openscad/pkg-plist ============================================================================== --- head/cad/openscad/pkg-plist Sat Mar 9 21:05:22 2019 (r495202) +++ head/cad/openscad/pkg-plist Sat Mar 9 21:11:35 2019 (r495203) @@ -1,7 +1,7 @@ bin/openscad man/man1/openscad.1.gz -share/appdata/openscad.appdata.xml share/applications/openscad.desktop +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 @@ -24,6 +24,7 @@ share/mime/packages/openscad.xml %%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 @@ -41,6 +42,7 @@ share/mime/packages/openscad.xml %%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 @@ -76,6 +78,10 @@ share/mime/packages/openscad.xml %%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 @@ -96,59 +102,12 @@ share/mime/packages/openscad.xml %%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%%/libraries/MCAD/2Dshapes.scad -%%DATADIR%%/libraries/MCAD/3d_triangle.scad -%%DATADIR%%/libraries/MCAD/README.markdown -%%DATADIR%%/libraries/MCAD/TODO -%%DATADIR%%/libraries/MCAD/__init__.py -%%DATADIR%%/libraries/MCAD/bearing.scad -%%DATADIR%%/libraries/MCAD/bitmap/README -%%DATADIR%%/libraries/MCAD/bitmap/alphabet_block.scad -%%DATADIR%%/libraries/MCAD/bitmap/bitmap.scad -%%DATADIR%%/libraries/MCAD/bitmap/height_map.scad -%%DATADIR%%/libraries/MCAD/bitmap/letter_necklace.scad -%%DATADIR%%/libraries/MCAD/bitmap/name_tag.scad -%%DATADIR%%/libraries/MCAD/boxes.scad -%%DATADIR%%/libraries/MCAD/constants.scad -%%DATADIR%%/libraries/MCAD/curves.scad -%%DATADIR%%/libraries/MCAD/fonts.scad -%%DATADIR%%/libraries/MCAD/gears.scad -%%DATADIR%%/libraries/MCAD/get_submodules.py -%%DATADIR%%/libraries/MCAD/gridbeam.scad -%%DATADIR%%/libraries/MCAD/hardware.scad -%%DATADIR%%/libraries/MCAD/involute_gears.scad -%%DATADIR%%/libraries/MCAD/layouts.scad -%%DATADIR%%/libraries/MCAD/lego_compatibility.scad -%%DATADIR%%/libraries/MCAD/lgpl-2.1.txt -%%DATADIR%%/libraries/MCAD/libtriangles.scad -%%DATADIR%%/libraries/MCAD/materials.scad -%%DATADIR%%/libraries/MCAD/math.scad -%%DATADIR%%/libraries/MCAD/metric_fastners.scad -%%DATADIR%%/libraries/MCAD/motors.scad -%%DATADIR%%/libraries/MCAD/multiply.scad -%%DATADIR%%/libraries/MCAD/nuts_and_bolts.scad -%%DATADIR%%/libraries/MCAD/openscad_testing.py -%%DATADIR%%/libraries/MCAD/openscad_utils.py -%%DATADIR%%/libraries/MCAD/polyholes.scad -%%DATADIR%%/libraries/MCAD/regular_shapes.scad -%%DATADIR%%/libraries/MCAD/screw.scad -%%DATADIR%%/libraries/MCAD/servos.scad -%%DATADIR%%/libraries/MCAD/shapes.scad -%%DATADIR%%/libraries/MCAD/stepper.scad -%%DATADIR%%/libraries/MCAD/teardrop.scad -%%DATADIR%%/libraries/MCAD/test_docs.py -%%DATADIR%%/libraries/MCAD/test_mcad.py -%%DATADIR%%/libraries/MCAD/transformations.scad -%%DATADIR%%/libraries/MCAD/triangles.scad -%%DATADIR%%/libraries/MCAD/trochoids.scad -%%DATADIR%%/libraries/MCAD/units.scad -%%DATADIR%%/libraries/MCAD/unregular_shapes.scad -%%DATADIR%%/libraries/MCAD/utilities.scad %%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/pl/LC_MESSAGES/openscad.mo %%DATADIR%%/locale/ru/LC_MESSAGES/openscad.mo +%%DATADIR%%/locale/uk/LC_MESSAGES/openscad.mo share/pixmaps/openscad.png -@dir %%DATADIR%%/libraries/MCAD/SolidPython -@dir %%DATADIR%%/libraries/MCAD/ThingDoc +@dir %%DATADIR%%/libraries/MCAD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903092111.x29LBZeC094162>