From nobody Fri Jun 09 18:44:25 2023 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 4Qd93Y5T0fz4c76M; Fri, 9 Jun 2023 18:44:25 +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 4Qd93Y5294z46cK; Fri, 9 Jun 2023 18:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686336265; 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=uwALboCzejJDFjfUqg0CTRX5ZnhfcjXFglw2FmAItJ8=; b=Owg6KPV/TnGiB5D5U5Dy4iAvFPsUgy/JkyIQzWccpiOb5FFMOAc3NJAdHB9qsKiedqUV20 dI+UiHK4NPvNULv/gf7DFfdwq95IlRqiqHQ5O2cFllXUub1uGxHpSTzUPt7rt8TBeigXvd DEormNhPZd38wsSeiITku59UBJrNOCI3u4H8kYY2rWhUHo6eWojhYOo7V2ZqLb5/eXOIyx IESKmxAFcon8vQWr0Hds4Ikr/ycf1d6ePMTWrvT1igSgE5VfdW12X7JGhUq6vRxVivckqR t7R58yQZSTBl+uNZSU+tJhZl1WYTr+XTsgngI9G2d3Z1MycVEwnwLv4eSQkuOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686336265; 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=uwALboCzejJDFjfUqg0CTRX5ZnhfcjXFglw2FmAItJ8=; b=ke36+BiJAyPpgns7s/p3u55tCOz6lZfs4SpYyRAVfmfX4VkUYuqxNZFfDCq3vjRHCvJuty r/5cBY0Zj2Tlz6CM4vBitlnlA7PiY+gyM3JUI1NUqpeqoVhabJlbUZxLL4wmtuJSdX6cjZ gNH8ZoQepc5z3FLd44aeaXKU5AY5PrVsDyi4AkcCwa31vNffvCnh87WzLkp6iTVD9Ov4ou URvgLQYH2XX+3KQs6UHGSJXc14NynVdV25KRrFQJ+oLTRqEEubuG5/ueGSuZLtcHDPofiU 3oTcad3P0jaihfngOj4bi1w7Nt535oZTn8VU2OMhuD4VP37lsOP5Sz0qWpscDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686336265; a=rsa-sha256; cv=none; b=psNfSFleUkW2GbdTroWdy2uslTHqDmU0DFLyUu0NjML8hSvOhuPhCnvpmdWGK+LPOTNpQH V5LbaEIpMOVMPn5HBkz27UKRmApuWlXk2B9nmgOrrSTesbC5jhReKiG7BjIHrwNFjJZWce R35CtdZI3/YOr2K9cscb0CqWKk+/E96ZvdO1ABZiXXD0AHAbQL18FPunqDeLhBh22lPMVF BiUutnGYNn8A1Up3TCiVeKYegB7U9zQpPqGPSyN/1BE6IHHDekR+3t9a73zV+v4ssA9gyv GkvTkYQrClwLkircovoNNxspU4werV919ndY5Ch1xYc9lCYIUxSwLyk107eU8w== 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 4Qd93Y47gTzmLK; Fri, 9 Jun 2023 18:44:25 +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 359IiPrD056238; Fri, 9 Jun 2023 18:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359IiPt4056237; Fri, 9 Jun 2023 18:44:25 GMT (envelope-from git) Date: Fri, 9 Jun 2023 18:44:25 GMT Message-Id: <202306091844.359IiPt4056237@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 051bd1477e29 - main - misc/xplr: again fix build on powerpc* 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 051bd1477e296db3279123dea1c69da1b811d6f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=051bd1477e296db3279123dea1c69da1b811d6f0 commit 051bd1477e296db3279123dea1c69da1b811d6f0 Author: Piotr Kubaj AuthorDate: 2023-06-09 18:42:28 +0000 Commit: Piotr Kubaj CommitDate: 2023-06-09 18:44:22 +0000 misc/xplr: again fix build on powerpc* Also move the luajit dependency to be global to prevent further breakages, following multiple fixes by improper port updating. Per port tree policy, ports should not bundle their own dependencies anyway. --- misc/xplr/Makefile | 11 ++--------- misc/xplr/files/{extra-patch-Cargo.toml => patch-Cargo.toml} | 6 +++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/misc/xplr/Makefile b/misc/xplr/Makefile index a292c1f5c565..0ac3577bb650 100644 --- a/misc/xplr/Makefile +++ b/misc/xplr/Makefile @@ -1,7 +1,7 @@ PORTNAME= xplr DISTVERSIONPREFIX= v DISTVERSION= 0.21.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MAINTAINER= lcook@FreeBSD.org @@ -11,7 +11,7 @@ WWW= https://xplr.dev LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cargo compiler desktop-file-utils gmake +USES= cargo compiler desktop-file-utils gmake luajit USE_GITHUB= yes GH_ACCOUNT= sayanarijit @@ -26,13 +26,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES _ASSETS= ${WRKSRC}/assets _ICONS= ${STAGEDIR}${PREFIX}/share/icons/hicolor -.include - -.if ${ARCH:Mpowerpc64*} -EXTRA_PATCHES= ${FILESDIR}/extra-patch-Cargo.toml -LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty -.endif - .include .if ${ARCH} == powerpc && ${COMPILER_VERSION} < 140 diff --git a/misc/xplr/files/extra-patch-Cargo.toml b/misc/xplr/files/patch-Cargo.toml similarity index 64% rename from misc/xplr/files/extra-patch-Cargo.toml rename to misc/xplr/files/patch-Cargo.toml index 5dcc699179a5..1b6f2ef71c1e 100644 --- a/misc/xplr/files/extra-patch-Cargo.toml +++ b/misc/xplr/files/patch-Cargo.toml @@ -1,9 +1,9 @@ ---- Cargo.toml.orig 2023-03-25 06:02:33 UTC +--- Cargo.toml.orig 2023-05-22 04:45:42 UTC +++ Cargo.toml -@@ -70,7 +70,7 @@ features = ['serde'] +@@ -72,7 +72,7 @@ features = ['serde'] [dependencies.mlua] - version = "0.8.8" + version = "0.8.9" -features = ['luajit', 'vendored', 'serialize', 'send'] +features = ['luajit', 'serialize', 'send']