Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 5FD1484EA5
	for <pkgsrc-changes@NetBSD.org>; Fri, 13 Oct 2023 09:57:35 +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 xd0wb_UTfGK0 for <pkgsrc-changes@netbsd.org>;
	Fri, 13 Oct 2023 09:57:34 +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 D782284CF9
	for <pkgsrc-changes@NetBSD.org>; Fri, 13 Oct 2023 09:57:34 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id CB7DFFADC; Fri, 13 Oct 2023 09:57:34 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1697191054226910"
MIME-Version: 1.0
Date: Fri, 13 Oct 2023 09:57:34 +0000
From: "pin" <pin@netbsd.org>
Subject: CVS commit: pkgsrc/devel/jj
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: pin@netbsd.org
X-Mailer: log_accum
Message-Id: <20231013095734.CB7DFFADC@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1697191054226910
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pin
Date:		Fri Oct 13 09:57:34 UTC 2023

Modified Files:
	pkgsrc/devel/jj: Makefile PLIST

Log Message:
devel/jj: fix broken install stage

... after upstream changes.
Bump pkgrev as there are changes in the package content.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/jj/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/jj/PLIST

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


--_----------=_1697191054226910
Content-Disposition: inline
Content-Length: 1445
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/jj/Makefile
diff -u pkgsrc/devel/jj/Makefile:1.2 pkgsrc/devel/jj/Makefile:1.3
--- pkgsrc/devel/jj/Makefile:1.2	Thu Oct 12 10:50:49 2023
+++ pkgsrc/devel/jj/Makefile	Fri Oct 13 09:57:34 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2023/10/12 10:50:49 pin Exp $
+# $NetBSD: Makefile,v 1.3 2023/10/13 09:57:34 pin Exp $
 
 DISTNAME=	jj-0.10.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=martinvonz/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -12,12 +13,18 @@ LICENSE=	apache-2.0
 
 .include "cargo-depends.mk"
 
+INSTALLATION_DIRS=	bin
+
 USE_TOOLS+=	pkg-config
 
 MAKE_ENV+=	OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
 RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libgit2}/lib
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/target/release/jj \
+		${DESTDIR}${PREFIX}/bin
+
 .include "../../lang/rust/cargo.mk"
 .include "../../devel/libgit2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/devel/jj/PLIST
diff -u pkgsrc/devel/jj/PLIST:1.1 pkgsrc/devel/jj/PLIST:1.2
--- pkgsrc/devel/jj/PLIST:1.1	Sat Aug 19 10:44:49 2023
+++ pkgsrc/devel/jj/PLIST	Fri Oct 13 09:57:34 2023
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2023/08/19 10:44:49 pin Exp $
-bin/fake-diff-editor
-bin/fake-editor
+@comment $NetBSD: PLIST,v 1.2 2023/10/13 09:57:34 pin Exp $
 bin/jj


--_----------=_1697191054226910--