From owner-svn-ports-head@freebsd.org Mon Aug 3 17:42:33 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EAEB93A2F3B; Mon, 3 Aug 2020 17:42:33 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BL4w95zdSz49gf; Mon, 3 Aug 2020 17:42:33 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B09811814E; Mon, 3 Aug 2020 17:42:33 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 073HgXrl040137; Mon, 3 Aug 2020 17:42:33 GMT (envelope-from jwb@FreeBSD.org) Received: (from jwb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 073HgWx6040039; Mon, 3 Aug 2020 17:42:32 GMT (envelope-from jwb@FreeBSD.org) Message-Id: <202008031742.073HgWx6040039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jwb set sender to jwb@FreeBSD.org using -f From: "Jason W. Bacon" Date: Mon, 3 Aug 2020 17:42:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544091 - in head/biology/vt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jwb X-SVN-Commit-Paths: in head/biology/vt: . files X-SVN-Commit-Revision: 544091 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Aug 2020 17:42:34 -0000 Author: jwb Date: Mon Aug 3 17:42:32 2020 New Revision: 544091 URL: https://svnweb.freebsd.org/changeset/ports/544091 Log: biology/vt: Patch to work with htslib 1.10.2 Minor API changes requiring type casts Added: head/biology/vt/files/patch-bcf__ordered__writer.cpp (contents, props changed) head/biology/vt/files/patch-discover.cpp (contents, props changed) head/biology/vt/files/patch-genotype.cpp (contents, props changed) head/biology/vt/files/patch-read__filter.cpp (contents, props changed) Modified: head/biology/vt/Makefile Modified: head/biology/vt/Makefile ============================================================================== --- head/biology/vt/Makefile Mon Aug 3 17:40:04 2020 (r544090) +++ head/biology/vt/Makefile Mon Aug 3 17:42:32 2020 (r544091) @@ -2,6 +2,7 @@ PORTNAME= vt DISTVERSION= 0.57721 +PORTREVISION= 1 CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org @@ -9,7 +10,7 @@ COMMENT= Discovers short variants from Next Generation LICENSE= MIT -LIB_DEPENDS= libhts.so:biology/htslib \ +LIB_DEPENDS= libhts.so.3:biology/htslib \ libsvm.so:science/libsvm \ libdeflate.so:archivers/libdeflate \ libcurl.so:ftp/curl Added: head/biology/vt/files/patch-bcf__ordered__writer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/vt/files/patch-bcf__ordered__writer.cpp Mon Aug 3 17:42:32 2020 (r544091) @@ -0,0 +1,20 @@ +--- bcf_ordered_writer.cpp.orig 2020-07-27 13:12:44 UTC ++++ bcf_ordered_writer.cpp +@@ -155,7 +155,7 @@ void BCFOrderedWriter::write(bcf1_t *v) + + if (i==buffer.end()) + { +- int32_t cutoff_pos1 = std::max(bcf_get_pos1(buffer.front())-window,1); ++ int32_t cutoff_pos1 = std::max(bcf_get_pos1(buffer.front())-window,(hts_pos_t)1); + if (bcf_get_pos1(v)1) + { +- int32_t cutoff_pos1 = std::max(bcf_get_pos1(buffer.front())-window,1); ++ int32_t cutoff_pos1 = std::max(bcf_get_pos1(buffer.front())-window,(hts_pos_t)1); + + while (buffer.size()>1) + { Added: head/biology/vt/files/patch-discover.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/vt/files/patch-discover.cpp Mon Aug 3 17:42:32 2020 (r544091) @@ -0,0 +1,11 @@ +--- discover.cpp.orig 2020-07-27 13:45:38 UTC ++++ discover.cpp +@@ -352,7 +352,7 @@ class Igor : Program + //already present + free(qname); + } +- kh_val(reads, k) = {bam_get_pos1(s), bam_get_pos1(s)+bam_get_l_qseq(s)-1}; ++ kh_val(reads, k) = {(int32_t)bam_get_pos1(s), (int32_t)bam_get_pos1(s)+bam_get_l_qseq(s)-1}; + } + } + else Added: head/biology/vt/files/patch-genotype.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/vt/files/patch-genotype.cpp Mon Aug 3 17:42:32 2020 (r544091) @@ -0,0 +1,11 @@ +--- genotype.cpp.orig 2020-07-27 13:47:27 UTC ++++ genotype.cpp +@@ -301,7 +301,7 @@ class Igor : Program + //already present + free(qname); + } +- kh_val(reads, k) = {bam_get_pos1(s), bam_get_pos1(s)+bam_get_l_qseq(s)-1}; ++ kh_val(reads, k) = {(int32_t)bam_get_pos1(s), (int32_t)bam_get_pos1(s)+bam_get_l_qseq(s)-1}; + } + } + else Added: head/biology/vt/files/patch-read__filter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/vt/files/patch-read__filter.cpp Mon Aug 3 17:42:32 2020 (r544091) @@ -0,0 +1,18 @@ +--- read_filter.cpp.orig 2020-07-27 13:49:14 UTC ++++ read_filter.cpp +@@ -92,7 +92,7 @@ bool ReadFilter::filter_read(bam_hdr_t* h, bam1_t *s) + //already present + free(qname); + } +- kh_val(reads, k) = {bam_get_pos1(s), bam_get_pos1(s)+bam_get_l_qseq(s)-1}; ++ kh_val(reads, k) = {(int32_t)bam_get_pos1(s), (int32_t)bam_get_pos1(s)+bam_get_l_qseq(s)-1}; + } + } + else +@@ -272,4 +272,4 @@ void ReadFilter::bam_print_key_values(bam_hdr_t *h, ba + if (qual.m) free(qual.s); + if (cigar_string.m) free(cigar_string.s); + if (cigar_expanded_string.m) free(cigar_expanded_string.s); +-} +\ No newline at end of file ++}