From nobody Thu Oct 28 21:59:09 2021 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 707B118273BA; Thu, 28 Oct 2021 21:59: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 4HgKG52hBZz4kcg; Thu, 28 Oct 2021 21:59:09 +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 3915D3398; Thu, 28 Oct 2021 21:59: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 19SLx9Ae023014; Thu, 28 Oct 2021 21:59:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19SLx9PZ023013; Thu, 28 Oct 2021 21:59:09 GMT (envelope-from git) Date: Thu, 28 Oct 2021 21:59:09 GMT Message-Id: <202110282159.19SLx9PZ023013@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: afa59c1967d1 - main - lang/luajit-devel: enable CONFLICTS_INSTALL 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afa59c1967d1dc4f5fd95f5ebb711e082d220850 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=afa59c1967d1dc4f5fd95f5ebb711e082d220850 commit afa59c1967d1dc4f5fd95f5ebb711e082d220850 Author: Sergey A. Osokin AuthorDate: 2021-10-28 21:57:01 +0000 Commit: Sergey A. Osokin CommitDate: 2021-10-28 21:57:01 +0000 lang/luajit-devel: enable CONFLICTS_INSTALL --- lang/luajit-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/luajit-devel/Makefile b/lang/luajit-devel/Makefile index 2098e7f2e060..5671214a6f1e 100644 --- a/lang/luajit-devel/Makefile +++ b/lang/luajit-devel/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT IGNORE_riscv64= fails to compile: lj_arch.h:73:2: No support for this architecture (yet) -#CONFLICTS_INSTALL= luajit luajit-openresty +CONFLICTS_INSTALL= luajit luajit-openresty USES= cpe gmake USE_LDCONFIG= yes