Index: head/biology/pbbam/Makefile =================================================================== --- head/biology/pbbam/Makefile (revision 493398) +++ head/biology/pbbam/Makefile (revision 493399) @@ -1,36 +1,33 @@ # $FreeBSD$ PORTNAME= pbbam -DISTVERSION= g20180416 -PORTREVISION= 3 +DISTVERSION= 0.18.0 # Test with biology/unanimity before upgrading! CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org COMMENT= PacBio BAM C++ library, with SWIG bindings LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= boost-libs>=1.60.0:devel/boost-libs LIB_DEPENDS= libhts.so:biology/htslib \ libboost_regex.so:devel/boost-libs -USES= cmake compiler:c++14-lang pkgconfig +# Meson needs BOOST_ROOT=${LOCALBASE} +# https://github.com/mesonbuild/meson/issues/2239 +USES= compiler:c++14-lang localbase meson pkgconfig python +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= PacificBiosciences -GH_TAGNAME= c6b8113adb5104948879e9ff69f739121f12a09f -# Disable tests for now. Bound to bundled googletest. -CMAKE_ARGS+= -DHTSLIB_INCLUDE_DIRS:STRING=${LOCALBASE}/include/htslib \ - -DHTSLIB_LIBRARIES:STRING="-L${LOCALBASE}/lib -lhts" \ - -DPacBioBAM_build_tests:BOOL=OFF \ - -DPacBioBAM_build_docs:BOOL=OFF +pre-configure: + @${REINPLACE_CMD} -e "s|'python'|'${PYTHON_VERSION}'|g" \ + ${WRKSRC}/meson.build -do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${BUILD_WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib - cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include - ${MV} ${STAGEDIR}${PREFIX}/include/meson.build \ - ${STAGEDIR}${PREFIX}/include/pbbam +post-install: + ${RLN} ${STAGEDIR}${PREFIX}/lib/libpbbam.so.${PORTVERSION} \ + ${STAGEDIR}${PREFIX}/lib/libpbbam.so.0.18 + ${RLN} ${STAGEDIR}${PREFIX}/lib/libpbbam.so.${PORTVERSION} \ + ${STAGEDIR}${PREFIX}/lib/libpbbam.so.0 .include Index: head/biology/pbbam/distinfo =================================================================== --- head/biology/pbbam/distinfo (revision 493398) +++ head/biology/pbbam/distinfo (revision 493399) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524331626 -SHA256 (PacificBiosciences-pbbam-g20180416-c6b8113adb5104948879e9ff69f739121f12a09f_GH0.tar.gz) = f7ede42417110db4fcc3fbc4b837911a0e2242e541a88c8ac34b4c26b4e5aad4 -SIZE (PacificBiosciences-pbbam-g20180416-c6b8113adb5104948879e9ff69f739121f12a09f_GH0.tar.gz) = 8105156 +TIMESTAMP = 1550453627 +SHA256 (PacificBiosciences-pbbam-0.18.0_GH0.tar.gz) = 45286e5f7deb7ff629e0643c8a416155915aec7b85d54c60b5cdc07f4d7b234a +SIZE (PacificBiosciences-pbbam-0.18.0_GH0.tar.gz) = 8136503 Index: head/biology/pbbam/files/patch-meson__options.txt =================================================================== --- head/biology/pbbam/files/patch-meson__options.txt (nonexistent) +++ head/biology/pbbam/files/patch-meson__options.txt (revision 493399) @@ -0,0 +1,11 @@ +--- meson_options.txt.orig 2019-02-17 01:55:33 UTC ++++ meson_options.txt +@@ -15,7 +15,7 @@ option('auto-validate', + + option('tests', + type : 'boolean', +- value : true, ++ value : false, + description : 'Enable dependencies required for testing') + + option('permissive-cigar', Property changes on: head/biology/pbbam/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/pbbam/pkg-plist =================================================================== --- head/biology/pbbam/pkg-plist (revision 493398) +++ head/biology/pbbam/pkg-plist (revision 493399) @@ -1,132 +1,148 @@ bin/bam2sam bin/pbbamify bin/pbindex bin/pbindexdump bin/pbmerge include/pbbam/Accuracy.h include/pbbam/AlignmentPrinter.h include/pbbam/BaiIndexedBamReader.h include/pbbam/BamFile.h include/pbbam/BamHeader.h include/pbbam/BamReader.h include/pbbam/BamRecord.h include/pbbam/BamRecordBuilder.h include/pbbam/BamRecordImpl.h include/pbbam/BamRecordTag.h include/pbbam/BamRecordView.h include/pbbam/BamTagCodec.h include/pbbam/BamWriter.h include/pbbam/BarcodeQuery.h include/pbbam/Cigar.h include/pbbam/CigarOperation.h include/pbbam/ClipType.h include/pbbam/Compare.h include/pbbam/CompositeBamReader.h include/pbbam/CompositeFastaReader.h include/pbbam/Config.h include/pbbam/DataSet.h include/pbbam/DataSetTypes.h include/pbbam/DataSetXsd.h include/pbbam/EntireFileQuery.h include/pbbam/FastaReader.h include/pbbam/FastaSequence.h include/pbbam/FastaSequenceQuery.h include/pbbam/FastqReader.h include/pbbam/FastqSequence.h include/pbbam/FrameEncodingType.h include/pbbam/Frames.h include/pbbam/GenomicInterval.h include/pbbam/GenomicIntervalQuery.h include/pbbam/IRecordWriter.h include/pbbam/IndexedBamWriter.h include/pbbam/IndexedFastaReader.h include/pbbam/Interval.h include/pbbam/LocalContextFlags.h include/pbbam/MD5.h include/pbbam/MakeUnique.h include/pbbam/MoveAppend.h include/pbbam/Orientation.h include/pbbam/PbiBasicTypes.h include/pbbam/PbiBuilder.h include/pbbam/PbiFile.h include/pbbam/PbiFilter.h include/pbbam/PbiFilterQuery.h include/pbbam/PbiFilterTypes.h include/pbbam/PbiIndexedBamReader.h include/pbbam/PbiRawData.h include/pbbam/Position.h include/pbbam/ProgramInfo.h include/pbbam/PulseBehavior.h include/pbbam/PulseExclusionReason.h include/pbbam/QNameQuery.h include/pbbam/QualityValue.h include/pbbam/QualityValues.h include/pbbam/ReadAccuracyQuery.h include/pbbam/ReadGroupInfo.h include/pbbam/RecordType.h include/pbbam/SamTagCodec.h include/pbbam/SamWriter.h include/pbbam/SequenceInfo.h include/pbbam/Strand.h include/pbbam/StringUtilities.h include/pbbam/SubreadLengthQuery.h include/pbbam/Tag.h include/pbbam/TagCollection.h include/pbbam/Unused.h include/pbbam/Validator.h include/pbbam/ZmwGroupQuery.h include/pbbam/ZmwQuery.h include/pbbam/ZmwType.h include/pbbam/ZmwTypeMap.h include/pbbam/exception/BundleChemistryMappingException.h include/pbbam/exception/InvalidSequencingChemistryException.h include/pbbam/exception/ValidationException.h include/pbbam/internal/Accuracy.inl include/pbbam/internal/BamHeader.inl include/pbbam/internal/BamRecord.inl include/pbbam/internal/BamRecordBuilder.inl include/pbbam/internal/BamRecordImpl.inl include/pbbam/internal/BamRecordView.inl include/pbbam/internal/Cigar.inl include/pbbam/internal/CigarOperation.inl include/pbbam/internal/Compare.inl include/pbbam/internal/CompositeBamReader.inl include/pbbam/internal/CompositeFastaReader.inl include/pbbam/internal/DataSet.inl include/pbbam/internal/DataSetBaseTypes.h include/pbbam/internal/DataSetBaseTypes.inl include/pbbam/internal/DataSetElement.h include/pbbam/internal/DataSetElement.inl include/pbbam/internal/DataSetListElement.h include/pbbam/internal/DataSetListElement.inl include/pbbam/internal/DataSetTypes.inl include/pbbam/internal/FastaSequence.inl include/pbbam/internal/FastqSequence.inl include/pbbam/internal/Frames.inl include/pbbam/internal/GenomicInterval.inl include/pbbam/internal/Interval.inl include/pbbam/internal/PbiBasicTypes.inl include/pbbam/internal/PbiFilter.inl include/pbbam/internal/PbiFilterTypes.inl include/pbbam/internal/PbiRawData.inl include/pbbam/internal/ProgramInfo.inl include/pbbam/internal/QualityValue.inl include/pbbam/internal/QualityValues.inl include/pbbam/internal/QueryBase.h include/pbbam/internal/QueryBase.inl include/pbbam/internal/ReadGroupInfo.inl include/pbbam/internal/SequenceInfo.inl include/pbbam/internal/Tag.inl include/pbbam/internal/Validator.inl -include/pbbam/meson.build +include/pbbam/vcf/VcfFile.h +include/pbbam/vcf/VcfFormat.h +include/pbbam/vcf/VcfHeader.h +include/pbbam/vcf/VcfHeaderTypes.h +include/pbbam/vcf/VcfQuery.h +include/pbbam/vcf/VcfReader.h +include/pbbam/vcf/VcfSort.h +include/pbbam/vcf/VcfVariant.h +include/pbbam/vcf/VcfWriter.h +include/pbbam/vcf/internal/VcfFile.inl +include/pbbam/vcf/internal/VcfHeader.inl +include/pbbam/vcf/internal/VcfHeaderTypes.inl +include/pbbam/vcf/internal/VcfVariant.inl include/pbbam/virtual/VirtualPolymeraseBamRecord.h include/pbbam/virtual/VirtualPolymeraseCompositeReader.h include/pbbam/virtual/VirtualPolymeraseReader.h include/pbbam/virtual/VirtualRegion.h include/pbbam/virtual/VirtualRegionType.h include/pbbam/virtual/VirtualRegionTypeMap.h include/pbbam/virtual/VirtualZmwBamRecord.h include/pbbam/virtual/WhitelistedZmwReadStitcher.h include/pbbam/virtual/ZmwReadStitcher.h include/pbbam/virtual/ZmwWhitelistVirtualReader.h -lib/libpbbam.a +lib/libpbbam.so +lib/libpbbam.so.0 +lib/libpbbam.so.0.18 +lib/libpbbam.so.0.18.0 +libdata/pkgconfig/pbbam.pc