Index: head/math/cadabra2/Makefile
===================================================================
--- head/math/cadabra2/Makefile	(revision 433378)
+++ head/math/cadabra2/Makefile	(revision 433379)
@@ -1,87 +1,88 @@
 # Created by: Yuri Victorovich <yuri@rawbw.com>
 # $FreeBSD$
 
 PORTNAME=	cadabra2
-PORTVERSION=	2.0.930
-PORTREVISION=	2
+PORTVERSION=	2.1.2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@rawbw.com
 COMMENT=	Computer algebra system for solving field theory problems
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
 PATCH_DEPENDS=	${NONEXISTENT}:devel/boost-libs:extract \
 		${NONEXISTENT}:devel/websocketpp:extract
 BUILD_DEPENDS=	${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp
 LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
 		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 \
 		${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kpeeters
-GH_TAGNAME=	85ac041
 
 OPTIONS_DEFINE=	GUI
 OPTIONS_DEFAULT=GUI
 
 USES=		compiler:c++14-lang cmake gettext-runtime pkgconfig python:2 sqlite
 GUI_USE=	GNOME=gtkmm30,gdkpixbuf2
 USE_TEX=	base texmf texhash
 USE_LDCONFIG=	yes
 OPTIONS_SUB=	yes
 GUI_INSTALLS_ICONS=	yes
+GUI_USES=	desktop-file-utils
 
 CMAKE_ARGS+=	-DBOOST_ROOT=${LOCALBASE}
 CMAKE_ARGS+=	-DUSE_PYTHON_3:BOOL=OFF
-GUI_CMAKE_OFF+=	-DENABLE_FRONTEND:BOOL=OFF
-GUI_CMAKE_ON+=	-DENABLE_FRONTEND:BOOL=ON
+GUI_CMAKE_BOOL=	FRONTEND
 CXXFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include/jsoncpp
 LDFLAGS+=	-L${LOCALBASE}/lib -ljsoncpp
 CMAKE_CXX_FLAGS=${CXXFLAGS}
 CMAKE_INSTALL_PREFIX=${PREFIX}
 
 post-extract:
 	@${RM} -r ${WRKSRC}/client_server/jsoncpp ${WRKSRC}/client_server/websocketpp
 
 pre-patch:
 	# workaround for https://github.com/zaphoyd/websocketpp/issues/563, so that the local patch can be applied
 	@${MKDIR} ${WRKSRC}/override/include/boost/asio/detail/impl
 	@${CP} `${MAKE} -C ${PORTSDIR}/devel/boost-libs -V WRKSRC`/boost/asio/detail/impl/socket_ops.ipp \
 		${WRKSRC}/override/include/boost/asio/detail/impl/
 	# workaround for https://github.com/zaphoyd/websocketpp/issues/587, so that the local patch can be applied
 	@${MKDIR} ${WRKSRC}/override/include/websocketpp/transport/asio
 	@${CP} `${MAKE} -C ${PORTSDIR}/devel/websocketpp -V WRKSRC`/websocketpp/transport/asio/endpoint.hpp \
 		${WRKSRC}/override/include/websocketpp/transport/asio/
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|"$${GIT_COMMIT_SERIAL}.$${GIT_SHORT_SHA}"|"FreeBSD port version=${PORTVERSION} tag=${GH_TAGNAME}"|' \
-		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|include_directories(|include_directories($${PROJECT_SOURCE_DIR}/override/include |' \
-		${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|execute|#execute|' \
+			-e 's|"$${GIT_COMMIT_SERIAL}.$${GIT_SHORT_SHA}"|"FreeBSD port version=${PORTVERSION} tag=${GH_TAGNAME}"|' \
+			-e 's|set(CADABRA_VERSION_DATE "$${THE_DATE}"|set(CADABRA_VERSION_DATE "'`date "+%Y-%m-%d"`'"|' \
+			-e 's|include_directories(|include_directories($${PROJECT_SOURCE_DIR}/override/include |' \
+				${WRKSRC}/CMakeLists.txt
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra2html
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra-server
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/cadabra2.so
 
 post-install-GUI-on:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra-gtk
-	@${GZIP_CMD} ${GZIP} < ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svg \
-	                     > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svgz
-	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svg
-	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/cadabra2.png \
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra2-gtk
+	@${GZIP_CMD}	< ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2-gtk.svg \
+			> ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2-gtk.svgz
+	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2-gtk.svg
+	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/cadabra2-gtk.png \
 	       ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/cadabra-gtk.png
-	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/cadabra2.png \
+	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/cadabra2-gtk.png \
+	       ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/cadabra-gtk.png
+	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/cadabra2-gtk.png \
 	       ${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/cadabra-gtk.png
-	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svgz \
+	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2-gtk.svgz \
 	       ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra-gtk.svgz
 
 .include <bsd.port.mk>
Index: head/math/cadabra2/distinfo
===================================================================
--- head/math/cadabra2/distinfo	(revision 433378)
+++ head/math/cadabra2/distinfo	(revision 433379)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476032351
-SHA256 (kpeeters-cadabra2-2.0.930-85ac041_GH0.tar.gz) = 3d07c5e72fd3ae79214e9472d44c12e2b304ad91d992ced2377a0484a5c494b2
-SIZE (kpeeters-cadabra2-2.0.930-85ac041_GH0.tar.gz) = 3908288
+TIMESTAMP = 1486104650
+SHA256 (kpeeters-cadabra2-2.1.2_GH0.tar.gz) = d8e4c304b71ab2bc7109347197bf4f19fce9ccb7c2986ad07d56b43383697995
+SIZE (kpeeters-cadabra2-2.1.2_GH0.tar.gz) = 4444189
Index: head/math/cadabra2/files/patch-client__server_CMakeLists.txt
===================================================================
--- head/math/cadabra2/files/patch-client__server_CMakeLists.txt	(revision 433378)
+++ head/math/cadabra2/files/patch-client__server_CMakeLists.txt	(revision 433379)
@@ -1,21 +1,27 @@
---- client_server/CMakeLists.txt.orig	2016-06-23 23:50:35 UTC
+--- client_server/CMakeLists.txt.orig	2017-01-04 17:38:25 UTC
 +++ client_server/CMakeLists.txt
-@@ -78,15 +78,15 @@ add_definitions("-D_WEBSOCKETPP_CPP11_ST
+@@ -86,21 +86,21 @@ add_definitions("-D_WEBSOCKETPP_CPP11_ST
  
  # Create the server library
- link_directories(${UUID_LIBRARY_DIRS})
+ #link_directories(${UUID_LIBRARY_DIRS})
 -add_library(cadabra_server SHARED Server.cc Snoop.cc jsoncpp/jsoncpp.cpp)
 +add_library(cadabra_server SHARED Server.cc Snoop.cc)
- target_link_libraries(cadabra_server ${Boost_LIBRARIES} ${SNOOP_LIBRARIES} sqlite3 ${UUID_LIBRARIES} ${PYTHON_LIBRARIES} )
+ target_link_libraries(cadabra_server ${Boost_LIBRARIES} ${SNOOP_LIBRARIES} sqlite3 ${PYTHON_LIBRARIES} ${GLIBMM3_LIBRARIES})
+ if (WIN32)
+    target_link_libraries(cadabra_server ws2_32 mswsock)
+ endif()
  
  # Create the client library.
--add_library(cadabra_client SHARED ComputeThread.cc DocumentThread.cc DataCell.cc Actions.cc popen2.cc Snoop.cc jsoncpp/jsoncpp.cpp)
-+add_library(cadabra_client SHARED ComputeThread.cc DocumentThread.cc DataCell.cc Actions.cc popen2.cc Snoop.cc)
- target_link_libraries(cadabra_client ${Boost_LIBRARIES} sqlite3 ${UUID_LIBRARIES} ${PYTHON_LIBRARIES})
+-add_library(cadabra_client SHARED ComputeThread.cc DocumentThread.cc DataCell.cc Actions.cc Snoop.cc jsoncpp/jsoncpp.cpp)
++add_library(cadabra_client SHARED ComputeThread.cc DocumentThread.cc DataCell.cc Actions.cc Snoop.cc)
+ target_link_libraries(cadabra_client ${Boost_LIBRARIES} sqlite3 ${PYTHON_LIBRARIES} ${GLIBMM3_LIBRARIES})
+ if (WIN32)
+    target_link_libraries(cadabra_client ws2_32)
+ endif()
  
  # Create server binary
 -include_directories("." "./websocketpp" "./jsoncpp")
 +include_directories("." "./websocketpp")
  add_executable(cadabra-server cadabra-server.cc)
  add_executable(cadabra2html cadabra2html.cc DataCell.cc)
- #add_executable(test_talk_to_server test_talk_to_server.cc)
+ add_executable(cadabra2cadabra cadabra2cadabra.cc DataCell.cc)
Index: head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
===================================================================
--- head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt	(nonexistent)
+++ head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt	(revision 433379)
@@ -0,0 +1,28 @@
+--- frontend/gtkmm/CMakeLists.txt.orig	2017-02-03 07:40:10 UTC
++++ frontend/gtkmm/CMakeLists.txt
+@@ -116,11 +116,11 @@ install(FILES    ${PROJECT_SOURCE_DIR}/.
+ #     there anyway.
+ #   - gtk-update-icon-cache is broken and only works half of the time.
+ 
+-if(APPLE)
++#if(APPLE)
+   set(ICON_PREFIX "${CMAKE_INSTALL_PREFIX}")
+-else()
+-  set(ICON_PREFIX "/usr")
+-endif()
++#else()
++#  set(ICON_PREFIX "/usr")
++#endif()
+ 
+ #set(ICON_THEME ${ICON_PREFIX}/share/icons/hicolor/index.theme)
+ #if(EXISTS "${ICON_THEME}")
+@@ -134,6 +134,6 @@ install(FILES    ${PROJECT_SOURCE_DIR}/.
+ install(FILES    ${PROJECT_SOURCE_DIR}/../../images/256x256/cadabra2-gtk.png   DESTINATION ${ICON_PREFIX}/share/icons/hicolor/256x256/apps)
+ install(FILES    ${PROJECT_SOURCE_DIR}/../../images/cadabra2-gtk.svg           DESTINATION ${ICON_PREFIX}/share/icons/hicolor/scalable/apps)
+ install(FILES    ${PROJECT_SOURCE_DIR}/../../config/cadabra2-gtk.desktop       DESTINATION ${ICON_PREFIX}/share/applications)
+-install(CODE     "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)")
+-install(CODE     "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)")
+-install(CODE     "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)")
++#install(CODE     "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)")
++#install(CODE     "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)")
++#install(CODE     "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)")

Property changes on: head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
___________________________________________________________________
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
Index: head/math/cadabra2/pkg-plist
===================================================================
--- head/math/cadabra2/pkg-plist	(revision 433378)
+++ head/math/cadabra2/pkg-plist	(revision 433379)
@@ -1,99 +1,98 @@
-%%GUI%%bin/cadabra-gtk
+%%GUI%%bin/cadabra2-gtk
 bin/cadabra-server
 bin/cadabra2
 bin/cadabra2html
 lib/libcadabra_client.so
 lib/libcadabra_server.so
 %%GUI%%lib/libtexengine.so
 %%PYTHON_SITELIBDIR%%/cadabra2.so
 %%PYTHON_SITELIBDIR%%/cadabra2_defaults.py
-%%PYTHON_SITELIBDIR%%/cdb/gr.py
-%%GUI%%share/applications/cadabra2.desktop
-%%GUI%%%%DATADIR%%/images/cadabra2.png
+%%PYTHON_SITELIBDIR%%/cdb/gauge_theory/__init__.py
+%%PYTHON_SITELIBDIR%%/cdb/gauge_theory/instantons.py
+%%PYTHON_SITELIBDIR%%/cdb/relativity/__init__.py
+%%PYTHON_SITELIBDIR%%/cdb/relativity/schwarzschild.py
+%%GUI%%share/applications/cadabra2-gtk.desktop
+%%GUI%%%%DATADIR%%/images/cadabra2-gtk.png
 %%GUI%%%%DATADIR%%/manual/algorithms/distribute.cnb
-%%GUI%%share/icons/hicolor/256x256/apps/cadabra2.png
-%%GUI%%share/icons/hicolor/64x64/apps/cadabra2.png
-%%GUI%%share/icons/hicolor/scalable/apps/cadabra2.svgz
+%%GUI%%share/icons/hicolor/256x256/apps/cadabra2-gtk.png
 %%GUI%%share/icons/hicolor/256x256/apps/cadabra-gtk.png
+%%GUI%%share/icons/hicolor/128x128/apps/cadabra2-gtk.png
+%%GUI%%share/icons/hicolor/128x128/apps/cadabra-gtk.png
+%%GUI%%share/icons/hicolor/64x64/apps/cadabra2-gtk.png
 %%GUI%%share/icons/hicolor/64x64/apps/cadabra-gtk.png
+%%GUI%%share/icons/hicolor/scalable/apps/cadabra2-gtk.svgz
 %%GUI%%share/icons/hicolor/scalable/apps/cadabra-gtk.svgz
-%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/breqn.sty
-%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/cmbase.sym
-%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/flexisym.sty
-%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/mathpazo.sym
-%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/mathptmx.sym
-%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/mathstyle.sty
-%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/msabm.sym
 %%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/tableaux.sty
 %%GUI%%@dir %%DATADIR%%/manual/properties
 %%GUI%%%%DATADIR%%/manual/algorithms/asym.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/canonicalise.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/collect_factors.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/collect_terms.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/combine.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/complete.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/decompose_product.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/drop_weight.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/eliminate_kronecker.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/eliminate_metric.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/epsilon_to_delta.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/evaluate.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/expand.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/expand_delta.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/expand_diracbar.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/expand_power.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/factor_in.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/factor_out.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/fierz.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/integrate_by_parts.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/join_gamma.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/keep_weight.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/product_rule.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/reduce_delta.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/rename_dummies.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/rewrite_indices.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/sort_product.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/sort_sum.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/split_gamma.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/split_index.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/substitute.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/take_match.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/unwrap.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/vary.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/young_project_product.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/young_project_tensor.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Accent.cnb
 %%GUI%%%%DATADIR%%/manual/properties/AntiCommuting.cnb
 %%GUI%%%%DATADIR%%/manual/properties/AntiSymmetric.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Commuting.cnb
 %%GUI%%%%DATADIR%%/manual/properties/CommutingAsProduct.cnb
 %%GUI%%%%DATADIR%%/manual/properties/CommutingAsSum.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Coordinate.cnb
 %%GUI%%%%DATADIR%%/manual/properties/DAntiSymmetric.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Depends.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Derivative.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Diagonal.cnb
 %%GUI%%%%DATADIR%%/manual/properties/DiracBar.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Distributable.cnb
 %%GUI%%%%DATADIR%%/manual/properties/EpsilonTensor.cnb
 %%GUI%%%%DATADIR%%/manual/properties/FilledTableau.cnb
 %%GUI%%%%DATADIR%%/manual/properties/GammaMatrix.cnb
 %%GUI%%%%DATADIR%%/manual/properties/ImplicitIndex.cnb
 %%GUI%%%%DATADIR%%/manual/properties/IndexInherit.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Indices.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Integer.cnb
 %%GUI%%%%DATADIR%%/manual/properties/InverseMetric.cnb
 %%GUI%%%%DATADIR%%/manual/properties/KroneckerDelta.cnb
 %%GUI%%%%DATADIR%%/manual/properties/LaTeXForm.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Metric.cnb
 %%GUI%%%%DATADIR%%/manual/properties/NonCommuting.cnb
 %%GUI%%%%DATADIR%%/manual/properties/PartialDerivative.cnb
 %%GUI%%%%DATADIR%%/manual/properties/RiemannTensor.cnb
 %%GUI%%%%DATADIR%%/manual/properties/SatisfiesBianchi.cnb
 %%GUI%%%%DATADIR%%/manual/properties/SelfAntiCommuting.cnb
 %%GUI%%%%DATADIR%%/manual/properties/SelfCommuting.cnb
 %%GUI%%%%DATADIR%%/manual/properties/SelfNonCommuting.cnb
 %%GUI%%%%DATADIR%%/manual/properties/SortOrder.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Spinor.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Symmetric.cnb
 %%GUI%%%%DATADIR%%/manual/properties/TableauSymmetry.cnb
+%%GUI%%%%DATADIR%%/texengine/preamble.tex