pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc *: add conflict between ja-less and jless due to bin/j...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff500f50cf92
branches:  trunk
changeset: 373250:ff500f50cf92
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 10 07:45:23 2022 +0000

description:
*: add conflict between ja-less and jless due to bin/jless

diffstat:

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

diffs (36 lines):

diff -r b652f7afb3ff -r ff500f50cf92 misc/ja-less/Makefile
--- a/misc/ja-less/Makefile     Thu Feb 10 07:42:26 2022 +0000
+++ b/misc/ja-less/Makefile     Thu Feb 10 07:45:23 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/05/16 15:56:54 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2022/02/10 07:45:23 wiz Exp $
 
 DISTNAME=      less-382
 PKGNAME=       ja-${DISTNAME}.262.03
@@ -19,6 +19,8 @@
 #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 b652f7afb3ff -r ff500f50cf92 textproc/jless/Makefile
--- a/textproc/jless/Makefile   Thu Feb 10 07:42:26 2022 +0000
+++ b/textproc/jless/Makefile   Thu Feb 10 07:45:23 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/02/09 17:02:46 pin Exp $
+# $NetBSD: Makefile,v 1.2 2022/02/10 07:45:23 wiz Exp $
 
 DISTNAME=      jless-0.7.1
 CATEGORIES=    textproc
@@ -10,6 +10,8 @@
 COMMENT=       Command-line pager for JSON data
 LICENSE=       mit
 
+CONFLICTS+=    ja-less-[0-9]*
+
 .include "cargo-depends.mk"
 
 INSTALLATION_DIRS=     bin



Home | Main Index | Thread Index | Old Index