On Tue, Aug 06, 2024 at 09:59:33PM +0100, Stuart Henderson wrote:
> On 2024/08/04 22:47, Bryan Vyhmeister wrote:
> > On Sat, Jul 27, 2024 at 11:55:31PM -0700, Bryan Vyhmeister wrote:
> > > I am re-posting about this change for rsync since it has been several
> > > more weeks. I appreciate everyone who has responded. I would like to see
> > > anyone else who might have objections to this speak up. I also checked
> > > around to see what FreeBSD and Debian are doing and both include zstd,
> > > lz4, and iconv in the default install.
> > 
> > Posting again. No one else has responded negatively.
> 
> It's OK with me, fwiw.

OK as well.

> > Index: net/rsync/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/net/rsync/Makefile,v
> > diff -u -p -u -r1.103 Makefile
> > --- net/rsync/Makefile	6 May 2024 12:23:48 -0000	1.103
> > +++ net/rsync/Makefile	3 Jul 2024 07:56:56 -0000
> > @@ -3,9 +3,9 @@ COMMENT =	mirroring/synchronization over
> >  DISTNAME =	rsync-3.3.0
> >  CATEGORIES =	net
> >  HOMEPAGE =	https://rsync.samba.org/
> > -REVISION =	0
> > +REVISION =	1
> >  
> > -FLAVORS =	iconv
> > +FLAVORS =	minimal
> >  FLAVOR ?=
> >  
> >  # GPLv3
> > @@ -43,10 +43,14 @@ CONFIGURE_ENV +=CPPFLAGS="-I${LOCALBASE}
> >  CONFIGURE_ARGS +=--enable-md5-asm
> >  .endif
> >  
> > -.if ${FLAVOR:Miconv}
> > +.if !${FLAVOR:Mminimal}
> > +CONFIGURE_ARGS +=--enable-lz4 \
> > +		--enable-zstd
> >  CONFIGURE_ENV +=LDFLAGS='-L${LOCALBASE}/lib'
> > -LIB_DEPENDS +=	converters/libiconv
> > -WANTLIB +=	iconv
> > +LIB_DEPENDS +=	archivers/lz4 \
> > +		archivers/zstd \
> > +		converters/libiconv
> > +WANTLIB +=	iconv lz4 zstd
> >  .endif
> >  
> >  DOCDIR =	${PREFIX}/share/doc/rsync
> > Index: net/rsync/pkg/DESCR
> > ===================================================================
> > RCS file: /cvs/ports/net/rsync/pkg/DESCR,v
> > diff -u -p -u -r1.6 DESCR
> > --- net/rsync/pkg/DESCR	26 Apr 2024 13:26:27 -0000	1.6
> > +++ net/rsync/pkg/DESCR	3 Jul 2024 07:57:10 -0000
> > @@ -7,11 +7,12 @@ its delta-transfer algorithm, which redu
> >  over the network by sending only the differences between the source
> >  files and the existing files in the destination. Rsync is widely
> >  used for backups and mirroring and as an improved copy command for
> > -everyday use.
> > +everyday use. This also includes options for lz4 and zstd compression
> > +as well as iconv for people wanting to bring files from other OSes 
> > +with more versatile filenames.
> >  
> > -Flavor: iconv
> > -    extra dependency, for people wanting to bring files from other OSes with
> > -    more versatile filenames.
> > +Flavor: minimal
> > +    without any extra dependencies of iconv, lz4, and zstd.
> >  
> >  To use the rrsync wrapper, python3 should be installed.
> >  
> > Index: net/rsync/pkg/PFRAG.no-minimal
> > ===================================================================
> > RCS file: net/rsync/pkg/PFRAG.no-minimal
> > diff -N net/rsync/pkg/PFRAG.no-minimal
> > --- /dev/null	1 Jan 1970 00:00:00 -0000
> > +++ net/rsync/pkg/PFRAG.no-minimal	3 Jul 2024 07:57:10 -0000
> > @@ -0,0 +1 @@
> > +@pkgpath net/rsync,iconv
> > Index: net/rsync/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/net/rsync/pkg/PLIST,v
> > diff -u -p -u -r1.18 PLIST
> > --- net/rsync/pkg/PLIST	8 Nov 2022 11:17:01 -0000	1.18
> > +++ net/rsync/pkg/PLIST	3 Jul 2024 07:57:10 -0000
> > @@ -11,3 +11,4 @@ bin/rsync-ssl
> >  share/doc/rsync/
> >  share/doc/rsync/tech_report.tex
> >  @extra ${SYSCONFDIR}/rsyncd.conf
> > +!%%minimal%%
> > 
> 

-- 
Antoine