Index: head/cad/openvsp/Makefile =================================================================== --- head/cad/openvsp/Makefile (revision 517605) +++ head/cad/openvsp/Makefile (revision 517606) @@ -1,65 +1,78 @@ # $FreeBSD$ PORTNAME= openvsp DISTVERSIONPREFIX= ${GH_PROJECT}_ -DISTVERSION= 3.18.0 +DISTVERSION= 3.19.0 CATEGORIES= cad MAINTAINER= fernape@FreeBSD.org COMMENT= Create a 3D model of an aircraft defined by engineering parameters LICENSE= NOSA13 LICENSE_NAME= NASA Open Source Agreement version 1.3 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= fails to compile: invokes x86 asm LIB_DEPENDS= libdrm.so:graphics/libdrm \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libfltk.so:x11-toolkits/fltk \ libcpptest.so:devel/cpptest BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs USES= compiler:c++11-lang cmake:noninja localbase\ gl gnome jpeg xorg USE_GITHUB= yes GH_PROJECT= OpenVSP GH_ACCOUNT= ${GH_PROJECT} CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CODEELI:BOOLEAN=no \ -DVSP_USE_SYSTEM_EIGEN:BOOLEAN=no \ -DVSP_USE_SYSTEM_LIBXML2:BOOLEAN=yes \ -DVSP_USE_SYSTEM_FLTK:boolean=yes \ -DVSP_USE_SYSTEM_CMINPACK:boolean=no \ -DVSP_USE_SYSTEM_GLM:BOOLEAN=yes \ -DVSP_USE_SYSTEM_GLEW:BOOLEAN=yes USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \ xinerama xrender xxf86vm USE_GL= gl glew glu USE_GNOME= libxml2 .include +.include + +# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230888 +.if ${OPSYS} == FreeBSD +.if (${OSVERSION} < 1200000 || ${OSVERSION} >=1300000) +BROKEN= undefined reference to __atomic_load +.endif +.endif + BUILD_PREFIX= OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-${DISTVERSION}-FreeBSD do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin - @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/vsp* @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vspIcon.png ${STAGEDIR}${DATADIR} + ${RM} ${STAGEDIR}${PREFIX}/vspIcon.png ${BUILD_WRKSRC}/${BUILD_PREFIX}/vspIcon.png + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin + ${RM} ${STAGEDIR}${PREFIX}/vsp* .for d in CustomScripts airfoil matlab scripts textures (cd ${BUILD_WRKSRC}/${BUILD_PREFIX}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) + ${RM} -rf ${STAGEDIR}${PREFIX}/${d} .endfor ${CP} ${BUILD_WRKSRC}/${BUILD_PREFIX}/LICENSE ${STAGEDIR}${DATADIR} + ${RM} ${STAGEDIR}${PREFIX}/LICENSE -.include +.include Index: head/cad/openvsp/distinfo =================================================================== --- head/cad/openvsp/distinfo (revision 517605) +++ head/cad/openvsp/distinfo (revision 517606) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567610562 -SHA256 (OpenVSP-OpenVSP-OpenVSP_3.18.0_GH0.tar.gz) = 0d1b15e3532ae1fe7893fd3cfdfbea89065379032957ab8cc37fbbe6019889e6 -SIZE (OpenVSP-OpenVSP-OpenVSP_3.18.0_GH0.tar.gz) = 110268961 +TIMESTAMP = 1573426703 +SHA256 (OpenVSP-OpenVSP-OpenVSP_3.19.0_GH0.tar.gz) = e6fe666875b7442c5717f66610cd6f7262f7d51473028edde5b0f7ab1e026445 +SIZE (OpenVSP-OpenVSP-OpenVSP_3.19.0_GH0.tar.gz) = 110506891 Index: head/cad/openvsp/pkg-plist =================================================================== --- head/cad/openvsp/pkg-plist (revision 517605) +++ head/cad/openvsp/pkg-plist (revision 517606) @@ -1,151 +1,78 @@ -CustomScripts/Box.vsppart -CustomScripts/BoxGroup.vsppart -CustomScripts/Cone.vsppart -CustomScripts/Disk.vsppart -CustomScripts/Duct.vsppart -CustomScripts/OnOffExample.vsppart -CustomScripts/PodMan.vsppart -CustomScripts/Seat.vsppart -CustomScripts/SeatGroup.vsppart -CustomScripts/TransportFuse.vsppart -LICENSE README.md -airfoil/23015.af -airfoil/Hershey_AR10.avl -airfoil/Hershey_AR10_AVL.dat -airfoil/N0012_VSP.af -airfoil/N0012_VSP_sym.af -airfoil/VKT_e0.1_k0.1_t10.dat -airfoil/XFoil_VKT_CpDist.txt -airfoil/b737a.af -airfoil/b737b.af -airfoil/b737c.af -airfoil/b737d.af -airfoil/clarky_Lednicer.dat -airfoil/e205_Selig.dat -airfoil/n0012.dat -airfoil/sc2_0404.af bin/vsp bin/vspaero bin/vspscript bin/vspslicer bin/vspviewer -matlab/BezierAirfoilExample.m -matlab/BezierCtrlToCoordPnts.m -matlab/OpenVSPParasiteDragPlotData.m -matlab/plotDegenPlate.m -matlab/plotDegenStick.m -matlab/plotDegenSurf.m -scripts/AirfoilExport.vspscript -scripts/CFDMesh.vspscript -scripts/CpSlicer.vspscript -scripts/CreateEditGeom.vspscript -scripts/DegenGeom.vspscript -scripts/DumpResults.vspscript -scripts/FEAMesh.vspscript -scripts/Fuselage.vspscript -scripts/Master_VSP_VV_Script.vspscript -scripts/ParasiteDragScriptTest.vspscript -scripts/SingleAirfoilExport.vspscript -scripts/SnapToDemo.vspscript -scripts/Stack.vspscript -scripts/StructuresParmContainerTest.vspscript -scripts/SubSurface.vspscript -scripts/TestAll.vspscript -scripts/TestAnalysis.vspscript -scripts/TestAnalysisVSPAERO.vspscript -scripts/testanimate.vspscript -scripts/TestAreaProj.vspscript -scripts/TestDXF.vspscript -scripts/TestFacet.vspscript -scripts/TestMassProperties.vspscript -scripts/TestMeasure.vspscript -scripts/TestSVG.vspscript -scripts/TestSaveLoad.vspscript -scripts/TestSurfQuery.vspscript -scripts/VKTAirfoil.vspscript -scripts/Wing.vspscript %%DATADIR%%/23015.af %%DATADIR%%/AirfoilExport.vspscript %%DATADIR%%/BezierAirfoilExample.m %%DATADIR%%/BezierCtrlToCoordPnts.m %%DATADIR%%/Box.vsppart %%DATADIR%%/BoxGroup.vsppart %%DATADIR%%/CFDMesh.vspscript %%DATADIR%%/Cone.vsppart %%DATADIR%%/CpSlicer.vspscript %%DATADIR%%/CreateEditGeom.vspscript %%DATADIR%%/DegenGeom.vspscript %%DATADIR%%/Disk.vsppart %%DATADIR%%/Duct.vsppart %%DATADIR%%/DumpResults.vspscript +%%DATADIR%%/EditCurveXSec.vspscript %%DATADIR%%/FEAMesh.vspscript %%DATADIR%%/Fuselage.vspscript %%DATADIR%%/Hershey_AR10.avl %%DATADIR%%/Hershey_AR10_AVL.dat %%DATADIR%%/LICENSE %%DATADIR%%/Master_VSP_VV_Script.vspscript %%DATADIR%%/N0012_VSP.af %%DATADIR%%/N0012_VSP_sym.af %%DATADIR%%/OnOffExample.vsppart %%DATADIR%%/OpenVSPParasiteDragPlotData.m %%DATADIR%%/ParasiteDragScriptTest.vspscript %%DATADIR%%/PodMan.vsppart %%DATADIR%%/Seat.vsppart %%DATADIR%%/SeatGroup.vsppart %%DATADIR%%/SharkTeeth.tga %%DATADIR%%/SingleAirfoilExport.vspscript %%DATADIR%%/SnapToDemo.vspscript %%DATADIR%%/Stack.vspscript %%DATADIR%%/StructuresParmContainerTest.vspscript %%DATADIR%%/SubSurface.vspscript %%DATADIR%%/TestAll.vspscript %%DATADIR%%/TestAnalysis.vspscript %%DATADIR%%/TestAnalysisVSPAERO.vspscript -%%DATADIR%%/testanimate.vspscript %%DATADIR%%/TestAreaProj.vspscript %%DATADIR%%/TestDXF.vspscript %%DATADIR%%/TestFacet.vspscript %%DATADIR%%/TestMassProperties.vspscript %%DATADIR%%/TestMeasure.vspscript %%DATADIR%%/TestSVG.vspscript %%DATADIR%%/TestSaveLoad.vspscript %%DATADIR%%/TestSurfQuery.vspscript %%DATADIR%%/TransportFuse.vsppart %%DATADIR%%/VKTAirfoil.vspscript %%DATADIR%%/VKT_e0.1_k0.1_t10.dat %%DATADIR%%/VSPBoxXSec.PNG %%DATADIR%%/VSPCircXSec.PNG %%DATADIR%%/VSPIXSec.PNG %%DATADIR%%/VSPPipeXSec.PNG %%DATADIR%%/VSPRectXSec.PNG %%DATADIR%%/Wing.vspscript %%DATADIR%%/XFoil_VKT_CpDist.txt %%DATADIR%%/b737a.af %%DATADIR%%/b737b.af %%DATADIR%%/b737c.af %%DATADIR%%/b737d.af %%DATADIR%%/clarky_Lednicer.dat %%DATADIR%%/e205_Selig.dat %%DATADIR%%/n0012.dat %%DATADIR%%/nasa-logo.tga %%DATADIR%%/plotDegenPlate.m %%DATADIR%%/plotDegenStick.m %%DATADIR%%/plotDegenSurf.m %%DATADIR%%/redbluearrow.tga %%DATADIR%%/sc2_0404.af +%%DATADIR%%/testanimate.vspscript +%%DATADIR%%/vspIcon.png %%DATADIR%%/window.tga -textures/SharkTeeth.tga -textures/VSPBoxXSec.PNG -textures/VSPCircXSec.PNG -textures/VSPIXSec.PNG -textures/VSPPipeXSec.PNG -textures/VSPRectXSec.PNG -textures/nasa-logo.tga -textures/redbluearrow.tga -textures/window.tga -vsp -vspaero -vspscript -vspslicer -vspviewer