Index: head/math/cadabra2/Makefile
===================================================================
--- head/math/cadabra2/Makefile	(revision 466102)
+++ head/math/cadabra2/Makefile	(revision 466103)
@@ -1,87 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	cadabra2
-DISTVERSION=	2.1.6
-PORTREVISION=	3
+DISTVERSION=	2.2.0
 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
 
-PATCH_DEPENDS=	${NONEXISTENT}:devel/boost-libs:extract \
-		${NONEXISTENT}:devel/websocketpp:extract
 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}
 
-OPTIONS_DEFINE=	GUI
-OPTIONS_DEFAULT=GUI
-
-USES=		compiler:c++14-lang cmake gettext-runtime pkgconfig python:2.7 sqlite
+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
-GUI_USE=	GNOME=gtkmm30,gdkpixbuf2
+DOS2UNIX_FILES=	cmake/version.cmake
+USE_GNOME=	glib20 glibmm libsigc++20
 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_BOOL=	FRONTEND
-CXXFLAGS+=	-I${LOCALBASE}/include
+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+=	-L${LOCALBASE}/lib -ljsoncpp
-CMAKE_CXX_FLAGS=${CXXFLAGS}
-CMAKE_INSTALL_PREFIX=${PREFIX}
+LDFLAGS+=	-ljsoncpp
 
-post-extract:
-	@${RM} -r ${WRKSRC}/client_server/jsoncpp ${WRKSRC}/client_server/websocketpp
+OPTIONS_DEFINE=	GUI
+OPTIONS_DEFAULT=	GUI
 
-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/
+GUI_USES=	desktop-file-utils
+GUI_USE=	GNOME=gtkmm30,gdkpixbuf2
+GUI_CMAKE_BOOL=	ENABLE_FRONTEND
+GUI_INSTALLS_ICONS=	yes
 
-post-patch:
-	@${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/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/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-gtk.svgz \
-	       ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra-gtk.svgz
+post-extract: # unbundle
+	@${RM} -r ${WRKSRC}/client_server/jsoncpp ${WRKSRC}/client_server/websocketpp
 
 .include <bsd.port.mk>
Index: head/math/cadabra2/distinfo
===================================================================
--- head/math/cadabra2/distinfo	(revision 466102)
+++ head/math/cadabra2/distinfo	(revision 466103)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1509811997
-SHA256 (kpeeters-cadabra2-2.1.6_GH0.tar.gz) = 462d902393a7d17637846debcd7205478f46465d418fe3359a450168ad8810e0
-SIZE (kpeeters-cadabra2-2.1.6_GH0.tar.gz) = 4595203
+TIMESTAMP = 1522534466
+SHA256 (kpeeters-cadabra2-2.2.0_GH0.tar.gz) = 4e0a408ab8fa611091bc4d776dd44efd730c2651e02e62cfd0251bd1d6b96249
+SIZE (kpeeters-cadabra2-2.2.0_GH0.tar.gz) = 23915602
+SHA256 (5d52108df5b05eeba2ffbd7220776887297c2846.patch) = 91c1259345332b9fc4b52eafa1c510d2a851b99ca708fa25af5673cdf737be87
+SIZE (5d52108df5b05eeba2ffbd7220776887297c2846.patch) = 735
Index: head/math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp
===================================================================
--- head/math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp	(revision 466102)
+++ head/math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp	(nonexistent)
@@ -1,19 +0,0 @@
---- override/include/boost/asio/detail/impl/socket_ops.ipp.orig	2016-10-09 22:39:18 UTC
-+++ override/include/boost/asio/detail/impl/socket_ops.ipp
-@@ -469,7 +469,15 @@ template <typename SockLenType>
- inline int call_connect(SockLenType msghdr::*,
-     socket_type s, const socket_addr_type* addr, std::size_t addrlen)
- {
--  return ::connect(s, addr, (SockLenType)addrlen);
-+  int res = ::connect(s, addr, (SockLenType)addrlen);
-+  if (res == -1 && errno==EINPROGRESS) {
-+    fd_set write_fd;
-+    FD_ZERO(&write_fd);
-+    FD_SET(s, &write_fd);
-+    res = ::select (s+1, NULL, &write_fd,NULL,NULL);
-+    res = res > 0 ? 0 : res;
-+  }
-+  return res;
- }
- 
- int connect(socket_type s, const socket_addr_type* addr,

Property changes on: head/math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/math/cadabra2/files/patch-core_cadabra2.in
===================================================================
--- head/math/cadabra2/files/patch-core_cadabra2.in	(revision 466102)
+++ head/math/cadabra2/files/patch-core_cadabra2.in	(nonexistent)
@@ -1,8 +0,0 @@
---- core/cadabra2.in.orig	2017-05-17 08:17:17 UTC
-+++ core/cadabra2.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python@PYTHON_POSTFIX@
-+#!@PYTHON_EXECUTABLE@
- #
- # \ingroup pythoncore
- #

Property changes on: head/math/cadabra2/files/patch-core_cadabra2.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/math/cadabra2/files/patch-override_include_websocketpp_transport_asio_endpoint.hpp
===================================================================
--- head/math/cadabra2/files/patch-override_include_websocketpp_transport_asio_endpoint.hpp	(revision 466102)
+++ head/math/cadabra2/files/patch-override_include_websocketpp_transport_asio_endpoint.hpp	(nonexistent)
@@ -1,20 +0,0 @@
---- override/include/websocketpp/transport/asio/endpoint.hpp.orig	2016-10-09 22:39:45 UTC
-+++ override/include/websocketpp/transport/asio/endpoint.hpp
-@@ -491,7 +491,7 @@ public:
-      * @param ec Set to indicate what error occurred, if any.
-      */
-     void listen(uint16_t port, lib::error_code & ec) {
--        listen(lib::asio::ip::tcp::v6(), port, ec);
-+        listen(lib::asio::ip::tcp::v4(), port, ec);
-     }
- 
-     /// Set up endpoint for listening on a port
-@@ -507,7 +507,7 @@ public:
-      * @param ec Set to indicate what error occurred, if any.
-      */
-     void listen(uint16_t port) {
--        listen(lib::asio::ip::tcp::v6(), port);
-+        listen(lib::asio::ip::tcp::v4(), port);
-     }
- 
-     /// Set up endpoint for listening on a host and service (exception free)

Property changes on: head/math/cadabra2/files/patch-override_include_websocketpp_transport_asio_endpoint.hpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/math/cadabra2/files/patch-client__server_CMakeLists.txt
===================================================================
--- head/math/cadabra2/files/patch-client__server_CMakeLists.txt	(revision 466102)
+++ head/math/cadabra2/files/patch-client__server_CMakeLists.txt	(revision 466103)
@@ -1,27 +1,35 @@
---- client_server/CMakeLists.txt.orig	2017-04-14 09:26:53 UTC
+--- client_server/CMakeLists.txt.orig	2018-03-30 09:33:27 UTC
 +++ client_server/CMakeLists.txt
-@@ -90,21 +90,21 @@ add_definitions("-D_WEBSOCKETPP_CPP11_ST
+@@ -28,7 +28,6 @@ find_package(Boost 1.53.0 COMPONENTS sys
+ set(CADABRA_SERVER_SRC
+   Server.cc 
+   Snoop.cc 
+-  jsoncpp/jsoncpp.cpp 
+   ../core/CdbPython.cc 
+   ../core/Stopwatch.cc 
+   ../core/ProgressMonitor.cc
+@@ -43,7 +42,6 @@ set(CADABRA_CLIENT_SRC
+   ../core/DataCell.cc 
+   Actions.cc 
+   Snoop.cc 
+-  jsoncpp/jsoncpp.cpp
+   ../libs/whereami/whereami.c
+   ../core/InstallPrefix.cc
+ #  ../libs/sqlite3/sqlite3.c
+@@ -58,7 +56,6 @@ include_directories(
+   "../core"
+   "../libs/pybind11/include"
+   "websocketpp" 
+-  "jsoncpp"
+   "../libs/internal/include"
+   "../libs/whereami"
+   ${Boost_INCLUDE_DIRS}
+@@ -114,7 +111,7 @@ add_executable(cadabra2html cadabra2html
+ target_link_libraries(cadabra2html cadabra_client)
  
- # Create the server library
- #link_directories(${UUID_LIBRARY_DIRS})
--add_library(cadabra_server SHARED Server.cc Snoop.cc jsoncpp/jsoncpp.cpp ../core/CdbPython.cc ../core/Stopwatch.cc ../core/ProgressMonitor.cc)
-+add_library(cadabra_server SHARED Server.cc Snoop.cc ../core/CdbPython.cc ../core/Stopwatch.cc ../core/ProgressMonitor.cc)
- 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 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(cadabra2cadabra cadabra2cadabra.cc DataCell.cc)
+ # Client library
+-add_library(cadabra_client STATIC ${CADABRA_CLIENT_SRC})
++add_library(cadabra_client SHARED ${CADABRA_CLIENT_SRC})
+ target_link_libraries(cadabra_client
+   ${Boost_LIBRARIES}
+   ${SQLITE3_LIBRARIES}
Index: head/math/cadabra2/files/patch-client__server_Server.cc
===================================================================
--- head/math/cadabra2/files/patch-client__server_Server.cc	(nonexistent)
+++ head/math/cadabra2/files/patch-client__server_Server.cc	(revision 466103)
@@ -0,0 +1,11 @@
+--- client_server/Server.cc.orig	2018-03-31 19:40:16 UTC
++++ client_server/Server.cc
+@@ -466,7 +466,7 @@ void Server::run() 
+ 		
+ 		wserver.init_asio();
+ 		wserver.set_reuse_addr(true);
+-		wserver.listen(0);
++		wserver.listen(websocketpp::lib::asio::ip::tcp::v4(), 0); // makes up for a failed assumption that IPv6 is mapped into IPv4: (see net.inet6.ip6.v6only=0)
+ 		wserver.start_accept();
+ 		websocketpp::lib::asio::error_code ec;
+ 		auto p = wserver.get_local_endpoint(ec);

Property changes on: head/math/cadabra2/files/patch-client__server_Server.cc
___________________________________________________________________
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/files/patch-cmake_version.cmake
===================================================================
--- head/math/cadabra2/files/patch-cmake_version.cmake	(nonexistent)
+++ head/math/cadabra2/files/patch-cmake_version.cmake	(revision 466103)
@@ -0,0 +1,20 @@
+--- cmake/version.cmake.orig	2018-03-31 20:48:09 UTC
++++ cmake/version.cmake
+@@ -3,13 +3,13 @@ set(CADABRA_VERSION_MINOR 2)
+ set(CADABRA_VERSION_PATCH 0)
+ set(CADABRA_VERSION_TWEAK 0)
+ set(COPYRIGHT_YEARS "2001-2018")
+-execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA     OUTPUT_STRIP_TRAILING_WHITESPACE)
+-execute_process(COMMAND git rev-list --count HEAD  OUTPUT_VARIABLE GIT_COMMIT_SERIAL OUTPUT_STRIP_TRAILING_WHITESPACE)
+-execute_process(COMMAND git log -1 --date=short --pretty=format:%cd  OUTPUT_VARIABLE GIT_COMMIT_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
++#execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA     OUTPUT_STRIP_TRAILING_WHITESPACE)
++#execute_process(COMMAND git rev-list --count HEAD  OUTPUT_VARIABLE GIT_COMMIT_SERIAL OUTPUT_STRIP_TRAILING_WHITESPACE)
++#execute_process(COMMAND git log -1 --date=short --pretty=format:%cd  OUTPUT_VARIABLE GIT_COMMIT_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(GIT_SHORT_SHA)
+   set(CADABRA_VERSION_BUILD "${GIT_COMMIT_SERIAL}.${GIT_SHORT_SHA}")
+ else()
+-  set(CADABRA_VERSION_BUILD "private")
++  set(CADABRA_VERSION_BUILD "from the FreeBSD port")
+ endif()
+ if(GIT_COMMIT_DATE)
+   set(CADABRA_VERSION_DATE "${GIT_COMMIT_DATE}")

Property changes on: head/math/cadabra2/files/patch-cmake_version.cmake
___________________________________________________________________
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/files/patch-core_CMakeLists.txt
===================================================================
--- head/math/cadabra2/files/patch-core_CMakeLists.txt	(nonexistent)
+++ head/math/cadabra2/files/patch-core_CMakeLists.txt	(revision 466103)
@@ -0,0 +1,19 @@
+--- core/CMakeLists.txt.orig	2018-03-31 17:08:45 UTC
++++ core/CMakeLists.txt
+@@ -197,7 +197,6 @@ include_directories(
+   "."
+   "../libs/internal/include"
+   "../libs/whereami"
+-  "../client_server/jsoncpp"
+   ${Boost_INCLUDE_DIRS}
+   )
+ # FIXME: 2nd line is to find Config.hh
+@@ -246,7 +245,7 @@ target_link_libraries(cadabra2python 
+   )
+ 
+ # cadabra2cadabra
+-add_executable(cadabra2cadabra cadabra2cadabra.cc DataCell.cc ../client_server/jsoncpp/jsoncpp.cpp ../libs/whereami/whereami.c InstallPrefix.cc)
++add_executable(cadabra2cadabra cadabra2cadabra.cc DataCell.cc ../libs/whereami/whereami.c InstallPrefix.cc)
+ target_link_libraries(cadabra2cadabra ${Boost_LIBRARIES})
+ 
+ # Mathematica WSTP test

Property changes on: head/math/cadabra2/files/patch-core_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/files/patch-frontend_gtkmm_CMakeLists.txt
===================================================================
--- head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt	(revision 466102)
+++ head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt	(revision 466103)
@@ -1,28 +1,31 @@
---- frontend/gtkmm/CMakeLists.txt.orig	2017-02-03 07:40:10 UTC
+--- frontend/gtkmm/CMakeLists.txt.orig	2018-03-30 09:33:27 UTC
 +++ frontend/gtkmm/CMakeLists.txt
-@@ -116,11 +116,11 @@ install(FILES    ${PROJECT_SOURCE_DIR}/.
+@@ -126,11 +126,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}/.
+@@ -144,9 +144,9 @@ 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)")
+ 
+ # Install shared libraries on Windows. 
+ # https://stackoverflow.com/questions/32662215/how-do-you-install-gtk-3-0-on-windows
Index: head/math/cadabra2/pkg-plist
===================================================================
--- head/math/cadabra2/pkg-plist	(revision 466102)
+++ head/math/cadabra2/pkg-plist	(revision 466103)
@@ -1,107 +1,104 @@
-%%GUI%%bin/cadabra2-gtk
 bin/cadabra-server
 bin/cadabra2
+%%GUI%%bin/cadabra2-gtk
+bin/cadabra2cadabra
 bin/cadabra2html
 bin/cadabra2python
 lib/libcadabra_client.so
-lib/libcadabra_server.so
-%%GUI%%lib/libtexengine.so
-%%PYTHON_SITELIBDIR%%/cadabra2.so
-%%PYTHON_SITELIBDIR%%/cadabra2_defaults.py
-%%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-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/tableaux.sty
+%%GUI%%%%DATADIR%%/latex/preamble.tex
+%%GUI%%%%DATADIR%%/latex/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/distribute.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/lr_tensor.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/map_sympy.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/replace_match.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/rewrite_indices.cnb
+%%GUI%%%%DATADIR%%/manual/algorithms/simplify.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/sort_product.cnb
 %%GUI%%%%DATADIR%%/manual/algorithms/sort_spinors.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/Symbol.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Symmetric.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Tableau.cnb
 %%GUI%%%%DATADIR%%/manual/properties/TableauSymmetry.cnb
 %%GUI%%%%DATADIR%%/manual/properties/WeightInherit.cnb
 %%GUI%%%%DATADIR%%/notebook.html
 %%GUI%%%%DATADIR%%/notebook.tex
-%%GUI%%%%DATADIR%%/texengine/preamble.tex
+%%DATADIR%%/python/cadabra2.so
+%%DATADIR%%/python/cadabra2_defaults.py
+%%DATADIR%%/python/cdb/gauge_theory/__init__.py
+%%DATADIR%%/python/cdb/gauge_theory/instantons.py
+%%DATADIR%%/python/cdb/relativity/__init__.py
+%%DATADIR%%/python/cdb/relativity/schwarzschild.py
+%%GUI%%share/icons/hicolor/128x128/apps/cadabra2-gtk.png
+%%GUI%%share/icons/hicolor/256x256/apps/cadabra2-gtk.png
+%%GUI%%share/icons/hicolor/64x64/apps/cadabra2-gtk.png
+%%GUI%%share/icons/hicolor/scalable/apps/cadabra2-gtk.svg