fastp: Back up to 0.22.0

[Jason W. Bacon <bacon4000%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Wed May 31 17:49:50 2023 -0500
Changeset:	a51f5afbfa0bea78356fea18c2ecee9e41b2adff

Modified Files:
	fastp/Makefile
	fastp/distinfo
	fastp/patches/patch-Makefile

Log Message:
fastp: Back up to 0.22.0

This is the last portable release, which doesn't use the Intel
isa-l library, written largely in assembly language.  It is only
used for deflating gzip files.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a51f5afbfa0bea78356fea18c2ecee9e41b2adff

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fastp/Makefile               |  2 +-
 fastp/distinfo               |  8 ++++----
 fastp/patches/patch-Makefile | 37 +++++++++++++------------------------
 3 files changed, 18 insertions(+), 29 deletions(-)

diffs:
diff --git a/fastp/Makefile b/fastp/Makefile
index 62ead90dd8..cf29420d15 100644
--- a/fastp/Makefile
+++ b/fastp/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	fastp-0.23.4
+DISTNAME=	fastp-0.22.0
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenGene/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/fastp/distinfo b/fastp/distinfo
index 66d1375b45..bf7e4881e2 100644
--- a/fastp/distinfo
+++ b/fastp/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-BLAKE2s (fastp-0.23.4.tar.gz) = a6c4cc3eec4765f28ecb0ee7ee9e19337e6bb6d4305f571b4dbb70331cd98d78
-SHA512 (fastp-0.23.4.tar.gz) = 2c929e974708f8cd2d8cab95d59c0a5fd01bea912f6ba5d08841fd929f0f5019ef89e506c771057bd02b879836ae30564b8417271866b6bbcb4917fbeb387e76
-Size (fastp-0.23.4.tar.gz) = 164071 bytes
-SHA1 (patch-Makefile) = 38e4e06bb9bb1befe6c90ac231ba030518bd391c
+BLAKE2s (fastp-0.22.0.tar.gz) = fbeed45925f33bde6020054e68affd30b076a81a43f383650cf5c8b6e0d09e7d
+SHA512 (fastp-0.22.0.tar.gz) = 661e61c78fd77347e23380bb0da79e4269ef0acf7350e2b95dd104b85083db55e12b52330bb8fbcaf25554f22d649315db05e083704b8bdabf1e5fb345e34c41
+Size (fastp-0.22.0.tar.gz) = 141257 bytes
+SHA1 (patch-Makefile) = d55955d62ede0e5fad1be39c937fedb7e79b746d
 SHA1 (patch-src_main.cpp) = d28fb587c72b59f4c86bc51fd66874344a9dd43d
diff --git a/fastp/patches/patch-Makefile b/fastp/patches/patch-Makefile
index 2a01baa92f..d7a68e4911 100644
--- a/fastp/patches/patch-Makefile
+++ b/fastp/patches/patch-Makefile
@@ -2,50 +2,39 @@ $NetBSD$
 
 # Respect env
 
---- Makefile.orig	2023-05-30 11:51:18.000000000 +0000
+--- Makefile.orig	2021-08-24 14:00:31.000000000 +0000
 +++ Makefile
-@@ -2,10 +2,12 @@ DIR_INC := ./inc
- DIR_SRC := ./src
- DIR_OBJ := ./obj
+@@ -7,6 +7,8 @@ BINDIR ?= $(PREFIX)/bin
+ INCLUDE_DIRS ?=
+ LIBRARY_DIRS ?=
  
--PREFIX ?= /usr/local
--BINDIR ?= $(PREFIX)/bin
--INCLUDE_DIRS ?=
--LIBRARY_DIRS ?=
-+PREFIX	?= /usr/local
-+BINDIR	?= $(PREFIX)/bin
-+INCLUDE_DIRS	?=
-+LIBRARY_DIRS	?=
-+
 +STRIP	?= strip
- 
++
  SRC := $(wildcard ${DIR_SRC}/*.cpp)
  OBJ := $(patsubst %.cpp,${DIR_OBJ}/%.o,$(notdir ${SRC}))
-@@ -15,15 +17,19 @@ TARGET := fastp
+ 
+@@ -15,13 +17,17 @@ TARGET := fastp
  BIN_TARGET := ${TARGET}
  
  CXX ?= g++
--CXXFLAGS := -std=c++11 -pthread -g -O3 -I${DIR_INC} $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir)) ${CXXFLAGS}
+-CXXFLAGS := -std=c++11 -g -O3 -I${DIR_INC} $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir)) ${CXXFLAGS}
 +# Optional flags that the user can override by setting CXXFLAGS in the
 +# env or make argument
 +CXXFLAGS ?= -g -O3
 +# Required flags
 +CXXFLAGS += -std=c++11 -I${DIR_INC} $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
- LIBS := -lisal -ldeflate -lpthread
- STATIC_FLAGS := -static -Wl,--no-as-needed -pthread
+ LIBS := -lz -lpthread
 -LD_FLAGS := $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) $(LIBS) $(LD_FLAGS)
-+# Append required flags to standard LDFLAGS from env
 +LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) $(LIBS)
- STATIC_LD_FLAGS := $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) $(STATIC_FLAGS) $(LIBS) $(STATIC_LD_FLAGS)
  
--
+ 
  ${BIN_TARGET}:${OBJ}
 -	$(CXX) $(OBJ) -o $@ $(LD_FLAGS)
 +	$(CXX) $(OBJ) -o $@ $(LDFLAGS)
  
- static:${OBJ}
- 	$(CXX) $(OBJ) -o ${BIN_TARGET} $(STATIC_LD_FLAGS)
-@@ -49,6 +55,12 @@ make_obj_dir:
+ ${DIR_OBJ}/%.o:${DIR_SRC}/%.cpp make_obj_dir
+ 	$(CXX) -c $< -o $@ $(CXXFLAGS)
+@@ -43,6 +49,12 @@ make_obj_dir:
  		mkdir $(DIR_OBJ) ; \
  	fi