Attachment 169447 Details for Bug 208904 – Patch to the ports tree

[patch] Patch to the ports tree

update-3.5.2.patch.txt (text/plain), 26.61 KB, created by Fernando Apesteguía on 2016-04-18 17:42:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2016-04-18 17:42:49 UTC

Size: 26.61 KB

patch

obsolete

>diff -ruN /usr/ports/cad/openvsp/.vsptime cad/openvsp/.vsptime
>--- /usr/ports/cad/openvsp/.vsptime	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/.vsptime	2016-04-17 16:46:28.971340000 +0200
>@@ -0,0 +1 @@
>+1460904388
>\ No newline at end of file
>diff -ruN /usr/ports/cad/openvsp/Makefile cad/openvsp/Makefile
>--- /usr/ports/cad/openvsp/Makefile	2015-08-30 19:41:23.000000000 +0200
>+++ cad/openvsp/Makefile	2016-04-17 21:03:48.572479000 +0200
>@@ -1,11 +1,11 @@
> # Created by: Fernando Apesteguia <fernando.apesteguia@gmail.com>
>-# $FreeBSD: head/cad/openvsp/Makefile 395630 2015-08-30 17:41:23Z rakuco $
>+# $FreeBSD: head/cad/openvsp/Makefile 355278 2014-05-26 06:55:07Z bapt $
> 
> PORTNAME=	openvsp
>-PORTVERSION=	2.3.0
>-DISTVERSIONPREFIX=	${GH_PROJECT}_
>-PORTREVISION=	4
>+PORTVERSION=	3.5.2
>+PORTREVISION=	0
> CATEGORIES=	cad
>+MASTER_SITES=	GH
> 
> MAINTAINER=	fernando.apesteguia@gmail.com
> COMMENT=	Create a 3D model of an aircraft defined by engineering parameters
>@@ -15,35 +15,54 @@
> 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
>+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 \
>-		libpng.so:${PORTSDIR}/graphics/png \
>+		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
>+		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}/src
>-USES=		cmake:outsource dos2unix jpeg
>+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
> 
>-PLIST_FILES=	bin/vsp
>-PORTEXAMPLES=	*
>-
>-OPTIONS_DEFINE=	EXAMPLES
>+BUILD_PREFIX=	OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-3.5.2-FreeBSD
> 
> do-install:
>-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/vsp/vsp ${STAGEDIR}${PREFIX}/bin
>-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
>+	${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>
>diff -ruN /usr/ports/cad/openvsp/distinfo cad/openvsp/distinfo
>--- /usr/ports/cad/openvsp/distinfo	2015-05-30 23:25:06.000000000 +0200
>+++ cad/openvsp/distinfo	2016-03-18 20:16:33.348044000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (OpenVSP-OpenVSP-OpenVSP_2.3.0_GH0.tar.gz) = e36d364fc4dd6bd3f994637fb67e1b2b2f06792620f151a61fbb75a6f4df8a2a
>-SIZE (OpenVSP-OpenVSP-OpenVSP_2.3.0_GH0.tar.gz) = 2940780
>+SHA256 (OpenVSP-OpenVSP-3.5.2-OpenVSP_3.5.2_GH0.tar.gz) = 0267d53fa88d5a1fae888131682cd7383b861680a3ed079597ad5b059e169d0e
>+SIZE (OpenVSP-OpenVSP-3.5.2-OpenVSP_3.5.2_GH0.tar.gz) = 27883392
>diff -ruN /usr/ports/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake
>--- /usr/ports/cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-Libraries_cmake_External__CMinpack.cmake	2016-04-17 16:15:49.779588000 +0200
>@@ -0,0 +1,16 @@
>+--- 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} )
>diff -ruN /usr/ports/cad/openvsp/files/patch-Libraries_cmake_External__libIGES.cmake cad/openvsp/files/patch-Libraries_cmake_External__libIGES.cmake
>--- /usr/ports/cad/openvsp/files/patch-Libraries_cmake_External__libIGES.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-Libraries_cmake_External__libIGES.cmake	2016-04-17 16:15:49.784835000 +0200
>@@ -0,0 +1,12 @@
>+--- 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}
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_cfd__mesh_CMakeLists.txt cad/openvsp/files/patch-src_cfd__mesh_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_cfd__mesh_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_cfd__mesh_CMakeLists.txt	2016-04-17 16:15:49.790291000 +0200
>@@ -0,0 +1,11 @@
>+--- src/cfd_mesh/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/cfd_mesh/CMakeLists.txt
>+@@ -48,6 +48,8 @@ SurfPatch.h
>+ Tri.h
>+ )
>+ 
>++set_target_properties( cfd_mesh PROPERTIES COMPILE_FLAGS "-fPIC")
>++
>+ ADD_DEPENDENCIES( cfd_mesh
>+ util
>+ )
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_cmake_External__STEPCode.cmake cad/openvsp/files/patch-src_cmake_External__STEPCode.cmake
>--- /usr/ports/cad/openvsp/files/patch-src_cmake_External__STEPCode.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_cmake_External__STEPCode.cmake	2016-04-17 16:15:49.797065000 +0200
>@@ -0,0 +1,19 @@
>+--- 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
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_external_CMakeLists.txt cad/openvsp/files/patch-src_external_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_external_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_external_CMakeLists.txt	2016-04-17 16:15:49.802411000 +0200
>@@ -0,0 +1,12 @@
>+--- 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)
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt	2016-04-17 16:15:49.807762000 +0200
>@@ -0,0 +1,11 @@
>+--- src/external/angelscript/sdk/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/external/angelscript/sdk/CMakeLists.txt
>+@@ -127,6 +127,8 @@ set(LIBRARY_OUTPUT_PATH  ${PROJECT_BINAR
>+ find_package(Threads)
>+ target_link_libraries(Angelscript ${CMAKE_THREAD_LIBS_INIT})
>+ 
>++set_target_properties( Angelscript PROPERTIES COMPILE_FLAGS "-fPIC")
>++
>+ if(MSVC)
>+         set_target_properties(Angelscript PROPERTIES COMPILE_FLAGS "/MP")
>+ endif(MSVC)
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_external_glfont2_CMakeLists.txt cad/openvsp/files/patch-src_external_glfont2_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_external_glfont2_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_external_glfont2_CMakeLists.txt	2016-04-17 16:15:49.813079000 +0200
>@@ -0,0 +1,10 @@
>+--- src/external/glfont2/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/external/glfont2/CMakeLists.txt
>+@@ -3,6 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
>+ SET(GLFONT2_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to glfont2 headers")
>+ 
>+ INCLUDE_DIRECTORIES( ${GLFONT2_INCLUDE_DIR}
>++	/usr/local/include
>+ )
>+ 
>+ ADD_LIBRARY( glfont2
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_external_sixseries_CMakeLists.txt cad/openvsp/files/patch-src_external_sixseries_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_external_sixseries_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_external_sixseries_CMakeLists.txt	2016-04-17 16:15:49.818577000 +0200
>@@ -0,0 +1,8 @@
>+--- src/external/sixseries/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/external/sixseries/CMakeLists.txt
>+@@ -10,3 +10,5 @@ s_copy.c
>+ s_stop.c
>+ f2c.h
>+ )
>++
>++set_target_properties( sixseries PROPERTIES COMPILE_FLAGS "-fPIC")
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_external_triangle_CMakeLists.txt cad/openvsp/files/patch-src_external_triangle_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_external_triangle_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_external_triangle_CMakeLists.txt	2016-04-17 16:15:49.823892000 +0200
>@@ -0,0 +1,11 @@
>+--- src/external/triangle/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/external/triangle/CMakeLists.txt
>+@@ -9,6 +9,8 @@ triangle.c
>+ triangle.h
>+ )
>+ 
>++set_target_properties( triangle PROPERTIES COMPILE_FLAGS "-fPIC")
>++
>+ # set MS Visual Compiler flags
>+ IF(WIN32)
>+   SET_TARGET_PROPERTIES( triangle PROPERTIES COMPILE_FLAGS "-fp:strict")
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_external_tritri_CMakeLists.txt cad/openvsp/files/patch-src_external_tritri_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_external_tritri_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_external_tritri_CMakeLists.txt	2016-04-17 16:15:49.829216000 +0200
>@@ -0,0 +1,11 @@
>+--- src/external/tritri/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/external/tritri/CMakeLists.txt
>+@@ -10,4 +10,6 @@ intersect_AABB.cpp
>+ intersect_triangle.cpp
>+ Tritri.cpp
>+ Tritri.h
>+-)
>+\ No newline at end of file
>++)
>++
>++set_target_properties( tritri PROPERTIES COMPILE_FLAGS "-fPIC")
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_fltk__screens_CMakeLists.txt cad/openvsp/files/patch-src_fltk__screens_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_fltk__screens_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_fltk__screens_CMakeLists.txt	2016-04-17 16:15:49.834457000 +0200
>@@ -0,0 +1,12 @@
>+--- 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
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_geom__api_CMakeLists.txt cad/openvsp/files/patch-src_geom__api_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_geom__api_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_geom__api_CMakeLists.txt	2016-04-17 16:15:49.839735000 +0200
>@@ -0,0 +1,27 @@
>+--- 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()
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_geom__core_CMakeLists.txt cad/openvsp/files/patch-src_geom__core_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_geom__core_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_geom__core_CMakeLists.txt	2016-04-17 16:15:49.844977000 +0200
>@@ -0,0 +1,11 @@
>+--- src/geom_core/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/geom_core/CMakeLists.txt
>+@@ -116,6 +116,8 @@ XSecCurve.h
>+ XSecSurf.h
>+ )
>+ 
>++set_target_properties( geom_core PROPERTIES COMPILE_FLAGS "-fPIC")
>++
>+ ADD_DEPENDENCIES( geom_core
>+ util
>+ )
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_gui__and__draw_CMakeLists.txt cad/openvsp/files/patch-src_gui__and__draw_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_gui__and__draw_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_gui__and__draw_CMakeLists.txt	2016-04-17 16:15:49.850237000 +0200
>@@ -0,0 +1,20 @@
>+--- 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
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_gui__and__draw_GroupLayout.h cad/openvsp/files/patch-src_gui__and__draw_GroupLayout.h
>--- /usr/ports/cad/openvsp/files/patch-src_gui__and__draw_GroupLayout.h	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_gui__and__draw_GroupLayout.h	2016-04-17 16:15:49.855482000 +0200
>@@ -0,0 +1,11 @@
>+--- src/gui_and_draw/GroupLayout.h.orig	2016-02-14 00:01:30 UTC
>++++ src/gui_and_draw/GroupLayout.h
>+@@ -17,7 +17,7 @@
>+ #include <FL/Fl_Text_Editor.H>
>+ #include <FL/Fl_Radio_Button.H>
>+ #include <FL/Fl_Color_Chooser.H>
>+-#include <FL/Fl_Sys_Menu_Bar.h>
>++#include <FL/Fl_Sys_Menu_Bar.H>
>+ 
>+ #include "GuiDevice.h"
>+ 
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_gui__and__draw_MainVSPScreen.h cad/openvsp/files/patch-src_gui__and__draw_MainVSPScreen.h
>--- /usr/ports/cad/openvsp/files/patch-src_gui__and__draw_MainVSPScreen.h	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_gui__and__draw_MainVSPScreen.h	2016-04-17 16:15:49.860735000 +0200
>@@ -0,0 +1,11 @@
>+--- src/gui_and_draw/MainVSPScreen.h.orig	2016-02-14 00:01:30 UTC
>++++ src/gui_and_draw/MainVSPScreen.h
>+@@ -15,7 +15,7 @@
>+ #include "MenuItem.h"
>+ #include "ScreenBase.h"
>+ #include "GuiDevice.h"
>+-#include "FL/Fl_Box.h"
>++#include "FL/Fl_Box.H"
>+ 
>+ namespace VSPGUI
>+ {
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_gui__and__draw_MenuItem.h cad/openvsp/files/patch-src_gui__and__draw_MenuItem.h
>--- /usr/ports/cad/openvsp/files/patch-src_gui__and__draw_MenuItem.h	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_gui__and__draw_MenuItem.h	2016-04-17 16:15:49.865976000 +0200
>@@ -0,0 +1,11 @@
>+--- src/gui_and_draw/MenuItem.h.orig	2016-02-14 00:01:30 UTC
>++++ src/gui_and_draw/MenuItem.h
>+@@ -10,7 +10,7 @@
>+ #define MENUITEM__INCLUDED_
>+ 
>+ #include <string>
>+-#include <FL/Fl_Sys_Menu_Bar.h>
>++#include <FL/Fl_Sys_Menu_Bar.H>
>+ 
>+ class ScreenMgr;
>+ class ActionScreen;
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_util_CMakeLists.txt cad/openvsp/files/patch-src_util_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_util_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_util_CMakeLists.txt	2016-04-17 16:15:49.871230000 +0200
>@@ -0,0 +1,8 @@
>+--- src/util/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/util/CMakeLists.txt
>+@@ -63,3 +63,5 @@ XferSurf.h
>+ ADD_DEPENDENCIES( util
>+ STEPCODE
>+ )
>++
>++set_target_properties( util PROPERTIES COMPILE_FLAGS "-fPIC")
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_util__code_array.h cad/openvsp/files/patch-src_util__code_array.h
>--- /usr/ports/cad/openvsp/files/patch-src_util__code_array.h	2016-02-25 23:21:37.000000000 +0100
>+++ cad/openvsp/files/patch-src_util__code_array.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,25 +0,0 @@
>-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
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_vsp__aero_CMakeLists.txt cad/openvsp/files/patch-src_vsp__aero_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_vsp__aero_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_vsp__aero_CMakeLists.txt	2016-04-17 16:15:49.876481000 +0200
>@@ -0,0 +1,10 @@
>+--- src/vsp_aero/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/vsp_aero/CMakeLists.txt
>+@@ -1,4 +1,7 @@
>+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
>+ 
>++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
>++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
>++
>+ ADD_SUBDIRECTORY( solver )
>+ ADD_SUBDIRECTORY( viewer )
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_vsp__graphic_CMakeLists.txt cad/openvsp/files/patch-src_vsp__graphic_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_vsp__graphic_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_vsp__graphic_CMakeLists.txt	2016-04-17 16:15:49.881724000 +0200
>@@ -0,0 +1,12 @@
>+--- 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)
>+ 
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_vsp__graphic_src_Image.cpp cad/openvsp/files/patch-src_vsp__graphic_src_Image.cpp
>--- /usr/ports/cad/openvsp/files/patch-src_vsp__graphic_src_Image.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_vsp__graphic_src_Image.cpp	2016-04-17 16:15:49.887060000 +0200
>@@ -0,0 +1,10 @@
>+--- src/vsp_graphic/src/Image.cpp.orig	2016-02-14 00:01:30 UTC
>++++ src/vsp_graphic/src/Image.cpp
>+@@ -1,6 +1,7 @@
>+ #include <assert.h>
>+ #include <MultiImageLoader.h>
>+ #include <algorithm>
>++#include <stdlib.h>
>+ 
>+ #include "Image.h"
>+ 
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp
>--- /usr/ports/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp	2016-04-17 16:15:49.892429000 +0200
>@@ -0,0 +1,9 @@
>+--- src/vsp_graphic/src/Shader.cpp.orig	2016-02-14 00:01:30 UTC
>++++ src/vsp_graphic/src/Shader.cpp
>+@@ -1,5 +1,6 @@
>+ #include <assert.h>
>+ #include <string>
>++#include <stdlib.h>
>+ 
>+ #include "Shader.h"
>+ 
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_vsp_af.cpp cad/openvsp/files/patch-src_vsp_af.cpp
>--- /usr/ports/cad/openvsp/files/patch-src_vsp_af.cpp	2016-02-25 23:21:37.000000000 +0100
>+++ cad/openvsp/files/patch-src_vsp_af.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,13 +0,0 @@
>-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 =====
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_vsp_havoc__geom.cpp cad/openvsp/files/patch-src_vsp_havoc__geom.cpp
>--- /usr/ports/cad/openvsp/files/patch-src_vsp_havoc__geom.cpp	2016-02-25 23:21:37.000000000 +0100
>+++ cad/openvsp/files/patch-src_vsp_havoc__geom.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,13 +0,0 @@
>-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++ )
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_vsp_havoc__geom.h cad/openvsp/files/patch-src_vsp_havoc__geom.h
>--- /usr/ports/cad/openvsp/files/patch-src_vsp_havoc__geom.h	2016-02-25 23:21:37.000000000 +0100
>+++ cad/openvsp/files/patch-src_vsp_havoc__geom.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,21 +0,0 @@
>-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;
>-    
>diff -ruN /usr/ports/cad/openvsp/files/patch-src_xmlvsp_CMakeLists.txt cad/openvsp/files/patch-src_xmlvsp_CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-src_xmlvsp_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/files/patch-src_xmlvsp_CMakeLists.txt	2016-04-17 16:15:49.897719000 +0200
>@@ -0,0 +1,9 @@
>+--- src/xmlvsp/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
>++++ src/xmlvsp/CMakeLists.txt
>+@@ -14,3 +14,6 @@ XmlUtil.h
>+ XmlUtil.cpp
>+ 
>+ )
>++
>++set_target_properties( xmlvsp PROPERTIES COMPILE_FLAGS "-fPIC")
>++
>diff -ruN /usr/ports/cad/openvsp/files/patch-vsp-CMakeLists.txt cad/openvsp/files/patch-vsp-CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-vsp-CMakeLists.txt	2014-08-10 21:50:23.000000000 +0200
>+++ cad/openvsp/files/patch-vsp-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- src/vsp/CMakeLists.txt.orig	2014-08-08 15:23:12.000000000 +0200
>-+++ src/vsp/CMakeLists.txt	2014-08-08 15:23:59.000000000 +0200
>-@@ -216,6 +216,7 @@
>-     ${FLTK_LIBRARIES}
>-     ${OPENGL_LIBRARIES}
>-     ${OPENNURBS_LIBRARIES}
>-+    -pthread
>- )
>- 
>- INSTALL( TARGETS vsp RUNTIME DESTINATION . )
>diff -ruN /usr/ports/cad/openvsp/files/patch-xmlvsp-CMakeLists.txt cad/openvsp/files/patch-xmlvsp-CMakeLists.txt
>--- /usr/ports/cad/openvsp/files/patch-xmlvsp-CMakeLists.txt	2013-04-16 22:19:19.000000000 +0200
>+++ cad/openvsp/files/patch-xmlvsp-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- /home/fernape/porting/openvsp/original/OpenVSP_2.0_community_src/src/xmlvsp/CMakeLists.txt	2012-04-04 21:03:54.000000000 +0200
>-+++ src/xmlvsp/CMakeLists.txt	2012-04-04 20:29:08.000000000 +0200
>-@@ -2,7 +2,7 @@
>- 
>- FIND_PACKAGE(LibXml2 REQUIRED)
>- 
>--INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR})
>-+INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} /usr/local/include)
>- 
>- SET(XMLVSP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to XML wrapper header.")
>- 
>diff -ruN /usr/ports/cad/openvsp/pkg-plist cad/openvsp/pkg-plist
>--- /usr/ports/cad/openvsp/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>+++ cad/openvsp/pkg-plist	2016-04-17 18:24:17.165265000 +0200
>@@ -0,0 +1,41 @@
>+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

Flags:

fernape: maintainer-approval+

Actions: View | Diff

Attachments on bug 208904: 169447 | 169448 | 169550 | 169551 | 169566 | 169567