Date: Sun, 19 Jan 2025 22:02:57 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: 7f56364aa54e - main - net/rsync: fix test patch when all options are disabled Message-ID: <202501192202.50JM2v3f056582@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=7f56364aa54e286c2bc328343fb0f94d27329150 commit 7f56364aa54e286c2bc328343fb0f94d27329150 Author: Rodrigo Osorio <rodrigo@FreeBSD.org> AuthorDate: 2025-01-19 21:46:34 +0000 Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> CommitDate: 2025-01-19 21:59:32 +0000 net/rsync: fix test patch when all options are disabled If all options are disabled, the extra-patch distfile is not extracted, breaking the build. Make this step optional if at least one option is active. PR: 284154 --- net/rsync/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index cbd568649489..5977ac517199 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,6 +1,6 @@ PORTNAME= rsync DISTVERSION= 3.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://www.mirrorservice.org/sites/rsync.samba.org/src/ \ http://rsync.mirror.garr.it/src/ \ @@ -78,7 +78,7 @@ ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no .include <bsd.port.options.mk> -.if make(makesum) || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} +.if ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} .endif @@ -88,8 +88,10 @@ DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} CONFIGURE_ARGS+= ac_cv_search_libiconv_open=no .endif +.if make(makesum) || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} pre-patch: @${REINPLACE_CMD} 's:+int module_dirlen = 0;:+:' ${WRKSRC}/patches/fileflags.diff +.endif post-patch: @${REINPLACE_CMD} -e 's:/etc/r{1,2}sync:${ETCDIR}/:g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501192202.50JM2v3f056582>