Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6EBEE1A923A for ; Thu, 10 Feb 2022 08:31:25 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id A8CB184EE5; Thu, 10 Feb 2022 08:31:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D88F184EDE for ; Thu, 10 Feb 2022 08:31:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id RImatKsXlIYr for ; Thu, 10 Feb 2022 08:31:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2A10584EDD for ; Thu, 10 Feb 2022 08:31:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1E484FB24; Thu, 10 Feb 2022 08:31:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16444818834870" MIME-Version: 1.0 Date: Thu, 10 Feb 2022 08:31:23 +0000 From: "pin" Subject: CVS commit: pkgsrc/textproc/jless To: pkgsrc-changes@NetBSD.org Reply-To: pin@netbsd.org X-Mailer: log_accum Message-Id: <20220210083123.1E484FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16444818834870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pin Date: Thu Feb 10 08:31:23 UTC 2022 Modified Files: pkgsrc/textproc/jless: Makefile PLIST Log Message: textproc/jless: rename command to avoid conflict with misc/ja-less. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/jless/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/jless/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16444818834870 Content-Disposition: inline Content-Length: 1331 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/jless/Makefile diff -u pkgsrc/textproc/jless/Makefile:1.2 pkgsrc/textproc/jless/Makefile:1.3 --- pkgsrc/textproc/jless/Makefile:1.2 Thu Feb 10 07:45:23 2022 +++ pkgsrc/textproc/jless/Makefile Thu Feb 10 08:31:22 2022 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2022/02/10 07:45:23 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2022/02/10 08:31:22 pin Exp $ DISTNAME= jless-0.7.1 +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=PaulJuliusMartinez/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -16,8 +17,12 @@ CONFLICTS+= ja-less-[0-9]* INSTALLATION_DIRS= bin +# jless command conflicts with misc/ja-less +# Rename it at install time + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/target/release/jless ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/target/release/jless \ + ${DESTDIR}${PREFIX}/bin/j_less .include "../../lang/rust/cargo.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/jless/PLIST diff -u pkgsrc/textproc/jless/PLIST:1.1 pkgsrc/textproc/jless/PLIST:1.2 --- pkgsrc/textproc/jless/PLIST:1.1 Wed Feb 9 17:02:46 2022 +++ pkgsrc/textproc/jless/PLIST Thu Feb 10 08:31:22 2022 @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2022/02/09 17:02:46 pin Exp $ -bin/jless +@comment $NetBSD: PLIST,v 1.2 2022/02/10 08:31:22 pin Exp $ +bin/j_less --_----------=_16444818834870--