Index: head/math/ignition-math/Makefile
===================================================================
--- head/math/ignition-math/Makefile	(revision 485477)
+++ head/math/ignition-math/Makefile	(revision 485478)
@@ -1,27 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	ignition-math
 DISTVERSION=	6.0.0
 CATEGORIES=	math
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	General purpose math library for robot applications
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ignition-cmake==2:devel/ignition-cmake
 
 USES=		cmake:outsource eigen:3
 USE_LDCONFIG=	yes
 
+CMAKE_OFF=	BUILD_TESTING
+
 BB_ACCOUNT=	ignitionrobotics
 BB_PROJECT=	ign-math
 BB_COMMIT=	46f3dd24499c
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
-PLIST_SUB+=	IGN_VER=${DISTVERSION:R:R}
+PLIST_SUB+=	MATH_IGN_VER=math${DISTVERSION:R:R}
+
+do-test: # one test is known to fail: https://bitbucket.org/ignitionrobotics/ign-math/issues/98
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
Index: head/math/ignition-math/pkg-plist
===================================================================
--- head/math/ignition-math/pkg-plist	(revision 485477)
+++ head/math/ignition-math/pkg-plist	(revision 485478)
@@ -1,66 +1,66 @@
-include/ignition/math%%IGN_VER%%/ignition/math.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Angle.hh
-include/ignition/math%%IGN_VER%%/ignition/math/AxisAlignedBox.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Box.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Color.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Cylinder.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Export.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Filter.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Frustum.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Helpers.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Inertial.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Kmeans.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Line2.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Line3.hh
-include/ignition/math%%IGN_VER%%/ignition/math/MassMatrix3.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Material.hh
-include/ignition/math%%IGN_VER%%/ignition/math/MaterialType.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Matrix3.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Matrix4.hh
-include/ignition/math%%IGN_VER%%/ignition/math/MovingWindowFilter.hh
-include/ignition/math%%IGN_VER%%/ignition/math/OrientedBox.hh
-include/ignition/math%%IGN_VER%%/ignition/math/PID.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Plane.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Pose3.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Quaternion.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Rand.hh
-include/ignition/math%%IGN_VER%%/ignition/math/RotationSpline.hh
-include/ignition/math%%IGN_VER%%/ignition/math/SemanticVersion.hh
-include/ignition/math%%IGN_VER%%/ignition/math/SignalStats.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Sphere.hh
-include/ignition/math%%IGN_VER%%/ignition/math/SphericalCoordinates.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Spline.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Stopwatch.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Temperature.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Triangle.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Triangle3.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Vector2.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Vector3.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Vector3Stats.hh
-include/ignition/math%%IGN_VER%%/ignition/math/Vector4.hh
-include/ignition/math%%IGN_VER%%/ignition/math/config.hh
-include/ignition/math%%IGN_VER%%/ignition/math/detail/Box.hh
-include/ignition/math%%IGN_VER%%/ignition/math/detail/Cylinder.hh
-include/ignition/math%%IGN_VER%%/ignition/math/detail/Export.hh
-include/ignition/math%%IGN_VER%%/ignition/math/detail/Sphere.hh
-include/ignition/math%%IGN_VER%%/ignition/math/eigen3.hh
-include/ignition/math%%IGN_VER%%/ignition/math/eigen3/Conversions.hh
-include/ignition/math%%IGN_VER%%/ignition/math/graph/Edge.hh
-include/ignition/math%%IGN_VER%%/ignition/math/graph/Graph.hh
-include/ignition/math%%IGN_VER%%/ignition/math/graph/GraphAlgorithms.hh
-include/ignition/math%%IGN_VER%%/ignition/math/graph/Vertex.hh
-lib/cmake/ignition-math%%IGN_VER%%-all/ignition-math%%IGN_VER%%-all-config-version.cmake
-lib/cmake/ignition-math%%IGN_VER%%-all/ignition-math%%IGN_VER%%-all-config.cmake
-lib/cmake/ignition-math%%IGN_VER%%-all/ignition-math%%IGN_VER%%-all-targets.cmake
-lib/cmake/ignition-math%%IGN_VER%%-eigen3/ignition-math%%IGN_VER%%-eigen3-config-version.cmake
-lib/cmake/ignition-math%%IGN_VER%%-eigen3/ignition-math%%IGN_VER%%-eigen3-config.cmake
-lib/cmake/ignition-math%%IGN_VER%%-eigen3/ignition-math%%IGN_VER%%-eigen3-targets.cmake
-lib/cmake/ignition-math%%IGN_VER%%/ignition-math%%IGN_VER%%-config-version.cmake
-lib/cmake/ignition-math%%IGN_VER%%/ignition-math%%IGN_VER%%-config.cmake
-lib/cmake/ignition-math%%IGN_VER%%/ignition-math%%IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/ignition-math%%IGN_VER%%/ignition-math%%IGN_VER%%-targets.cmake
-lib/libignition-math%%IGN_VER%%.so
-lib/libignition-math%%IGN_VER%%.so.6
-lib/libignition-math%%IGN_VER%%.so.6.0.0~pre4
-libdata/pkgconfig/ignition-math%%IGN_VER%%-eigen3.pc
-libdata/pkgconfig/ignition-math%%IGN_VER%%.pc
+include/ignition/%%MATH_IGN_VER%%/ignition/math.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Angle.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/AxisAlignedBox.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Box.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Color.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Cylinder.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Export.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Filter.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Frustum.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Helpers.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Inertial.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Kmeans.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Line2.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Line3.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/MassMatrix3.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Material.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/MaterialType.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Matrix3.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Matrix4.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/MovingWindowFilter.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/OrientedBox.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/PID.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Plane.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Pose3.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Quaternion.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Rand.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/RotationSpline.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/SemanticVersion.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/SignalStats.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Sphere.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/SphericalCoordinates.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Spline.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Stopwatch.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Temperature.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Triangle.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Triangle3.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Vector2.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Vector3.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Vector3Stats.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/Vector4.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/config.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/detail/Box.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/detail/Cylinder.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/detail/Export.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/detail/Sphere.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/eigen3.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/eigen3/Conversions.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/graph/Edge.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/graph/Graph.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/graph/GraphAlgorithms.hh
+include/ignition/%%MATH_IGN_VER%%/ignition/math/graph/Vertex.hh
+lib/cmake/ignition-%%MATH_IGN_VER%%-all/ignition-%%MATH_IGN_VER%%-all-config-version.cmake
+lib/cmake/ignition-%%MATH_IGN_VER%%-all/ignition-%%MATH_IGN_VER%%-all-config.cmake
+lib/cmake/ignition-%%MATH_IGN_VER%%-all/ignition-%%MATH_IGN_VER%%-all-targets.cmake
+lib/cmake/ignition-%%MATH_IGN_VER%%-eigen3/ignition-%%MATH_IGN_VER%%-eigen3-config-version.cmake
+lib/cmake/ignition-%%MATH_IGN_VER%%-eigen3/ignition-%%MATH_IGN_VER%%-eigen3-config.cmake
+lib/cmake/ignition-%%MATH_IGN_VER%%-eigen3/ignition-%%MATH_IGN_VER%%-eigen3-targets.cmake
+lib/cmake/ignition-%%MATH_IGN_VER%%/ignition-%%MATH_IGN_VER%%-config-version.cmake
+lib/cmake/ignition-%%MATH_IGN_VER%%/ignition-%%MATH_IGN_VER%%-config.cmake
+lib/cmake/ignition-%%MATH_IGN_VER%%/ignition-%%MATH_IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/ignition-%%MATH_IGN_VER%%/ignition-%%MATH_IGN_VER%%-targets.cmake
+lib/libignition-%%MATH_IGN_VER%%.so
+lib/libignition-%%MATH_IGN_VER%%.so.6
+lib/libignition-%%MATH_IGN_VER%%.so.6.0.0~pre4
+libdata/pkgconfig/ignition-%%MATH_IGN_VER%%-eigen3.pc
+libdata/pkgconfig/ignition-%%MATH_IGN_VER%%.pc