diff --git a/biology/btllib/Makefile b/biology/btllib/Makefile index dd5daa7c9272..750b970ec0be 100644 --- a/biology/btllib/Makefile +++ b/biology/btllib/Makefile @@ -1,32 +1,33 @@ PORTNAME= btllib DISTVERSIONPREFIX= v DISTVERSION= 1.7.5 +PORTREVISION= 1 CATEGORIES= biology devel MAINTAINER= yuri@FreeBSD.org COMMENT= Bioinformatics Technology Lab common code library WWW= https://github.com/bcgsc/btllib LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= armv6 armv7 i386 mips powerpc # temporary until https://github.com/bcgsc/btllib/issues/117 is fixed BUILD_DEPENDS= bash:shells/bash \ samtools:biology/samtools \ cmake:devel/cmake-core LIB_DEPENDS= libsdsl.so:devel/sdsl-lite RUN_DEPENDS= samtools:biology/samtools USES= meson pkgconfig python:build shebangfix SHEBANG_FILES= scripts/* USE_GITHUB= yes GH_ACCOUNT= bcgsc GH_TUPLE= p-ranav:argparse:15d745f:argparse/subprojects/argparse \ skystrife:cpptoml:fededad:cpptoml/subprojects/cpptoml BINARY_ALIAS= python3=${PYTHON_CMD} # python3-config=${PYTHON_CMD}-config # installs python binding into a wrong location, see https://github.com/bcgsc/btllib/issues/111 .include diff --git a/devel/sdsl-lite/Makefile b/devel/sdsl-lite/Makefile index fd763bd755fe..1514d02cf78d 100644 --- a/devel/sdsl-lite/Makefile +++ b/devel/sdsl-lite/Makefile @@ -1,36 +1,37 @@ PORTNAME= sdsl-lite DISTVERSIONPREFIX= v -DISTVERSION= 2.1.1-137 -DISTVERSIONSUFFIX= -gc32874c +DISTVERSION= 2.3.1-vgteam-20 +DISTVERSIONSUFFIX= -g8abd7c9 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= Succinct Data Structure Library 2.0 WWW= https://github.com/simongog/sdsl-lite LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:testing compiler:c++11-lang +USES= cmake:testing compiler:c++17-lang USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= simongog GH_TUPLE= simongog:libdivsufsort:0f24acd:libdivsufsort/external/libdivsufsort \ - google:googletest:c2d90bd:googletest/external/googletest + google:googletest:71815bb:googletest/external/googletest CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_OFF= WITH_GOOGLETEST CONFLICTS_INSTALL= libdivsufsort PORTSCOUT= limit:^[v1-9].*$$ # prevent tags like c++11v1 post-install: # remove bundled gtest, see https://github.com/simongog/sdsl-lite/issues/458 ${RM} -r \ ${STAGEDIR}${PREFIX}/include/gtest \ ${STAGEDIR}${PREFIX}/lib/libgtest* # * uses bundled (too old) divsufsort not compatible with math/libdivsufsort, see https://github.com/simongog/sdsl-lite/issues/457 # * unclear how to run tests, see https://github.com/simongog/sdsl-lite/issues/459 .include diff --git a/devel/sdsl-lite/distinfo b/devel/sdsl-lite/distinfo index 14007db745a0..425808ada147 100644 --- a/devel/sdsl-lite/distinfo +++ b/devel/sdsl-lite/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1689969070 -SHA256 (simongog-sdsl-lite-v2.1.1-137-gc32874c_GH0.tar.gz) = 3554d08faf7375833ec05b8e44b6837550acace9a995734aacca3f4cb0b3732e -SIZE (simongog-sdsl-lite-v2.1.1-137-gc32874c_GH0.tar.gz) = 646011 +TIMESTAMP = 1760081725 +SHA256 (simongog-sdsl-lite-v2.3.1-vgteam-20-g8abd7c9_GH0.tar.gz) = e56afbf9639befb99b88978e59350ceb6cbdfa6147099ebe6bebe29b14c8bec4 +SIZE (simongog-sdsl-lite-v2.3.1-vgteam-20-g8abd7c9_GH0.tar.gz) = 1166860 SHA256 (simongog-libdivsufsort-0f24acd_GH0.tar.gz) = 10f76dba7a59111404511ff313b23098950f5b2eef69e3f249e63c59cca09d3e SIZE (simongog-libdivsufsort-0f24acd_GH0.tar.gz) = 25952 -SHA256 (google-googletest-c2d90bd_GH0.tar.gz) = 014bf6c1c899344efb5bfe458326a459e04e3e2347f20eb9156af36bbade0829 -SIZE (google-googletest-c2d90bd_GH0.tar.gz) = 1284614 +SHA256 (google-googletest-71815bb_GH0.tar.gz) = 386281d4eddb10c6cf5f93ee02d56793fb075138cb584ca31b1e70ab38c7678c +SIZE (google-googletest-71815bb_GH0.tar.gz) = 873787 diff --git a/devel/sdsl-lite/files/patch-include_sdsl_louds__tree.hpp b/devel/sdsl-lite/files/patch-include_sdsl_louds__tree.hpp deleted file mode 100644 index aac7769bbd31..000000000000 --- a/devel/sdsl-lite/files/patch-include_sdsl_louds__tree.hpp +++ /dev/null @@ -1,19 +0,0 @@ -- fix build with clang-19, see https://github.com/simongog/sdsl-lite/issues/462 - ---- include/sdsl/louds_tree.hpp.orig 2024-11-03 05:50:59 UTC -+++ include/sdsl/louds_tree.hpp -@@ -176,12 +176,13 @@ class louds_tree - return v.nr; - } - -- -+#if 0 - void swap(louds_tree& tree) { - m_bv.swap(tree.m_bv); - util::swap_support(m_bv_select1, tree.m_select1, &m_bv, &(tree.m_bv)); - util::swap_support(m_bv_select0, tree.m_select0, &m_bv, &(tree.m_bv)); - } -+#endif - - size_type serialize(std::ostream& out, structure_tree_node* v=nullptr, std::string name="")const { - structure_tree_node* child = structure_tree::add_child(v, name, util::class_name(*this)); diff --git a/devel/sdsl-lite/pkg-plist b/devel/sdsl-lite/pkg-plist index becee623b563..fdf4179bd35d 100644 --- a/devel/sdsl-lite/pkg-plist +++ b/devel/sdsl-lite/pkg-plist @@ -1,123 +1,125 @@ include/divsufsort.h include/divsufsort64.h include/sdsl/bit_vector_il.hpp include/sdsl/bit_vectors.hpp include/sdsl/bits.hpp include/sdsl/bp_support.hpp include/sdsl/bp_support_algorithm.hpp include/sdsl/bp_support_g.hpp include/sdsl/bp_support_gg.hpp include/sdsl/bp_support_sada.hpp include/sdsl/coder.hpp include/sdsl/coder_comma.hpp include/sdsl/coder_elias_delta.hpp include/sdsl/coder_elias_gamma.hpp include/sdsl/coder_fibonacci.hpp include/sdsl/config.hpp include/sdsl/construct.hpp include/sdsl/construct_bwt.hpp include/sdsl/construct_config.hpp include/sdsl/construct_isa.hpp include/sdsl/construct_lcp.hpp include/sdsl/construct_lcp_helper.hpp include/sdsl/construct_sa.hpp include/sdsl/construct_sa_se.hpp include/sdsl/csa_alphabet_strategy.hpp include/sdsl/csa_bitcompressed.hpp include/sdsl/csa_sada.hpp include/sdsl/csa_sampling_strategy.hpp include/sdsl/csa_wt.hpp include/sdsl/cst_fully.hpp include/sdsl/cst_iterators.hpp include/sdsl/cst_sada.hpp include/sdsl/cst_sct3.hpp include/sdsl/dac_vector.hpp include/sdsl/enc_vector.hpp include/sdsl/fast_cache.hpp include/sdsl/hyb_vector.hpp include/sdsl/int_vector.hpp include/sdsl/int_vector_buffer.hpp include/sdsl/int_vector_io_wrappers.hpp include/sdsl/int_vector_mapper.hpp include/sdsl/inv_perm_support.hpp include/sdsl/io.hpp include/sdsl/iterators.hpp include/sdsl/k2_treap.hpp include/sdsl/k2_treap_algorithm.hpp include/sdsl/k2_treap_helper.hpp include/sdsl/k2_tree.hpp include/sdsl/k2_tree_helper.hpp include/sdsl/lcp.hpp include/sdsl/lcp_bitcompressed.hpp include/sdsl/lcp_byte.hpp include/sdsl/lcp_dac.hpp include/sdsl/lcp_support_sada.hpp include/sdsl/lcp_support_tree.hpp include/sdsl/lcp_support_tree2.hpp include/sdsl/lcp_vlc.hpp include/sdsl/lcp_wt.hpp include/sdsl/louds_tree.hpp include/sdsl/memory_management.hpp include/sdsl/nearest_neighbour_dictionary.hpp include/sdsl/nn_dict_dynamic.hpp include/sdsl/qsufsort.hpp include/sdsl/ram_filebuf.hpp include/sdsl/ram_fs.hpp include/sdsl/rank_support.hpp include/sdsl/rank_support_scan.hpp include/sdsl/rank_support_v.hpp include/sdsl/rank_support_v5.hpp include/sdsl/raster_img.hpp +include/sdsl/rle_vector.hpp include/sdsl/rmq_succinct_sada.hpp include/sdsl/rmq_succinct_sct.hpp include/sdsl/rmq_support.hpp include/sdsl/rmq_support_sparse_table.hpp include/sdsl/rrr_helper.hpp include/sdsl/rrr_vector.hpp include/sdsl/rrr_vector_15.hpp include/sdsl/sd_vector.hpp include/sdsl/sdsl_concepts.hpp include/sdsl/select_support.hpp include/sdsl/select_support_mcl.hpp include/sdsl/select_support_scan.hpp include/sdsl/sfstream.hpp +include/sdsl/simple_sds.hpp include/sdsl/sorted_int_stack.hpp include/sdsl/sorted_multi_stack_support.hpp include/sdsl/sorted_stack_support.hpp include/sdsl/structure_tree.hpp include/sdsl/suffix_array_algorithm.hpp include/sdsl/suffix_array_helper.hpp include/sdsl/suffix_arrays.hpp include/sdsl/suffix_tree_algorithm.hpp include/sdsl/suffix_tree_helper.hpp include/sdsl/suffix_trees.hpp include/sdsl/uint128_t.hpp include/sdsl/uint256_t.hpp include/sdsl/uintx_t.hpp include/sdsl/util.hpp include/sdsl/vectors.hpp include/sdsl/vlc_vector.hpp include/sdsl/wavelet_trees.hpp include/sdsl/wm_int.hpp include/sdsl/wt_algorithm.hpp include/sdsl/wt_ap.hpp include/sdsl/wt_blcd.hpp include/sdsl/wt_gmr.hpp include/sdsl/wt_helper.hpp include/sdsl/wt_huff.hpp include/sdsl/wt_hutu.hpp include/sdsl/wt_int.hpp include/sdsl/wt_pc.hpp include/sdsl/wt_rlmn.hpp lib/libdivsufsort.so lib/libdivsufsort.so.3 lib/libdivsufsort.so.3.0.1 lib/libdivsufsort64.so lib/libdivsufsort64.so.3 lib/libdivsufsort64.so.3.0.1 lib/libsdsl.so -lib/libsdsl.so.2.1.0 +lib/libsdsl.so.2.3.1 lib/libsdsl.so.3 libdata/pkgconfig/libdivsufsort.pc libdata/pkgconfig/libdivsufsort64.pc libdata/pkgconfig/sdsl-lite.pc