rsync: Unbreak and fix depends

rsync now depends on stuff in LOCALBASE. Previously, clang only needed to know
about LOCALBASE if POPT or ICONV was enabled. When those options are off, xxhash
and zstd were not found by configure.

Also, a depend on libssl was missing, and there were some noop reinplaces.

With hat: portmgr
This commit is contained in:
Adam Weinberger 2020-07-28 23:51:00 +00:00
parent a118852d2c
commit f180a39684
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=543637

View File

@ -19,7 +19,7 @@ LICENSE= GPLv3
LIB_DEPENDS= libxxhash.so:devel/xxhash \
libzstd.so:archivers/zstd
USES= cpe shebangfix
USES= cpe shebangfix ssl
SHEBANG_FILES= support/rrsync
CPE_VENDOR= samba
@ -35,6 +35,8 @@ TEST_TARGET= check
CONFIGURE_ARGS= --disable-debug --enable-ipv6 \
--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PORTDOCS= NEWS.md README.md csprotocol.txt tech_report.tex
@ -69,13 +71,9 @@ ACL_EXTRA_PATCHES= ${WRKSRC}/patches/acls.diff \
${FILESDIR}/extrapatch-acl
ICONV_USES= iconv:translit
ICONV_CPPFLAGS= -I${LOCALBASE}/include
ICONV_LDFLAGS= -L${LOCALBASE}/lib
ICONV_CONFIGURE_ENABLE= iconv iconv-open
POPT_PORT_LIB_DEPENDS= libpopt.so:devel/popt
POPT_PORT_CPPFLAGS= -I${LOCALBASE}/include
POPT_PORT_LDFLAGS= -L${LOCALBASE}/lib
POPT_PORT_CONFIGURE_OFF= --with-included-popt
@ -100,9 +98,8 @@ CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no
.endif
post-patch:
@${REINPLACE_CMD} -e 's|perl.*|${DO_NADA}|' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's:/etc/:${ETCDIR}/:g' \
${WRKSRC}/rsync.h ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5
${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5
@${REINPLACE_CMD} -e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g' ${WRKSRC}/support/rrsync
post-install: