Page MenuHomeFreeBSD
Files F140862766

D9439.diff
No OneTemporary
Actions

D9439.diff
View Options

Index: head/math/cadabra2/Makefile
===================================================================
--- head/math/cadabra2/Makefile
+++ head/math/cadabra2/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cadabra2
-PORTVERSION= 2.0.930
-PORTREVISION= 2
+PORTVERSION= 2.1.2
CATEGORIES= math
MAINTAINER= yuri@rawbw.com
@@ -26,7 +25,6 @@
USE_GITHUB= yes
GH_ACCOUNT= kpeeters
-GH_TAGNAME= 85ac041
OPTIONS_DEFINE= GUI
OPTIONS_DEFAULT=GUI
@@ -37,11 +35,11 @@
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
@@ -62,10 +60,11 @@
${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
@@ -73,15 +72,17 @@
${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
+++ head/math/cadabra2/distinfo
@@ -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
+++ head/math/cadabra2/files/patch-client__server_CMakeLists.txt
@@ -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
+++ head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
@@ -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)")
Index: head/math/cadabra2/pkg-plist
===================================================================
--- head/math/cadabra2/pkg-plist
+++ head/math/cadabra2/pkg-plist
@@ -1,4 +1,4 @@
-%%GUI%%bin/cadabra-gtk
+%%GUI%%bin/cadabra2-gtk
bin/cadabra-server
bin/cadabra2
bin/cadabra2html
@@ -7,23 +7,21 @@
%%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
@@ -97,3 +95,4 @@
%%GUI%%%%DATADIR%%/manual/properties/Spinor.cnb
%%GUI%%%%DATADIR%%/manual/properties/Symmetric.cnb
%%GUI%%%%DATADIR%%/manual/properties/TableauSymmetry.cnb
+%%GUI%%%%DATADIR%%/texengine/preamble.tex

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 29, 11:52 PM (21 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27370557
Default Alt Text
D9439.diff (10 KB)

Event Timeline