diff --git a/biology/btllib/Makefile b/biology/btllib/Makefile index 750b970ec0be..32eee1f92648 100644 --- a/biology/btllib/Makefile +++ b/biology/btllib/Makefile @@ -1,33 +1,32 @@ PORTNAME= btllib DISTVERSIONPREFIX= v -DISTVERSION= 1.7.5 -PORTREVISION= 1 +DISTVERSION= 1.7.6 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/biology/btllib/distinfo b/biology/btllib/distinfo index ade68a39b615..e92a79aa83fd 100644 --- a/biology/btllib/distinfo +++ b/biology/btllib/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1733374207 -SHA256 (bcgsc-btllib-v1.7.5_GH0.tar.gz) = a4c9cdd2c1d37d7f0465dc15e6267693f74e5e3b547b5ff187989abf1e4ca0b8 -SIZE (bcgsc-btllib-v1.7.5_GH0.tar.gz) = 956716 +TIMESTAMP = 1773511448 +SHA256 (bcgsc-btllib-v1.7.6_GH0.tar.gz) = ab7f20e017b7a1541d91400c00dce37f7843a478b510257fba58388dc9d1ec4d +SIZE (bcgsc-btllib-v1.7.6_GH0.tar.gz) = 957034 SHA256 (p-ranav-argparse-15d745f_GH0.tar.gz) = f033d4eb4a430b4ae4bf3c2a40e087709bf77462c1f9968ae07828437219a370 SIZE (p-ranav-argparse-15d745f_GH0.tar.gz) = 105608 SHA256 (skystrife-cpptoml-fededad_GH0.tar.gz) = dd2d129b67f537ae7d6f8d8d084c8c0d772d0f5b4b3118c1892e67ff536e335e SIZE (skystrife-cpptoml-fededad_GH0.tar.gz) = 47398 diff --git a/biology/btllib/files/patch-meson.build b/biology/btllib/files/patch-meson.build index 878516f5d78b..f32d592315c1 100644 --- a/biology/btllib/files/patch-meson.build +++ b/biology/btllib/files/patch-meson.build @@ -1,54 +1,50 @@ ---- meson.build.orig 2023-07-06 15:52:18 UTC +--- meson.build.orig 2026-03-11 18:55:57 UTC +++ meson.build -@@ -1,7 +1,7 @@ +@@ -1,7 +1,7 @@ project('btllib', 'cpp', project('btllib', 'cpp', - version : '1.6.2', + version : '1.7.6', license : 'GPL3', - default_options : [ 'cpp_std=c++17', 'warning_level=3', 'werror=true', 'b_coverage=true' ], + default_options : [ 'cpp_std=c++17', 'warning_level=3', 'b_coverage=true' ], meson_version : '>= 0.60.0') # Configuration -@@ -48,22 +48,28 @@ threads_dep = dependency('threads') +@@ -48,7 +48,7 @@ cmake_options = cmake.subproject_options() openmp_dep = dependency('openmp', required : false) cmake_options = cmake.subproject_options() -cmake_options.set_override_option('werror', 'false') +#cmake_options.set_override_option('werror', 'false') cmake_options.set_install(false) + if host_machine.cpu_family() == 'aarch64' +@@ -59,16 +59,16 @@ cpptomp_dep = cpptoml_subproject.dependency('cpptoml') cpptoml_subproject = cmake.subproject('cpptoml', options : cmake_options) cpptomp_dep = cpptoml_subproject.dependency('cpptoml') -run_command(meson.project_source_root() + '/scripts/prepare-sdsl') +#run_command(meson.project_source_root() + '/scripts/prepare-sdsl') -sdsl_subproject = cmake.subproject('sdsl-lite', options : cmake_options) -sdsl_dep = sdsl_subproject.dependency('sdsl', include_type: 'system') -+#sdsl_subproject = cmake.subproject('sdsl-lite', options : cmake_options) - -+#sdsl_dep = sdsl_subproject.dependency('sdsl', include_type: 'system') -+ +pkg = import('pkgconfig') +sdsl_dep = dependency('sdsl-lite') -+#lib = library('foo', dependencies : [bar]) -+#pkg.generate(lib) -+ + deps = [ threads_dep, openmp_dep, cpptomp_dep, sdsl_dep ] # These are unfortunate hacks. Currently, neither cpptoml nor sdsl-lite install their headers (even when set_install(true) is called), and so we need to do it manually meson.add_install_script('scripts/install-cpptoml') -meson.add_install_script('scripts/install-sdsl-lite') +#meson.add_install_script('scripts/install-sdsl-lite') argparse_subproject = cmake.subproject('argparse', options : cmake_options) argparse_dep = argparse_subproject.dependency('argparse') -@@ -126,7 +132,7 @@ run_target('test-wrappers', command: join_paths(rootpa +@@ -131,7 +131,7 @@ btllib_sources = run_command('scripts/get-files', 'src btllib_include = [ include_directories('include'), include_directories('.') ] btllib_sources = run_command('scripts/get-files', 'src').stdout().strip().split() -btllib_lib = static_library('btllib', +btllib_lib = shared_library('btllib', btllib_sources, include_directories : btllib_include, dependencies : deps,