From nobody Sun Jan 19 22:02:57 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YbnXK5hJ5z5lmfB; Sun, 19 Jan 2025 22:02:57 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YbnXK3xWDz3H7G; Sun, 19 Jan 2025 22:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737324177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26qZRkxoSPvUzZ+iA5qkUIfw06J23OzCdMjqADKZ+vg=; b=RrVPQQrTqzUem3HIkN+5MzBAn1oUvcpXsbnWr6yyioLeVHlUHC9xUpJYOqLL0i7tkKNvyo UuO7aD8X/BeRrPi+/InovoRL4xfP9z6qcqR1448u9szCzJomQmyp9ZnePtkNtuF9NDX+tT XUKgOOFEXuFrPzoNr07vSUoMvXObAmc5iQVJe1aRJFAIvSmpNvu4fIyCu7Yx1DZ6Uw9ljA HnTgRlwsP5hj4e5TAQG2rmDRayOaBJK+wj516xsemyjZXl5lKim/mMgUmmiatDkeW/C9PX SkvF8JcjgBkumAHg1PPHqX0DcP4gxJuQYBwfYWMT0cVa6OwG1SORbrBVWJR+Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737324177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26qZRkxoSPvUzZ+iA5qkUIfw06J23OzCdMjqADKZ+vg=; b=HRxvnV7LFxzQpkyAR54TwZJyLB1gQRHPMnoAEn5LAaRm79hvfBI53B8qOq4PfBKR/2li+r 246x0b//99b/cEmmXIQjA7d6322JPZg7BTdYBxfWOxCNg4XzDaEFuoAHD5PAr/ud8HleHG a1WdXQNzRrd1C7nQSZMe34777LSEhDQpF3qP+bhp4wAjmtr3MZDIKRLNsk+KrPo49oUX5h 3+YROezkdmRXr3p8+2SLsO8r7CVjhQTwvIQWM9ledDYvWjrmLBXCa/2xSx2lrZ6RfmeHUp W2wfGYWkP1K/ErG6c++F9JXLBKUzM9sWY8k5nIDwLHwahoQek2K8AKm1SN12Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737324177; a=rsa-sha256; cv=none; b=VMKHLBEoQ8NbccZprVhbH89Gu/zCNxUQvZ5Nj5NZL43rpXSCZWu6MyrIzol0FeJV5Gb9Hw F3QSqroUlaf3ilHk1GZ0JFBDMgwkjYQBf3Fq6NbWV19CPpndKqHxWVh3r9CrE0olaTmLk+ 7OhpFJEOlEchqtaqUdh71LCs9RU/Qi3b9mybbBN8GYPa24ZFKYHWnLYvABhyT9d9uZ6su/ intvwNQUonAEUdbD0pTLHOhcTcq2sXQHN/Qqa+G8zABFNKpMZLXnTeajFfcEdxE7F0EHyx VNg5Co1dcAAkS9q9t5VMAY8HVCoeY8g0PU/omQWFrp0HPKi0Okg4nM3WukmPNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YbnXK2dcsz172Y; Sun, 19 Jan 2025 22:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50JM2vVN056588; Sun, 19 Jan 2025 22:02:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50JM2v3f056582; Sun, 19 Jan 2025 22:02:57 GMT (envelope-from git) Date: Sun, 19 Jan 2025 22:02:57 GMT Message-Id: <202501192202.50JM2v3f056582@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 7f56364aa54e - main - net/rsync: fix test patch when all options are disabled List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f56364aa54e286c2bc328343fb0f94d27329150 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f56364aa54e286c2bc328343fb0f94d27329150 commit 7f56364aa54e286c2bc328343fb0f94d27329150 Author: Rodrigo Osorio AuthorDate: 2025-01-19 21:46:34 +0000 Commit: Rodrigo Osorio CommitDate: 2025-01-19 21:59:32 +0000 net/rsync: fix test patch when all options are disabled If all options are disabled, the extra-patch distfile is not extracted, breaking the build. Make this step optional if at least one option is active. PR: 284154 --- net/rsync/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index cbd568649489..5977ac517199 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,6 +1,6 @@ PORTNAME= rsync DISTVERSION= 3.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://www.mirrorservice.org/sites/rsync.samba.org/src/ \ http://rsync.mirror.garr.it/src/ \ @@ -78,7 +78,7 @@ ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no .include -.if make(makesum) || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} +.if ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} .endif @@ -88,8 +88,10 @@ 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} pre-patch: @${REINPLACE_CMD} 's:+int module_dirlen = 0;:+:' ${WRKSRC}/patches/fileflags.diff +.endif post-patch: @${REINPLACE_CMD} -e 's:/etc/r{1,2}sync:${ETCDIR}/:g' \