git: f4683ac1be44 - main - lang/quickjs: resolve conflict with lang/quickjs-ng

From: Sergey A. Osokin <osa_at_FreeBSD.org>
Date: Tue, 28 Jan 2025 21:03:33 UTC 
The branch main has been updated by osa:

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

commit f4683ac1be44ded112bcbc18f7473aeb47bfee59
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2025-01-28 21:01:58 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2025-01-28 21:03:22 +0000

    lang/quickjs: resolve conflict with lang/quickjs-ng
    
    Bump PORTREVISION.
---
 lang/quickjs/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lang/quickjs/Makefile b/lang/quickjs/Makefile
index 31da1f00d164..6662e89c22af 100644
--- a/lang/quickjs/Makefile
+++ b/lang/quickjs/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	quickjs
 DISTVERSION=	2024.01.13-20240727
+PORTREVISION=	1
 CATEGORIES=	lang devel
 #MASTER_SITES=	https://bellard.org/${PORTNAME}/
 #DISTNAME=	${PORTNAME}-${DISTVERSION:S/./-/g}
@@ -19,6 +20,8 @@ GH_TAGNAME=	6e2e68f
 
 CPE_VENDOR=	${PORTNAME}_project
 
+CONFLICTS=	quickjs
+
 TEST_TARGET=	test
 
 .include <bsd.port.pre.mk>