From owner-svn-ports-all@freebsd.org Wed Dec 4 07:18:03 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 707111CBCF3; Wed, 4 Dec 2019 07:18:03 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47SVYl2Lktz4VyF; Wed, 4 Dec 2019 07:18:03 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 33BB6247C7; Wed, 4 Dec 2019 07:18:03 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB47I2i3007017; Wed, 4 Dec 2019 07:18:02 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB47I2rK007013; Wed, 4 Dec 2019 07:18:02 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201912040718.xB47I2rK007013@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Wed, 4 Dec 2019 07:18:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518999 - in head/math/boolector: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/math/boolector: . files X-SVN-Commit-Revision: 518999 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Dec 2019 07:18:03 -0000 Author: yuri Date: Wed Dec 4 07:18:01 2019 New Revision: 518999 URL: https://svnweb.freebsd.org/changeset/ports/518999 Log: math/boolector: Update 3.0.0-239 -> 3.1.0 Reported by: portscout Modified: head/math/boolector/Makefile head/math/boolector/distinfo head/math/boolector/files/patch-CMakeLists.txt head/math/boolector/files/patch-src_CMakeLists.txt head/math/boolector/pkg-plist Modified: head/math/boolector/Makefile ============================================================================== --- head/math/boolector/Makefile Wed Dec 4 07:17:16 2019 (r518998) +++ head/math/boolector/Makefile Wed Dec 4 07:18:01 2019 (r518999) @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= boolector -DISTVERSION= 3.0.0-239 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -g0b4b8540 +DISTVERSION= 3.1.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -12,8 +10,10 @@ COMMENT= Satisfiability Modulo Theories (SMT) solver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= picosat>0:math/picosat -LIB_DEPENDS= libbtor2parser.so:math/btor2tools +BUILD_DEPENDS= cadical>0:math/cadical +LIB_DEPENDS= libbtor2parser.so:math/btor2tools \ + libminisat.so:math/minisat \ + libpicosat.so:math/picosat USES= cmake:noninja compiler:c++11-lang # ninja fails to build tests USE_GITHUB= yes Modified: head/math/boolector/distinfo ============================================================================== --- head/math/boolector/distinfo Wed Dec 4 07:17:16 2019 (r518998) +++ head/math/boolector/distinfo Wed Dec 4 07:18:01 2019 (r518999) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560489123 -SHA256 (Boolector-boolector-3.0.0-239-g0b4b8540_GH0.tar.gz) = f0de750314c8075f6adb9f88a72c7efb897e52d53dc06b41b9beceec0f163765 -SIZE (Boolector-boolector-3.0.0-239-g0b4b8540_GH0.tar.gz) = 1372029 +TIMESTAMP = 1575434687 +SHA256 (Boolector-boolector-3.1.0_GH0.tar.gz) = 0c799f4e835e7f20ae7ecf7c3c8a99b9638b01cfe7b7f5dd1bc93ac478a0b06c +SIZE (Boolector-boolector-3.1.0_GH0.tar.gz) = 1548782 Modified: head/math/boolector/files/patch-CMakeLists.txt ============================================================================== --- head/math/boolector/files/patch-CMakeLists.txt Wed Dec 4 07:17:16 2019 (r518998) +++ head/math/boolector/files/patch-CMakeLists.txt Wed Dec 4 07:18:01 2019 (r518999) @@ -1,17 +1,28 @@ ---- CMakeLists.txt.orig 2019-05-30 02:33:58 UTC +--- CMakeLists.txt.orig 2019-12-02 22:50:20 UTC +++ CMakeLists.txt -@@ -402,11 +402,15 @@ configure_file( - ${CMAKE_CURRENT_BINARY_DIR}/src/btorconfig.h) +@@ -434,20 +434,24 @@ configure_file( + # Regression tests - # Enable CTest + # Get and configure google test +if (BUILD_TESTING) - enable_testing() + include(cmake/googletest.cmake) + fetch_googletest( + ${PROJECT_SOURCE_DIR}/cmake + ${PROJECT_BINARY_DIR}/googletest + ) + +-enable_testing() ++ enable_testing() +endif(BUILD_TESTING) + #-----------------------------------------------------------------------------# + # Source directories + include_directories(src ${CMAKE_CURRENT_BINARY_DIR}/src) add_subdirectory(src) +-add_subdirectory(test) +if (BUILD_TESTING) - add_subdirectory(test) ++ add_subdirectory(test) +endif(BUILD_TESTING) if(PYTHON) add_subdirectory(src/api/python) Modified: head/math/boolector/files/patch-src_CMakeLists.txt ============================================================================== --- head/math/boolector/files/patch-src_CMakeLists.txt Wed Dec 4 07:17:16 2019 (r518998) +++ head/math/boolector/files/patch-src_CMakeLists.txt Wed Dec 4 07:18:01 2019 (r518999) @@ -1,11 +1,11 @@ ---- src/CMakeLists.txt.orig 2019-06-14 07:01:21 UTC +--- src/CMakeLists.txt.orig 2019-12-04 04:46:17 UTC +++ src/CMakeLists.txt -@@ -129,7 +129,7 @@ set_target_properties(boolector-bin - PROPERTIES - OUTPUT_NAME boolector - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) --if(NOT SHARED AND NOT APPLE) -+if(NOT SHARED AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - set_target_properties(boolector-bin - PROPERTIES - LINK_FLAGS "-static -Wl,--no-export-dynamic" +@@ -195,7 +195,7 @@ target_link_libraries(btorimc boolector) + #-----------------------------------------------------------------------------# + # Static binaries + +-if(NOT BUILD_SHARED_LIBS AND NOT APPLE) ++if(NOT BUILD_SHARED_LIBS AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + set(BTOR_STATIC_FLAGS "-static") + set(STATIC_TARGETS boolector-bin btormc btoruntrace btorimc) + Modified: head/math/boolector/pkg-plist ============================================================================== --- head/math/boolector/pkg-plist Wed Dec 4 07:17:16 2019 (r518998) +++ head/math/boolector/pkg-plist Wed Dec 4 07:18:01 2019 (r518999) @@ -6,4 +6,4 @@ lib/cmake/Boolector/BoolectorConfig.cmake lib/cmake/Boolector/BoolectorConfigVersion.cmake lib/cmake/Boolector/BoolectorTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Boolector/BoolectorTargets.cmake -lib/libboolector.a +lib/libboolector.so