From nobody Sun Sep 10 16:13:38 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkFJg2BJ6z4s26y; Sun, 10 Sep 2023 16:13:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkFJg10qmz3Pqm; Sun, 10 Sep 2023 16:13:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694362419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TRlC1RN9qJehvf4ojVvQpSLwhvB8KhIImW82GBgASRs=; b=wp76hwp9GhakW6z6P1om3e9D+lpsgRV/5bQXMs1kC5buM3ZoRioYMRekii06Z8L7BkOUDD tmDbADj3ZIUEX+kN/rWdmeHCvAqGZrdidffNwxEBolW15vwooUoUVdlGjlh/D3VM1j1ebP SOq7U88NbmkZiH0Ztnihiu1rbQBLOU3evVT+dsvOuFLtAPKZVSI6GP/xRvITJVxaJYv2AL uHBN8jfW0OfT5AJjmSZWK59untW19yrGa4k1wiHK8sB3KTZKNmYUtf9pk0T9J1RwpgcmaO 5h3VjHjhBs6LD0Lo97XVwsAnqKzb/nYDnIOjgOkoXAKiMkLCQfYky08wz4Qnaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694362419; a=rsa-sha256; cv=none; b=lTOh8v7VBKLpde6vpnXgmShzxe/S4OhOzgsEytDK52jGeg0jW67aR2HG325VewIV6UpYcI e4nkB/zSmCVQaJSuCKwJYv8a/BoKRaHKtWOQYOP+RsdsIcmPLYM6of2aHy8bRbpzK0lVLa BET/ps+KHwXtgjlSNSqo94/QIiBymJA4HCZ1aYjLlAsOWt8KsmpZ9Lf6Y1nuWXTm15FY3+ nuNPtoisg56AP25zmW0JE9Qih2ngUzCmELiKj0k5pCXq++fSYqWTAuL+vOVe+794wfkSWQ 6xVvkz2EGxarY4QFXGatPXqldQoJqfs3mqKwyVJx7Wa4cT0Xf4YE1R1KyTFxuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694362419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TRlC1RN9qJehvf4ojVvQpSLwhvB8KhIImW82GBgASRs=; b=K9aSuCUIVnoCqEKnTcXZqzQHaghZsQRnUDKfyGNehSONBWuyh7ZFjLuqPiEbBfXyW9Lqfs oNui8ETTK+Kv+QmRf6kLm3ZCoeRiPWRdMBcICZTfCb2goKjbLDvobcR3zjJyOoaBok9C9r QHjCwuDq/52Q70m0MSdYkQgF1eYj7YB2pfB0ydJeRJVacvg93R/E3wqH1h4SamJ0JIEOMQ RM7lFGdNId3duItjfxPqzEqxaL2QC+H/A2SbcOqoH6b8cGatuE2acSANoKXiyhr+kQXE5N aZqQjNVKv8jz0wxhoWqOAzTyd7rjlA597xLMBFCDc2yhQnGfduOw0hx7mOBnTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkFJf6hhsz1CqB; Sun, 10 Sep 2023 16:13:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38AGDcJ8024819; Sun, 10 Sep 2023 16:13:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AGDcns024816; Sun, 10 Sep 2023 16:13:38 GMT (envelope-from git) Date: Sun, 10 Sep 2023 16:13:38 GMT Message-Id: <202309101613.38AGDcns024816@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 99d0f41c6015 - main - sysutils/jdupes: Update to 1.27.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99d0f41c60158d38b4f67fdc8d0ceca96e65ef23 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=99d0f41c60158d38b4f67fdc8d0ceca96e65ef23 commit 99d0f41c60158d38b4f67fdc8d0ceca96e65ef23 Author: Thomas Hurst AuthorDate: 2023-08-28 15:39:21 +0000 Commit: Robert Clausecker CommitDate: 2023-09-10 16:12:59 +0000 sysutils/jdupes: Update to 1.27.3 Some notable user-facing changes: * Text-based hash database with -y/--hash-db * -e/--error-on-dupe flag to terminate immediately if any dupe is found * -C/--chunk-size now uses KiB instead of bytes (BREAKING CHANGE) Many thanks to the author for upstream changes made to help simplify the port. Additionally this removes the workaround for a strip(1) issue with LOW_MEMORY builds I can no longer reproduce (bin/269568). Changelog: https://github.com/jbruchon/jdupes/releases/tag/v1.27.3 PR: 273403 --- sysutils/jdupes/Makefile | 23 +++++++---------------- sysutils/jdupes/distinfo | 6 +++--- sysutils/jdupes/files/patch-Makefile | 34 ---------------------------------- sysutils/jdupes/pkg-message | 7 +++++++ 4 files changed, 17 insertions(+), 53 deletions(-) diff --git a/sysutils/jdupes/Makefile b/sysutils/jdupes/Makefile index 1dfe50737abe..ebb0aed66e32 100644 --- a/sysutils/jdupes/Makefile +++ b/sysutils/jdupes/Makefile @@ -1,6 +1,6 @@ PORTNAME= jdupes DISTVERSIONPREFIX= v -DISTVERSION= 1.21.3 +DISTVERSION= 1.27.3 CATEGORIES= sysutils MAINTAINER= tom@hur.st @@ -8,16 +8,18 @@ COMMENT= Powerful duplicate file finder and an enhanced fork of 'fdupes' WWW= https://github.com/jbruchon/jdupes LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libxxhash.so:devel/xxhash +LIB_DEPENDS= libjodycode.so:devel/libjodycode \ + libxxhash.so:devel/xxhash USES= gmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= jbruchon -LDFLAGS+= -lxxhash +MAKE_FLAGS= EXTERNAL_HASH_LIB=1 +LDFLAGS+= -ljodycode -lxxhash PLIST_FILES= bin/jdupes \ man/man1/jdupes.1.gz @@ -26,19 +28,8 @@ OPTIONS_DEFINE= LOW_MEMORY 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_KLD} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${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 e3a0627c7c10..d9d8129555b1 100644 --- a/sysutils/jdupes/distinfo +++ b/sysutils/jdupes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675962603 -SHA256 (jbruchon-jdupes-v1.21.3_GH0.tar.gz) = 8992d0ff1fe135c685063ce3c9d69d54f1f19f1b32845e84441f888218063cc0 -SIZE (jbruchon-jdupes-v1.21.3_GH0.tar.gz) = 155979 +TIMESTAMP = 1693232321 +SHA256 (jbruchon-jdupes-v1.27.3_GH0.tar.gz) = 6e8352f61b3920a2b5626c7122c3b80b4fdcc5cdd3f1c0c3424530425a77d846 +SIZE (jbruchon-jdupes-v1.27.3_GH0.tar.gz) = 174831 diff --git a/sysutils/jdupes/files/patch-Makefile b/sysutils/jdupes/files/patch-Makefile deleted file mode 100644 index 2f4a4f9181d1..000000000000 --- a/sysutils/jdupes/files/patch-Makefile +++ /dev/null @@ -1,34 +0,0 @@ ---- 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) -@@ -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 jody_hash.o -+OBJS += jody_hash.o - OBJS += $(ADDITIONAL_OBJECTS) - - all: $(PROGRAM_NAME) diff --git a/sysutils/jdupes/pkg-message b/sysutils/jdupes/pkg-message index 56b07c7dafc9..0ea4e9cb4aa0 100644 --- a/sysutils/jdupes/pkg-message +++ b/sysutils/jdupes/pkg-message @@ -6,4 +6,11 @@ WARNING: jdupes -X/--extfilter size filtering is now INCLUSIVE instead of EXCLUSIVE. Please see "jdupes -X help" for details. EOM } +{ type: upgrade + maximum_version: "1.25.3" + message: <