Commit faf8043d authored by Yuri Victorovich's avatar Yuri Victorovich
Browse files

math/cvc4: Move to math/cvc5 - CVC4 was succeeded by CVC5 

Remove the PYTHON option - it will be made into a separate port.
parent 7780472b

MOVED

+1 −0
Original line number Diff line number Diff line
@@ -17747,3 +17747,4 @@ sysutils/beats6||2023-01-01|Has expired: No longer maintained and supported 
sysutils/logstash6||2023-01-01|Has expired: No longer maintained and supported

textproc/elasticsearch6||2023-01-01|Has expired: No longer maintained and supported

japanese/ja-tex-xdvik|print/tex-xdvik|2023-01-02|pTeX support has been integrated

math/cvc4|math/cvc5|2023-01-03|CVC4 was succeeded by CVC5

math/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ 
    SUBDIR += cudd

    SUBDIR += curv

    SUBDIR += cvc3

    SUBDIR += cvc4

    SUBDIR += cvc5

    SUBDIR += dbcsr

    SUBDIR += deal.ii

    SUBDIR += dieharder

math/cvc4/files/patch-cmake_FindANTLR.cmake

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
We fetch 3.4 (since 3.5 breaks it), we don't want it to find

system antlr3 (3.5) and overwrite our fetched one



--- cmake/FindANTLR.cmake.orig	2019-04-09 16:14:31 UTC

+++ cmake/FindANTLR.cmake

@@ -27,7 +27,6 @@ find_library(ANTLR_LIBRARIES

   NO_DEFAULT_PATH)

 

 if(CHECK_SYSTEM_VERSION)

-  find_program(ANTLR_BINARY NAMES antlr3)

   find_path(ANTLR_INCLUDE_DIR NAMES antlr3.h)

   find_library(ANTLR_LIBRARIES NAMES antlr3c)

 endif()

math/cvc4/files/patch-cmake_FindReadline.cmake

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
CMAKE_REQUIRED_INCLUDES does not work for some reason,

the check is compiled without the include path



--- cmake/FindReadline.cmake.orig	2019-04-09 16:14:31 UTC

+++ cmake/FindReadline.cmake

@@ -13,15 +13,7 @@ find_library(Readline_LIBRARIES NAMES readline)

 function(try_compile_readline libs _result)

   set(CMAKE_REQUIRED_QUIET TRUE)

   set(CMAKE_REQUIRED_LIBRARIES ${Readline_LIBRARIES} ${libs})

-  check_cxx_source_compiles(

-    "

-    #include <stdio.h>

-    #include <readline/readline.h>

-    int main() { readline(\"\"); return 0; }

-    "

-    ${_result}

-  )

-  set(${_result} ${${_result}} PARENT_SCOPE)

+  set(${_result} OK PARENT_SCOPE)

 endfunction()

 

 if(Readline_INCLUDE_DIR)

@@ -42,18 +34,7 @@ if(Readline_INCLUDE_DIR)

 

   # Check which standard of readline is installed on the system.

   # https://github.com/CVC4/CVC4/issues/702

-  include(CheckCXXSourceCompiles)

-  set(CMAKE_REQUIRED_QUIET TRUE)

-  set(CMAKE_REQUIRED_LIBRARIES ${Readline_LIBRARIES})

-  check_cxx_source_compiles(

-    "#include <stdio.h>

-     #include <readline/readline.h>

-     char* foo(const char*, int) { return (char*)0; }

-     int main() { rl_completion_entry_function = foo; return 0; }"

-     Readline_COMPENTRY_FUNC_RETURNS_CHARPTR

-  )

-  unset(CMAKE_REQUIRED_QUIET)

-  unset(CMAKE_REQUIRED_LIBRARIES)

+  set(Readline_COMPENTRY_FUNC_RETURNS_CHARPTR TRUE)

 endif()

 

 include(FindPackageHandleStandardArgs)

math/cvc4/files/patch-doc_CMakeLists.txt

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
--- doc/CMakeLists.txt.orig	2019-06-06 21:29:05 UTC

+++ doc/CMakeLists.txt

@@ -34,10 +34,10 @@ configure_file(

 #-----------------------------------------------------------------------------#

 # Install man pages

 

-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cvc4.1 DESTINATION share/man/man1)

-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cvc4.5 DESTINATION share/man/man5)

+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cvc4.1 DESTINATION man/man1)

+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cvc4.5 DESTINATION man/man5)

 if(ENABLE_PORTFOLIO)

-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cvc4.1 DESTINATION share/man/man1

+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cvc4.1 DESTINATION man/man1

           RENAME pcvc4.1)

 endif()

 install(FILES

@@ -45,4 +45,4 @@ install(FILES

         ${CMAKE_CURRENT_BINARY_DIR}/libcvc4parser.3

         ${CMAKE_CURRENT_BINARY_DIR}/options.3cvc

         ${CMAKE_CURRENT_BINARY_DIR}/SmtEngine.3cvc

-        DESTINATION share/man/man3)

+        DESTINATION man/man3)