Index: cad/openvsp/Makefile
===================================================================
--- cad/openvsp/Makefile	(revision 448461)
+++ cad/openvsp/Makefile	(working copy)
@@ -32,7 +32,7 @@
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
-USES=		cmake:outsource,noninja compiler:gcc-c++11-lib jpeg
+USES=		cmake:outsource,noninja compiler:c++11-lib jpeg
 
 # On FreeBSD < 11 libc++ lacks support for sized delete operators.
 # GCC dropped the builtin version of these operators in 6+ by
@@ -41,6 +41,7 @@
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484
 USE_CXXSTD=	gnu++11
 
+CFLAGS+=	-I${LOCALBASE}/include
 CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CODEELI:BOOLEAN=no \
Index: cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp
===================================================================
--- cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp	(nonexistent)
+++ cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp	(working copy)
@@ -0,0 +1,164 @@
+--- src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp.orig	2017-08-02 20:09:54 UTC
++++ src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp
+@@ -340,7 +340,7 @@ endcopy:
+ 	volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+ 
+ 	asm __volatile__(
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// When compiled with optimizations the stack unwind doesn't work properly, 
+ 		// causing exceptions to crash the application. By adding this prologue
+ 		// and the epilogue below, the stack unwind works as it should. 
+@@ -385,7 +385,7 @@ endcopy:
+ 		// Pop the alignment bytes
+ 		"popl  %%esp            \n"
+ 		"popl  %%ebx            \n"
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// Epilogue
+ 		"movl %%ebp, %%esp         \n"
+ 		".cfi_def_cfa_register esp \n"
+@@ -462,7 +462,7 @@ endcopy:
+ 	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+ 
+ 	asm __volatile__ (
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// When compiled with optimizations the stack unwind doesn't work properly, 
+ 		// causing exceptions to crash the application. By adding this prologue
+ 		// and the epilogue below, the stack unwind works as it should. 
+@@ -508,7 +508,7 @@ endcopy:
+ 		// Pop the alignment bytes
+ 		"popl  %%esp            \n"
+ 		"popl  %%ebx            \n"
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// Epilogue
+ 		"movl %%ebp, %%esp         \n"
+ 		".cfi_def_cfa_register esp \n"
+@@ -585,7 +585,7 @@ endcopy:
+ 	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+ 
+ 	asm __volatile__ (
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// When compiled with optimizations the stack unwind doesn't work properly, 
+ 		// causing exceptions to crash the application. By adding this prologue
+ 		// and the epilogue below, the stack unwind works as it should. 
+@@ -631,7 +631,7 @@ endcopy:
+ 		// Pop the alignment bytes
+ 		"popl  %%esp            \n"
+ 		"popl  %%ebx            \n"
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// Epilogue
+ 		"movl %%ebp, %%esp         \n"
+ 		".cfi_def_cfa_register esp \n"
+@@ -717,7 +717,7 @@ endcopy:
+ 	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
+ 
+ 	asm __volatile__ (
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// When compiled with optimizations the stack unwind doesn't work properly, 
+ 		// causing exceptions to crash the application. By adding this prologue
+ 		// and the epilogue below, the stack unwind works as it should. 
+@@ -767,7 +767,7 @@ endcopy:
+ 		// Pop the alignment bytes
+ 		"popl  %%esp            \n"
+ 		"popl  %%ebx            \n"
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// Epilogue
+ 		"movl %%ebp, %%esp         \n"
+ 		".cfi_def_cfa_register esp \n"
+@@ -849,7 +849,7 @@ endcopy:
+ 	volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
+ 
+ 	asm __volatile__ (
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// When compiled with optimizations the stack unwind doesn't work properly, 
+ 		// causing exceptions to crash the application. By adding this prologue
+ 		// and the epilogue below, the stack unwind works as it should. 
+@@ -896,7 +896,7 @@ endcopy:
+ 		// Pop the alignment bytes
+ 		"popl  %%esp            \n"
+ 		"popl  %%ebx            \n"
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// Epilogue
+ 		"movl %%ebp, %%esp         \n"
+ 		".cfi_def_cfa_register esp \n"
+@@ -980,7 +980,7 @@ endcopy:
+ 	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
+ 
+ 	asm __volatile__ (
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// When compiled with optimizations the stack unwind doesn't work properly, 
+ 		// causing exceptions to crash the application. By adding this prologue
+ 		// and the epilogue below, the stack unwind works as it should. 
+@@ -1030,7 +1030,7 @@ endcopy:
+ 		// Pop the alignment bytes
+ 		"popl  %%esp            \n"
+ 		"popl  %%ebx            \n"
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// Epilogue
+ 		"movl %%ebp, %%esp         \n"
+ 		".cfi_def_cfa_register esp \n"
+@@ -1102,7 +1102,7 @@ endcopy:
+ 	volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+ 
+ 	asm __volatile__ (
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// When compiled with optimizations the stack unwind doesn't work properly, 
+ 		// causing exceptions to crash the application. By adding this prologue
+ 		// and the epilogue below, the stack unwind works as it should. 
+@@ -1145,7 +1145,7 @@ endcopy:
+ 		// Pop the alignment bytes
+ 		"popl  %%esp            \n"
+ 		"popl  %%ebx            \n"
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// Epilogue
+ 		"movl %%ebp, %%esp         \n"
+ 		".cfi_def_cfa_register esp \n"
+@@ -1233,7 +1233,7 @@ endcopy:
+ 	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+ 
+ 	asm __volatile__ (
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// When compiled with optimizations the stack unwind doesn't work properly, 
+ 		// causing exceptions to crash the application. By adding this prologue
+ 		// and the epilogue below, the stack unwind works as it should. 
+@@ -1285,7 +1285,7 @@ endcopy:
+ 		// Pop the alignment bytes
+ 		"popl  %%esp            \n"
+ 		"popl  %%ebx            \n"
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// Epilogue
+ 		"movl %%ebp, %%esp         \n"
+ 		".cfi_def_cfa_register esp \n"
+@@ -1380,7 +1380,7 @@ endcopy:
+ 	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
+ 
+ 	asm __volatile__ (
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// When compiled with optimizations the stack unwind doesn't work properly, 
+ 		// causing exceptions to crash the application. By adding this prologue
+ 		// and the epilogue below, the stack unwind works as it should. 
+@@ -1445,7 +1445,7 @@ endcopy:
+ 		// Pop the alignment bytes
+ 		"popl  %%esp           \n"
+ 		"popl  %%ebx           \n"
+-#ifdef __OPTIMIZE__
++#if defined(__OPTIMIZE__) && !defined(__clang__)
+ 		// Epilogue
+ 		"movl %%ebp, %%esp         \n"
+ 		".cfi_def_cfa_register esp \n"

Property changes on: cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property