git: afa59c1967d1 - main - lang/luajit-devel: enable CONFLICTS_INSTALL

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Sergey A. Osokin <osa_at_FreeBSD.org>
Date: Thu, 28 Oct 2021 21:59:09 UTC

The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=afa59c1967d1dc4f5fd95f5ebb711e082d220850

commit afa59c1967d1dc4f5fd95f5ebb711e082d220850
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2021-10-28 21:57:01 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
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