diff --git a/biology/fastp/Makefile b/biology/fastp/Makefile index 5d6f8cb6c9fa..7af865fb935a 100644 --- a/biology/fastp/Makefile +++ b/biology/fastp/Makefile @@ -1,27 +1,27 @@ PORTNAME= fastp DISTVERSIONPREFIX= v -DISTVERSION= 0.24.0 +DISTVERSION= 0.24.1 CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org COMMENT= Ultra-fast all-in-one FASTQ preprocessor WWW= https://github.com/OpenGene/fastp LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libdeflate.so:archivers/libdeflate \ libisal.so:devel/isa-l USES= gmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= OpenGene ALL_TARGET= fastp PLIST_FILES= bin/fastp post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fastp .include diff --git a/biology/fastp/distinfo b/biology/fastp/distinfo index 4326e6876f20..d33c3c0986a6 100644 --- a/biology/fastp/distinfo +++ b/biology/fastp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731759959 -SHA256 (OpenGene-fastp-v0.24.0_GH0.tar.gz) = 42445973c57be9209c753027e99781261c69381013813c576ad447e413ff3d04 -SIZE (OpenGene-fastp-v0.24.0_GH0.tar.gz) = 164236 +TIMESTAMP = 1744893121 +SHA256 (OpenGene-fastp-v0.24.1_GH0.tar.gz) = dd8a1b7e0410a800f80939e4d14b116e90bbec83ef7294a5f13fdaaba3fcc719 +SIZE (OpenGene-fastp-v0.24.1_GH0.tar.gz) = 164307 diff --git a/biology/fastp/files/patch-Makefile b/biology/fastp/files/patch-Makefile index da927edbe011..5e68e39804a1 100644 --- a/biology/fastp/files/patch-Makefile +++ b/biology/fastp/files/patch-Makefile @@ -1,57 +1,50 @@ ---- Makefile.orig 2021-10-19 02:19:29 UTC +--- Makefile.orig 2025-04-16 10:13:35 UTC +++ Makefile -@@ -2,11 +2,13 @@ DIR_INC := ./inc - DIR_SRC := ./src - DIR_OBJ := ./obj - --PREFIX ?= /usr/local --BINDIR ?= $(PREFIX)/bin --INCLUDE_DIRS ?= --LIBRARY_DIRS ?= -+PREFIX ?= /usr/local -+BINDIR ?= $(PREFIX)/bin -+INCLUDE_DIRS ?= -+LIBRARY_DIRS ?= +@@ -7,6 +7,8 @@ LIBRARY_DIRS ?= + 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,15 +17,20 @@ CXX ?= g++ 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 -pthread -g -O3 -MD -MP -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 -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,11 @@ make_obj_dir: - mkdir $(DIR_OBJ) ; \ - fi +@@ -38,8 +45,13 @@ clean: + @rm -rf $(DIR_OBJ) + @rm -f $(TARGET) +# Respect DESTDIR for staged installs (used by most package managers) install: - install $(TARGET) $(BINDIR)/$(TARGET) + install $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET) @echo "Installed." + +# Many package managers use install-strip target if debugging is not enabled +install-strip: install + $(STRIP) $(DESTDIR)$(BINDIR)/$(TARGET) + + -include $(OBJ:.o=.d)