9 files changed, 88 insertions, 5 deletions

diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile
index 7b218b5d5792..2baddb51d34b 100644
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openvsp
-PORTVERSION=	3.8.1
+PORTVERSION=	3.9.0
 DISTVERSIONPREFIX=	${GH_PROJECT}_
 CATEGORIES=	cad
 MASTER_SITES=	GH
diff --git a/cad/openvsp/distinfo b/cad/openvsp/distinfo
index 625ac873eaec..0b68e927e456 100644
--- a/cad/openvsp/distinfo
+++ b/cad/openvsp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470080361
-SHA256 (OpenVSP-OpenVSP-OpenVSP_3.8.1_GH0.tar.gz) = 107d2f6f18817fa5f690f60bc2799418469862ff374963a6a559f6b755df3416
-SIZE (OpenVSP-OpenVSP-OpenVSP_3.8.1_GH0.tar.gz) = 32679615
+TIMESTAMP = 1472060174
+SHA256 (OpenVSP-OpenVSP-OpenVSP_3.9.0_GH0.tar.gz) = 582efa843ecd46543950a8faac9c4c1274f0d897d31eef0bef887795d91142d3
+SIZE (OpenVSP-OpenVSP-OpenVSP_3.9.0_GH0.tar.gz) = 32750881
diff --git a/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake b/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake
index 92658ee88a3e..c8381ad07afb 100644
--- a/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake
+++ b/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake
@@ -1,4 +1,4 @@
---- Libraries/cmake/External_CMinpack.cmake.orig	2016-02-14 00:01:30 UTC
+--- Libraries/cmake/External_CMinpack.cmake.orig	2016-08-21 15:22:39 UTC
 +++ Libraries/cmake/External_CMinpack.cmake
 @@ -1,3 +1,6 @@
 +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lm -fPIC")
diff --git a/cad/openvsp/files/patch-src_vsp__aero_viewer_ContourLevel.fl b/cad/openvsp/files/patch-src_vsp__aero_viewer_ContourLevel.fl
new file mode 100644
index 000000000000..b16c6e027cfb
--- /dev/null
+++ b/cad/openvsp/files/patch-src_vsp__aero_viewer_ContourLevel.fl
@@ -0,0 +1,11 @@
+--- src/vsp_aero/viewer/ContourLevel.fl.orig	2016-08-21 15:22:39 UTC
++++ src/vsp_aero/viewer/ContourLevel.fl
+@@ -12,7 +12,7 @@ class ContourLevelUserInterface {open
+     Fl_Window MainWindow {
+       label {Set Contour Levels} open
+       xywh {603 165 297 144} align 129
+-      code0 {\#include "ContourLevel.H"}
++      code0 {\#include "ContourLevel.h"}
+       code1 {\#include "glviewer.H"} visible
+     } {
+       Fl_Button Reset {
diff --git a/cad/openvsp/files/patch-src_vsp__aero_viewer_CuttingPlane.fl b/cad/openvsp/files/patch-src_vsp__aero_viewer_CuttingPlane.fl
new file mode 100644
index 000000000000..ce20ff4f25da
--- /dev/null
+++ b/cad/openvsp/files/patch-src_vsp__aero_viewer_CuttingPlane.fl
@@ -0,0 +1,11 @@
+--- src/vsp_aero/viewer/CuttingPlane.fl.orig	2016-08-21 15:22:39 UTC
++++ src/vsp_aero/viewer/CuttingPlane.fl
+@@ -9,7 +9,7 @@ class CuttingPlaneUserInterface {open
+     Fl_Window MainWindow {
+       label {Cutting Plane} open
+       xywh {525 164 297 106} type Double align 129
+-      code0 {\#include "ContourLevel.H"}
++      code0 {\#include "ContourLevel.h"}
+       code1 {\#include "glviewer.H"} visible
+     } {
+       Fl_Value_Input CuttingPlaneValue {
diff --git a/cad/openvsp/files/patch-src_vsp__aero_viewer_glviewer.H b/cad/openvsp/files/patch-src_vsp__aero_viewer_glviewer.H
new file mode 100644
index 000000000000..942e241a4080
--- /dev/null
+++ b/cad/openvsp/files/patch-src_vsp__aero_viewer_glviewer.H
@@ -0,0 +1,11 @@
+--- src/vsp_aero/viewer/glviewer.H.orig	2016-08-21 15:22:39 UTC
++++ src/vsp_aero/viewer/glviewer.H
+@@ -36,7 +36,7 @@
+ #include "utils.H"
+ #include "glf.H"
+ #include "binaryio.H"
+-#include "viewerUI.H"
++#include "viewerUI.h"
+ //#include "tiffio.h"
+ #include "TagList.H"
+ #include "TagListGroup.H"
diff --git a/cad/openvsp/files/patch-src_vsp__aero_viewer_viewerUI.fl b/cad/openvsp/files/patch-src_vsp__aero_viewer_viewerUI.fl
new file mode 100644
index 000000000000..fd85c1619b21
--- /dev/null
+++ b/cad/openvsp/files/patch-src_vsp__aero_viewer_viewerUI.fl
@@ -0,0 +1,35 @@
+--- src/vsp_aero/viewer/viewerUI.fl.orig	2016-08-21 15:22:39 UTC
++++ src/vsp_aero/viewer/viewerUI.fl
+@@ -324,28 +324,28 @@ glviewer->redraw();}
+ CL = new ContourLevelUserInterface;
+ CL->show(glviewer);}
+           xywh {10 10 100 20} divider
+-          code0 {\#include "ContourLevel.H"}
++          code0 {\#include "ContourLevel.h"}
+         }
+         MenuItem OptionsMenuUseSmoothFunctionShading {
+           label {Use Smooth Function Shading}
+           callback {glviewer->DrawSmoothFunctionsWasPicked();
+ glviewer->redraw();}
+           xywh {40 40 100 20} type Toggle divider
+-          code0 {\#include "ContourLevel.H"}
++          code0 {\#include "ContourLevel.h"}
+         }
+         MenuItem OptionsMenuUseFlatShading {
+           label {Use Flat Shading}
+           callback {glviewer->DrawFlatShadedWasPicked();
+ glviewer->redraw();}
+           xywh {40 40 100 20} type Toggle divider
+-          code0 {\#include "ContourLevel.H"}
++          code0 {\#include "ContourLevel.h"}
+         }
+         MenuItem OptionsMenuDrawWakesToInfinity {
+           label {Draw Wakes To Infinity}
+           callback {glviewer->DrawWakesToInfinityWasPicked();
+ glviewer->redraw();}
+           xywh {50 50 100 20} type Toggle divider
+-          code0 {\#include "ContourLevel.H"}
++          code0 {\#include "ContourLevel.h"}
+         }
+       }
+       Fl_Button KeyboardControlInfoButton {
diff --git a/cad/openvsp/files/patch-src_vsp__aero_viewer_vspaero__viewer.C b/cad/openvsp/files/patch-src_vsp__aero_viewer_vspaero__viewer.C
new file mode 100644
index 000000000000..9443ef88f5e6
--- /dev/null
+++ b/cad/openvsp/files/patch-src_vsp__aero_viewer_vspaero__viewer.C
@@ -0,0 +1,11 @@
+--- src/vsp_aero/viewer/vspaero_viewer.C.orig	2016-08-24 17:53:16 UTC
++++ src/vsp_aero/viewer/vspaero_viewer.C
+@@ -8,7 +8,7 @@
+ #include <stdio.h>
+ //#include <config.h>
+ #include <FL/Fl.H>
+-#include "viewerUI.H"
++#include "viewerUI.h"
+ 
+ int ForceView = 0;
+ int TimeStamp = 0;
diff --git a/cad/openvsp/pkg-plist b/cad/openvsp/pkg-plist
index 17961cfe399d..627f9167294d 100644
--- a/cad/openvsp/pkg-plist
+++ b/cad/openvsp/pkg-plist
@@ -38,7 +38,9 @@ scripts/Stack.vspscript
 scripts/SubSurface.vspscript
 scripts/TestAll.vspscript
 scripts/TestAnalysis.vspscript
+scripts/TestAnalysisVSPAERO.vspscript
 scripts/TestAreaProj.vspscript
+scripts/TestDXF.vspscript
 scripts/Wing.vspscript
 %%DATADIR%%/23015.af
 %%DATADIR%%/Box.vsppart
@@ -64,7 +66,9 @@ scripts/Wing.vspscript
 %%DATADIR%%/SubSurface.vspscript
 %%DATADIR%%/TestAll.vspscript
 %%DATADIR%%/TestAnalysis.vspscript
+%%DATADIR%%/TestAnalysisVSPAERO.vspscript
 %%DATADIR%%/TestAreaProj.vspscript
+%%DATADIR%%/TestDXF.vspscript
 %%DATADIR%%/TransportFuse.vsppart
 %%DATADIR%%/Wing.vspscript
 %%DATADIR%%/b737a.af