Index: head/math/cadabra2/Makefile
===================================================================
--- head/math/cadabra2/Makefile	(revision 476640)
+++ head/math/cadabra2/Makefile	(revision 476641)
@@ -1,52 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	cadabra2
 DISTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	5d52108df5b05eeba2ffbd7220776887297c2846.patch:-p1 # https://github.com/kpeeters/cadabra2/pull/82
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Computer algebra system for solving field theory problems
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp
 LIB_DEPENDS=	${PY_BOOST} \
 		libboost_system.so:devel/boost-libs \
 		libpcrecpp.so:devel/pcre \
 		libjsoncpp.so:devel/jsoncpp \
 		libgmp.so:math/gmp \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang cmake:outsource dos2unix gettext-runtime localbase:ldflags pkgconfig python:3.4+ sqlite # USES=python picks random python versions
 USE_GITHUB=	yes
 GH_ACCOUNT=	kpeeters
 DOS2UNIX_FILES=	cmake/version.cmake
 USE_GNOME=	glib20 glibmm libsigc++20
 USE_TEX=	base texmf texhash
 USE_LDCONFIG=	yes
 OPTIONS_SUB=	yes
 
 CMAKE_ON=	USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76
 CMAKE_OFF=	ENABLE_MATHEMATICA
 CXXFLAGS+=	-I${LOCALBASE}/include/jsoncpp
 LDFLAGS+=	-ljsoncpp
 
 OPTIONS_DEFINE=	GUI
 OPTIONS_DEFAULT=	GUI
 
 GUI_USES=	desktop-file-utils
 GUI_USE=	GNOME=gtkmm30,gdkpixbuf2
 GUI_CMAKE_BOOL=	ENABLE_FRONTEND
 GUI_INSTALLS_ICONS=	yes
 
 post-extract: # unbundle
 	@${RM} -r ${WRKSRC}/client_server/jsoncpp ${WRKSRC}/client_server/websocketpp
 
 .include <bsd.port.mk>
Index: head/math/cadabra2/files/patch-pybind11-libc++7
===================================================================
--- head/math/cadabra2/files/patch-pybind11-libc++7	(nonexistent)
+++ head/math/cadabra2/files/patch-pybind11-libc++7	(revision 476641)
@@ -0,0 +1,26 @@
+https://github.com/pybind/pybind11/commit/ff6bd092d482b0c4e51aeb7367c3e5ecbc18a9de
+
+--- libs/pybind11/include/pybind11/cast.h.orig	2018-03-30 09:33:27 UTC
++++ libs/pybind11/include/pybind11/cast.h
+@@ -1685,6 +1685,9 @@ template <> inline void cast_safe<void>(object &&) {}
+ 
+ NAMESPACE_END(detail)
+ 
++template <return_value_policy policy = return_value_policy::automatic_reference>
++tuple make_tuple() { return tuple(0); }
++
+ template <return_value_policy policy = return_value_policy::automatic_reference,
+           typename... Args> tuple make_tuple(Args&&... args_) {
+     constexpr size_t size = sizeof...(Args);
+--- libs/pybind11/include/pybind11/stl.h.orig	2018-03-30 09:33:27 UTC
++++ libs/pybind11/include/pybind11/stl.h
+@@ -30,7 +30,8 @@
+ #    define PYBIND11_HAS_OPTIONAL 1
+ #  endif
+ // std::experimental::optional (but not allowed in c++11 mode)
+-#  if defined(PYBIND11_CPP14) && __has_include(<experimental/optional>)
++#  if defined(PYBIND11_CPP14) && (__has_include(<experimental/optional>) && \
++                                 !__has_include(<optional>))
+ #    include <experimental/optional>
+ #    define PYBIND11_HAS_EXP_OPTIONAL 1
+ #  endif

Property changes on: head/math/cadabra2/files/patch-pybind11-libc++7
___________________________________________________________________
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