Skip to content

Commit 1f2f722

Browse files
committed
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.
1 parent b535dda commit 1f2f722

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

‎net/rsync/Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,25 @@ ZLIB_BASE_DESC= Use zlib from base instead of bundled one
5858
PTS_DESC= Functionality provided by third party patches
5959
RENAMED_DESC= Add support for renamed file detection
6060

61-
FLAGS_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
6261
FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \
6362
${FILESDIR}/extrapatch-main.c
6463

65-
ICONV_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
6664
ICONV_USES= iconv:translit
6765
ICONV_CONFIGURE_ENABLE= iconv iconv-open
6866

6967
POPT_PORT_LIB_DEPENDS= libpopt.so:devel/popt
7068
POPT_PORT_CONFIGURE_OFF= --with-included-popt
7169

72-
RENAMED_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
7370
RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff
7471

7572
SSH_CONFIGURE_ON= --with-rsh=ssh
7673
SSH_CONFIGURE_OFF= --with-rsh=rsh
7774

7875
ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no
7976

80-
.if make(makesum)
77+
.include <bsd.port.options.mk>
78+
79+
.if make(makesum) || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MRENAMED}
8180
DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
8281
.endif
8382

0 commit comments

Comments
 (0)