svn commit: r492523 - in head/math/cadabra2: . files

Yuri Victorovich yuri at FreeBSD.org
Sat Feb 9 21:39:23 UTC 2019 

Author: yuri
Date: Sat Feb  9 21:39:21 2019
New Revision: 492523
URL: https://svnweb.freebsd.org/changeset/ports/492523

Log:
  math/cadabra2: Update 2.2.4 -> 2.2.5-5

Deleted:
  head/math/cadabra2/files/patch-client__server_CMakeLists.txt
  head/math/cadabra2/files/patch-core_CMakeLists.txt
Modified:
  head/math/cadabra2/Makefile
  head/math/cadabra2/distinfo
  head/math/cadabra2/files/patch-cmake_version.cmake
  head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
  head/math/cadabra2/pkg-plist

Modified: head/math/cadabra2/Makefile
==============================================================================
--- head/math/cadabra2/Makefile	Sat Feb  9 21:04:06 2019	(r492522)
+++ head/math/cadabra2/Makefile	Sat Feb  9 21:39:21 2019	(r492523)
@@ -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 at 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

Modified: head/math/cadabra2/distinfo
==============================================================================
--- head/math/cadabra2/distinfo	Sat Feb  9 21:04:06 2019	(r492522)
+++ head/math/cadabra2/distinfo	Sat Feb  9 21:39:21 2019	(r492523)
@@ -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

Modified: head/math/cadabra2/files/patch-cmake_version.cmake
==============================================================================
--- head/math/cadabra2/files/patch-cmake_version.cmake	Sat Feb  9 21:04:06 2019	(r492522)
+++ head/math/cadabra2/files/patch-cmake_version.cmake	Sat Feb  9 21:39:21 2019	(r492523)
@@ -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")

Modified: head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
==============================================================================
--- head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt	Sat Feb  9 21:04:06 2019	(r492522)
+++ head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt	Sat Feb  9 21:39:21 2019	(r492523)
@@ -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

Modified: head/math/cadabra2/pkg-plist
==============================================================================
--- head/math/cadabra2/pkg-plist	Sat Feb  9 21:04:06 2019	(r492522)
+++ head/math/cadabra2/pkg-plist	Sat Feb  9 21:39:21 2019	(r492523)
@@ -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

More information about the svn-ports-head mailing list