[pkgsrc/trunk]: pkgsrc Remove conflict flag

[pin <pin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ad3054afdec
branches:  trunk
changeset: 373254:1ad3054afdec
user:      pin <pin%pkgsrc.org@localhost>
date:      Thu Feb 10 10:49:42 2022 +0000

description:
Remove conflict flag

diffstat:

 misc/ja-less/Makefile   |  4 +---
 textproc/jless/Makefile |  4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 13007f743104 -r 1ad3054afdec misc/ja-less/Makefile
--- a/misc/ja-less/Makefile     Thu Feb 10 10:46:23 2022 +0000
+++ b/misc/ja-less/Makefile     Thu Feb 10 10:49:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/02/10 07:45:23 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/02/10 10:49:42 pin Exp $
 
 DISTNAME=      less-382
 PKGNAME=       ja-${DISTNAME}.262.03
@@ -19,8 +19,6 @@
 #HOMEPAGE=     http://www25.big.jp/~jam/less/
 COMMENT=       Less + zcat + ISO-2022 + UTF-8 - a pager similar to more and pg
 
-CONFLICTS+=    jless-[0-9]*
-
 GNU_CONFIGURE= yes
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
diff -r 13007f743104 -r 1ad3054afdec textproc/jless/Makefile
--- a/textproc/jless/Makefile   Thu Feb 10 10:46:23 2022 +0000
+++ b/textproc/jless/Makefile   Thu Feb 10 10:49:42 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/02/10 08:31:22 pin Exp $
+# $NetBSD: Makefile,v 1.4 2022/02/10 10:50:22 pin Exp $
 
 DISTNAME=      jless-0.7.1
 PKGREVISION=    1
@@ -11,8 +11,6 @@
 COMMENT=       Command-line pager for JSON data
 LICENSE=       mit
 
-CONFLICTS+=    ja-less-[0-9]*
-
 .include "cargo-depends.mk"
 
 INSTALLATION_DIRS=     bin