diff --git a/sysutils/jdupes/Makefile b/sysutils/jdupes/Makefile index 00de24d17878..1dfe50737abe 100644 --- a/sysutils/jdupes/Makefile +++ b/sysutils/jdupes/Makefile @@ -1,33 +1,44 @@ PORTNAME= jdupes DISTVERSIONPREFIX= v -DISTVERSION= 1.21.1 +DISTVERSION= 1.21.3 CATEGORIES= sysutils MAINTAINER= tom@hur.st COMMENT= Powerful duplicate file finder and an enhanced fork of 'fdupes' WWW= https://github.com/jbruchon/jdupes LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libxxhash.so:devel/xxhash USES= gmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= jbruchon LDFLAGS+= -lxxhash PLIST_FILES= bin/jdupes \ man/man1/jdupes.1.gz OPTIONS_DEFINE= LOW_MEMORY -LOW_MEMORY_DESC= Build for lower memory usage instead of speed +LOW_MEMORY_DESC= Minimally-featured build for embedded systems LOW_MEMORY_MAKE_ENV= LOW_MEMORY=1 +.include + +# ELF Tool Chain's strip breaks binary so use LLVM's for now +# To avoid hardcoded stripping use INSTALL_KLD instead of _BIN +.if ${PORT_OPTIONS:MLOW_MEMORY} && !defined(WITH_DEBUG) +STRIP_CMD= /usr/bin/llvm-strip +.endif + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_KLD} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jdupes + .include diff --git a/sysutils/jdupes/distinfo b/sysutils/jdupes/distinfo index 537ae3db17fc..e3a0627c7c10 100644 --- a/sysutils/jdupes/distinfo +++ b/sysutils/jdupes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674235527 -SHA256 (jbruchon-jdupes-v1.21.1_GH0.tar.gz) = 22de88d1963f70c8ed4d0aa40abe05b48aaa4cc08eed6a2c6c9747010f9f4eb7 -SIZE (jbruchon-jdupes-v1.21.1_GH0.tar.gz) = 97397 +TIMESTAMP = 1675962603 +SHA256 (jbruchon-jdupes-v1.21.3_GH0.tar.gz) = 8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0 +SIZE (jbruchon-jdupes-v1.21.3_GH0.tar.gz) = 155979 diff --git a/sysutils/jdupes/files/patch-Makefile b/sysutils/jdupes/files/patch-Makefile index f84bea644e15..2f4a4f9181d1 100644 --- a/sysutils/jdupes/files/patch-Makefile +++ b/sysutils/jdupes/files/patch-Makefile @@ -1,34 +1,34 @@ ---- Makefile.orig 2022-09-03 18:09:32 UTC +--- Makefile.orig 2023-02-09 14:46:39 UTC +++ Makefile @@ -54,7 +54,7 @@ MKDIR = mkdir -p CC ?= gcc COMPILER_OPTIONS = -Wall -Wwrite-strings -Wcast-align -Wstrict-aliasing -Wstrict-prototypes -Wpointer-arith -Wundef COMPILER_OPTIONS += -Wshadow -Wfloat-equal -Waggregate-return -Wcast-qual -Wswitch-default -Wswitch-enum -Wconversion -Wunreachable-code -Wformat=2 -COMPILER_OPTIONS += -std=gnu99 -O2 -g -D_FILE_OFFSET_BITS=64 -fstrict-aliasing -pipe +COMPILER_OPTIONS += -std=gnu99 -D_FILE_OFFSET_BITS=64 -fstrict-aliasing -pipe COMPILER_OPTIONS += -DSMA_MAX_FREE=11 -DNO_ATIME ##################################################################### @@ -62,10 +62,10 @@ COMPILER_OPTIONS += -DSMA_MAX_FREE=11 -DNO_ATIME ##################################################################### # Don't use unsupported compiler options on gcc 3/4 (OS X 10.5.8 Xcode) -GCCVERSION = $(shell expr `LC_ALL=C gcc -v 2>&1 | grep 'gcc version ' | cut -d\ -f3 | cut -d. -f1` \>= 5) -ifeq "$(GCCVERSION)" "1" +#GCCVERSION = $(shell expr `LC_ALL=C gcc -v 2>&1 | grep 'gcc version ' | cut -d\ -f3 | cut -d. -f1` \>= 5) +#ifeq "$(GCCVERSION)" "1" COMPILER_OPTIONS += -Wextra -Wstrict-overflow=5 -Winit-self -endif +#endif # Are we running on a Windows OS? ifeq ($(OS), Windows_NT) -@@ -167,7 +167,7 @@ INSTALL_DATA = $(INSTALL) -m 0644 +@@ -182,7 +182,7 @@ INSTALL_DATA = $(INSTALL) -m 0644 OBJS += jdupes.o jody_paths.o jody_sort.o jody_win_unicode.o jody_strtoepoch.o string_malloc.o oom.o OBJS += jody_cacheinfo.o OBJS += act_deletefiles.o act_linkfiles.o act_printmatches.o act_summarize.o act_printjson.o --OBJS += xxhash.o -+# OBJS += xxhash.o +-OBJS += xxhash.o jody_hash.o ++OBJS += jody_hash.o OBJS += $(ADDITIONAL_OBJECTS) all: $(PROGRAM_NAME)