Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id BF68684E64
	for <pkgsrc-changes@NetBSD.org>; Sat, 21 Oct 2023 18:56:02 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id 7fU5yfVoRHwu for <pkgsrc-changes@netbsd.org>;
	Sat, 21 Oct 2023 18:56:02 +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 1C69084D24
	for <pkgsrc-changes@NetBSD.org>; Sat, 21 Oct 2023 18:56:02 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 19E62FADC; Sat, 21 Oct 2023 18:56:02 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_169791456249560"
MIME-Version: 1.0
Date: Sat, 21 Oct 2023 18:56:02 +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: <20231021185602.19E62FADC@cvs.NetBSD.org>

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	pin
Date:		Sat Oct 21 18:56:02 UTC 2023

Modified Files:
	pkgsrc/devel/jj: Makefile

Log Message:
devel/jj: fix build with new libgit2

Switch to vendored libgit2 to avoid mismatches.


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

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


--_----------=_169791456249560
Content-Disposition: inline
Content-Length: 1032
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.3 pkgsrc/devel/jj/Makefile:1.4
--- pkgsrc/devel/jj/Makefile:1.3	Fri Oct 13 09:57:34 2023
+++ pkgsrc/devel/jj/Makefile	Sat Oct 21 18:56:01 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2023/10/13 09:57:34 pin Exp $
+# $NetBSD: Makefile,v 1.4 2023/10/21 18:56:01 pin Exp $
 
 DISTNAME=	jj-0.10.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=martinvonz/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -19,13 +19,11 @@ 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"
 .include "../../mk/bsd.pkg.mk"


--_----------=_169791456249560--