Date: Sun, 23 Oct 2022 15:16:16 GMT From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1f2f7227e8ca - main - net/rsync: Fix distinfo file generation Message-ID: <202210231516.29NFGGcU075787@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f2f7227e8ca9c91872adf2d3b67c69dda097961 commit 1f2f7227e8ca9c91872adf2d3b67c69dda097961 Author: Rodrigo Osorio <rodrigo@FreeBSD.org> AuthorDate: 2022-10-23 14:40:36 +0000 Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> CommitDate: 2022-10-23 15:06:05 +0000 net/rsync: Fix distinfo file generation Fix a long standing issue in distinfo file generation caused by the way patch distfiles are handled. In the previous code, every time a patch was activated, it adds its own entry into the DISTFILES variable, but because all the patches comes from the same distfile, we ended with duplicate entries in the list. As a consequence, the make makesum target generates a distinfo file with duplicate entries, causing issues to the builder who tries to fetch and untar the same file in paralel. Now we add the distfile to the list if one of the options is activated, avoiding duplication in the DISTFILES list. This fix has no impact on the generated package, so no PORTREVISION bump is required. --- net/rsync/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 6d9a68ccca1d..785b0d061f5d 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -58,18 +58,15 @@ ZLIB_BASE_DESC= Use zlib from base instead of bundled one PTS_DESC= Functionality provided by third party patches RENAMED_DESC= Add support for renamed file detection -FLAGS_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \ ${FILESDIR}/extrapatch-main.c -ICONV_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} ICONV_USES= iconv:translit ICONV_CONFIGURE_ENABLE= iconv iconv-open POPT_PORT_LIB_DEPENDS= libpopt.so:devel/popt POPT_PORT_CONFIGURE_OFF= --with-included-popt -RENAMED_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff SSH_CONFIGURE_ON= --with-rsh=ssh @@ -77,7 +74,9 @@ SSH_CONFIGURE_OFF= --with-rsh=rsh ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no -.if make(makesum) +.include <bsd.port.options.mk> + +.if make(makesum) || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MRENAMED} DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210231516.29NFGGcU075787>