From owner-dev-commits-ports-all@freebsd.org Sun Aug 22 14:17:32 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 5ACE1655FE7; Sun, 22 Aug 2021 14:17:32 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GsyBN23xNz3NGK; Sun, 22 Aug 2021 14:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B09122332; Sun, 22 Aug 2021 14:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17MEHWtb038646; Sun, 22 Aug 2021 14:17:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17MEHWLb038645; Sun, 22 Aug 2021 14:17:32 GMT (envelope-from git) Date: Sun, 22 Aug 2021 14:17:32 GMT Message-Id: <202108221417.17MEHWLb038645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: 205fcac2210b - main - biology/minimap2: Update to 2.22 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 205fcac2210ba735dde3e037616661ab16cd5e66 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Aug 2021 14:17:32 -0000 The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=205fcac2210ba735dde3e037616661ab16cd5e66 commit 205fcac2210ba735dde3e037616661ab16cd5e66 Author: Jason W. Bacon AuthorDate: 2021-08-22 14:15:06 +0000 Commit: Jason W. Bacon CommitDate: 2021-08-22 14:15:06 +0000 biology/minimap2: Update to 2.22 Changelog: https://github.com/lh3/minimap2/releases/tag/v2.22 Reported by: portscout --- biology/minimap2/Makefile | 4 +--- biology/minimap2/distinfo | 6 +++--- biology/minimap2/files/patch-Makefile | 16 ++++++++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/biology/minimap2/Makefile b/biology/minimap2/Makefile index 2f3f34aeef46..dd5213d9851f 100644 --- a/biology/minimap2/Makefile +++ b/biology/minimap2/Makefile @@ -1,6 +1,6 @@ PORTNAME= minimap2 DISTVERSIONPREFIX= v -DISTVERSION= 2.20 +DISTVERSION= 2.22 CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org @@ -21,6 +21,4 @@ MAKE_ARGS+= CFLAGS+=-Wextra ALL_TARGET= extra INSTALL_TARGET= install-strip -PLIST_FILES= bin/minimap2 bin/minimap2-lite bin/sdust man/man1/minimap2.1.gz - .include diff --git a/biology/minimap2/distinfo b/biology/minimap2/distinfo index 94d841b72134..e52728d52312 100644 --- a/biology/minimap2/distinfo +++ b/biology/minimap2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622319613 -SHA256 (lh3-minimap2-v2.20_GH0.tar.gz) = 8153a0dda3c16da13d70b893ab7ea93366136f147407aab994bffe5eaa93e897 -SIZE (lh3-minimap2-v2.20_GH0.tar.gz) = 239973 +TIMESTAMP = 1629640993 +SHA256 (lh3-minimap2-v2.22_GH0.tar.gz) = b625a7580d9b5996f2553ee90ffcec84870bd9b88c009c9d71e8c1c648c53ed6 +SIZE (lh3-minimap2-v2.22_GH0.tar.gz) = 251821 diff --git a/biology/minimap2/files/patch-Makefile b/biology/minimap2/files/patch-Makefile index 1de7e1c5e6ee..79c9c3617b38 100644 --- a/biology/minimap2/files/patch-Makefile +++ b/biology/minimap2/files/patch-Makefile @@ -1,28 +1,34 @@ --- Makefile.orig 2021-05-27 19:26:04 UTC +++ Makefile -@@ -1,5 +1,6 @@ +@@ -1,5 +1,9 @@ -CFLAGS= -g -Wall -O2 -Wc++-compat #-Wextra -CPPFLAGS= -DHAVE_KALLOC ++ ++# Makefile patches rejected by upstream ++ +CFLAGS?= -g -Wall -O2 +CFLAGS+= -Wc++-compat #-Wextra +CPPFLAGS?= -DHAVE_KALLOC INCLUDES= OBJS= kthread.o kalloc.o misc.o bseq.o sketch.o sdust.o options.o index.o \ lchain.o align.o hit.o seed.o map.o format.o pe.o esterr.o splitidx.o \ -@@ -8,6 +9,12 @@ PROG= minimap2 +@@ -8,6 +12,15 @@ PROG= minimap2 PROG_EXTRA= sdust minimap2-lite LIBS= -lm -lz -lpthread +PREFIX?= /usr/local +MAN1DIR?= ${PREFIX}/man/man1 ++DATADIR?= ${PREFIX}/share/minimap2 ++ +MKDIR?= mkdir ++CP?= cp +INSTALL?= install +STRIP?= strip + ifeq ($(arm_neon),) # if arm_neon is not defined ifeq ($(sse2only),) # if sse2only is not defined OBJS+=ksw2_extz2_sse41.o ksw2_extd2_sse41.o ksw2_exts2_sse41.o ksw2_extz2_sse2.o ksw2_extd2_sse2.o ksw2_exts2_sse2.o ksw2_dispatch.o -@@ -34,7 +41,7 @@ ifneq ($(tsan),) +@@ -34,7 +47,7 @@ ifneq ($(tsan),) LIBS+=-fsanitize=thread endif @@ -31,7 +37,7 @@ .SUFFIXES:.c .o .c.o: -@@ -96,6 +103,19 @@ ksw2_exts2_neon.o:ksw2_exts2_sse.c ksw2.h kalloc.h +@@ -96,6 +109,21 @@ ksw2_exts2_neon.o:ksw2_exts2_sse.c ksw2.h kalloc.h $(CC) -c $(CFLAGS) $(CPPFLAGS) -DKSW_SSE2_ONLY -D__SSE2__ $(INCLUDES) $< -o $@ # other non-file targets @@ -39,10 +45,12 @@ +install: all + ${MKDIR} -p ${DESTDIR}${PREFIX}/bin + ${MKDIR} -p ${DESTDIR}${MAN1DIR} ++ ${MKDIR} -p ${DESTDIR}${DATADIR} + ${INSTALL} -c minimap2 ${DESTDIR}${PREFIX}/bin + ${INSTALL} -c minimap2-lite ${DESTDIR}${PREFIX}/bin + ${INSTALL} -c sdust ${DESTDIR}${PREFIX}/bin + ${INSTALL} -c minimap2.1 ${DESTDIR}${MAN1DIR} ++ ${CP} -R test ${DESTDIR}${DATADIR} + +install-strip: install + ${STRIP} ${DESTDIR}${PREFIX}/bin/minimap2