net/rsync: revert to single package without Python dependency

Restore the previous setup with a single net/rsync package that includes
the rrsync script but does not depend on Python.

Users who require the rrsync script must install Python separately,
as indicated in the install message.

Bump PORTREVISION

This reverts commit fc42790ae011acedf0195c7d31b1cf63b8c02155.
This reverts commit f02bc3be718072b75bd291f81f66b7f15865f535.

PR:		286073

4 files changed, 26 insertions, 25 deletions

diff --git a/UPDATING b/UPDATING
index cc9123063572..10a1febfb914 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20260418:
+  AFFECTS: Users of net/rsync and net/rsync@python
+  AUTHOR: rodrigo@FreeBSD.org
+
+  Revert the introduction of two net/rsync flavours, the default  without
+  the rrsync script and the python flavour with rrsync and python as a dependency.
+  Restore the previous setup with a single net/rsync package that includes
+  the rrsync script but does not depend on Python.
+  Users who require the rrsync script must install Python separately,
+  as indicated in the install message.
+
 20260412:
   AFFECTS: Users of sysutils/ansible
   AUTHOR: cy@FreeBSD.org
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 6b03b79028d5..32e73f5eee5c 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rsync
 DISTVERSION=	3.4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	https://www.mirrorservice.org/sites/rsync.samba.org/src/ \
 		http://rsync.mirror.garr.it/src/ \
@@ -19,28 +19,16 @@ LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libxxhash.so:devel/xxhash \
 		libzstd.so:archivers/zstd
 
-FLAVORS=	default python
-FLAVOR?=	${FLAVORS:[1]}
-FLAVORS_SUB=	yes
-python_PKGNAMESUFFIX=	-python
-
-USES=		autoreconf:build cpe ssl
-.if ${FLAVOR:U} == python
-USES+=	python:run shebangfix
-.endif
-
-CONFLICTS=	rsync rsync-python
-
+USES=		autoreconf:build cpe python shebangfix ssl
+PYTHON_NO_DEPENDS=	yes
 CPE_VENDOR=	samba
 CPE_PRODUCT=	rsync
 USE_RC_SUBR=	rsyncd
 
-.if ${FLAVOR:U} == python
 SHEBANG_FILES=	support/rrsync
-.endif
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-debug \
 		--enable-ipv6 \
 		--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
@@ -61,7 +49,6 @@ OPTIONS_DEFINE=		DOCS ICONV POPT_PORT SSH ZLIB_BASE
 OPTIONS_DEFAULT=	FLAGS ICONV SSH ZLIB_BASE
 OPTIONS_RADIO=		PTS
 OPTIONS_RADIO_PTS=	FLAGS RENAMED
-OPTIONS_SUB=		yes
 
 # options provided upstream
 FLAGS_DESC=	File system flags support patch, adds --fileflags
@@ -101,8 +88,7 @@ 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}
+.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
@@ -119,15 +105,11 @@ pre-configure:
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/
-.if ${FLAVOR:U} == python
 	${INSTALL_SCRIPT} ${WRKSRC}/support/rrsync ${STAGEDIR}${PREFIX}/sbin
-.endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-.if ${FLAVOR:U} == python
 	${INSTALL_DATA} ${WRKSRC}/support/rrsync.1.md ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/rsync/pkg-message b/net/rsync/pkg-message
new file mode 100644
index 000000000000..32f957ffaa35
--- /dev/null
+++ b/net/rsync/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+Some scripts provided by rsync, such as rrsync,
+require Python, which is not installed by default.
+EOM
+}
+]
diff --git a/net/rsync/pkg-plist b/net/rsync/pkg-plist
index 06aadf721fda..6614a2d1b5a3 100644
--- a/net/rsync/pkg-plist
+++ b/net/rsync/pkg-plist
@@ -1,8 +1,8 @@
 bin/rsync
 bin/rsync-ssl
-%%PYTHON%%sbin/rrsync
+sbin/rrsync
 share/man/man1/rsync.1.gz
 share/man/man1/rsync-ssl.1.gz
 share/man/man5/rsyncd.conf.5.gz
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/rrsync.1.md
+%%PORTDOCS%%%%DOCSDIR%%/rrsync.1.md
 @sample %%ETCDIR%%/rsyncd.conf.sample