Thu Feb 10 10:50:22 2022 UTC ()
Remove conflict flag


(pin)
diff -r1.3 -r1.4 pkgsrc/textproc/jless/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/textproc/jless/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/jless/Makefile 2022/02/10 08:31:22 1.3
+++ pkgsrc/textproc/jless/Makefile 2022/02/10 10:50:22 1.4
@@ -1,28 +1,26 @@ @@ -1,28 +1,26 @@
1# $NetBSD: Makefile,v 1.3 2022/02/10 08:31:22 pin Exp $ 1# $NetBSD: Makefile,v 1.4 2022/02/10 10:50:22 pin Exp $
2 2
3DISTNAME= jless-0.7.1 3DISTNAME= jless-0.7.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= ${MASTER_SITE_GITHUB:=PaulJuliusMartinez/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=PaulJuliusMartinez/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pin@NetBSD.org 9MAINTAINER= pin@NetBSD.org
10HOMEPAGE= https://github.com/PaulJuliusMartinez/jless/ 10HOMEPAGE= https://github.com/PaulJuliusMartinez/jless/
11COMMENT= Command-line pager for JSON data 11COMMENT= Command-line pager for JSON data
12LICENSE= mit 12LICENSE= mit
13 13
14CONFLICTS+= ja-less-[0-9]* 
15 
16.include "cargo-depends.mk" 14.include "cargo-depends.mk"
17 15
18INSTALLATION_DIRS= bin 16INSTALLATION_DIRS= bin
19 17
20# jless command conflicts with misc/ja-less 18# jless command conflicts with misc/ja-less
21# Rename it at install time 19# Rename it at install time
22 20
23do-install: 21do-install:
24 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/jless \ 22 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/jless \
25 ${DESTDIR}${PREFIX}/bin/j_less 23 ${DESTDIR}${PREFIX}/bin/j_less
26 24
27.include "../../lang/rust/cargo.mk" 25.include "../../lang/rust/cargo.mk"
28.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"