diff --git a/science/dimod/Makefile b/science/dimod/Makefile index 0d7c47051874..99d9e143f6bc 100644 --- a/science/dimod/Makefile +++ b/science/dimod/Makefile @@ -1,36 +1,36 @@ PORTNAME= dimod -DISTVERSION= 0.11.5 +DISTVERSION= 0.11.6 CATEGORIES= science python MAINTAINER= yuri@FreeBSD.org COMMENT= DWave: Shared API for QUBO/Ising samplers WWW= https://github.com/dwavesystems/dimod LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= catch>0:devel/catch USES= compiler:c++11-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= dwavesystems NO_BUILD= yes NO_ARCH= yes PLIST_FILES= include/dimod/iterators.h \ include/dimod/lp.h \ include/dimod/quadratic_model.h \ include/dimod/utils.h BINARY_ALIAS= g++=${CXX} git=true do-install: cd ${WRKSRC}/dimod/include && \ ${COPYTREE_SHARE} dimod ${STAGEDIR}${PREFIX}/include do-test: @cd ${WRKSRC}/testscpp && ${SETENV} ${MAKE_ENV} ${MAKE} .include diff --git a/science/dimod/distinfo b/science/dimod/distinfo index cdecb040478e..3b7c3a46ddaf 100644 --- a/science/dimod/distinfo +++ b/science/dimod/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1661575588 -SHA256 (dwavesystems-dimod-0.11.5_GH0.tar.gz) = 8602da849ed8ae13d48eb0507d4107b2037d072a53652673ab108bb5772f443b -SIZE (dwavesystems-dimod-0.11.5_GH0.tar.gz) = 520765 -SHA256 (catchorg-Catch2-f0dc4d9_GH0.tar.gz) = 2fed775decd4fa7adbfb193d2e80a2937e3eaaeef2f5b0633ec21449995ff77d -SIZE (catchorg-Catch2-f0dc4d9_GH0.tar.gz) = 651357 +TIMESTAMP = 1665166180 +SHA256 (dwavesystems-dimod-0.11.6_GH0.tar.gz) = a6ede2065f13008fe40e2ca9ebf7b0458293c837cf26d97a9ac54ac39ff264ae +SIZE (dwavesystems-dimod-0.11.6_GH0.tar.gz) = 523197 diff --git a/science/dimod/files/patch-testscpp_Makefile b/science/dimod/files/patch-testscpp_Makefile index f0f295b10761..561e51f67e75 100644 --- a/science/dimod/files/patch-testscpp_Makefile +++ b/science/dimod/files/patch-testscpp_Makefile @@ -1,18 +1,27 @@ ---- testscpp/Makefile.orig 2022-08-16 14:45:27 UTC +--- testscpp/Makefile.orig 2022-10-05 22:19:20 UTC +++ testscpp/Makefile -@@ -13,12 +13,12 @@ coverage: +@@ -2,7 +2,7 @@ ROOT := .. + SRC := $(ROOT)/dimod/include/ + CATCH2 := $(ROOT)/testscpp/Catch2/single_include/ + +-all: catch2 test_main tests ++all: test_main tests + + coverage: + $(CXX) -std=c++11 -Wall -c test_main.cpp -I $(CATCH2) --coverage -fno-inline -fno-inline-small-functions -fno-default-inline +@@ -14,12 +14,12 @@ coverage: rm baseline.info test.info lcov --remove coverage.info '/usr/*' --output-file coverage.info -tests: test_main.out +tests: test_main ./test_main test_main: test_main.cpp -- g++ -std=c++11 -Wall -Werror -c test_main.cpp -- g++ -std=c++11 -Wall -Werror test_main.o tests/*.cpp -o test_main -I $(SRC) -+ g++ $(CXXFLAGS) `pkg-config --cflags catch2` -std=c++11 -Wall -c test_main.cpp -+ g++ $(CXXFLAGS) `pkg-config --cflags --libs catch2` -std=c++11 -Wall test_main.o tests/*.cpp -o test_main -I $(SRC) +- $(CXX) -std=c++11 -Wall -Werror -c test_main.cpp -I $(CATCH2) +- $(CXX) -std=c++11 -Wall -Werror test_main.o tests/*.cpp -o test_main -I $(SRC) -I $(CATCH2) ++ $(CXX) -std=c++11 `pkg-config --cflags catch2` -Wall -Werror -c test_main.cpp -I $(CATCH2) ++ $(CXX) -std=c++11 `pkg-config --cflags catch2` -Wall -Werror test_main.o tests/*.cpp -o test_main -I $(SRC) -I $(CATCH2) catch2: git submodule init diff --git a/science/dimod/files/patch-testscpp_test__main.cpp b/science/dimod/files/patch-testscpp_test__main.cpp index bb485e158894..3dcb5a17fc5d 100644 --- a/science/dimod/files/patch-testscpp_test__main.cpp +++ b/science/dimod/files/patch-testscpp_test__main.cpp @@ -1,9 +1,9 @@ ---- testscpp/test_main.cpp.orig 2022-08-27 15:45:50 UTC +--- testscpp/test_main.cpp.orig 2022-10-05 22:19:20 UTC +++ testscpp/test_main.cpp @@ -1,5 +1,5 @@ #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file --#include "Catch2/single_include/catch2/catch.hpp" +-#include "catch2/catch.hpp" +#include /* The purpose of this file is to include Catch's main(). Tests can be found inside tests directory. diff --git a/science/dimod/files/patch-testscpp_tests_test__quadratic__model.cpp b/science/dimod/files/patch-testscpp_tests_test__quadratic__model.cpp index b29152b9e491..22fd876428fe 100644 --- a/science/dimod/files/patch-testscpp_tests_test__quadratic__model.cpp +++ b/science/dimod/files/patch-testscpp_tests_test__quadratic__model.cpp @@ -1,11 +1,11 @@ ---- testscpp/tests/test_quadratic_model.cpp.orig 2022-08-27 15:54:59 UTC +--- testscpp/tests/test_quadratic_model.cpp.orig 2022-10-05 22:19:20 UTC +++ testscpp/tests/test_quadratic_model.cpp @@ -14,7 +14,7 @@ #include --#include "../Catch2/single_include/catch2/catch.hpp" +-#include "catch2/catch.hpp" +#include #include "dimod/quadratic_model.h" namespace dimod { diff --git a/science/dimod/files/patch-testscpp_tests_test__utils.cpp b/science/dimod/files/patch-testscpp_tests_test__utils.cpp index 6283681a7a6b..8848df69fba9 100644 --- a/science/dimod/files/patch-testscpp_tests_test__utils.cpp +++ b/science/dimod/files/patch-testscpp_tests_test__utils.cpp @@ -1,11 +1,11 @@ ---- testscpp/tests/test_utils.cpp.orig 2022-08-27 15:49:35 UTC +--- testscpp/tests/test_utils.cpp.orig 2022-10-05 22:19:20 UTC +++ testscpp/tests/test_utils.cpp @@ -15,7 +15,7 @@ #include #include --#include "../Catch2/single_include/catch2/catch.hpp" +-#include "catch2/catch.hpp" +#include #include "dimod/utils.h" namespace dimod {