From nobody Fri Nov 29 20:42:43 2024 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 4Y0Q9H6smKz5fh0L; Fri, 29 Nov 2024 20:42:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y0Q9H4CCjz40FV; Fri, 29 Nov 2024 20:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732912963; 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=Y/s9B3h5zbKSIz4L1RUG2q1KR1zGbPS89jnoYeNPI48=; b=Rzs8Seq+Ol19vdizKCMEq9bIyjNYnu6EHOPLahoRFkeKOQPrb5A8MxUMOwmYaCX2mu7E6V Yybhvj8qDEP+El6yO+30A14W3DwCxBI0Y13XUvCvTuYCS6WysyTH4Loguy+OUKkxWeulXS tqbkLy418rnnxSyBfUaAxv0hbeV5lAqvhQKYI9vBnJ6+SWChwKKR1Gm1TIhKlIz8McKo67 JJcPr/nQ+uwY3dnPvNM7C5vCBf0mKJvMgvokZEYHeqq37wBcis2d5w8MzIuGi4VOkAE1sv BUF0rR05X8VwLwi67gd2oZin9jPQ0pm9YRS/fX0hRYCXa2KpwM06svXmzs4xCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732912963; 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=Y/s9B3h5zbKSIz4L1RUG2q1KR1zGbPS89jnoYeNPI48=; b=u2lmQc7yluRx5uG4hf0YccO+po+u35uYggY0j4HF+/CArcTsJNXSaWhEnOHP33XpXbGoHl s4XCZga82V3zMknweTMrFRASNgyg0iWEHfvY5O4muHzf7k22okRlJjWrjWuCjBvcos3yao OUg+OsvbqjYBkEGdO191jzjim+5JhqYhTyOsLY4yd+NBP0LcEkbIcNVmjZKyYxkPYobz+X R5QeDObOvsX9dZ8m9PigVUwotdApFx4ET1M2ENePcfaphoDqfx2uIzBUsuBQVaj7L/VjOM TwhtY7dOwTjhksTHCxTA3w6+kEZ4nIk1ncrtWS7WB6G8PLqJGHJdfBB7rajSuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732912963; a=rsa-sha256; cv=none; b=e2JDkwBBU2rGYDM04p1rPhDdMC6WjghoaSbVotpS4p5hVrFb+b0Vr8Nz2sHwD3+zq/Qa84 yDYTfxnSg/aaD0a0xBtbWPvy6mcRczckXh7MR1jaGgC9iX973xspVOZhyHYORekSxKBmpQ Dj8XvbE/PW6LflVFrtfafAq0OuFi/gqLggUf1NMXmCU0ifaiJJcMUFY8RcgD5+8RqN2QAu wpO06UWRYiBvhmk5s6QVRUeq8iNghC4XsvLLuUnFRT3qGqDocYkz63N8XzuJR7d37SQqVh cA9jlFQntNDixw6SVnY6Seu4uzMiHLhoh+ye1LV0QRuDAQ4qxUbTNs604aAGDQ== 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 4Y0Q9H3pvbzdyK; Fri, 29 Nov 2024 20:42:43 +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 4ATKghwZ098416; Fri, 29 Nov 2024 20:42:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ATKghK2098413; Fri, 29 Nov 2024 20:42:43 GMT (envelope-from git) Date: Fri, 29 Nov 2024 20:42:43 GMT Message-Id: <202411292042.4ATKghK2098413@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 0065d33851dc - main - devel/mercurial: Fix build with NLS option turned off 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0065d33851dcecefcb57fe727621cf36cfed751d Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0065d33851dcecefcb57fe727621cf36cfed751d commit 0065d33851dcecefcb57fe727621cf36cfed751d Author: Gleb Popov AuthorDate: 2024-11-29 20:39:34 +0000 Commit: Gleb Popov CommitDate: 2024-11-29 20:39:34 +0000 devel/mercurial: Fix build with NLS option turned off --- devel/mercurial/files/extra-patch-setup.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/devel/mercurial/files/extra-patch-setup.py b/devel/mercurial/files/extra-patch-setup.py index ddb389b7523a..fc8a62f9e36e 100644 --- a/devel/mercurial/files/extra-patch-setup.py +++ b/devel/mercurial/files/extra-patch-setup.py @@ -1,20 +1,26 @@ ---- setup.py.orig 2020-08-03 17:43:51 UTC +--- setup.py.orig 2024-11-20 14:38:51 UTC +++ setup.py -@@ -477,32 +477,7 @@ class hgbuildmo(build): - description = "build translations (.mo files)" +@@ -527,39 +527,7 @@ class hgbuildmo(build): + raise DistutilsExecError("failed to build translations") - def run(self): + def _run(self): +- try: +- from shutil import which as find_executable +- except ImportError: +- # Deprecated in py3.12 +- from distutils.spawn import find_executable +- - if not find_executable('msgfmt'): - self.warn( - "could not find msgfmt executable, no translations " - "will be built" - ) -- return +- return False - - podir = 'i18n' - if not os.path.isdir(podir): - self.warn("could not find %s/ directory" % podir) -- return +- return False - - join = os.path.join - for po in os.listdir(podir): @@ -30,6 +36,7 @@ - cmd.append('-c') - self.mkpath(join('mercurial', modir)) - self.make_file([pofile], mobuildfile, spawn, (cmd,)) +- return True + pass