diff --git a/biology/sra-tools/Makefile b/biology/sra-tools/Makefile index ae9900e9a08b..6349393f5493 100644 --- a/biology/sra-tools/Makefile +++ b/biology/sra-tools/Makefile @@ -1,65 +1,65 @@ PORTNAME= sra-tools DISTVERSION= 3.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology java MAINTAINER= jwb@FreeBSD.org COMMENT= NCBI's toolkit for handling data in INSDC Sequence Read Archives WWW= https://github.com/ncbi/sra-tools LICENSE= PD LGPL21+ LICENSE_COMB= multi LICENSE_FILE_PD= ${WRKSRC}/LICENSE LICENSE_DISTFILES_LGPL21+ = ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= Upstream explicitly supports specific platforms # hdf5 is dynamically loaded by some tools, but nothing links to it BUILD_DEPENDS= bash:shells/bash RUN_DEPENDS= hdf5>0:science/hdf5 USES= bison cmake java shebangfix USE_GITHUB= yes -USE_LDCONFIG= ${PREFIX}/lib64 +USE_LDCONFIG= yes # Builds with earlier versions, but ngs-doc plist differs if jdk17 is present JAVA_VERSION= 17 OPTIONS_DEFINE= EXAMPLES SHEBANG_GLOB= *.sh GH_ACCOUNT= ncbi # FIXME: At the time this was added, sra-tools build required access to the # ncbi-vdb source tree. Use a separate dependent port if that is no # longer the case. CMakeLists.txt still looks for ../ncbi-vdb in 3.1.1. GH_TUPLE+= ncbi:ncbi-vdb:${DISTVERSION}:vdb/ncbi-vdb CMAKE_ARGS+= -DVDB_LIBDIR:STRING=${WRKSRC}/ncbi-vdb/build/lib # Prevent cmake from using a later Java version, if present CMAKE_ARGS+= -DJAVA_HOME:PATH=${JAVA_HOME} PLIST_SUB= PORTVERSION=${PORTVERSION} pre-configure: # Reinplaces may follow static patches. Run "make clean patch" # before updating those patches so reinplaces do not get added to them. @${REINPLACE_CMD} -e 's|"/etc/ncbi"|"${PREFIX}/etc/ncbi"|g' \ ${WRKSRC}/ncbi-vdb/libs/kfg/config.c @${REINPLACE_CMD} -e 's|/usr/local/bin|${PREFIX}/bin|g' \ ${WRKSRC}/tools/external/driver-tool/file-path.posix.cpp @${REINPLACE_CMD} -e 's|/../ncbi-vdb|/ncbi-vdb|g' \ ${WRKSRC}/CMakeLists.txt cd ${WRKSRC}/ncbi-vdb/build && cmake .. && make # FIXME: Unsure where the jquery version comes from and it differs on # amd64 (jquery-3.7.1.min.js) and aarch64 (jquery-3.6.1.min.js). # Just hack the version out for now. Not sure we even need javadoc installed. post-stage: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*.${DISTVERSION} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib64/*.${DISTVERSION} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.${DISTVERSION} post-stage-EXAMPLES-off: ${RM} -r ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/biology/sra-tools/distinfo b/biology/sra-tools/distinfo index b1e90b984179..b25432518e22 100644 --- a/biology/sra-tools/distinfo +++ b/biology/sra-tools/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1774483084 +TIMESTAMP = 1778630814 SHA256 (ncbi-sra-tools-3.4.1_GH0.tar.gz) = 874dcbb28b7ebffb5554839254e777b1137b0f0430815bab175068decfe96e98 SIZE (ncbi-sra-tools-3.4.1_GH0.tar.gz) = 66796004 SHA256 (ncbi-ncbi-vdb-3.4.1_GH0.tar.gz) = 2fa0919b2842641ead93eeeb45047e87ca480a543b6e4eda15f94d5187e91c85 SIZE (ncbi-ncbi-vdb-3.4.1_GH0.tar.gz) = 19106888 diff --git a/biology/sra-tools/files/patch-build_env.cmake b/biology/sra-tools/files/patch-build_env.cmake index b23966de6be0..c99cf6af041b 100644 --- a/biology/sra-tools/files/patch-build_env.cmake +++ b/biology/sra-tools/files/patch-build_env.cmake @@ -1,13 +1,22 @@ ---- build/env.cmake.orig 2026-05-12 21:39:17 UTC +--- build/env.cmake.orig 2026-03-25 20:33:21 UTC +++ build/env.cmake @@ -470,8 +470,8 @@ if( Python3_EXECUTABLE ) find_package( Python3 COMPONENTS Interpreter Development ) # message(STATUS "Use: ${Python3_EXECUTABLE}") - execute_process( COMMAND - "${Python3_EXECUTABLE}" -m pip install --upgrade pip setuptools wheel ) + # execute_process( COMMAND + # "${Python3_EXECUTABLE}" -m pip install --upgrade pip setuptools wheel ) endif() endif() +@@ -485,7 +485,7 @@ if ( NOT CMAKE_INSTALL_LIBDIR ) + endif() + + if ( NOT CMAKE_INSTALL_LIBDIR ) +- set( CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib64 ) ++ set( CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib ) + endif() + + function( ExportStatic name install ) diff --git a/biology/sra-tools/files/patch-ncbi-vdb_libs_kfg_CMakeLists.txt b/biology/sra-tools/files/patch-ncbi-vdb_libs_kfg_CMakeLists.txt new file mode 100644 index 000000000000..57d8d6af7b16 --- /dev/null +++ b/biology/sra-tools/files/patch-ncbi-vdb_libs_kfg_CMakeLists.txt @@ -0,0 +1,10 @@ +--- ncbi-vdb/libs/kfg/CMakeLists.txt.orig 2026-05-13 00:05:30 UTC ++++ ncbi-vdb/libs/kfg/CMakeLists.txt +@@ -58,6 +58,6 @@ if ( SINGLE_CONFIG AND NOT _NCBIVDB_CFG_PACKAGING) + + if ( SINGLE_CONFIG AND NOT _NCBIVDB_CFG_PACKAGING) + install( SCRIPT CODE +- "execute_process(COMMAND /bin/bash -c \"${CMAKE_CURRENT_SOURCE_DIR}/install.sh ${CMAKE_SOURCE_DIR}/interfaces/kfg/ncbi ${CMAKE_INSTALL_PREFIX}/lib64/ncbi /etc/ncbi ${CMAKE_SOURCE_DIR}/interfaces/kfg/ncbi/kfgsums \" )" ++ "execute_process(COMMAND /bin/bash -c \"${CMAKE_CURRENT_SOURCE_DIR}/install.sh ${CMAKE_SOURCE_DIR}/interfaces/kfg/ncbi ${CMAKE_INSTALL_PREFIX}/lib/ncbi /etc/ncbi ${CMAKE_SOURCE_DIR}/interfaces/kfg/ncbi/kfgsums \" )" + ) + endif() diff --git a/biology/sra-tools/pkg-plist b/biology/sra-tools/pkg-plist index b140de4f836a..1360b711e40f 100644 --- a/biology/sra-tools/pkg-plist +++ b/biology/sra-tools/pkg-plist @@ -1,228 +1,228 @@ bin/abi-dump bin/abi-dump.3 bin/abi-dump.%%PORTVERSION%% bin/align-info bin/align-info.3 bin/align-info.%%PORTVERSION%% bin/check-corrupt bin/check-corrupt.3 bin/check-corrupt.%%PORTVERSION%% bin/fasterq-dump bin/fasterq-dump-orig.%%PORTVERSION%% bin/fasterq-dump.3 bin/fasterq-dump.%%PORTVERSION%% bin/fastq-dump bin/fastq-dump-orig.%%PORTVERSION%% bin/fastq-dump.3 bin/fastq-dump.%%PORTVERSION%% bin/illumina-dump bin/illumina-dump.3 bin/illumina-dump.%%PORTVERSION%% bin/kdbmeta bin/kdbmeta.3 bin/kdbmeta.%%PORTVERSION%% bin/ngs-pileup bin/ngs-pileup.3 bin/ngs-pileup.%%PORTVERSION%% bin/prefetch bin/prefetch-orig.%%PORTVERSION%% bin/prefetch.3 bin/prefetch.%%PORTVERSION%% bin/rcexplain bin/rcexplain.3 bin/rcexplain.%%PORTVERSION%% bin/ref-variation bin/ref-variation.3 bin/ref-variation.%%PORTVERSION%% bin/sam-dump bin/sam-dump-orig.%%PORTVERSION%% bin/sam-dump.3 bin/sam-dump.%%PORTVERSION%% bin/sff-dump bin/sff-dump.3 bin/sff-dump.%%PORTVERSION%% bin/sra-info bin/sra-info.3 bin/sra-info.%%PORTVERSION%% bin/sra-pileup bin/sra-pileup-orig.%%PORTVERSION%% bin/sra-pileup.3 bin/sra-pileup.%%PORTVERSION%% bin/sra-search bin/sra-search.3 bin/sra-search.%%PORTVERSION%% bin/sra-stat bin/sra-stat.3 bin/sra-stat.%%PORTVERSION%% bin/srapath bin/srapath-orig.%%PORTVERSION%% bin/srapath.3 bin/srapath.%%PORTVERSION%% bin/sratools bin/sratools.3 bin/sratools.%%PORTVERSION%% bin/test-sra bin/test-sra.3 bin/test-sra.%%PORTVERSION%% bin/var-expand bin/var-expand.3 bin/var-expand.%%PORTVERSION%% bin/vdb-config bin/vdb-config.3 bin/vdb-config.%%PORTVERSION%% bin/vdb-decrypt bin/vdb-decrypt.3 bin/vdb-decrypt.%%PORTVERSION%% bin/vdb-dump bin/vdb-dump-orig.%%PORTVERSION%% bin/vdb-dump.3 bin/vdb-dump.%%PORTVERSION%% bin/vdb-encrypt bin/vdb-encrypt.3 bin/vdb-encrypt.%%PORTVERSION%% bin/vdb-validate bin/vdb-validate.3 bin/vdb-validate.%%PORTVERSION%% include/ncbi-vdb/NGS.hpp include/ngs/Alignment.hpp include/ngs/AlignmentIterator.hpp include/ngs/ErrorMsg.hpp include/ngs/Fragment.hpp include/ngs/FragmentIterator.hpp include/ngs/Package.hpp include/ngs/Pileup.hpp include/ngs/PileupEvent.hpp include/ngs/PileupEventIterator.hpp include/ngs/PileupIterator.hpp include/ngs/Read.hpp include/ngs/ReadCollection.hpp include/ngs/ReadGroup.hpp include/ngs/ReadGroupIterator.hpp include/ngs/ReadIterator.hpp include/ngs/Reference.hpp include/ngs/ReferenceIterator.hpp include/ngs/ReferenceSequence.hpp include/ngs/Statistics.hpp include/ngs/StringRef.hpp include/ngs/adapter/AlignmentItf.hpp include/ngs/adapter/ErrorMsg.hpp include/ngs/adapter/FragmentItf.hpp include/ngs/adapter/PileupEventItf.hpp include/ngs/adapter/PileupItf.hpp include/ngs/adapter/ReadCollectionItf.hpp include/ngs/adapter/ReadGroupItf.hpp include/ngs/adapter/ReadItf.hpp include/ngs/adapter/Refcount.hpp include/ngs/adapter/ReferenceItf.hpp include/ngs/adapter/ReferenceSequenceItf.hpp include/ngs/adapter/StatisticsItf.hpp include/ngs/adapter/StringItf.hpp include/ngs/adapter/defs.h include/ngs/inl/Alignment.hpp include/ngs/inl/AlignmentIterator.hpp include/ngs/inl/Fragment.hpp include/ngs/inl/FragmentIterator.hpp include/ngs/inl/Package.hpp include/ngs/inl/Pileup.hpp include/ngs/inl/PileupEvent.hpp include/ngs/inl/PileupEventIterator.hpp include/ngs/inl/PileupIterator.hpp include/ngs/inl/Read.hpp include/ngs/inl/ReadCollection.hpp include/ngs/inl/ReadGroup.hpp include/ngs/inl/ReadGroupIterator.hpp include/ngs/inl/ReadIterator.hpp include/ngs/inl/Reference.hpp include/ngs/inl/ReferenceIterator.hpp include/ngs/inl/ReferenceSequence.hpp include/ngs/inl/Statistics.hpp include/ngs/inl/StringRef.hpp include/ngs/itf/AlignmentItf.h include/ngs/itf/AlignmentItf.hpp include/ngs/itf/ErrBlock.h include/ngs/itf/ErrBlock.hpp include/ngs/itf/ErrorMsg.hpp include/ngs/itf/FragmentItf.h include/ngs/itf/FragmentItf.hpp include/ngs/itf/PackageItf.hpp include/ngs/itf/PileupEventItf.h include/ngs/itf/PileupEventItf.hpp include/ngs/itf/PileupItf.h include/ngs/itf/PileupItf.hpp include/ngs/itf/ReadCollectionItf.h include/ngs/itf/ReadCollectionItf.hpp include/ngs/itf/ReadGroupItf.h include/ngs/itf/ReadGroupItf.hpp include/ngs/itf/ReadItf.h include/ngs/itf/ReadItf.hpp include/ngs/itf/Refcount.h include/ngs/itf/Refcount.hpp include/ngs/itf/ReferenceItf.h include/ngs/itf/ReferenceItf.hpp include/ngs/itf/ReferenceSequenceItf.h include/ngs/itf/ReferenceSequenceItf.hpp include/ngs/itf/StatisticsItf.h include/ngs/itf/StatisticsItf.hpp include/ngs/itf/StringItf.h include/ngs/itf/StringItf.hpp include/ngs/itf/VTable.h include/ngs/itf/VTable.hpp include/ngs/itf/defs.h include/ngs/unix/arm64/atomic32.h include/ngs/unix/fat86/atomic32.h include/ngs/unix/i386/atomic32.h include/ngs/unix/x86_64/atomic32.h include/ngs/win/atomic32.h include/ngs/win/stdbool.h jar/ngs-examples.jar jar/ngs-java.jar jar/ngs-src.jar -lib64/libkapp-static.a -lib64/libkapp.a -lib64/libkapp.a.3 -lib64/libkapp.a.%%PORTVERSION%% -lib64/libncbi-ngs-c++-static.a -lib64/libncbi-ngs-c++.a -lib64/libncbi-ngs-c++.a.3 -lib64/libncbi-ngs-c++.a.%%PORTVERSION%% -lib64/libncbi-ngs-static.a -lib64/libncbi-ngs.a -lib64/libncbi-ngs.a.3 -lib64/libncbi-ngs.a.%%PORTVERSION%% -lib64/libncbi-ngs.so -lib64/libncbi-ngs.so.3 -lib64/libncbi-ngs.so.%%PORTVERSION%% -lib64/libngs-c++-static.a -lib64/libngs-c++.a -lib64/libngs-c++.a.3 -lib64/libngs-c++.a.%%PORTVERSION%% -lib64/libngs-c++.so -lib64/libngs-c++.so.3 -lib64/libngs-c++.so.%%PORTVERSION%% +lib/libkapp-static.a +lib/libkapp.a +lib/libkapp.a.3 +lib/libkapp.a.%%PORTVERSION%% +lib/libncbi-ngs-c++-static.a +lib/libncbi-ngs-c++.a +lib/libncbi-ngs-c++.a.3 +lib/libncbi-ngs-c++.a.%%PORTVERSION%% +lib/libncbi-ngs-static.a +lib/libncbi-ngs.a +lib/libncbi-ngs.a.3 +lib/libncbi-ngs.a.%%PORTVERSION%% +lib/libncbi-ngs.so +lib/libncbi-ngs.so.3 +lib/libncbi-ngs.so.%%PORTVERSION%% +lib/libngs-c++-static.a +lib/libngs-c++.a +lib/libngs-c++.a.3 +lib/libngs-c++.a.%%PORTVERSION%% +lib/libngs-c++.so +lib/libngs-c++.so.3 +lib/libngs-c++.so.%%PORTVERSION%% %%PORTEXAMPLES%%%%EXAMPLESDIR%%/AlignSliceTest.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/AlignTest.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/DumpReferenceFASTA.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/FragTest.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/PileupTest.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/RefTest.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/expected.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/README.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/examples/AlignSliceTest.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/examples/AlignTest.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/examples/DumpReferenceFASTA.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/examples/FragTest.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/examples/PileupTest.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/examples/ReadGroupTest.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/examples/RefTest.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/expected.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/AlignSliceTest.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/AlignTest.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/FragTest.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/PileupTest.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/README.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/RefTest.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/expected.txt