From nobody Tue Jun 27 21:39:32 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 4QrJ5J6hMdz4kD5m; Tue, 27 Jun 2023 21:39:32 +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 4QrJ5J6Bvcz3LGL; Tue, 27 Jun 2023 21:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687901972; 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=bLT+jhUZTw/F+ZYNpeO2bszaMaXKjdtsG7f2u3RqoHQ=; b=jT1iyqgojhXqMvr8W4JpUW2iFFXj3pstIdgs8jz/oPrv0182Mtpnx+eoVRFJIb0f7/18BA 24Qj7y+kSmjdfAanAi2FlFlgNVsXPI7bcPnU2TpXOEhDWTfm1qviw9Wu9+s4rpUOeRp5vr JfcXsrrIJ4FO8145cWGdZ+uxorK7qZ8ODz8t77PsKnrVc6X0VI90zudwfRTBBseePArWOV ys0SZfp9fUJ4KR961BITCMoUfYDF6prZ9VjJSAXc7B8WTS7qNgBadTai3mVFOtNEpIlpHv QKmEyxStI98t1VAihuAC7qO7yXEPjuzeNudeg3qGuOwKOWIR7teFeZyf19VaZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687901972; 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=bLT+jhUZTw/F+ZYNpeO2bszaMaXKjdtsG7f2u3RqoHQ=; b=mTwzN7V0/DKKmnjWOCEp/OciY72sUOzQNRSs2erzcd+hxSnmJpHynCTf0FiBSi0obzispL uA8IlhSkXES53qAl1h4c2aJZFyVRCH5Bwil0eFyV8X229IU3M9gs05Cpeyhyz5OPFVOvmL z206SbSqMVQE9abi/CcYxai9lf/3uMZ9UwMxBkhllH5cxRFOphos3U4xE8V8WWuh5uDqHk eR2+he2L695iukw+mXVXI5J61nm2TRSuflHY1iHpViPy3cdE0kWG9KloqsZ2asZqNbh8Oj fbfGUhRm6djvlC8gEOYSPRkoDymUAxOvdHAfEmYSaXt0PqQkcNKdd/7jym5tEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687901972; a=rsa-sha256; cv=none; b=VW4q9VhMjaiwIjIK85IgscrqNuUbDdF+RPP5pMfBCNjB7kRl4LdTAJyij8B6hqPnzgpF16 YXz7l7dvS9hEvIoavXvnQ7qSoZT3Q+W25SfgjOSm815UUi+4r2sqGgPm5iRJEmGyFH45pK ffDwIN+VKpp/ZgOBz2fRhlnfkUbzaXd5qnCXugcB+Vn4ia5rb9qLWHhdR9mg1oyc1nMfHx OxO5YBqYHAXdd5wI0k3+sTZ7Wm09TyV91ynNpewo4T0hdxf1x4fAF8p7sUoEBtkjt1wmDs 4J6NrI7F90rAdPNFBqJeQQsAQj6zGt+t4dI82sYtOr5dxOmNCvedEkk2PU9ckw== 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 4QrJ5J5BWvz17TX; Tue, 27 Jun 2023 21:39:32 +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 35RLdWSD048345; Tue, 27 Jun 2023 21:39:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35RLdW5e048344; Tue, 27 Jun 2023 21:39:32 GMT (envelope-from git) Date: Tue, 27 Jun 2023 21:39:32 GMT Message-Id: <202306272139.35RLdW5e048344@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 3a23ac6db800 - main - Mk/bsd.gecko.mk: fix merge typo 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a23ac6db800bbbc5493eeb0fd53b4e5d5b5899f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a23ac6db800bbbc5493eeb0fd53b4e5d5b5899f commit 3a23ac6db800bbbc5493eeb0fd53b4e5d5b5899f Author: Christoph Moench-Tegeder AuthorDate: 2023-06-27 21:38:46 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-06-27 21:38:46 +0000 Mk/bsd.gecko.mk: fix merge typo Reported by: rene@ --- Mk/bsd.gecko.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 0f514f9cc3f2..5b8b46c9aa6d 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -61,7 +61,7 @@ MOZILLA_VER?= ${PORTVERSION} MOZILLA_BIN?= ${PORTNAME}-bin MOZILLA_EXEC_NAME?=${MOZILLA} USES+= compiler:c++17-lang cpe gl gmake gnome iconv localbase pkgconfig \ - python,build desktop-file-utils + python:build desktop-file-utils .if ${MOZILLA_VER:R:R} < 115 USES+= perl5 .endif