git: 5e8e9ffbff18 - main - net/rsync: fix build with portmaster
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 19 Jan 2025 21:06:24 UTC
The branch main has been updated by rodrigo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5e8e9ffbff18ffa1cc46d7833227e4143030d314
commit 5e8e9ffbff18ffa1cc46d7833227e4143030d314
Author: Rodrigo Osorio <rodrigo@FreeBSD.org>
AuthorDate: 2025-01-19 14:25:16 +0000
Commit: Rodrigo Osorio <rodrigo@FreeBSD.org>
CommitDate: 2025-01-19 21:02:53 +0000
net/rsync: fix build with portmaster
Change the fix for tests to unbreak the build with postmaster
PR: 284154
Reported by: <iron.udjin@gmail.com>
---
net/rsync/Makefile | 3 +++
net/rsync/files/patch-t_stub.c | 10 ----------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 7189ea8bae7c..cbd568649489 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -88,6 +88,9 @@ DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
CONFIGURE_ARGS+= ac_cv_search_libiconv_open=no
.endif
+pre-patch:
+ @${REINPLACE_CMD} 's:+int module_dirlen = 0;:+:' ${WRKSRC}/patches/fileflags.diff
+
post-patch:
@${REINPLACE_CMD} -e 's:/etc/r{1,2}sync:${ETCDIR}/:g' \
-e 's:/etc/letsencrypt:${PREFIX}/etc/letsencrypt:g' \
diff --git a/net/rsync/files/patch-t_stub.c b/net/rsync/files/patch-t_stub.c
deleted file mode 100644
index 6da977be0db5..000000000000
--- a/net/rsync/files/patch-t_stub.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- t_stub.c.orig 2025-01-18 20:59:30 UTC
-+++ t_stub.c
-@@ -28,7 +28,6 @@
- int protect_args = 0;
- int module_id = -1;
- int relative_paths = 0;
--int module_dirlen = 0;
- int force_change = 0;
- int preserve_acls = 0;
- unsigned int module_dirlen = 0;