CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb 10 07:45:23 UTC 2022

Modified Files:
        pkgsrc/misc/ja-less: Makefile
        pkgsrc/textproc/jless: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/misc/ja-less/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/jless/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/ja-less/Makefile
diff -u pkgsrc/misc/ja-less/Makefile:1.14 pkgsrc/misc/ja-less/Makefile:1.15
--- pkgsrc/misc/ja-less/Makefile:1.14   Sat May 16 15:56:54 2020
+++ pkgsrc/misc/ja-less/Makefile        Thu Feb 10 07:45:23 2022
@@ -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 @@ MAINTAINER=   komine%cc.meisei-u.ac.jp@localhost
 #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}

Index: pkgsrc/textproc/jless/Makefile
diff -u pkgsrc/textproc/jless/Makefile:1.1 pkgsrc/textproc/jless/Makefile:1.2
--- pkgsrc/textproc/jless/Makefile:1.1  Wed Feb  9 17:02:46 2022
+++ pkgsrc/textproc/jless/Makefile      Thu Feb 10 07:45:23 2022
@@ -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 @@ HOMEPAGE=     https://github.com/PaulJuliusM
 COMMENT=       Command-line pager for JSON data
 LICENSE=       mit
 
+CONFLICTS+=    ja-less-[0-9]*
+
 .include "cargo-depends.mk"
 
 INSTALLATION_DIRS=     bin