From nobody Tue Mar 28 16:25:09 2023 X-Original-To: dev-commits-ports-all@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 4PmFQY49BRz427nd; Tue, 28 Mar 2023 16:25:09 +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 4PmFQY3kRRz3jPW; Tue, 28 Mar 2023 16:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680020709; 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=UQgazY80d3P9EfKSqOZVx0md/9Hn2MeVhHj4P/BZUgM=; b=cVoU15r3yaGUIz+hDZJIbwFuJkIw6tn3dy6oe19ZqyVafa5gXF56fcHfwx7+9rNagbCqCs cV3tSD/M0v+92t3WEBVCoYXUFQUK4JRXdX2YoyyH+GUSqkaPrs4ai1J8gKeL2t92qEVw9e S5Xcxuiz/PdcdXIFPQ/c9YTBybTcS+JMKs1K4Bvokwxneynfh9uEWUcR4MlTUPlaQzy1iX qKrn1/HxXwpMN9kNsUoXqI2ek9Jmvv/hfWwindbNLr68zF8/9rmRXLHTfJR4YzPB1BpJhW ae4kGdh7mZSTF49AtLHeUIhNihhSpRzLBjbVsf5aOVkcvcuoifbY9GmVsQnjfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680020709; 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=UQgazY80d3P9EfKSqOZVx0md/9Hn2MeVhHj4P/BZUgM=; b=qxMlttPx2VWzfVipBzTo+28GPy5dBiZ0rctxJlWqlQOhQWR/5XRQxN5j4IOxIddpgdKy9u qNA3P0gSm4eR4B2ZHwff1tHXqIO6zSJNnlo68JU5KJXdTdx6JrcTKRRMfJzhuBOAGgV6qe 9gm1khWorbdrbO6rThy5SC0tbedX4oK8gUgYVWoKzA6yofm7TTCtZTq4uMTbA6yGju86+X S0mheon8SQVk3qgvDjk/qmkL3h/S8BWsTMLaFbmMADhn3e2k4OZSN3xSEgWLLt68TxaFrJ LGt59h+SIQ4hFPA5SeH8tCdsI3z7WZDQNMxjdr1jhIUQm8dxSO9X8xH3r4Nwhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680020709; a=rsa-sha256; cv=none; b=O1U5MWkHy+gK2p2vp43NgpijzMDG/MRa2dv97F0LjAN+4aS3bkifwN1BdZ79+qM0/JaxHu 9jS1Cw4oD4ssONp6k1dIat04G5aCAwBHDY8h3kwwO9IrkZZuDzK4PQdC8Hj+dkIVb6SJOs 0WiKaerrJ4JIgrJdPV0H6cpWUcNTIAL41OuXLz8VwsBgDfb4ifsIJ0gu21OiY2q7WjxPwI ETJ7oHn7wlPxB2My1p81kkBHTofDu1be7z4spPHf7JOSTTuMP6a2T9nOkSxqrQ4a7ty6XT xet/UHK/nsxXEikvWEof8f1gxvdPu6ML9gi1GUzexxcV9OyszFIpbcoqF6O3KQ== 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 4PmFQY2pqnz19k4; Tue, 28 Mar 2023 16:25:09 +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 32SGP9kO023689; Tue, 28 Mar 2023 16:25:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SGP9JQ023688; Tue, 28 Mar 2023 16:25:09 GMT (envelope-from git) Date: Tue, 28 Mar 2023 16:25:09 GMT Message-Id: <202303281625.32SGP9JQ023688@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: dab5a380703f - main - www/onlyoffice-documentserver: Fix build conflict with devel/py-build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dab5a380703f6468d73de046d7204055d9180436 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=dab5a380703f6468d73de046d7204055d9180436 commit dab5a380703f6468d73de046d7204055d9180436 Author: Mikael Urankar AuthorDate: 2023-03-27 16:22:07 +0000 Commit: Mikael Urankar CommitDate: 2023-03-28 16:24:56 +0000 www/onlyoffice-documentserver: Fix build conflict with devel/py-build The script "build_tools/make.py" tries to import "scripts/build.py" but does this not properly and instead imports the module "build" from devel/py-build PR: 267265 Submitted by: freebsd.org@vollkorn.cryptobitch.de --- .../files/patch-build__tools_make.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_make.py b/www/onlyoffice-documentserver/files/patch-build__tools_make.py new file mode 100644 index 000000000000..e09eac182720 --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-build__tools_make.py @@ -0,0 +1,11 @@ +--- build_tools/make.py.orig 2023-03-27 10:50:23 UTC ++++ build_tools/make.py +@@ -8,7 +8,7 @@ import base + sys.path.append('scripts/core_common/modules') + import config + import base +-import build ++from scripts import build + import build_js + import build_server + import deploy