kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

math/cadabra2: Update 2.2.4 -> 2.2.5-5

Browse source
This commit is contained in:
Yuri Victorovich 2019-02-09 21:39:21 +00:00
parent 4c2cec68c8
commit 7f18e84c97
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=492523
7 changed files with 22 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
math/cadabra2/Makefile
View file

@ -1,12 +1,10 @@
# $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
@ -32,7 +30,7 @@ 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

8
math/cadabra2/distinfo
View file

@ -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

26
math/cadabra2/files/patch-client__server_CMakeLists.txt
View file

@ -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}

4
math/cadabra2/files/patch-cmake_version.cmake
View file

@ -1,6 +1,6 @@
--- 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")

34
math/cadabra2/files/patch-core_CMakeLists.txt
View file

@ -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})

16
math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
View file

@ -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

7
math/cadabra2/pkg-plist
View file

@ -4,7 +4,12 @@ bin/cadabra2
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