diff --git a/biology/minimap2/Makefile b/biology/minimap2/Makefile index 2ab83948882d..d403413cc324 100644 --- a/biology/minimap2/Makefile +++ b/biology/minimap2/Makefile @@ -1,26 +1,25 @@ PORTNAME= minimap2 DISTVERSIONPREFIX= v -DISTVERSION= 2.25 -PORTREVISION= 1 +DISTVERSION= 2.27 CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org COMMENT= Pairwise aligner for genomic and spliced nucleotide sequences WWW= https://github.com/lh3/minimap2 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= simde>0:devel/simde USES= gmake localbase USE_GITHUB= yes GH_ACCOUNT= lh3 ALL_TARGET= extra INSTALL_TARGET= install-strip MAKEFILE= Makefile.simde .include diff --git a/biology/minimap2/distinfo b/biology/minimap2/distinfo index 7c79ce9501e2..5a1bf73dfa7d 100644 --- a/biology/minimap2/distinfo +++ b/biology/minimap2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682729894 -SHA256 (lh3-minimap2-v2.25_GH0.tar.gz) = 9742ff0be01e51ea7d65f70c01d1344eee6f0d7b135359e0c00aec30fb74ac38 -SIZE (lh3-minimap2-v2.25_GH0.tar.gz) = 257574 +TIMESTAMP = 1710332275 +SHA256 (lh3-minimap2-v2.27_GH0.tar.gz) = ca9ceb07e3b388858ebc2d7d91a6c74e996659402d16aa759ecedd63588b1ef7 +SIZE (lh3-minimap2-v2.27_GH0.tar.gz) = 259736 diff --git a/biology/minimap2/files/patch-Makefile.simde b/biology/minimap2/files/patch-Makefile.simde index faef217fbdab..5d5e0ccf482c 100644 --- a/biology/minimap2/files/patch-Makefile.simde +++ b/biology/minimap2/files/patch-Makefile.simde @@ -1,66 +1,66 @@ ---- Makefile.simde.orig 2023-04-25 16:44:52 UTC +--- Makefile.simde.orig 2021-11-18 22:11:48 UTC +++ Makefile.simde @@ -1,13 +1,26 @@ -CFLAGS= -g -Wall -O2 -Wc++-compat #-Wextra -CPPFLAGS= -DHAVE_KALLOC -DUSE_SIMDE -DSIMDE_ENABLE_NATIVE_ALIASES -INCLUDES= -Ilib/simde -OBJS= kthread.o kalloc.o misc.o bseq.o sketch.o sdust.o options.o index.o lchain.o align.o hit.o map.o format.o pe.o seed.o esterr.o splitidx.o \ - ksw2_extz2_simde.o ksw2_extd2_simde.o ksw2_exts2_simde.o ksw2_ll_simde.o + +# Makefile patches rejected by upstream + +CFLAGS?= -g -Wall -O2 +CFLAGS+= -Wc++-compat -DUSE_SIMDE -DSIMDE_ENABLE_NATIVE_ALIASES -D__SSE2__ +CPPFLAGS?= -DHAVE_KALLOC +OBJS= kthread.o kalloc.o misc.o bseq.o sketch.o sdust.o options.o \ + index.o lchain.o align.o hit.o map.o format.o pe.o seed.o \ + esterr.o splitidx.o ksw2_extz2_simde.o ksw2_extd2_simde.o \ + ksw2_exts2_simde.o ksw2_ll_simde.o PROG= minimap2 PROG_EXTRA= sdust minimap2-lite LIBS= -lm -lz -lpthread +PREFIX?= /usr/local -+MAN1DIR?= ${PREFIX}/share/man/man1 ++MAN1DIR?= ${PREFIX}/man/man1 +DATADIR?= ${PREFIX}/share/minimap2 +MKDIR?= mkdir +CP?= cp +INSTALL?= install +STRIP?= strip + ifneq ($(arm_neon),) # if arm_neon is defined ifeq ($(aarch64),) #if aarch64 is not defined CFLAGS+=-D_FILE_OFFSET_BITS=64 -mfpu=neon -fsigned-char -@@ -26,7 +39,7 @@ endif +@@ -26,7 +39,7 @@ ifneq ($(tsan),) LIBS+=-fsanitize=thread endif -.PHONY:all extra clean depend +.PHONY:all extra install install-strip clean depend .SUFFIXES:.c .o .c.o: @@ -61,6 +74,22 @@ ksw2_exts2_simde.o:ksw2_exts2_sse.c ksw2.h kalloc.h $(CC) -c $(CFLAGS) -msse4.1 $(CPPFLAGS) $(INCLUDES) $< -o $@ # other non-file targets + + +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 + ${STRIP} ${DESTDIR}${PREFIX}/bin/minimap2-lite + ${STRIP} ${DESTDIR}${PREFIX}/bin/sdust clean: rm -fr gmon.out *.o a.out $(PROG) $(PROG_EXTRA) *~ *.a *.dSYM build dist mappy*.so mappy.c python/mappy.c mappy.egg* diff --git a/biology/minimap2/pkg-plist b/biology/minimap2/pkg-plist index 742d1eb1b3f7..1d11d4c99c2f 100644 --- a/biology/minimap2/pkg-plist +++ b/biology/minimap2/pkg-plist @@ -1,10 +1,10 @@ bin/minimap2 bin/minimap2-lite bin/sdust -share/man/man1/minimap2.1.gz +man/man1/minimap2.1.gz %%DATADIR%%/test/MT-human.fa %%DATADIR%%/test/MT-orang.fa %%DATADIR%%/test/q-inv.fa %%DATADIR%%/test/q2.fa %%DATADIR%%/test/t-inv.fa %%DATADIR%%/test/t2.fa