Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Mar 2023 10:03:39 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 11db49e26787 - main - sysutils/jdupes: Update to 1.21.3
Message-ID:  <202303131003.32DA3dVH065061@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=11db49e26787c408dcc391462e2ad98dc7f4519e

commit 11db49e26787c408dcc391462e2ad98dc7f4519e
Author:     Thomas Hurst <tom@hur.st>
AuthorDate: 2023-03-13 09:41:03 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-03-13 10:02:55 +0000

    sysutils/jdupes: Update to 1.21.3
    
    Changelog: https://github.com/jbruchon/jdupes/releases/tag/v1.21.3
    
    PR:             269443
---
 sysutils/jdupes/Makefile             | 17 ++++++++++++++---
 sysutils/jdupes/distinfo             |  6 +++---
 sysutils/jdupes/files/patch-Makefile |  8 ++++----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/sysutils/jdupes/Makefile b/sysutils/jdupes/Makefile
index 00de24d17878..1dfe50737abe 100644
--- a/sysutils/jdupes/Makefile
+++ b/sysutils/jdupes/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jdupes
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.21.1
+DISTVERSION=	1.21.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	tom@hur.st
@@ -23,11 +23,22 @@ 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 <bsd.port.options.mk>
+
+# 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 <bsd.port.mk>
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,4 +1,4 @@
---- 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
@@ -23,12 +23,12 @@
  
  # 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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303131003.32DA3dVH065061>