From nobody Sun Oct 30 20:06:34 2022 X-Original-To: dev-commits-ports-main@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 4N0nNp6rtgz4gTDm; Sun, 30 Oct 2022 20:06:34 +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 4N0nNp6NGrz3c69; Sun, 30 Oct 2022 20:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667160394; 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=wvkjMnusTtraSC6Glxhc/prvcSROpkBRFPZQTCZ06HQ=; b=yH1EWLLJ1zFYfW8rGCn/IUpAa8YddDqEPu3EHR+D+f3felsaJ1EpkRtnIsqcUFNjaTWysy ZkcEqBN7yL5WqqE5DllLAnG1EnKbrDDABm72rUklFkbhBXbKXJ8V+H/0yyl4/WHRQNIqQ4 Ti6cHrsB2y+PxyNkjwJ392nG1dDHMWzbr6D4p9AtmPwU4lERrN0YkWfdWoDgGx4yJZa5Wo Le+rmeQuXD9EF/HUaFRJ1VgDT/Hx8NSEkrFOAA0R06oMiiX7Mo7LKkn/crFsk1Op+njugz MTgpe0GXofmPp5jOtOHYGi3cZgrT79Gkz2SjT7bGsSgsuwYmN0G4Qa6oZBXjTw== 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 4N0nNp5V76z18KS; Sun, 30 Oct 2022 20:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29UK6YE1011475; Sun, 30 Oct 2022 20:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29UK6Y3e011474; Sun, 30 Oct 2022 20:06:34 GMT (envelope-from git) Date: Sun, 30 Oct 2022 20:06:34 GMT Message-Id: <202210302006.29UK6Y3e011474@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 3375d85b5e7f - main - sysutils/jdupes: Update to 1.21.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3375d85b5e7f7e4dec59696ed7f37debb0883fef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667160394; 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=wvkjMnusTtraSC6Glxhc/prvcSROpkBRFPZQTCZ06HQ=; b=YXceq8VCTf07yoAxIlneMBrI9AQjKMWTL281EfGs+lSw+DblXJTV/5fYmc3jPGR5O/zITP XlzNPy975G+eTEBrPT9KqAJXG3A1y6GaOpZw2ut+rYv502U+Wai1kjsyHihDgz2MKVhQ/S NG7AYHQBQzWVazy7Hry1lwO8QlNqzjD+hhAOYAEJTxrjIWKNYP0zQfOqUoFNINH9uUYvsG RwSJPZ2oF6JxK/Ub0GsFjSCwTcXELBTKVbZBHDX5VH1fu+cVD2fZECt+tvHDmc3Lw6kS5R BqinLh1ZxUasDiOYo56tCCRICEEzTaKIh3egiBTULX0YKoTnbBlsWXWe8wsDUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667160394; a=rsa-sha256; cv=none; b=BGH7x0+yxpMJ6AULd/HgWjI/Db6JnRM1cGwwsKArVwCNI94xAW2paMkj6LIbuRVPVbq9SN Kz3kSqbgBmfE6QC4hmn+CgnACfD/WOB4s3m+/sicVAiPlrFH9wZlvuvkJ5JiK8Ha7Wt65z G1g2YFjw3BKW4TsYT73TO/leEZChvMtwCK4S4JUKOCR5f0pwiDT/j3DNzHK++ddywxBJ// uypmxmHqsLtiDQf6Ka4H3Wffmz0thMdU42334R3ZGRjCoGvrQp5RTarLoWZ+mBl45Q95Nl XQwuHwUNcSd5bBowmSz5SQC7i/vJgDfA4L62QTLfEiSTopyvNLPkCVVDIAcfpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3375d85b5e7f7e4dec59696ed7f37debb0883fef commit 3375d85b5e7f7e4dec59696ed7f37debb0883fef Author: Daniel Engberg AuthorDate: 2022-10-30 19:47:50 +0000 Commit: Daniel Engberg CommitDate: 2022-10-30 20:04:23 +0000 sysutils/jdupes: Update to 1.21.0 Use xxHash from ports instead of bundled version Strip hardcoded optimization and -g Remove hardcoded GCC version check Changelog: https://github.com/jbruchon/jdupes/releases/tag/v1.21.0 PR: 267073 Reviewed by: Thomas Hurst (maintainer) --- sysutils/jdupes/Makefile | 8 ++++++-- sysutils/jdupes/distinfo | 6 +++--- sysutils/jdupes/files/patch-Makefile | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/sysutils/jdupes/Makefile b/sysutils/jdupes/Makefile index a3a963d29e35..bf25227b3e9d 100644 --- a/sysutils/jdupes/Makefile +++ b/sysutils/jdupes/Makefile @@ -1,6 +1,6 @@ PORTNAME= jdupes DISTVERSIONPREFIX= v -DISTVERSION= 1.19.2 +DISTVERSION= 1.21.0 CATEGORIES= sysutils MAINTAINER= tom@hur.st @@ -10,11 +10,15 @@ WWW= https://github.com/jbruchon/jdupes LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake +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 diff --git a/sysutils/jdupes/distinfo b/sysutils/jdupes/distinfo index 2b04c011cbf2..2468ad0cf7ac 100644 --- a/sysutils/jdupes/distinfo +++ b/sysutils/jdupes/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616799484 -SHA256 (jbruchon-jdupes-v1.19.2_GH0.tar.gz) = c14da2751a519f2dff82bbbf9eaaccf13272c979082611a67a348044476424d4 -SIZE (jbruchon-jdupes-v1.19.2_GH0.tar.gz) = 93197 +TIMESTAMP = 1665829385 +SHA256 (jbruchon-jdupes-v1.21.0_GH0.tar.gz) = 13e56c608354f10f9314c99cf37b034dde14e6bf4a9303c77391323e2ef4f549 +SIZE (jbruchon-jdupes-v1.21.0_GH0.tar.gz) = 96407 diff --git a/sysutils/jdupes/files/patch-Makefile b/sysutils/jdupes/files/patch-Makefile new file mode 100644 index 000000000000..f84bea644e15 --- /dev/null +++ b/sysutils/jdupes/files/patch-Makefile @@ -0,0 +1,34 @@ +--- Makefile.orig 2022-09-03 18:09:32 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 + 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 += $(ADDITIONAL_OBJECTS) + + all: $(PROGRAM_NAME)