fastp: Successful build of 0.23.4 using wip/isa-l

[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 13:14:13 2023 -0500
Changeset:	85f49e2314c8cb7a07c5796330b34c515e44e0d1

Modified Files:
	fastp/Makefile
	fastp/distinfo
	fastp/patches/patch-Makefile
	fastp/patches/patch-src_main.cpp

Log Message:
fastp: Successful build of 0.23.4 using wip/isa-l

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

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

diffstat:
 fastp/Makefile                   |  3 +--
 fastp/distinfo                   |  4 ++--
 fastp/patches/patch-Makefile     | 16 ++++++++++------
 fastp/patches/patch-src_main.cpp |  4 ++++
 4 files changed, 17 insertions(+), 10 deletions(-)

diffs:
diff --git a/fastp/Makefile b/fastp/Makefile
index d82725f815..62ead90dd8 100644
--- a/fastp/Makefile
+++ b/fastp/Makefile
@@ -20,7 +20,6 @@ post-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/libdeflate/buildlink3.mk"
-# Need to finish isa-l package before fastp can be updated
-# .include "../../wip/isa-l/buildlink3.mk"
+.include "../../wip/isa-l/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fastp/distinfo b/fastp/distinfo
index 248673c775..66d1375b45 100644
--- a/fastp/distinfo
+++ b/fastp/distinfo
@@ -3,5 +3,5 @@ $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) = b3a1feb79a08e3c0b755b50281b933da048b866c
-SHA1 (patch-src_main.cpp) = c81d63fcafe612797b511235830b017670310462
+SHA1 (patch-Makefile) = 38e4e06bb9bb1befe6c90ac231ba030518bd391c
+SHA1 (patch-src_main.cpp) = d28fb587c72b59f4c86bc51fd66874344a9dd43d
diff --git a/fastp/patches/patch-Makefile b/fastp/patches/patch-Makefile
index da927edbe0..2a01baa92f 100644
--- a/fastp/patches/patch-Makefile
+++ b/fastp/patches/patch-Makefile
@@ -1,6 +1,10 @@
---- Makefile.orig	2021-10-19 02:19:29 UTC
+$NetBSD$
+
+# Respect env
+
+--- Makefile.orig	2023-05-30 11:51:18.000000000 +0000
 +++ Makefile
-@@ -2,11 +2,13 @@ DIR_INC := ./inc
+@@ -2,10 +2,12 @@ DIR_INC := ./inc
  DIR_SRC := ./src
  DIR_OBJ := ./obj
  
@@ -12,12 +16,11 @@
 +BINDIR	?= $(PREFIX)/bin
 +INCLUDE_DIRS	?=
 +LIBRARY_DIRS	?=
- 
-+STRIP	?= strip
 +
++STRIP	?= strip
+ 
  SRC := $(wildcard ${DIR_SRC}/*.cpp)
  OBJ := $(patsubst %.cpp,${DIR_OBJ}/%.o,$(notdir ${SRC}))
- 
 @@ -15,15 +17,19 @@ TARGET := fastp
  BIN_TARGET := ${TARGET}
  
@@ -42,13 +45,14 @@
  
  static:${OBJ}
  	$(CXX) $(OBJ) -o ${BIN_TARGET} $(STATIC_LD_FLAGS)
-@@ -49,6 +55,11 @@ make_obj_dir:
+@@ -49,6 +55,12 @@ make_obj_dir:
  		mkdir $(DIR_OBJ) ; \
  	fi
  
 +# Respect DESTDIR for staged installs (used by most package managers)
  install:
 -	install $(TARGET) $(BINDIR)/$(TARGET)
++	mkdir $(DESTDIR)$(BINDIR)
 +	install $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET)
  	@echo "Installed."
 +
diff --git a/fastp/patches/patch-src_main.cpp b/fastp/patches/patch-src_main.cpp
index 28e5bf9189..fd0cfc6065 100644
--- a/fastp/patches/patch-src_main.cpp
+++ b/fastp/patches/patch-src_main.cpp
@@ -1,3 +1,7 @@
+$NetBSD$
+
+# Make sure main() returns a value
+
 --- src/main.cpp.orig	2021-10-19 02:19:29 UTC
 +++ src/main.cpp
 @@ -1,4 +1,5 @@