Index: multimedia/assimp/Makefile =================================================================== --- multimedia/assimp/Makefile +++ multimedia/assimp/Makefile @@ -2,7 +2,7 @@ PORTNAME= assimp DISTVERSIONPREFIX= v -DISTVERSION= 4.0.1 +DISTVERSION= 4.1.0 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -19,16 +19,11 @@ USE_GITHUB= yes USE_LDCONFIG= yes -# CMAKE_ARGS instructs cmake to skip runtime path removal during install -CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON -DASSIMP_BUILD_TESTS:BOOL=OFF +CMAKE_OFF= ASSIMP_BUILD_TESTS -PLIST_SUB= SHLIB_VER=${DISTVERSION} +PLIST_SUB= SHL3=${DISTVERSION} VER2=${DISTVERSION:R} SHL1=${DISTVERSION:R:R} -.include +post-install: # rm the third-party lib installed by mistake: https://github.com/assimp/assimp/issues/1650 + @${RM} ${STAGEDIR}${PREFIX}/lib/libIrrXML.a -.if ${CHOSEN_COMPILER_TYPE} == gcc -# GCC C++11 support is broken on FreeBSD (see PR 193528 for details) -CXXFLAGS+= -D_GLIBCXX_USE_C99 -.endif - -.include +.include Index: multimedia/assimp/distinfo =================================================================== --- multimedia/assimp/distinfo +++ multimedia/assimp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1509810769 -SHA256 (assimp-assimp-v4.0.1_GH0.tar.gz) = 60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e -SIZE (assimp-assimp-v4.0.1_GH0.tar.gz) = 44625148 +TIMESTAMP = 1513844771 +SHA256 (assimp-assimp-v4.1.0_GH0.tar.gz) = 3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71 +SIZE (assimp-assimp-v4.1.0_GH0.tar.gz) = 45417293 Index: multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp =================================================================== --- multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp +++ multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp @@ -1,11 +1,10 @@ ---- code/D3MFOpcPackage.cpp.orig 2017-07-18 17:03:26 UTC +--- code/D3MFOpcPackage.cpp.orig 2017-12-11 13:22:45 UTC +++ code/D3MFOpcPackage.cpp -@@ -55,6 +55,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O +@@ -55,6 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + #include #include #include - +#include -+ #include + #include "3MFXmlTags.h" - namespace Assimp { Index: multimedia/assimp/files/patch-code_Q3BSPZipArchive.cpp =================================================================== --- /dev/null +++ multimedia/assimp/files/patch-code_Q3BSPZipArchive.cpp @@ -0,0 +1,10 @@ +--- code/Q3BSPZipArchive.cpp.orig 2018-02-07 19:36:57 UTC ++++ code/Q3BSPZipArchive.cpp +@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + + #include "Q3BSPZipArchive.h" + #include ++#include + #include + + namespace Assimp { Index: multimedia/assimp/pkg-plist =================================================================== --- multimedia/assimp/pkg-plist +++ multimedia/assimp/pkg-plist @@ -5,6 +5,7 @@ include/assimp/DefaultIOStream.h include/assimp/DefaultIOSystem.h include/assimp/DefaultLogger.hpp +include/assimp/Defines.h include/assimp/Exporter.hpp include/assimp/IOStream.hpp include/assimp/IOSystem.hpp @@ -45,9 +46,9 @@ include/assimp/vector3.h include/assimp/vector3.inl include/assimp/version.h -lib/cmake/assimp-4.0/assimp-config-version.cmake -lib/cmake/assimp-4.0/assimp-config.cmake +lib/cmake/assimp-%%VER2%%/assimp-config-version.cmake +lib/cmake/assimp-%%VER2%%/assimp-config.cmake lib/libassimp.so -lib/libassimp.so.4 -lib/libassimp.so.%%SHLIB_VER%% +lib/libassimp.so.%%SHL1%% +lib/libassimp.so.%%SHL3%% libdata/pkgconfig/assimp.pc