From nobody Tue Apr 28 18:26:22 2026 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 4g4pmH2sCWz6bvD9 for ; Tue, 28 Apr 2026 18:26:23 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4pmH20ZNz3rpB for ; Tue, 28 Apr 2026 18:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777400783; 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=GlBDPA71CZglWb/dGKbtQc5yrW0I2LxzaB1HXBbXfLY=; b=uyjt4E4dL3a4yxhewsh1vKJuI8fRtctetKwy6qGeRC+JDnnxZKk2T3gjTfgQpWO5ZO+uKB QhpYL3ZxdqfNkHMQhry+ZZTAnWG1jl/vquuYWigQFl+iXLoa37HJ2rYs7/YlWXr73jdG/n 5/zkX3tpYRSgJyrq88bi4646VMmyHVgLgwQJ7yWxIybfz/UZYjoR6o5BeIuCljQ8by651i bzQwSvLZFHOAuYUKJ/a5ZbreZF6SBpe17cktfsKycJ510bTfF9luOrUUWqkERUqX6N4vEq YJX5InF1gOqdGeKzkYiQmt9ikMskPyax55mKRNiBJdNNsBbAhLTvDOkdBsG8Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777400783; a=rsa-sha256; cv=none; b=BZxp40iKeblOPeMYqG1Ja+OB91spwqbQlsD2vqM8scgL7FgeDLuITJacx4hBFaKvgmGfqS b+2Lvi3LrpsWWkSarrUJcYmebyAUa9Xk77VxRQQNCW4VsvyIVnIxIqjlhd/q6Q3DJ+6X+l 1TKvv0w9He1kP5kkku9DtRLSN91nebUy70omSacvclKog2vxLv7SWDJiQ1Wp7Z3Vyd+xdw IXyL6txtE+aq+oyVdoamGPpY2Xwpn5zBweGe698dl1IpYK6mmWtXlQQ/n6ucFuhZXHA9Q3 8r2Za4ns8wjto37MyFI0PClaG4IkVaYRcAyYIsY32LXMtOnaWfD7BrLdyhCU2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777400783; 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=GlBDPA71CZglWb/dGKbtQc5yrW0I2LxzaB1HXBbXfLY=; b=xPckIe1ILE6WkP2w7mZktPVjX3lH8u2/ApqunfP7serFV4EybZsw8XjjDmkzRqrmAIcWgC gECgNCJmqX5MgH5ChFXyltggSd6VMmAgKLoSfxdWjfEYsxQLCuNwfpw3U5Kr9UZvVDLKTR jsQdFvLud7kej85V9arKjOf8F+jy7NA8U+0gIF4NpRjE49uMNT8JtVg5gzO+FY4hgZPGt6 PubFzVJnru8k2bGzJoajDt7kNzuf32OB2P6poKIzp0op+dC3ZYOum2zYsTpGcpVVJTm8lj bKNhrO4GoRKHU3/97me1UvHxWBd9RYUx2EJzPyBDZztAdu9ymRk6hEf0MaUJRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4pmH0tQxz14qM for ; Tue, 28 Apr 2026 18:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 202f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Apr 2026 18:26:22 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 70718cbf1b00 - main - Mk/Uses/meson.mk: Silence warning during do-configure stage 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70718cbf1b0089043c9278c6b5f578fadcdf9b9d Auto-Submitted: auto-generated Date: Tue, 28 Apr 2026 18:26:22 +0000 Message-Id: <69f0fbce.202f4.25de3156@gitrepo.freebsd.org> The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=70718cbf1b0089043c9278c6b5f578fadcdf9b9d commit 70718cbf1b0089043c9278c6b5f578fadcdf9b9d Author: Daniel Engberg AuthorDate: 2026-04-28 18:09:42 +0000 Commit: Daniel Engberg CommitDate: 2026-04-28 18:22:33 +0000 Mk/Uses/meson.mk: Silence warning during do-configure stage Add setup to CONFIGURE_ARGS to silence following warning: "WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated." While at it add a safeguard when CONFIGURE_ARGS is used instead of MESON_ARGS PR: 294808 Reviewed by: desktop (arrowd), previous interation --- Mk/Uses/meson.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk index f1b41cbdbceb..3a5aa9d7eba9 100644 --- a/Mk/Uses/meson.mk +++ b/Mk/Uses/meson.mk @@ -25,13 +25,17 @@ _INCLUDE_USES_MESON_MK= yes _valid_ARGS= muon -# Sanity check +# Sanity checks . for _arg in ${meson_ARGS} . if empty(_valid_ARGS:M${_arg}) IGNORE= 'USES+= meson:${meson_ARGS}' usage: argument [${_arg}] is not recognized . endif . endfor +. if defined(CONFIGURE_ARGS) +IGNORE= Please use MESON_ARGS instead of CONFIGURE_ARGS for Meson based ports +. endif + . if !empty(meson_ARGS:Mmuon) BUILD_DEPENDS+= muon:devel/muon . else @@ -49,7 +53,8 @@ USE_LOCALE?= en_US.UTF-8 CONFIGURE_ARGS+= meson . endif -CONFIGURE_ARGS+= --prefix ${PREFIX} \ +CONFIGURE_ARGS+= setup \ + --prefix ${PREFIX} \ --localstatedir /var \ --infodir ${INFO_PATH}