diff -ruN assimp.orig/Makefile assimp/Makefile
--- assimp.orig/Makefile	2015-05-14 14:15:04.000000000 +0400
+++ assimp/Makefile	2016-02-29 04:13:34.824557000 +0400
@@ -2,11 +2,10 @@
 # $FreeBSD: head/multimedia/assimp/Makefile 386312 2015-05-14 10:15:04Z mat $
 
 PORTNAME=	assimp
-PORTVERSION=	3.0
-PORTREVISION=	5
+PORTVERSION=	3.1.1
+DISTVERSIONSUFFIX=	_no_test_models
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.0
-DISTNAME=	${PORTNAME}--${PORTVERSION}.1270-source-only
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.1
 
 MAINTAINER=	yuri@tsoft.com
 COMMENT=	Library to import various 3D model formats in a uniform manner
@@ -14,17 +13,28 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		cmake pkgconfig zip
-USE_GCC=	yes	# GCC 4.2 causes compiler warnings
 USE_LDCONFIG=	yes
 
 # CMAKE_ARGS instructs cmake to skip runtime path removal during install
 CMAKE_ARGS+=	"-DCMAKE_SKIP_RPATH=ON"
 
+OPTIONS_DEFINE=	BOOST
+OPTIONS_DEFAULT=	BOOST
+BOOST_LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
+BOOST_CMAKE_ON=	-DASSIMP_ENABLE_BOOST_WORKAROUND:BOOL=OFF
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
+# GCC 4.2 causes compiler warnings
+USE_GCC=	yes
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
+	@${REINPLACE_CMD} 's|$${ASSIMP_LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
 		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff -ruN assimp.orig/distinfo assimp/distinfo
--- assimp.orig/distinfo	2014-01-22 19:30:13.000000000 +0400
+++ assimp/distinfo	2016-02-28 17:16:58.651099000 +0400
@@ -1,2 +1,2 @@
-SHA256 (assimp--3.0.1270-source-only.zip) = ac29beb596db97df57451a5503afaf2d8b4366522842a6914da89644927a1423
-SIZE (assimp--3.0.1270-source-only.zip) = 4042147
+SHA256 (assimp-3.1.1_no_test_models.zip) = da9827876f10a8b447270368753392cfd502e70a2e9d1361554e5dfcb1fede9e
+SIZE (assimp-3.1.1_no_test_models.zip) = 6626442
diff -ruN assimp.orig/pkg-plist assimp/pkg-plist
--- assimp.orig/pkg-plist	2015-02-02 00:24:27.000000000 +0400
+++ assimp/pkg-plist	2016-02-28 17:23:18.328039000 +0400
@@ -30,6 +30,7 @@
 include/assimp/matrix4x4.h
 include/assimp/matrix4x4.inl
 include/assimp/mesh.h
+include/assimp/metadata.h
 include/assimp/postprocess.h
 include/assimp/quaternion.h
 include/assimp/quaternion.inl
@@ -41,9 +42,9 @@
 include/assimp/vector3.h
 include/assimp/vector3.inl
 include/assimp/version.h
-lib/cmake/assimp-3.0/assimp-config-version.cmake
-lib/cmake/assimp-3.0/assimp-config.cmake
+lib/cmake/assimp-3.1/assimp-config-version.cmake
+lib/cmake/assimp-3.1/assimp-config.cmake
 lib/libassimp.so
 lib/libassimp.so.3
-lib/libassimp.so.3.0.1264
+lib/libassimp.so.3.1.1
 libdata/pkgconfig/assimp.pc