CVS commit: pkgsrc/devel/git-branchless

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Sat Oct 21 18:57:15 UTC 2023

Modified Files:
        pkgsrc/devel/git-branchless: Makefile

Log Message:
devel/git-branchless: fix build with new libgit2

Switch to vendored libgit2 to avoid mismatches.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/git-branchless/Makefile

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

Modified files:

Index: pkgsrc/devel/git-branchless/Makefile
diff -u pkgsrc/devel/git-branchless/Makefile:1.4 pkgsrc/devel/git-branchless/Makefile:1.5
--- pkgsrc/devel/git-branchless/Makefile:1.4    Wed Aug 30 08:30:17 2023
+++ pkgsrc/devel/git-branchless/Makefile        Sat Oct 21 18:57:14 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2023/08/30 08:30:17 pin Exp $
+# $NetBSD: Makefile,v 1.5 2023/10/21 18:57:14 pin Exp $
 
 DISTNAME=      git-branchless-0.8.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=arxanas/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -17,7 +18,6 @@ USE_NCURSES=  yes #NCURSES_MOUSE_VERSION
 
 INSTALLATION_DIRS=     bin
 
-RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libgit2}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib
 
@@ -29,7 +29,6 @@ do-install:
                ${DESTDIR}${PREFIX}/bin
 
 .include "../../lang/rust/cargo.mk"
-.include "../../devel/libgit2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/ncursesw/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"