Re: rsync: update to 3.2.2

On Tue, Aug 04, 2020 at 06:07:35PM -0000, Christian Weisgerber wrote:
> On 2020-07-30, Klemens Nanni <kn@openbsd.org> wrote:
>
> > Any OKs for this diff which updates and brings in all the support?
>
> I haven't gotten around to really looking at this... but since it's
> committed now:
>
> This changed rsync from a self-contained port that you could quickly
> compile on a clean box to something with this list of dependencies
> on clang archs:
Here's a diff to disable the three dependencies again.

> The iconv FLAVOR doesn't build:
>
> Missing library for iconv>=0.0
>
> Never mind that the iconv flavor doesn't make sense any longer,
> given that there are now multiple library dependencies and libiconv
> is a build dependency anyway.
I also looked at iconv but rsync configures and builds with it even when
--disable-iconv gets passed, this smells like some configure* bug.


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/rsync/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile 3 Aug 2020 21:35:36 -0000 1.86
+++ Makefile 4 Aug 2020 19:45:52 -0000
@@ -3,6 +3,7 @@
COMMENT = mirroring/synchronization over low bandwidth links

DISTNAME = rsync-3.2.2
+REVISION = 0
CATEGORIES = net
HOMEPAGE = https://rsync.samba.org/

@@ -14,14 +15,17 @@ FLAVOR ?=
# GPLv3
PERMIT_PACKAGE = Yes

-WANTLIB = c crypto lz4 xxhash zstd
+WANTLIB = c crypto

MASTER_SITES = https://rsync.samba.org/ftp/rsync/src/ \
http://ftp.funet.fi/pub/mirrors/samba.org/pub/rsync/src/

SEPARATE_BUILD =Yes
CONFIGURE_STYLE =gnu
-CONFIGURE_ARGS =--with-included-popt \
+CONFIGURE_ARGS =--disable-lz4 \
+ --disable-xxhash \
+ --disable-zstd \
+ --with-included-popt \
--with-included-zlib \
--with-rsyncd-conf="${SYSCONFDIR}/rsyncd.conf" \
--with-rsh=/usr/bin/ssh \
@@ -36,10 +40,6 @@ WANTLIB += iconv

DOCDIR = ${PREFIX}/share/doc/rsync
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-
-LIB_DEPENDS = archivers/lz4 \
- archivers/zstd \
- sysutils/xxhash

pre-configure:
${SUBST_CMD} ${WRKSRC}/rsyncd.conf.5 \