Index: head/math/cadabra2/Makefile =================================================================== --- head/math/cadabra2/Makefile (revision 492522) +++ head/math/cadabra2/Makefile (revision 492523) @@ -1,51 +1,49 @@ # $FreeBSD$ PORTNAME= cadabra2 -DISTVERSION= 2.2.4 +DISTVERSION= 2.2.5-5 +DISTVERSIONSUFFIX= -gf10cac6b9a 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 dos2unix gettext-runtime gnome 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= BUILD_SHARED_LIBS USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76 +CMAKE_ON= ENABLE_SYSTEM_JSONCPP BUILD_SHARED_LIBS 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 Index: head/math/cadabra2/distinfo =================================================================== --- head/math/cadabra2/distinfo (revision 492522) +++ head/math/cadabra2/distinfo (revision 492523) @@ -1,5 +1,3 @@ -TIMESTAMP = 1545586266 -SHA256 (kpeeters-cadabra2-2.2.4_GH0.tar.gz) = 2e75e5bf1763e55d795eb876bff61e1b5b359488a8b5db0b45eabd0d04df92c9 -SIZE (kpeeters-cadabra2-2.2.4_GH0.tar.gz) = 23960964 -SHA256 (5d52108df5b05eeba2ffbd7220776887297c2846.patch) = 91c1259345332b9fc4b52eafa1c510d2a851b99ca708fa25af5673cdf737be87 -SIZE (5d52108df5b05eeba2ffbd7220776887297c2846.patch) = 735 +TIMESTAMP = 1549747092 +SHA256 (kpeeters-cadabra2-2.2.5-5-gf10cac6b9a_GH0.tar.gz) = 9b998c2dab003fa36944bf261828d4c9ae3f75a760b1ac458c4a12757d506bf5 +SIZE (kpeeters-cadabra2-2.2.5-5-gf10cac6b9a_GH0.tar.gz) = 24065768 Index: head/math/cadabra2/files/patch-client__server_CMakeLists.txt =================================================================== --- head/math/cadabra2/files/patch-client__server_CMakeLists.txt (revision 492522) +++ head/math/cadabra2/files/patch-client__server_CMakeLists.txt (nonexistent) @@ -1,26 +0,0 @@ ---- client_server/CMakeLists.txt.orig 2018-12-07 04:46:45 UTC -+++ client_server/CMakeLists.txt -@@ -32,7 +32,6 @@ set(CADABRA_SERVER_SRC - ${CADABRA_CORE_DIR}/InstallPrefix.cc - ${CADABRA_CORE_DIR}/CdbPython.cc - ${CADABRA_CORE_DIR}/Stopwatch.cc -- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp - ${CADABRA_LIBS_DIR}/whereami/whereami.c - ) - -@@ -43,7 +42,6 @@ set(CADABRA_CLIENT_SRC - Snoop.cc - ${CADABRA_CORE_DIR}/DataCell.cc - ${CADABRA_CORE_DIR}/InstallPrefix.cc -- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp - ${CADABRA_LIBS_DIR}/whereami/whereami.c - ) - -@@ -56,7 +54,6 @@ include_directories( - "${CADABRA_CORE_DIR}" - "${CADABRA_LIBS_DIR}/pybind11/include" - "${CADABRA_LIBS_DIR}/websocketpp" -- "${CADABRA_LIBS_DIR}/jsoncpp" - "${CADABRA_LIBS_DIR}/internal/include" - "${CADABRA_LIBS_DIR}/whereami" - ${Boost_INCLUDE_DIRS} Property changes on: head/math/cadabra2/files/patch-client__server_CMakeLists.txt ___________________________________________________________________ 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_CMakeLists.txt =================================================================== --- head/math/cadabra2/files/patch-core_CMakeLists.txt (revision 492522) +++ head/math/cadabra2/files/patch-core_CMakeLists.txt (nonexistent) @@ -1,34 +0,0 @@ ---- core/CMakeLists.txt.orig 2018-12-07 05:20:52 UTC -+++ core/CMakeLists.txt -@@ -204,7 +204,6 @@ set(LOCAL_SRC_FILES - modules/xperm_new.cc - ${ALGORITHM_SRC_FILES} - ${PROPERTY_SRC_FILES} -- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp - ) - if(MATHEMATICA_FOUND) - set(LOCAL_SRC_FILES -@@ -227,7 +226,6 @@ include_directories( - "." - "${CADABRA_LIBS_DIR}/internal/include" - "${CADABRA_LIBS_DIR}/whereami" -- "${CADABRA_LIBS_DIR}/jsoncpp" - ${Boost_INCLUDE_DIRS} - ) - # FIXME: 2nd line is to find Config.hh -@@ -263,7 +261,6 @@ add_executable(test_preprocessor - add_executable(cadabra2python - cadabra2python.cc - CdbPython.cc -- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp - ) - target_link_libraries(cadabra2python - ${Boost_LIBRARIES} -@@ -275,7 +272,6 @@ add_executable(cadabra2cadabra - cadabra2cadabra.cc - DataCell.cc - InstallPrefix.cc -- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp - ${CADABRA_LIBS_DIR}/whereami/whereami.c - ) - target_link_libraries(cadabra2cadabra ${Boost_LIBRARIES} ${GLIBMM3_LIBRARIES}) Property changes on: head/math/cadabra2/files/patch-core_CMakeLists.txt ___________________________________________________________________ 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-cmake_version.cmake =================================================================== --- head/math/cadabra2/files/patch-cmake_version.cmake (revision 492522) +++ head/math/cadabra2/files/patch-cmake_version.cmake (revision 492523) @@ -1,20 +1,20 @@ ---- cmake/version.cmake.orig 2018-12-07 05:19:36 UTC +--- cmake/version.cmake.orig 2019-02-09 20:39:43 UTC +++ cmake/version.cmake -@@ -4,7 +4,7 @@ set(CADABRA_VERSION_PATCH 2) +@@ -4,7 +4,7 @@ set(CADABRA_VERSION_PATCH 4) set(CADABRA_VERSION_TWEAK 0) set(COPYRIGHT_YEARS "2001-2018") math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8") -find_program(GIT git PATHS ${GIT_DIR}) +#find_program(GIT git PATHS ${GIT_DIR}) if(GIT) message("-- Git found: ${GIT}") execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -16,7 +16,7 @@ endif() 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}") Index: head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt =================================================================== --- head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt (revision 492522) +++ head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt (revision 492523) @@ -1,15 +1,15 @@ ---- frontend/gtkmm/CMakeLists.txt.orig 2018-12-07 05:18:13 UTC +--- frontend/gtkmm/CMakeLists.txt.orig 2019-02-09 20:40:21 UTC +++ frontend/gtkmm/CMakeLists.txt -@@ -165,9 +165,9 @@ if (NOT INSTALL_TARGETS_ONLY) +@@ -162,9 +162,9 @@ if (NOT INSTALL_TARGETS_ONLY) install(FILES ${CADABRA_IMAGES_DIR}/256x256/cadabra2-gtk.png DESTINATION ${ICON_PREFIX}/share/icons/hicolor/256x256/apps) install(FILES ${CADABRA_IMAGES_DIR}/cadabra2-gtk.svg DESTINATION ${ICON_PREFIX}/share/icons/hicolor/scalable/apps) install(FILES ${CADABRA_ROOT_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(CODE "execute_process(COMMAND touch ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)") +- install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 {ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor)") +- install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)") ++ #install(CODE "execute_process(COMMAND touch ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)") ++ #install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 {ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor)") ++ #install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX_WITH_DESTDIR}/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 492522) +++ head/math/cadabra2/pkg-plist (revision 492523) @@ -1,113 +1,118 @@ bin/cadabra-server bin/cadabra2 %%GUI%%bin/cadabra2-gtk bin/cadabra2cadabra bin/cadabra2html bin/cadabra2python -lib/libcadabra_client.a +man/man1/cadabra-server.1.gz +man/man1/cadabra2-gtk.1.gz +man/man1/cadabra2.1.gz +man/man1/cadabra2cadabra.1.gz +man/man1/cadabra2html.1.gz +man/man1/cadabra2python.1.gz %%GUI%%share/applications/cadabra2-gtk.desktop %%GUI%%%%DATADIR%%/images/cadabra2-gtk.png %%GUI%%%%DATADIR%%/latex/preamble.tex %%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.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/einsteinify.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/lower_free_indices.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/raise_free_indices.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/algorithms/zoom.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/Determinant.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 %%DATADIR%%/python/cadabra2.so %%DATADIR%%/python/cadabra2_defaults.py %%DATADIR%%/python/cdb/core/component.cnb %%DATADIR%%/python/cdb/core/manip.cnb %%DATADIR%%/python/cdb/core/solve.cnb %%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 %%DATADIR%%/python/cdb/utils/node.cnb %%DATADIR%%/python/cdb_appdirs.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