git: 0df6e80691dc - main - devel/lua-cjson: add CONFLICTS with devel/lua-cjson-openresty

From: Martin Matuska <mm_at_FreeBSD.org>
Date: Sat, 28 Feb 2026 09:19:24 UTC 
The branch main has been updated by mm:

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

commit 0df6e80691dccb4845aa513389e534d587fe4894
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2026-02-28 09:10:50 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2026-02-28 09:19:19 +0000

    devel/lua-cjson: add CONFLICTS with devel/lua-cjson-openresty
---
 devel/lua-cjson/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devel/lua-cjson/Makefile b/devel/lua-cjson/Makefile
index 5ec7794150d0..32c200500b2b 100644
--- a/devel/lua-cjson/Makefile
+++ b/devel/lua-cjson/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cjson
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kyne.au/~mark/software/download/
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		lua:module
 
+CONFLICTS_INSTALL=	lua[0-9][0-9]-cjson-openresty
+
 MAKE_ARGS=	LUA_VERSION=${LUA_VER}
 
 PLIST_FILES=	${LUA_MODLIBDIR}/cjson.so