From owner-svn-ports-head@freebsd.org Tue Jul 28 23:51:00 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EDFDC377799; Tue, 28 Jul 2020 23:51:00 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BGYN465gqz43DP; Tue, 28 Jul 2020 23:51:00 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B610B17121; Tue, 28 Jul 2020 23:51:00 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06SNp0DX014134; Tue, 28 Jul 2020 23:51:00 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06SNp0co014133; Tue, 28 Jul 2020 23:51:00 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <202007282351.06SNp0co014133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Tue, 28 Jul 2020 23:51:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543637 - head/net/rsync X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: head/net/rsync X-SVN-Commit-Revision: 543637 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2020 23:51:01 -0000 Author: adamw Date: Tue Jul 28 23:51:00 2020 New Revision: 543637 URL: https://svnweb.freebsd.org/changeset/ports/543637 Log: 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 Modified: head/net/rsync/Makefile Modified: head/net/rsync/Makefile ============================================================================== --- head/net/rsync/Makefile Tue Jul 28 22:22:00 2020 (r543636) +++ head/net/rsync/Makefile Tue Jul 28 23:51:00 2020 (r543637) @@ -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: