Date: Wed, 9 Oct 2024 22:23:16 GMT From: "Jason W. Bacon" <jwb@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f3b6d6f5f45c - main - biology/bio-mocha: Update to 1.20 Message-ID: <202410092223.499MNGnI059868@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3b6d6f5f45c96c43580169b1cfc37897625c602 commit f3b6d6f5f45c96c43580169b1cfc37897625c602 Author: Jason W. Bacon <jwb@FreeBSD.org> AuthorDate: 2024-10-09 22:22:39 +0000 Commit: Jason W. Bacon <jwb@FreeBSD.org> CommitDate: 2024-10-09 22:23:10 +0000 biology/bio-mocha: Update to 1.20 Numerous bug fixes and enhancements since 1.16 Reported by: portscout --- biology/bio-mocha/Makefile | 11 +++++------ biology/bio-mocha/distinfo | 10 +++++----- biology/bio-mocha/files/patch-Makefile | 28 ++++++++++++++-------------- biology/bio-mocha/pkg-plist | 1 - 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/biology/bio-mocha/Makefile b/biology/bio-mocha/Makefile index 33147346e72d..a9228be3a30e 100644 --- a/biology/bio-mocha/Makefile +++ b/biology/bio-mocha/Makefile @@ -1,8 +1,9 @@ PORTNAME= bio-mocha -DISTVERSION= 1.16 +DISTVERSION= 1.20 CATEGORIES= biology MASTER_SITES= https://software.broadinstitute.org/software/mocha/ -DISTFILES+= ${PORTNAME}_${DISTVERSION}-20221221.tar.gz +# Get this right, or ports will download bcftools in it's place via tuple +DISTFILES+= ${PORTNAME}_${DISTVERSION}-20240505.tar.gz MAINTAINER= jwb@FreeBSD.org COMMENT= Bcftools plugin for mosaic chromosomal alteration analysis @@ -10,8 +11,8 @@ WWW= https://software.broadinstitute.org/software/mocha/ LICENSE= MIT +BUILD_DEPENDS= bash:shells/bash htslib>=1.21:biology/htslib LIB_DEPENDS= libhts.so:biology/htslib -BUILD_DEPENDS= bash:shells/bash RUN_DEPENDS= bcftools>=${PORTVERSION}:biology/bcftools USES= autoreconf gmake localbase perl5 python:env shebangfix @@ -20,7 +21,7 @@ USE_PERL5= test GH_ACCOUNT= samtools GH_PROJECT= bcftools -GH_TAGNAME= 1.16 +GH_TAGNAME= 1.21 GNU_CONFIGURE= yes SHEBANG_FILES= misc/* test/test.pl @@ -42,8 +43,6 @@ do-install: ${STAGEDIR}${PREFIX}/libexec/bcftools ${INSTALL_PROGRAM} ${WRKSRC}/plugins/mochatools.so \ ${STAGEDIR}${PREFIX}/libexec/bcftools - ${INSTALL_PROGRAM} ${WRKSRC}/plugins/trio-phase.so \ - ${STAGEDIR}${PREFIX}/libexec/bcftools (cd ${WRKSRC}/MoCha && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) .include <bsd.port.mk> diff --git a/biology/bio-mocha/distinfo b/biology/bio-mocha/distinfo index c5a05127a3d6..6f2f8b800396 100644 --- a/biology/bio-mocha/distinfo +++ b/biology/bio-mocha/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1672095342 -SHA256 (bio-mocha_1.16-20221221.tar.gz) = 576cbdda53760f353fc8fd989751716b1d4f8c5e1921f838c263476282cced86 -SIZE (bio-mocha_1.16-20221221.tar.gz) = 68625 -SHA256 (samtools-bcftools-1.16_GH0.tar.gz) = c44c85a04e058e1f1eceeb712106031100bbd700b8ff3f623f7ff872469a4ba3 -SIZE (samtools-bcftools-1.16_GH0.tar.gz) = 3432435 +TIMESTAMP = 1727475837 +SHA256 (bio-mocha_1.20-20240505.tar.gz) = 3beeb7f046b491fed162dfedd83a29b3eebb165fb1f2a25f44df7fa2f063793b +SIZE (bio-mocha_1.20-20240505.tar.gz) = 66752 +SHA256 (samtools-bcftools-1.20-1.21_GH0.tar.gz) = 7484695c5d833fb1a89c2b886ec302db0514ba3c8e5ef7397b9302fa8bd37f8d +SIZE (samtools-bcftools-1.20-1.21_GH0.tar.gz) = 3665160 diff --git a/biology/bio-mocha/files/patch-Makefile b/biology/bio-mocha/files/patch-Makefile index 3299954ae45b..55d6f64d426d 100644 --- a/biology/bio-mocha/files/patch-Makefile +++ b/biology/bio-mocha/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2021-03-17 09:16:18 UTC +--- Makefile.orig 2024-09-12 15:06:36 UTC +++ Makefile -@@ -58,13 +58,14 @@ pluginpath = $(plugindir) +@@ -59,13 +59,14 @@ misc_bindir = $(bindir) # Installation location for $(MISC_PROGRAMS) and $(MISC_SCRIPTS) misc_bindir = $(bindir) @@ -12,22 +12,22 @@ -INSTALL_PROGRAM = $(INSTALL) -INSTALL_SCRIPT = $(INSTALL_PROGRAM) +# Use BSD_INSTALL_PROGRAM to strip when WITH_DEBUG not set -+MKDIR_P = mkdir -p -+INSTALL = install -p -+INSTALL_DATA = ${BSD_INSTALL_DATA} -+INSTALL_DIR = $(MKDIR_P) -+INSTALL_MAN = ${BSD_INSTALL_MAN} -+INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM} -+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} ++MKDIR_P = mkdir -p ++INSTALL = install -p ++INSTALL_DATA = ${BSD_INSTALL_DATA} ++INSTALL_DIR = $(MKDIR_P) ++INSTALL_MAN = ${BSD_INSTALL_MAN} ++INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM} ++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} PROGRAMS = bcftools MISC_SCRIPTS = \ -@@ -142,7 +143,7 @@ print-version: - ifdef USE_GPL +@@ -144,7 +145,7 @@ ifdef USE_GPL main.o : EXTRA_CPPFLAGS += -DUSE_GPL OBJS += polysomy.o peakfit.o -- GSL_LIBS ?= -lgsl -lcblas -+ GSL_LIBS ?= -lgslcblas + ifndef GSL_LIBS +- GSL_LIBS += -lgsl -lcblas ++ GSL_LIBS += -lgslcblas + endif endif - print-%: diff --git a/biology/bio-mocha/pkg-plist b/biology/bio-mocha/pkg-plist index a56018707fc6..e6767d770f0f 100644 --- a/biology/bio-mocha/pkg-plist +++ b/biology/bio-mocha/pkg-plist @@ -1,7 +1,6 @@ libexec/bcftools/extendFMT.so libexec/bcftools/mocha.so libexec/bcftools/mochatools.so -libexec/bcftools/trio-phase.so %%DATADIR%%/mocha_plot.R %%DATADIR%%/pileup_plot.R %%DATADIR%%/summary_plot.R
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410092223.499MNGnI059868>