Index: head/biology/pbcopper/Makefile =================================================================== --- head/biology/pbcopper/Makefile (revision 493396) +++ head/biology/pbcopper/Makefile (revision 493397) @@ -1,29 +1,28 @@ # $FreeBSD$ PORTNAME= pbcopper -DISTVERSION= g20180413 -PORTREVISION= 3 +DISTVERSION= 0.4.1 # Test with biology/unanimity before upgrading! CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org COMMENT= Core C++ library for Pacific Biosciences tools LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libboost_regex.so:devel/boost-libs -USES= cmake compiler:c++14-lang -# Although there are a couple releases, git describe --tags does not work -# so we cannot use the usual USE_GITHUB tools here. +# Meson needs BOOST_ROOT=${LOCALBASE} +# https://github.com/mesonbuild/meson/issues/2239 +USES= compiler:c++14-lang localbase meson +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= PacificBiosciences -GH_TAGNAME= 17ef457a0dbe1894a8d17af7ddba01a6261bf117 -do-install: - ${INSTALL_DATA} ${BUILD_WRKSRC}/lib/*.a ${STAGEDIR}${PREFIX}/lib - cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include - ${MV} ${STAGEDIR}${PREFIX}/include/meson.build \ - ${STAGEDIR}${PREFIX}/include/pbcopper +post-install: + ${RLN} ${STAGEDIR}${PREFIX}/lib/libpbcopper.so.${PORTVERSION} \ + ${STAGEDIR}${PREFIX}/lib/libpbcopper.so.0.4 + ${RLN} ${STAGEDIR}${PREFIX}/lib/libpbcopper.so.${PORTVERSION} \ + ${STAGEDIR}${PREFIX}/lib/libpbcopper.so.0 .include Index: head/biology/pbcopper/distinfo =================================================================== --- head/biology/pbcopper/distinfo (revision 493396) +++ head/biology/pbcopper/distinfo (revision 493397) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524500014 -SHA256 (PacificBiosciences-pbcopper-g20180413-17ef457a0dbe1894a8d17af7ddba01a6261bf117_GH0.tar.gz) = 13f006d53334a0538657e0ba5c6e02f811f1901cd25fce220fc9011726ffe23f -SIZE (PacificBiosciences-pbcopper-g20180413-17ef457a0dbe1894a8d17af7ddba01a6261bf117_GH0.tar.gz) = 3033636 +TIMESTAMP = 1550453144 +SHA256 (PacificBiosciences-pbcopper-0.4.1_GH0.tar.gz) = 4c8daf6c1a6efe3860a16fb5b6111ebe65221423254819f3a68a400d0a984fcd +SIZE (PacificBiosciences-pbcopper-0.4.1_GH0.tar.gz) = 3095846 Index: head/biology/pbcopper/files/patch-cmake_pbcopper-gitsha1.cmake =================================================================== --- head/biology/pbcopper/files/patch-cmake_pbcopper-gitsha1.cmake (revision 493396) +++ head/biology/pbcopper/files/patch-cmake_pbcopper-gitsha1.cmake (nonexistent) @@ -1,21 +0,0 @@ ---- cmake/pbcopper-gitsha1.cmake.orig 2018-03-16 16:16:38 UTC -+++ cmake/pbcopper-gitsha1.cmake -@@ -5,16 +5,15 @@ endif() - set(__find_git_sha1 YES) - - function(find_git_sha1 _GIT_SHA1) -- find_package(Git QUIET REQUIRED) - execute_process(COMMAND -- "${GIT_EXECUTABLE}" "describe" "--always" "--dirty=*" -+ echo ce9a4b6 - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - RESULT_VARIABLE res - OUTPUT_VARIABLE out - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE) - if (NOT res EQUAL 0) -- message(FATAL_ERROR "Could not determine git sha1 via `git describe --always --dirty=*`") -+ message(FATAL_ERROR "Could not determine git sha1") - endif() - set(${_GIT_SHA1} "${out}" PARENT_SCOPE) - endfunction() Property changes on: head/biology/pbcopper/files/patch-cmake_pbcopper-gitsha1.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/biology/pbcopper/files/patch-meson__options.txt =================================================================== --- head/biology/pbcopper/files/patch-meson__options.txt (nonexistent) +++ head/biology/pbcopper/files/patch-meson__options.txt (revision 493397) @@ -0,0 +1,7 @@ +--- meson_options.txt.orig 2019-02-17 22:34:29 UTC ++++ meson_options.txt +@@ -1,3 +1,3 @@ + option('build-examples', type : 'boolean', value : true, description : 'Build pbcopper examples') + option('build-docs', type : 'boolean', value : false, description : 'Build pbcopper docs') +-option('tests', type : 'boolean', value : true, description : 'Enable dependencies required for testing') ++option('tests', type : 'boolean', value : false, description : 'Enable dependencies required for testing') Property changes on: head/biology/pbcopper/files/patch-meson__options.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/biology/pbcopper/pkg-plist =================================================================== --- head/biology/pbcopper/pkg-plist (revision 493396) +++ head/biology/pbcopper/pkg-plist (revision 493397) @@ -1,75 +1,78 @@ include/pbcopper/PbcopperConfig.h +include/pbcopper/PbcopperMakeUnique.h include/pbcopper/align/Seed.h include/pbcopper/align/Seeds.h include/pbcopper/align/internal/Seed-inl.h include/pbcopper/align/internal/Seeds-inl.h include/pbcopper/cli/CLI.h include/pbcopper/cli/HelpPrinter.h include/pbcopper/cli/Interface.h include/pbcopper/cli/Option.h include/pbcopper/cli/OptionFlags.h include/pbcopper/cli/Parser.h include/pbcopper/cli/PositionalArg.h include/pbcopper/cli/Results.h include/pbcopper/cli/SingleDashMode.h include/pbcopper/cli/VersionPrinter.h include/pbcopper/cli/internal/Option-inl.h include/pbcopper/cli/toolcontract/Config.h include/pbcopper/cli/toolcontract/Driver.h include/pbcopper/cli/toolcontract/InputFileType.h include/pbcopper/cli/toolcontract/JsonPrinter.h include/pbcopper/cli/toolcontract/OutputFileType.h include/pbcopper/cli/toolcontract/ResolvedToolContract.h include/pbcopper/cli/toolcontract/ResourceType.h include/pbcopper/cli/toolcontract/Task.h include/pbcopper/cli/toolcontract/TaskType.h -include/pbcopper/cli/toolcontract/internal/Config-inl.h include/pbcopper/cli/toolcontract/internal/Driver-inl.h include/pbcopper/cli/toolcontract/internal/InputFileType-inl.h include/pbcopper/cli/toolcontract/internal/OutputFileType-inl.h include/pbcopper/cli/toolcontract/internal/Task-inl.h include/pbcopper/data/CCSTag.h include/pbcopper/data/Cigar.h include/pbcopper/data/CigarOperation.h include/pbcopper/data/Interval.h include/pbcopper/data/MovieName.h include/pbcopper/data/Position.h include/pbcopper/data/RSMovieName.h include/pbcopper/data/RSReadName.h include/pbcopper/data/ReadName.h include/pbcopper/data/Zmw.h include/pbcopper/data/internal/CigarOperation-inl.h include/pbcopper/data/internal/Interval-inl.h include/pbcopper/data/internal/MovieName-inl.h include/pbcopper/data/internal/RSMovieName-inl.h include/pbcopper/data/internal/ReadNameBase-inl.h include/pbcopper/data/internal/ReadNameBase.h include/pbcopper/json/JSON.h include/pbcopper/json/internal/json.hpp include/pbcopper/logging/Logging.h include/pbcopper/logging/internal/Logging-inl.h -include/pbcopper/meson.build include/pbcopper/parallel/FireAndForget.h include/pbcopper/parallel/WorkQueue.h include/pbcopper/qgram/Index.h include/pbcopper/qgram/IndexHit.h include/pbcopper/qgram/IndexHits.h include/pbcopper/qgram/internal/Hashing-inl.h include/pbcopper/qgram/internal/Index-inl.h include/pbcopper/stream/Stream.h include/pbcopper/utility/CallbackTimer.h include/pbcopper/utility/EnumClassHash.h include/pbcopper/utility/FileUtils.h include/pbcopper/utility/MoveAppend.h include/pbcopper/utility/PbcopperVersion.h include/pbcopper/utility/SafeSubtract.h include/pbcopper/utility/Stopwatch.h include/pbcopper/utility/StringUtils.h include/pbcopper/utility/SystemInfo.h include/pbcopper/utility/Unused.h include/pbcopper/utility/internal/CallbackTimer-inl.h include/pbcopper/utility/internal/FileUtils-inl.h include/pbcopper/utility/internal/Stopwatch-inl.h include/pbcopper/utility/internal/StringUtils-inl.h include/pbcopper/utility/internal/SystemInfo-inl.h -lib/libpbcopper.a +lib/libpbcopper.so +lib/libpbcopper.so.0 +lib/libpbcopper.so.0.4 +lib/libpbcopper.so.0.4.1 +libdata/pkgconfig/pbcopper.pc