Attachment #169447 for bug #208904

Line 0 Link Here

(-)cad/openvsp/.vsptime (+1 lines)
	1	1460904388




# Created by: Fernando Apesteguia <fernando.apesteguia@gmail.com>
# $FreeBSD: head/cad/openvsp/Makefile 355278 2014-05-26 06:55:07Z bapt $

PORTNAME=	openvsp
PORTVERSION=	3.5.2
PORTREVISION=	0
PORTREVISION=	4
CATEGORIES=	cad
MASTER_SITES=	GH

MAINTAINER=	fernando.apesteguia@gmail.com
COMMENT=	Create a 3D model of an aircraft defined by engineering parameters

LICENSE_FILE=	${WRKSRC}/LICENSE
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BUILD_DEPENDS=	${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs \
		${LOCALBASE}/include/eli/code_eli.hpp:${PORTSDIR}/graphics/code-eli \
		${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm \
		${LOCALBASE}/include/eigen3/Eigen/Array:${PORTSDIR}/math/eigen3

LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
		libjpeg.so:${PORTSDIR}/graphics/jpeg \
		libdrm.so:${PORTSDIR}/graphics/libdrm \
		libpng16.so:${PORTSDIR}/graphics/png \
		libfreetype.so:${PORTSDIR}/print/freetype2 \
		libexpat.so:${PORTSDIR}/textproc/expat2 \
		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
		libGLEW.so:${PORTSDIR}/graphics/glew \
		libcpptest.so:${PORTSDIR}/devel/cpptest \

USE_GITHUB=	yes
GH_PROJECT=	OpenVSP
GH_ACCOUNT=	${GH_PROJECT}
GH_TAGNAME=	${GH_PROJECT}_${PORTVERSION}

WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}_${PORTVERSION}

CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
USES=		cmake:outsource compiler:gcc-c++11-lib
CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
		-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \
		-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 \
		-DVSP_USE_SYSTEM_GLEW:BOOLEAN=yes
USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \
		xinerama xrender xxf86vm
USE_GL=		glu
USE_GNOME=	libxml2
CFLAGS+=	-I${LOCALBASE}/include/openNURBS

BUILD_PREFIX=	OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-3.5.2-FreeBSD
PORTEXAMPLES=	*

OPTIONS_DEFINE=	EXAMPLES

do-install:
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin
	${MKDIR} ${STAGEDIR}${DATADIR}
.for d in CustomScripts airfoil matlab scripts textures
	(cd ${BUILD_WRKSRC}/${BUILD_PREFIX}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
.endfor
	
	${CP} ${BUILD_WRKSRC}/${BUILD_PREFIX}/LICENSE ${STAGEDIR}${DATADIR}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)cad/openvsp/distinfo (-2 / +2 lines)
1	SHA256 (OpenVSP-OpenVSP-OpenVSP_2.3.0_GH0.tar.gz) = e36d364fc4dd6bd3f994637fb67e1b2b2f06792620f151a61fbb75a6f4df8a2a	1	SHA256 (OpenVSP-OpenVSP-3.5.2-OpenVSP_3.5.2_GH0.tar.gz) = 0267d53fa88d5a1fae888131682cd7383b861680a3ed079597ad5b059e169d0e
2	SIZE (OpenVSP-OpenVSP-OpenVSP_2.3.0_GH0.tar.gz) = 2940780	2	SIZE (OpenVSP-OpenVSP-3.5.2-OpenVSP_3.5.2_GH0.tar.gz) = 27883392




--- Libraries/cmake/External_CMinpack.cmake.orig	2016-02-14 00:01:30 UTC
+++ Libraries/cmake/External_CMinpack.cmake
@@ -1,3 +1,6 @@
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lm -fPIC")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -lm -fPIC")
+
 ExternalProject_Add( CMINPACK
     URL ${CMAKE_CURRENT_SOURCE_DIR}/cminpack-1.3.3.tar.gz
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
@@ -8,4 +11,4 @@ ExternalProject_Add( CMINPACK
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 )
 ExternalProject_Get_Property( CMINPACK BINARY_DIR INSTALL_DIR )
-SET( CMINPACK_INSTALL_DIR ${INSTALL_DIR} )
\ No newline at end of file
+SET( CMINPACK_INSTALL_DIR ${INSTALL_DIR} )




--- Libraries/cmake/External_libIGES.cmake.orig	2016-02-14 00:01:30 UTC
+++ Libraries/cmake/External_libIGES.cmake
@@ -1,6 +1,9 @@
 
 #    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libIGES/
 
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+
 ExternalProject_Add( LIBIGES
     URL ${CMAKE_CURRENT_SOURCE_DIR}/libIGES-03f6ee919151.zip
 	CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}

Line 0 Link Here

(-)cad/openvsp/files/patch-src_cfd__mesh_CMakeLists.txt (+11 lines)
	1	--- src/cfd_mesh/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/cfd_mesh/CMakeLists.txt
	3	@@ -48,6 +48,8 @@ SurfPatch.h
	4	Tri.h
	5	)
	6
	7	+set_target_properties( cfd_mesh PROPERTIES COMPILE_FLAGS "-fPIC")
	8	+
	9	ADD_DEPENDENCIES( cfd_mesh
	10	util
	11	)




--- src/cmake/External_STEPCode.cmake.orig	2016-02-14 00:01:30 UTC
+++ src/cmake/External_STEPCode.cmake
@@ -8,6 +8,9 @@ ELSE()
     SET( SC_SHARED ON )
 ENDIF()
 
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+
 ExternalProject_Add( STEPCODE
 	URL ${CMAKE_CURRENT_SOURCE_DIR}/stepcode-7dcd6ef3418a.zip
 	CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -37,4 +40,4 @@ SET( STEPCODE_BINARY_DIR ${BINARY_DIR} )
 # Consequently, force Debug so it installs in ../sc-install directory
 # instead of /usr/local/lib.
 #
-# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF
\ No newline at end of file
+# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF




--- src/external/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
+++ src/external/CMakeLists.txt
@@ -8,6 +8,9 @@ FIND_PACKAGE(CPPTest REQUIRED)
 SET( CMAKE_PREFIX_PATH ${LIBXML2_INSTALL_DIR} ${ORIG_CMAKE_PREFIX_PATH} )
 FIND_PACKAGE(LibXml2 REQUIRED)
 
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+
 IF( NOT VSP_NO_GRAPHICS )
 	SET( CMAKE_PREFIX_PATH ${FLTK_INSTALL_DIR} ${ORIG_CMAKE_PREFIX_PATH} )
 	FIND_PACKAGE(FLTK REQUIRED)

Line 0 Link Here

(-)cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt (+11 lines)
	1	--- src/external/angelscript/sdk/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/external/angelscript/sdk/CMakeLists.txt
	3	@@ -127,6 +127,8 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINAR
	4	find_package(Threads)
	5	target_link_libraries(Angelscript ${CMAKE_THREAD_LIBS_INIT})
	6
	7	+set_target_properties( Angelscript PROPERTIES COMPILE_FLAGS "-fPIC")
	8	+
	9	if(MSVC)
	10	set_target_properties(Angelscript PROPERTIES COMPILE_FLAGS "/MP")
	11	endif(MSVC)

Line 0 Link Here

(-)cad/openvsp/files/patch-src_external_glfont2_CMakeLists.txt (+10 lines)
	1	--- src/external/glfont2/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/external/glfont2/CMakeLists.txt
	3	@@ -3,6 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
	4	SET(GLFONT2_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to glfont2 headers")
	5
	6	INCLUDE_DIRECTORIES( ${GLFONT2_INCLUDE_DIR}
	7	+ /usr/local/include
	8	)
	9
	10	ADD_LIBRARY( glfont2

Line 0 Link Here

(-)cad/openvsp/files/patch-src_external_sixseries_CMakeLists.txt (+8 lines)
	1	--- src/external/sixseries/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/external/sixseries/CMakeLists.txt
	3	@@ -10,3 +10,5 @@ s_copy.c
	4	s_stop.c
	5	f2c.h
	6	)
	7	+
	8	+set_target_properties( sixseries PROPERTIES COMPILE_FLAGS "-fPIC")

Line 0 Link Here

(-)cad/openvsp/files/patch-src_external_triangle_CMakeLists.txt (+11 lines)
	1	--- src/external/triangle/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/external/triangle/CMakeLists.txt
	3	@@ -9,6 +9,8 @@ triangle.c
	4	triangle.h
	5	)
	6
	7	+set_target_properties( triangle PROPERTIES COMPILE_FLAGS "-fPIC")
	8	+
	9	# set MS Visual Compiler flags
	10	IF(WIN32)
	11	SET_TARGET_PROPERTIES( triangle PROPERTIES COMPILE_FLAGS "-fp:strict")

Line 0 Link Here

(-)cad/openvsp/files/patch-src_external_tritri_CMakeLists.txt (+11 lines)
	1	--- src/external/tritri/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/external/tritri/CMakeLists.txt
	3	@@ -10,4 +10,6 @@ intersect_AABB.cpp
	4	intersect_triangle.cpp
	5	Tritri.cpp
	6	Tritri.h
	7	-)
	8	\ No newline at end of file
	9	+)
	10	+
	11	+set_target_properties( tritri PROPERTIES COMPILE_FLAGS "-fPIC")




--- src/fltk_screens/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
+++ src/fltk_screens/CMakeLists.txt
@@ -4,6 +4,9 @@ INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR}
 
 SET(SCREENS_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Path to FLTK generated *.h files")
 
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+
 FLTK_WRAP_UI( screens
 aboutScreen.fl
 awaveFlScreen.fl




--- src/geom_api/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
+++ src/geom_api/CMakeLists.txt
@@ -29,6 +29,8 @@ GuiInterface.h
 VSP_Geom_API.h
 )
 
+set_target_properties( geom_api PROPERTIES COMPILE_FLAGS "-fPIC")
+
 ADD_DEPENDENCIES( geom_api
 util
 )
@@ -49,7 +51,7 @@ IF( NOT VSP_NO_GRAPHICS )
 	util
 	)
 
-	set_target_properties( geom_api_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1")
+set_target_properties( geom_api_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1 -fPIC")
 
 	ADD_LIBRARY( gui_interface_g
 	GuiInterface.cpp
@@ -61,5 +63,5 @@ IF( NOT VSP_NO_GRAPHICS )
 	util
 	)
 
-	set_target_properties( gui_interface_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1")
+set_target_properties( gui_interface_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1 -fPIC")
 ENDIF()

Line 0 Link Here

(-)cad/openvsp/files/patch-src_geom__core_CMakeLists.txt (+11 lines)
	1	--- src/geom_core/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/geom_core/CMakeLists.txt
	3	@@ -116,6 +116,8 @@ XSecCurve.h
	4	XSecSurf.h
	5	)
	6
	7	+set_target_properties( geom_core PROPERTIES COMPILE_FLAGS "-fPIC")
	8	+
	9	ADD_DEPENDENCIES( geom_core
	10	util
	11	)




--- src/gui_and_draw/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
+++ src/gui_and_draw/CMakeLists.txt
@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES( 
     ${STEPCODE_INCLUDE_DIR}
     ${LIBIGES_INCLUDE_DIR}
     ${GUI_AND_DRAW_INCLUDE_DIR}
+    /usr/local/include
 )
 
 ADD_LIBRARY(gui_and_draw
@@ -130,6 +131,9 @@ VSPWindow.h
 WingScreen.h
 )
 
+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+
 ADD_DEPENDENCIES(gui_and_draw
 geom_core
 vsp_graphic

Line 0 Link Here

(-)cad/openvsp/files/patch-src_gui__and__draw_GroupLayout.h (+11 lines)
	1	--- src/gui_and_draw/GroupLayout.h.orig 2016-02-14 00:01:30 UTC
	2	+++ src/gui_and_draw/GroupLayout.h
	3	@@ -17,7 +17,7 @@
	4	#include <FL/Fl_Text_Editor.H>
	5	#include <FL/Fl_Radio_Button.H>
	6	#include <FL/Fl_Color_Chooser.H>
	7	-#include <FL/Fl_Sys_Menu_Bar.h>
	8	+#include <FL/Fl_Sys_Menu_Bar.H>
	9
	10	#include "GuiDevice.h"
	11

Line 0 Link Here

(-)cad/openvsp/files/patch-src_gui__and__draw_MainVSPScreen.h (+11 lines)
	1	--- src/gui_and_draw/MainVSPScreen.h.orig 2016-02-14 00:01:30 UTC
	2	+++ src/gui_and_draw/MainVSPScreen.h
	3	@@ -15,7 +15,7 @@
	4	#include "MenuItem.h"
	5	#include "ScreenBase.h"
	6	#include "GuiDevice.h"
	7	-#include "FL/Fl_Box.h"
	8	+#include "FL/Fl_Box.H"
	9
	10	namespace VSPGUI
	11	{

Line 0 Link Here

(-)cad/openvsp/files/patch-src_gui__and__draw_MenuItem.h (+11 lines)
	1	--- src/gui_and_draw/MenuItem.h.orig 2016-02-14 00:01:30 UTC
	2	+++ src/gui_and_draw/MenuItem.h
	3	@@ -10,7 +10,7 @@
	4	#define MENUITEM__INCLUDED_
	5
	6	#include <string>
	7	-#include <FL/Fl_Sys_Menu_Bar.h>
	8	+#include <FL/Fl_Sys_Menu_Bar.H>
	9
	10	class ScreenMgr;
	11	class ActionScreen;

Line 0 Link Here

(-)cad/openvsp/files/patch-src_util_CMakeLists.txt (+8 lines)
	1	--- src/util/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/util/CMakeLists.txt
	3	@@ -63,3 +63,5 @@ XferSurf.h
	4	ADD_DEPENDENCIES( util
	5	STEPCODE
	6	)
	7	+
	8	+set_target_properties( util PROPERTIES COMPILE_FLAGS "-fPIC")




Workaround for libc++, which declares std::array even if not in C++11 mode (see
ports/207253 for a bigger discussion).
--- src/util_code/array.h.orig	2016-02-25 10:29:49 UTC
+++ src/util_code/array.h
@@ -20,11 +20,12 @@
 #include <iostream>
 using namespace std;
 
+namespace openvsp {
+
 // Define Error Flags //
 #define BELOW_BOUNDS	0
 #define ABOVE_BOUNDS	1
 
-
 template<class Item_type>
 
 class array
@@ -328,5 +331,6 @@ void array<Item_type>::print_error_messa
 
 }
 
+}  // namespace openvsp
 
 #endif

Line 0 Link Here

(-)cad/openvsp/files/patch-src_vsp__aero_CMakeLists.txt (+10 lines)
	1	--- src/vsp_aero/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/vsp_aero/CMakeLists.txt
	3	@@ -1,4 +1,7 @@
	4	CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
	5
	6	+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
	7	+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
	8	+
	9	ADD_SUBDIRECTORY( solver )
	10	ADD_SUBDIRECTORY( viewer )




--- src/vsp_graphic/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
+++ src/vsp_graphic/CMakeLists.txt
@@ -4,6 +4,9 @@ SET(VSP_GRAPHIC_INCLUDE_DIR ${CMAKE_CURR
 
 set(GRAPHIC_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+
 FILE(GLOB_RECURSE GRAPHIC_HEADER ./include/*.h)
 FILE(GLOB_RECURSE GRAPHIC_SOURCE ./src/*.cpp)
 

Line 0 Link Here

(-)cad/openvsp/files/patch-src_vsp__graphic_src_Image.cpp (+10 lines)
	1	--- src/vsp_graphic/src/Image.cpp.orig 2016-02-14 00:01:30 UTC
	2	+++ src/vsp_graphic/src/Image.cpp
	3	@@ -1,6 +1,7 @@
	4	#include <assert.h>
	5	#include <MultiImageLoader.h>
	6	#include <algorithm>
	7	+#include <stdlib.h>
	8
	9	#include "Image.h"
	10

Line 0 Link Here

(-)cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp (+9 lines)
	1	--- src/vsp_graphic/src/Shader.cpp.orig 2016-02-14 00:01:30 UTC
	2	+++ src/vsp_graphic/src/Shader.cpp
	3	@@ -1,5 +1,6 @@
	4	#include <assert.h>
	5	#include <string>
	6	+#include <stdlib.h>
	7
	8	#include "Shader.h"
	9




Workaround for libc++, which declares std::array even if not in C++11 mode (see
ports/207253 for a bigger discussion).
--- src/vsp/af.cpp.orig	2016-02-25 10:34:17 UTC
+++ src/vsp/af.cpp
@@ -1744,7 +1744,7 @@ vec3d Af::get_rounded_end_cap(int index)
 void Af::invert_airfoil()
 {
   int i;
-  array <double> z;
+  openvsp::array <double> z;
   z.init(num_pnts);
 
   //===== Switch Upper and Lower Z values =====




Workaround for libc++, which declares std::array even if not in C++11 mode (see
ports/207253 for a bigger discussion).
--- src/vsp/havoc_geom.cpp.orig	2016-02-25 10:35:42 UTC
+++ src/vsp/havoc_geom.cpp
@@ -428,7 +428,7 @@ void Havoc_geom::generate_planform_curve
   
   //==== Find Xsec Locations ====// 
   int num_xsecs = havoc_num_xsecs - 3;
-  array< double > tmp_x;
+  openvsp::array< double > tmp_x;
   tmp_x.init ( num_xsecs );
   
   for ( i = 0 ; i < num_xsecs ; i++ )




Workaround for libc++, which declares std::array even if not in C++11 mode (see
ports/207253 for a bigger discussion).
--- src/vsp/havoc_geom.h.orig	2016-02-25 10:33:52 UTC
+++ src/vsp/havoc_geom.h
@@ -88,11 +88,11 @@ class Havoc_geom : public Geom
    int havoc_num_xsecs;
    int havoc_num_pnts;
    
-   array< double > x_locs;
-   array< double > left;
-   array< double > right;
-   array< double > upper;
-   array< double > lower;
+   openvsp::array< double > x_locs;
+   openvsp::array< double > left;
+   openvsp::array< double > right;
+   openvsp::array< double > upper;
+   openvsp::array< double > lower;
  
    Parm length;
    

Line 0 Link Here

(-)cad/openvsp/files/patch-src_xmlvsp_CMakeLists.txt (+9 lines)
	1	--- src/xmlvsp/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/xmlvsp/CMakeLists.txt
	3	@@ -14,3 +14,6 @@ XmlUtil.h
	4	XmlUtil.cpp
	5
	6	)
	7	+
	8	+set_target_properties( xmlvsp PROPERTIES COMPILE_FLAGS "-fPIC")
	9	+

Lines 1-10 Link Here

(-)cad/openvsp/files/patch-vsp-CMakeLists.txt (-10 lines)
1	--- src/vsp/CMakeLists.txt.orig 2014-08-08 15:23:12.000000000 +0200
2	+++ src/vsp/CMakeLists.txt 2014-08-08 15:23:59.000000000 +0200
3	@@ -216,6 +216,7 @@
4	${FLTK_LIBRARIES}
5	${OPENGL_LIBRARIES}
6	${OPENNURBS_LIBRARIES}
7	+ -pthread
8	)
9
10	INSTALL( TARGETS vsp RUNTIME DESTINATION . )

Lines 1-11 Link Here

(-)cad/openvsp/files/patch-xmlvsp-CMakeLists.txt (-11 lines)
1	--- /home/fernape/porting/openvsp/original/OpenVSP_2.0_community_src/src/xmlvsp/CMakeLists.txt 2012-04-04 21:03:54.000000000 +0200
2	+++ src/xmlvsp/CMakeLists.txt 2012-04-04 20:29:08.000000000 +0200
3	@@ -2,7 +2,7 @@
4
5	FIND_PACKAGE(LibXml2 REQUIRED)
6
7	-INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR})
8	+INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} /usr/local/include)
9
10	SET(XMLVSP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to XML wrapper header.")
11




bin/vsp
bin/vspaero
bin/vspscript
bin/vspviewer
%%DATADIR%%/23015.af
%%DATADIR%%/Box.vsppart
%%DATADIR%%/BoxGroup.vsppart
%%DATADIR%%/CFDMesh.vspscript
%%DATADIR%%/Cone.vsppart
%%DATADIR%%/CreateEditGeom.vspscript
%%DATADIR%%/DegenGeom.vspscript
%%DATADIR%%/Disk.vsppart
%%DATADIR%%/Duct.vsppart
%%DATADIR%%/Fuselage.vspscript
%%DATADIR%%/LICENSE
%%DATADIR%%/N0012_VSP.af
%%DATADIR%%/N0012_VSP_sym.af
%%DATADIR%%/OnOffExample.vsppart
%%DATADIR%%/PodMan.vsppart
%%DATADIR%%/Seat.vsppart
%%DATADIR%%/SeatGroup.vsppart
%%DATADIR%%/SharkTeeth.tga
%%DATADIR%%/Stack.vspscript
%%DATADIR%%/SubSurface.vspscript
%%DATADIR%%/TestAll.vspscript
%%DATADIR%%/TransportFuse.vsppart
%%DATADIR%%/Wing.vspscript
%%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%%/window.tga

Return to bug 208904

Lines 1-11 Link Here

(-)cad/openvsp/Makefile (-16 / +35 lines)
1	# Created by: Fernando Apesteguia <fernando.apesteguia@gmail.com>	1	# Created by: Fernando Apesteguia <fernando.apesteguia@gmail.com>
2	# $FreeBSD: head/cad/openvsp/Makefile 395630 2015-08-30 17:41:23Z rakuco $	2	# $FreeBSD: head/cad/openvsp/Makefile 355278 2014-05-26 06:55:07Z bapt $
3		3
4	PORTNAME= openvsp	4	PORTNAME= openvsp
5	PORTVERSION= 2.3.0	5	PORTVERSION= 3.5.2
6	DISTVERSIONPREFIX= ${GH_PROJECT}_	6	PORTREVISION= 0
7	PORTREVISION= 4
8	CATEGORIES= cad	7	CATEGORIES= cad
		8	MASTER_SITES= GH
9		9
10	MAINTAINER= fernando.apesteguia@gmail.com	10	MAINTAINER= fernando.apesteguia@gmail.com
11	COMMENT= Create a 3D model of an aircraft defined by engineering parameters	11	COMMENT= Create a 3D model of an aircraft defined by engineering parameters
Lines 15-49 Link Here
15	LICENSE_FILE= ${WRKSRC}/LICENSE	15	LICENSE_FILE= ${WRKSRC}/LICENSE
16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
17		17
18	BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs	18	BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs \
		19	${LOCALBASE}/include/eli/code_eli.hpp:${PORTSDIR}/graphics/code-eli \
		20	${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm \
		21	${LOCALBASE}/include/eigen3/Eigen/Array:${PORTSDIR}/math/eigen3
		22
19	LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \	23	LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
		24	libjpeg.so:${PORTSDIR}/graphics/jpeg \
20	libdrm.so:${PORTSDIR}/graphics/libdrm \	25	libdrm.so:${PORTSDIR}/graphics/libdrm \
21	libpng.so:${PORTSDIR}/graphics/png \	26	libpng16.so:${PORTSDIR}/graphics/png \
22	libfreetype.so:${PORTSDIR}/print/freetype2 \	27	libfreetype.so:${PORTSDIR}/print/freetype2 \
23	libexpat.so:${PORTSDIR}/textproc/expat2 \	28	libexpat.so:${PORTSDIR}/textproc/expat2 \
24	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \	29	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
25	libfltk.so:${PORTSDIR}/x11-toolkits/fltk	30	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
		31	libGLEW.so:${PORTSDIR}/graphics/glew \
		32	libcpptest.so:${PORTSDIR}/devel/cpptest \
26		33
27	USE_GITHUB= yes	34	USE_GITHUB= yes
28	GH_PROJECT= OpenVSP	35	GH_PROJECT= OpenVSP
29	GH_ACCOUNT= ${GH_PROJECT}	36	GH_ACCOUNT= ${GH_PROJECT}
		37	GH_TAGNAME= ${GH_PROJECT}_${PORTVERSION}
		38
		39	WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}_${PORTVERSION}
30		40
31	CMAKE_SOURCE_PATH= ${WRKSRC}/src	41	CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject
32	USES= cmake:outsource dos2unix jpeg	42	USES= cmake:outsource compiler:gcc-c++11-lib
		43	CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
		44	-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \
		45	-DVSP_USE_SYSTEM_LIBXML2:BOOLEAN=yes \
		46	-DVSP_USE_SYSTEM_EIGEN:BOOLEAN=yes \
		47	-DVSP_USE_SYSTEM_FLTK:boolean=yes \
		48	-DVSP_USE_SYSTEM_CMINPACK:boolean=no \
		49	-DVSP_USE_SYSTEM_GLM:BOOLEAN=yes \
		50	-DVSP_USE_SYSTEM_GLEW:BOOLEAN=yes
33	USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \	51	USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \
34	xinerama xrender xxf86vm	52	xinerama xrender xxf86vm
35	USE_GL= glu	53	USE_GL= glu
36	USE_GNOME= libxml2	54	USE_GNOME= libxml2
37	CFLAGS+= -I${LOCALBASE}/include/openNURBS	55	CFLAGS+= -I${LOCALBASE}/include/openNURBS
38		56
39	PLIST_FILES= bin/vsp	57	BUILD_PREFIX= OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-3.5.2-FreeBSD
40	PORTEXAMPLES= *
41
42	OPTIONS_DEFINE= EXAMPLES
43		58
44	do-install:	59	do-install:
45	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/vsp/vsp ${STAGEDIR}${PREFIX}/bin	60	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin
46	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	61	${MKDIR} ${STAGEDIR}${DATADIR}
47	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})	62	.for d in CustomScripts airfoil matlab scripts textures
		63	(cd ${BUILD_WRKSRC}/${BUILD_PREFIX}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
		64	.endfor
		65
		66	${CP} ${BUILD_WRKSRC}/${BUILD_PREFIX}/LICENSE ${STAGEDIR}${DATADIR}
48		67
49	.include <bsd.port.mk>	68	.include <bsd.port.mk>

Line 0 Link Here

(-)cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake (+16 lines)
	1	--- Libraries/cmake/External_CMinpack.cmake.orig 2016-02-14 00:01:30 UTC
	2	+++ Libraries/cmake/External_CMinpack.cmake
	3	@@ -1,3 +1,6 @@
	4	+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lm -fPIC")
	5	+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -lm -fPIC")
	6	+
	7	ExternalProject_Add( CMINPACK
	8	URL ${CMAKE_CURRENT_SOURCE_DIR}/cminpack-1.3.3.tar.gz
	9	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
	10	@@ -8,4 +11,4 @@ ExternalProject_Add( CMINPACK
	11	-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
	12	)
	13	ExternalProject_Get_Property( CMINPACK BINARY_DIR INSTALL_DIR )
	14	-SET( CMINPACK_INSTALL_DIR ${INSTALL_DIR} )
	15	\ No newline at end of file
	16	+SET( CMINPACK_INSTALL_DIR ${INSTALL_DIR} )

Line 0 Link Here

(-)cad/openvsp/files/patch-Libraries_cmake_External__libIGES.cmake (+12 lines)
	1	--- Libraries/cmake/External_libIGES.cmake.orig 2016-02-14 00:01:30 UTC
	2	+++ Libraries/cmake/External_libIGES.cmake
	3	@@ -1,6 +1,9 @@
	4
	5	# SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libIGES/
	6
	7	+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
	8	+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
	9	+
	10	ExternalProject_Add( LIBIGES
	11	URL ${CMAKE_CURRENT_SOURCE_DIR}/libIGES-03f6ee919151.zip
	12	CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}

Line 0 Link Here

(-)cad/openvsp/files/patch-src_cmake_External__STEPCode.cmake (+19 lines)
	1	--- src/cmake/External_STEPCode.cmake.orig 2016-02-14 00:01:30 UTC
	2	+++ src/cmake/External_STEPCode.cmake
	3	@@ -8,6 +8,9 @@ ELSE()
	4	SET( SC_SHARED ON )
	5	ENDIF()
	6
	7	+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
	8	+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
	9	+
	10	ExternalProject_Add( STEPCODE
	11	URL ${CMAKE_CURRENT_SOURCE_DIR}/stepcode-7dcd6ef3418a.zip
	12	CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
	13	@@ -37,4 +40,4 @@ SET( STEPCODE_BINARY_DIR ${BINARY_DIR} )
	14	# Consequently, force Debug so it installs in ../sc-install directory
	15	# instead of /usr/local/lib.
	16	#
	17	-# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF
	18	\ No newline at end of file
	19	+# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF

Line 0 Link Here

(-)cad/openvsp/files/patch-src_external_CMakeLists.txt (+12 lines)
	1	--- src/external/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/external/CMakeLists.txt
	3	@@ -8,6 +8,9 @@ FIND_PACKAGE(CPPTest REQUIRED)
	4	SET( CMAKE_PREFIX_PATH ${LIBXML2_INSTALL_DIR} ${ORIG_CMAKE_PREFIX_PATH} )
	5	FIND_PACKAGE(LibXml2 REQUIRED)
	6
	7	+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
	8	+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
	9	+
	10	IF( NOT VSP_NO_GRAPHICS )
	11	SET( CMAKE_PREFIX_PATH ${FLTK_INSTALL_DIR} ${ORIG_CMAKE_PREFIX_PATH} )
	12	FIND_PACKAGE(FLTK REQUIRED)

Line 0 Link Here

(-)cad/openvsp/files/patch-src_fltk__screens_CMakeLists.txt (+12 lines)
	1	--- src/fltk_screens/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/fltk_screens/CMakeLists.txt
	3	@@ -4,6 +4,9 @@ INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR}
	4
	5	SET(SCREENS_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Path to FLTK generated *.h files")
	6
	7	+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
	8	+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
	9	+
	10	FLTK_WRAP_UI( screens
	11	aboutScreen.fl
	12	awaveFlScreen.fl

Line 0 Link Here

(-)cad/openvsp/files/patch-src_geom__api_CMakeLists.txt (+27 lines)
	1	--- src/geom_api/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/geom_api/CMakeLists.txt
	3	@@ -29,6 +29,8 @@ GuiInterface.h
	4	VSP_Geom_API.h
	5	)
	6
	7	+set_target_properties( geom_api PROPERTIES COMPILE_FLAGS "-fPIC")
	8	+
	9	ADD_DEPENDENCIES( geom_api
	10	util
	11	)
	12	@@ -49,7 +51,7 @@ IF( NOT VSP_NO_GRAPHICS )
	13	util
	14	)
	15
	16	- set_target_properties( geom_api_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1")
	17	+set_target_properties( geom_api_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1 -fPIC")
	18
	19	ADD_LIBRARY( gui_interface_g
	20	GuiInterface.cpp
	21	@@ -61,5 +63,5 @@ IF( NOT VSP_NO_GRAPHICS )
	22	util
	23	)
	24
	25	- set_target_properties( gui_interface_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1")
	26	+set_target_properties( gui_interface_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1 -fPIC")
	27	ENDIF()

Line 0 Link Here

(-)cad/openvsp/files/patch-src_gui__and__draw_CMakeLists.txt (+20 lines)
	1	--- src/gui_and_draw/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/gui_and_draw/CMakeLists.txt
	3	@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES(
	4	${STEPCODE_INCLUDE_DIR}
	5	${LIBIGES_INCLUDE_DIR}
	6	${GUI_AND_DRAW_INCLUDE_DIR}
	7	+ /usr/local/include
	8	)
	9
	10	ADD_LIBRARY(gui_and_draw
	11	@@ -130,6 +131,9 @@ VSPWindow.h
	12	WingScreen.h
	13	)
	14
	15	+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
	16	+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
	17	+
	18	ADD_DEPENDENCIES(gui_and_draw
	19	geom_core
	20	vsp_graphic

Lines 1-25 Link Here

(-)cad/openvsp/files/patch-src_util__code_array.h (-25 lines)
1	Workaround for libc++, which declares std::array even if not in C++11 mode (see
2	ports/207253 for a bigger discussion).
3	--- src/util_code/array.h.orig 2016-02-25 10:29:49 UTC
4	+++ src/util_code/array.h
5	@@ -20,11 +20,12 @@
6	#include <iostream>
7	using namespace std;
8
9	+namespace openvsp {
10	+
11	// Define Error Flags //
12	#define BELOW_BOUNDS 0
13	#define ABOVE_BOUNDS 1
14
15	-
16	template<class Item_type>
17
18	class array
19	@@ -328,5 +331,6 @@ void array<Item_type>::print_error_messa
20
21	}
22
23	+} // namespace openvsp
24
25	#endif

Line 0 Link Here

(-)cad/openvsp/files/patch-src_vsp__graphic_CMakeLists.txt (+12 lines)
	1	--- src/vsp_graphic/CMakeLists.txt.orig 2016-02-14 00:01:30 UTC
	2	+++ src/vsp_graphic/CMakeLists.txt
	3	@@ -4,6 +4,9 @@ SET(VSP_GRAPHIC_INCLUDE_DIR ${CMAKE_CURR
	4
	5	set(GRAPHIC_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include)
	6
	7	+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
	8	+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
	9	+
	10	FILE(GLOB_RECURSE GRAPHIC_HEADER ./include/*.h)
	11	FILE(GLOB_RECURSE GRAPHIC_SOURCE ./src/*.cpp)
	12

Lines 1-13 Link Here

(-)cad/openvsp/files/patch-src_vsp_af.cpp (-13 lines)
1	Workaround for libc++, which declares std::array even if not in C++11 mode (see
2	ports/207253 for a bigger discussion).
3	--- src/vsp/af.cpp.orig 2016-02-25 10:34:17 UTC
4	+++ src/vsp/af.cpp
5	@@ -1744,7 +1744,7 @@ vec3d Af::get_rounded_end_cap(int index)
6	void Af::invert_airfoil()
7	{
8	int i;
9	- array <double> z;
10	+ openvsp::array <double> z;
11	z.init(num_pnts);
12
13	//===== Switch Upper and Lower Z values =====

Lines 1-13 Link Here

(-)cad/openvsp/files/patch-src_vsp_havoc__geom.cpp (-13 lines)
1	Workaround for libc++, which declares std::array even if not in C++11 mode (see
2	ports/207253 for a bigger discussion).
3	--- src/vsp/havoc_geom.cpp.orig 2016-02-25 10:35:42 UTC
4	+++ src/vsp/havoc_geom.cpp
5	@@ -428,7 +428,7 @@ void Havoc_geom::generate_planform_curve
6
7	//==== Find Xsec Locations ====//
8	int num_xsecs = havoc_num_xsecs - 3;
9	- array< double > tmp_x;
10	+ openvsp::array< double > tmp_x;
11	tmp_x.init ( num_xsecs );
12
13	for ( i = 0 ; i < num_xsecs ; i++ )

Line 0 Link Here

(-)cad/openvsp/pkg-plist (+41 lines)
	1	bin/vsp
	2	bin/vspaero
	3	bin/vspscript
	4	bin/vspviewer
	5	%%DATADIR%%/23015.af
	6	%%DATADIR%%/Box.vsppart
	7	%%DATADIR%%/BoxGroup.vsppart
	8	%%DATADIR%%/CFDMesh.vspscript
	9	%%DATADIR%%/Cone.vsppart
	10	%%DATADIR%%/CreateEditGeom.vspscript
	11	%%DATADIR%%/DegenGeom.vspscript
	12	%%DATADIR%%/Disk.vsppart
	13	%%DATADIR%%/Duct.vsppart
	14	%%DATADIR%%/Fuselage.vspscript
	15	%%DATADIR%%/LICENSE
	16	%%DATADIR%%/N0012_VSP.af
	17	%%DATADIR%%/N0012_VSP_sym.af
	18	%%DATADIR%%/OnOffExample.vsppart
	19	%%DATADIR%%/PodMan.vsppart
	20	%%DATADIR%%/Seat.vsppart
	21	%%DATADIR%%/SeatGroup.vsppart
	22	%%DATADIR%%/SharkTeeth.tga
	23	%%DATADIR%%/Stack.vspscript
	24	%%DATADIR%%/SubSurface.vspscript
	25	%%DATADIR%%/TestAll.vspscript
	26	%%DATADIR%%/TransportFuse.vsppart
	27	%%DATADIR%%/Wing.vspscript
	28	%%DATADIR%%/b737a.af
	29	%%DATADIR%%/b737b.af
	30	%%DATADIR%%/b737c.af
	31	%%DATADIR%%/b737d.af
	32	%%DATADIR%%/clarky_Lednicer.dat
	33	%%DATADIR%%/e205_Selig.dat
	34	%%DATADIR%%/n0012.dat
	35	%%DATADIR%%/nasa-logo.tga
	36	%%DATADIR%%/plotDegenPlate.m
	37	%%DATADIR%%/plotDegenStick.m
	38	%%DATADIR%%/plotDegenSurf.m
	39	%%DATADIR%%/redbluearrow.tga
	40	%%DATADIR%%/sc2_0404.af
	41	%%DATADIR%%/window.tga