From owner-dev-commits-ports-main@freebsd.org Sun Sep 5 20:31:30 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 E5F7B66169B; Sun, 5 Sep 2021 20:31:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H2jqQ6535z4gng; Sun, 5 Sep 2021 20:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B0C9212023; Sun, 5 Sep 2021 20:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 185KVUrS011617; Sun, 5 Sep 2021 20:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 185KVUmw011616; Sun, 5 Sep 2021 20:31:30 GMT (envelope-from git) Date: Sun, 5 Sep 2021 20:31:30 GMT Message-Id: <202109052031.185KVUmw011616@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 751f060df08b - main - devel/meson: fix patch warning after afb3593eef00 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 751f060df08bb93132b7869a41190da87cecaeb8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Sep 2021 20:31:31 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=751f060df08bb93132b7869a41190da87cecaeb8 commit 751f060df08bb93132b7869a41190da87cecaeb8 Author: Jan Beich AuthorDate: 2021-09-03 01:00:41 +0000 Commit: Jan Beich CommitDate: 2021-09-05 20:31:18 +0000 devel/meson: fix patch warning after afb3593eef00 ===> Patching for meson-0.58.1 ===> Applying FreeBSD patches for meson-0.58.1 from /a/ports/devel/meson/files No such line 37 in input file, ignoring PR: 257251 Approved by: tcberner --- devel/meson/files/patch-setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devel/meson/files/patch-setup.py b/devel/meson/files/patch-setup.py index 28d9c4c1fe9f..54608af977e8 100644 --- a/devel/meson/files/patch-setup.py +++ b/devel/meson/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2018-09-22 13:22:03 UTC +--- setup.py.orig 2021-04-27 06:49:45 UTC +++ setup.py -@@ -38,7 +38,7 @@ packages = ['mesonbuild', +@@ -25,7 +25,7 @@ from setuptools import setup data_files = [] if sys.platform != 'win32': # Only useful on UNIX-like systems @@ -8,4 +8,4 @@ + data_files = [('man/man1', ['man/meson.1']), ('share/polkit-1/actions', ['data/com.mesonbuild.install.policy'])] - if __name__ == '__main__': + setup(data_files=data_files,)