aboutsummaryrefslogtreecommitdiffstats
path: root/cad
diff options
context:
space:
mode:
authormatthew <matthew@FreeBSD.org>2017-06-23 15:03:30 +0800
committermatthew <matthew@FreeBSD.org>2017-06-23 15:03:30 +0800
commitb30d4b30aac8087b5b7788283cbee20f8b8625d2 (patch)
treeabac9289289a74ed0f6833baa2259d7bb0a1fd4b /cad
parent7f833c1bcc5d2ce4e8c95ec89d3193e9ed4be47b (diff)
downloadfreebsd-ports-gnome-b30d4b30aac8087b5b7788283cbee20f8b8625d2.tar.gz
freebsd-ports-gnome-b30d4b30aac8087b5b7788283cbee20f8b8625d2.tar.zst
freebsd-ports-gnome-b30d4b30aac8087b5b7788283cbee20f8b8625d2.zip
Update to 3.12.1
Update cad/openvsp to 3.12.1 _and_ unbreak cad/openvsp. The recent update to eigen3 broke cad/openvsp (since it is used directly) and graphics/code-eli that is a dependency of cad/openvsp. Until there is a fix for code-eli change the port to use the internal eigen3 and code-eli packages bundled in the distribution. In addition, one of the local patches was accepted upstream and is no longer necessary. From the announcement: Features: - Parasite drag buildup tool - Full control of VSPAERO from OpenVSP GUI - DegenGeom preview visualization - Advanced control surface modeling Bug Fixes: - Advanced links not loading from file with 'Loop' policy geoms - Crash conformal components with some file airfoils - CompGeom when subsurfaces fall on tessellation line - DegenGeom handling of tip caps with blended wings - CustomGeom name matching GUI mismatch PR: 220212 Submitted by: fernando.apesteguia@gmail.com (maintainer)
Diffstat (limited to 'cad')
-rw-r--r--cad/openvsp/Makefile8
-rw-r--r--cad/openvsp/distinfo6
-rw-r--r--cad/openvsp/files/patch-src_util_SVGUtil.h11
-rw-r--r--cad/openvsp/pkg-plist4
4 files changed, 10 insertions, 19 deletions
diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile
index 26244a176b85..e5b2ff66c3cb 100644
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= openvsp
-PORTVERSION= 3.11.0
-PORTREVISION= 2
+PORTVERSION= 3.12.1
DISTVERSIONPREFIX= ${GH_PROJECT}_
CATEGORIES= cad
@@ -24,9 +23,7 @@ LIB_DEPENDS= libdrm.so:graphics/libdrm \
libGLEW.so:graphics/glew \
libcpptest.so:devel/cpptest
BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \
- ${LOCALBASE}/include/eli/code_eli.hpp:graphics/code-eli \
${LOCALBASE}/include/glm/glm.hpp:math/glm \
- ${LOCALBASE}/include/eigen3/Eigen/Array:math/eigen3 \
${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
USE_GITHUB= yes
@@ -39,8 +36,9 @@ USES= cmake:outsource compiler:gcc-c++11-lib jpeg
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_EIGEN:BOOLEAN=yes \
-DVSP_USE_SYSTEM_FLTK:boolean=yes \
-DVSP_USE_SYSTEM_CMINPACK:boolean=no \
-DVSP_USE_SYSTEM_GLM:BOOLEAN=yes \
diff --git a/cad/openvsp/distinfo b/cad/openvsp/distinfo
index 0f0b808764a3..073af7a90d49 100644
--- a/cad/openvsp/distinfo
+++ b/cad/openvsp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489420424
-SHA256 (OpenVSP-OpenVSP-OpenVSP_3.11.0_GH0.tar.gz) = 29614785ce54742bf1aa532b8be332d15690b2e5c2e2583479e6f2946e57d9aa
-SIZE (OpenVSP-OpenVSP-OpenVSP_3.11.0_GH0.tar.gz) = 34013137
+TIMESTAMP = 1497963456
+SHA256 (OpenVSP-OpenVSP-OpenVSP_3.12.1_GH0.tar.gz) = 011b01878b77d296b8f4411a7a301aa3ca0eb1c6e443e7057a2657f487255323
+SIZE (OpenVSP-OpenVSP-OpenVSP_3.12.1_GH0.tar.gz) = 34090509
diff --git a/cad/openvsp/files/patch-src_util_SVGUtil.h b/cad/openvsp/files/patch-src_util_SVGUtil.h
deleted file mode 100644
index e4b601b9f434..000000000000
--- a/cad/openvsp/files/patch-src_util_SVGUtil.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/util/SVGUtil.h.orig 2017-03-13 15:54:25 UTC
-+++ src/util/SVGUtil.h
-@@ -14,7 +14,7 @@
- #include "Vec3d.h"
- #include "APIDefines.h"
- #include "BndBox.h"
--#include "XmlUtil.h"
-+#include "../xmlvsp/XmlUtil.h"
-
- #include <vector>
- #include <string>
diff --git a/cad/openvsp/pkg-plist b/cad/openvsp/pkg-plist
index f762d7ee2d8e..50e546fde87e 100644
--- a/cad/openvsp/pkg-plist
+++ b/cad/openvsp/pkg-plist
@@ -25,6 +25,7 @@ bin/vsp
bin/vspaero
bin/vspscript
bin/vspviewer
+matlab/OpenVSPParasiteDragPlotData.m
matlab/plotDegenPlate.m
matlab/plotDegenStick.m
matlab/plotDegenSurf.m
@@ -33,6 +34,7 @@ scripts/CreateEditGeom.vspscript
scripts/DegenGeom.vspscript
scripts/DumpResults.vspscript
scripts/Fuselage.vspscript
+scripts/ParasiteDragScriptTest.vspscript
scripts/SnapToDemo.vspscript
scripts/Stack.vspscript
scripts/SubSurface.vspscript
@@ -61,6 +63,8 @@ scripts/Wing.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