Index: head/cad/freecad/Makefile =================================================================== --- head/cad/freecad/Makefile (revision 556487) +++ head/cad/freecad/Makefile (revision 556488) @@ -1,85 +1,82 @@ # $FreeBSD$ PORTNAME= FreeCAD -DISTVERSION= 0.18.4 -PORTREVISION= 11 +DISTVERSION= 0.18.5 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e CATEGORIES= cad PATCH_SITES= https://github.com/FreeCAD/FreeCAD/commit/ PATCHFILES+= 6eacb17b3e03d20.patch:-p1 # Python 3.8 compat MAINTAINER= cmt@FreeBSD.org COMMENT= General purpose 3D CAD modeller LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyside2-tools>5.14.0:devel/pyside2-tools@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ ${PY_BOOST} \ libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR} \ libCoin.so:graphics/Coin \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libvtkFiltersTexture-8.2.so:math/vtk8 \ libTKernel.so:cad/opencascade \ libxerces-c.so:textproc/xerces-c3 \ libboost_thread.so:devel/boost-libs \ libarea.so:devel/libarea \ libmed.so:french/med \ libmpi.so:net/openmpi \ libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \ libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} USES= dos2unix compiler:c++11-lib cmake gl eigen:3 fortran jpeg \ localbase:ldflags pkgconfig python:3.6+ localbase qt:5 xorg USE_GITHUB= yes USE_XORG= ice sm x11 xext xt USE_GL= gl glu USE_QT= buildtools concurrent core gui network opengl printsupport \ qmake_build svg webkit widgets xml USE_LDCONFIG= yes DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DOPENMPI_INCLUDE_DIRS="${LOCALBASE}/mpi/openmpi/include" \ -DBUILD_QT5="ON" \ -DPYTHON_LIBRARY="${PYTHONBASE}/lib/libpython${PYTHON_VER}${PYTHON_ABIVER}.so" \ -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}" \ -DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \ -DPYTHON_EXECUTABLE="${PYTHON_CMD}" \ -DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \ -DPYSIDE2RCCBINARY="${LOCALBASE}/bin/rcc" \ -DPYSIDE2UICBINARY="${LOCALBASE}/bin/uic" \ -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2 CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} OPTIONS_DEFINE= COLLADA COLLADA_DESC= Install pycollada for Collada files import COLLADA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR} DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \ ${PORTNAME} "Graphics;Engineering;" false post-patch: - @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \ - ${WRKSRC}/src/Gui/CMakeLists.txt @${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \ ${WRKSRC}/src/Tools/SubWCRev.py post-install: ${LN} -s ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD ${LN} -s ../${PORTNAME}/bin/FreeCADCmd ${STAGEDIR}${LOCALBASE}/bin/FreeCADCmd .include Index: head/cad/freecad/distinfo =================================================================== --- head/cad/freecad/distinfo (revision 556487) +++ head/cad/freecad/distinfo (revision 556488) @@ -1,5 +1,5 @@ -TIMESTAMP = 1595364680 -SHA256 (FreeCAD-FreeCAD-0.18.4_GH0.tar.gz) = 4e0cce447b31b8989a00cf68c49ae012ce8e5546a56c6e0874fbd8f7ddedffd2 -SIZE (FreeCAD-FreeCAD-0.18.4_GH0.tar.gz) = 219759477 +TIMESTAMP = 1606511424 +SHA256 (FreeCAD-FreeCAD-0.18.5_GH0.tar.gz) = 592c552237effc7a658730718a7f5a94b3819cd7a2f1476a9858c2752a98540a +SIZE (FreeCAD-FreeCAD-0.18.5_GH0.tar.gz) = 219762319 SHA256 (6eacb17b3e03d20.patch) = 3d2570c143825acd01b8eeb645fc450566e9ac20d6333de9e17cbc10fb5a13e0 SIZE (6eacb17b3e03d20.patch) = 1023 Index: head/cad/freecad/files/patch-src_Mod_Part_App_PropertyTopoShape.cpp =================================================================== --- head/cad/freecad/files/patch-src_Mod_Part_App_PropertyTopoShape.cpp (revision 556487) +++ head/cad/freecad/files/patch-src_Mod_Part_App_PropertyTopoShape.cpp (nonexistent) @@ -1,14 +0,0 @@ ---- src/Mod/Part/App/PropertyTopoShape.cpp.orig 2019-10-04 10:26:07 UTC -+++ src/Mod/Part/App/PropertyTopoShape.cpp -@@ -281,9 +281,9 @@ static void BRepTools_Write(const TopoDS_Shape& Sh, St - static Standard_Boolean BRepTools_Write(const TopoDS_Shape& Sh, - const Standard_CString File) - { -- ofstream os; -+ std::ofstream os; - #if OCC_VERSION_HEX >= 0x060800 -- OSD_OpenStream(os, File, ios::out); -+ OSD_OpenStream(os, File, std::ios::out); - #else - os.open(File, ios::out); - #endif Property changes on: head/cad/freecad/files/patch-src_Mod_Part_App_PropertyTopoShape.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/freecad/files/patch-src_Mod_Part_App_Geometry.cpp =================================================================== --- head/cad/freecad/files/patch-src_Mod_Part_App_Geometry.cpp (revision 556487) +++ head/cad/freecad/files/patch-src_Mod_Part_App_Geometry.cpp (nonexistent) @@ -1,165 +0,0 @@ ---- src/Mod/Part/App/Geometry.cpp.orig 2019-10-04 10:23:58 UTC -+++ src/Mod/Part/App/Geometry.cpp -@@ -203,7 +203,7 @@ unsigned int Geometry::getMemSize (void) const - void Geometry::Save(Base::Writer &writer) const - { - const char c = Construction?'1':'0'; -- writer.Stream() << writer.ind() << "" << endl; -+ writer.Stream() << writer.ind() << "" << std::endl; - } - - void Geometry::Restore(Base::XMLReader &reader) -@@ -323,7 +323,7 @@ void GeomPoint::Save(Base::Writer &writer) const - << "X=\"" << Point.x << - "\" Y=\"" << Point.y << - "\" Z=\"" << Point.z << -- "\"/>" << endl; -+ "\"/>" << std::endl; - } - - void GeomPoint::Restore(Base::XMLReader &reader) -@@ -793,7 +793,7 @@ void GeomBezierCurve::Save(Base::Writer& writer) const - << writer.ind() - << "" << endl; -+ "\">" << std::endl; - - writer.incInd(); - -@@ -808,11 +808,11 @@ void GeomBezierCurve::Save(Base::Writer& writer) const - "\" Y=\"" << (*itp).y << - "\" Z=\"" << (*itp).z << - "\" Weight=\"" << (*itw) << -- "\"/>" << endl; -+ "\"/>" << std::endl; - } - - writer.decInd(); -- writer.Stream() << writer.ind() << "" << endl ; -+ writer.Stream() << writer.ind() << "" << std::endl ; - } - - void GeomBezierCurve::Restore(Base::XMLReader& reader) -@@ -1270,7 +1270,7 @@ void GeomBSplineCurve::Save(Base::Writer& writer) cons - "\" KnotsCount=\"" << knots.size() << - "\" Degree=\"" << degree << - "\" IsPeriodic=\"" << (int) isperiodic << -- "\">" << endl; -+ "\">" << std::endl; - - writer.incInd(); - -@@ -1285,7 +1285,7 @@ void GeomBSplineCurve::Save(Base::Writer& writer) cons - "\" Y=\"" << (*itp).y << - "\" Z=\"" << (*itp).z << - "\" Weight=\"" << (*itw) << -- "\"/>" << endl; -+ "\"/>" << std::endl; - } - - std::vector::const_iterator itk; -@@ -1297,11 +1297,11 @@ void GeomBSplineCurve::Save(Base::Writer& writer) cons - << "" << endl; -+ "\"/>" << std::endl; - } - - writer.decInd(); -- writer.Stream() << writer.ind() << "" << endl ; -+ writer.Stream() << writer.ind() << "" << std::endl ; - } - - void GeomBSplineCurve::Restore(Base::XMLReader& reader) -@@ -1903,7 +1903,7 @@ void GeomCircle::Save(Base::Writer& writer) const - "\" NormalZ=\"" << normal.Z() << - "\" AngleXU=\"" << AngleXU << - "\" Radius=\"" << this->myCurve->Radius() << -- "\"/>" << endl; -+ "\"/>" << std::endl; - } - - void GeomCircle::Restore(Base::XMLReader& reader) -@@ -2132,7 +2132,7 @@ void GeomArcOfCircle::Save(Base::Writer &writer) const - "\" Radius=\"" << circle->Radius() << - "\" StartAngle=\"" << this->myCurve->FirstParameter() << - "\" EndAngle=\"" << this->myCurve->LastParameter() << -- "\"/>" << endl; -+ "\"/>" << std::endl; - } - - void GeomArcOfCircle::Restore(Base::XMLReader &reader) -@@ -2383,7 +2383,7 @@ void GeomEllipse::Save(Base::Writer& writer) const - << "MajorRadius=\"" << this->myCurve->MajorRadius() << "\" " - << "MinorRadius=\"" << this->myCurve->MinorRadius() << "\" " - << "AngleXU=\"" << AngleXU << "\" " -- << "/>" << endl; -+ << "/>" << std::endl; - } - - void GeomEllipse::Restore(Base::XMLReader& reader) -@@ -2653,7 +2653,7 @@ void GeomArcOfEllipse::Save(Base::Writer &writer) cons - << "AngleXU=\"" << AngleXU << "\" " - << "StartAngle=\"" << this->myCurve->FirstParameter() << "\" " - << "EndAngle=\"" << this->myCurve->LastParameter() << "\" " -- << "/>" << endl; -+ << "/>" << std::endl; - } - - void GeomArcOfEllipse::Restore(Base::XMLReader &reader) -@@ -2826,7 +2826,7 @@ void GeomHyperbola::Save(Base::Writer& writer) const - << "MajorRadius=\"" << this->myCurve->MajorRadius() << "\" " - << "MinorRadius=\"" << this->myCurve->MinorRadius() << "\" " - << "AngleXU=\"" << AngleXU << "\" " -- << "/>" << endl; -+ << "/>" << std::endl; - } - - void GeomHyperbola::Restore(Base::XMLReader& reader) -@@ -3083,7 +3083,7 @@ void GeomArcOfHyperbola::Save(Base::Writer &writer) co - << "AngleXU=\"" << AngleXU << "\" " - << "StartAngle=\"" << this->myCurve->FirstParameter() << "\" " - << "EndAngle=\"" << this->myCurve->LastParameter() << "\" " -- << "/>" << endl; -+ << "/>" << std::endl; - } - - void GeomArcOfHyperbola::Restore(Base::XMLReader &reader) -@@ -3236,7 +3236,7 @@ void GeomParabola::Save(Base::Writer& writer) const - << "NormalZ=\"" << normal.Z() << "\" " - << "Focal=\"" << this->myCurve->Focal() << "\" " - << "AngleXU=\"" << AngleXU << "\" " -- << "/>" << endl; -+ << "/>" << std::endl; - } - - void GeomParabola::Restore(Base::XMLReader& reader) -@@ -3436,7 +3436,7 @@ void GeomArcOfParabola::Save(Base::Writer &writer) con - << "AngleXU=\"" << AngleXU << "\" " - << "StartAngle=\"" << this->myCurve->FirstParameter() << "\" " - << "EndAngle=\"" << this->myCurve->LastParameter() << "\" " -- << "/>" << endl; -+ << "/>" << std::endl; - } - - void GeomArcOfParabola::Restore(Base::XMLReader &reader) -@@ -3581,7 +3581,7 @@ void GeomLine::Save(Base::Writer &writer) const - "\" DirX=\"" << Dir.x << - "\" DirY=\"" << Dir.y << - "\" DirZ=\"" << Dir.z << -- "\"/>" << endl; -+ "\"/>" << std::endl; - } - void GeomLine::Restore(Base::XMLReader &reader) - { -@@ -3722,7 +3722,7 @@ void GeomLineSegment::Save (Base::Writer &writer - "\" EndX=\"" << End.x << - "\" EndY=\"" << End.y << - "\" EndZ=\"" << End.z << -- "\"/>" << endl; -+ "\"/>" << std::endl; - } - - void GeomLineSegment::Restore (Base::XMLReader &reader) Property changes on: head/cad/freecad/files/patch-src_Mod_Part_App_Geometry.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/freecad/files/patch-src_3rdParty_salomesmesh_inc_Rn.h =================================================================== --- head/cad/freecad/files/patch-src_3rdParty_salomesmesh_inc_Rn.h (revision 556487) +++ head/cad/freecad/files/patch-src_3rdParty_salomesmesh_inc_Rn.h (nonexistent) @@ -1,17 +0,0 @@ ---- src/3rdParty/salomesmesh/inc/Rn.h.orig 2019-10-04 10:14:23 UTC -+++ src/3rdParty/salomesmesh/inc/Rn.h -@@ -180,12 +180,12 @@ class R4: public R3 - { - friend std::ostream& operator <<(std::ostream& f, const R4 & P ) - { f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; } -- friend istream& operator >>(istream& f, R4 & P) -+ friend std::istream& operator >>(std::istream& f, R4 & P) - { f >> P.x >> P.y >> P.z >> P.omega ; return f; } - - friend std::ostream& operator <<(std::ostream& f, const R4 * P ) - { f << P->x << ' ' << P->y << ' ' << P->z << ' ' << P->omega; return f; } -- friend istream& operator >>(istream& f, R4 * P) -+ friend std::istream& operator >>(std::istream& f, R4 * P) - { f >> P->x >> P->y >> P->z >> P->omega ; return f; } - - public: Property changes on: head/cad/freecad/files/patch-src_3rdParty_salomesmesh_inc_Rn.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property