git: 3b937ad738af - main - biology/jellyfish: Switch to static tarball and update license info

[Joseph Mingrone]

The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3b937ad738af5bdf96233d23bc6c1f7008085d85

commit 3b937ad738af5bdf96233d23bc6c1f7008085d85
Author:     Joseph Mingrone <jrm at FreeBSD.org>
AuthorDate: 2021-09-16 16:50:28 +0000
Commit:     Joseph Mingrone <jrm at FreeBSD.org>
CommitDate: 2021-09-17 18:01:35 +0000

    biology/jellyfish: Switch to static tarball and update license info
    
    The GitHub-generated tarballs require reautoconf and more dependencies
    including gettext, regardless whether the NLS knob is turned off.
    https://github.com/gmarcais/Jellyfish/issues/138#issuecomment-463272029
    
    This update also fixes a build issue when the NLS knob was turned off.
    http://pkg.ftfl.ca/data/13amd64-default/2021-09-16_13h45m55s/logs/errors/Jellyfish-2.3.0_1.log
    
    Differential Revision:  https://reviews.freebsd.org/D31984
    
    Co-authored-by: Jason W. Bacon <jwb at FreeBSD.org>
---
 biology/jellyfish/Makefile | 15 ++++++++-------
 biology/jellyfish/distinfo |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/biology/jellyfish/Makefile b/biology/jellyfish/Makefile
index 4079f92b3c4f..d69f8a62f373 100644
--- a/biology/jellyfish/Makefile
+++ b/biology/jellyfish/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=		Jellyfish
 DISTVERSIONPREFIX=	v
 DISTVERSION=		2.3.0
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		biology
+MASTER_SITES=		https://github.com/gmarcais/${PORTNAME}/releases/download/v2.3.0/	# Custom distfile reduces dependencies
+DISTNAME=		${PORTNAME:tl}-${DISTVERSION}
 
 MAINTAINER=	jwb at FreeBSD.org
 COMMENT=	Fast, memory-efficient counting of k-mers in DNA
 
-LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE=	BSD3CLAUSE GPLv3+
+LICENSE_COMB=	dual
+LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE-BSD-3-Clause
+LICENSE_FILE_GPLv3=		${WRKSRC}/LICENSE-GPL-3.0
 
-BUILD_DEPENDS=	yaggo:devel/yaggo
 LIB_DEPENDS=	libhts.so:biology/htslib
 
-USES=		autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig
+USES=		compiler:c++11-lib libtool
 USE_LDCONFIG=	yes
-USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
-GH_ACCOUNT=	gmarcais
 
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	VER=${PORTVERSION}
diff --git a/biology/jellyfish/distinfo b/biology/jellyfish/distinfo
index 8e77167cbbfa..9cb65c74783b 100644
--- a/biology/jellyfish/distinfo
+++ b/biology/jellyfish/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629646709
-SHA256 (gmarcais-Jellyfish-v2.3.0_GH0.tar.gz) = 23819da9edb579a0cfb8baac9eff473a9477f4f749930cdb754dce1d117495cd
-SIZE (gmarcais-Jellyfish-v2.3.0_GH0.tar.gz) = 679144
+TIMESTAMP = 1631812776
+SHA256 (jellyfish-2.3.0.tar.gz) = e195b7cf7ba42a90e5e112c0ed27894cd7ac864476dc5fb45ab169f5b930ea5a
+SIZE (jellyfish-2.3.0.tar.gz) = 1151287