From a077eb590b3357bf89e5cfbc74e7b4ba4ebd646b Mon Sep 17 00:00:00 2001
From: cheusov <cheusov@pkgsrc.org>
Date: Wed, 3 Jul 2024 13:27:16 +0000
Subject: [PATCH] Add new tool "git", oked by gdt@ and wiz@

---
 mk/tools/defaults.mk     |  3 ++-
 mk/tools/replace.mk      | 12 +++++++++++-
 mk/tools/tools.Darwin.mk |  5 ++++-
 mk/tools/tools.Linux.mk  |  5 ++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index ea7cc856f513..a731fd54275a 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.65 2024/04/12 19:53:25 riastradh Exp $
+# $NetBSD: defaults.mk,v 1.66 2024/07/03 13:27:16 cheusov Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -82,6 +82,7 @@ _TOOLS_VARNAME.file=		FILE_CMD
 _TOOLS_VARNAME.find=		FIND
 _TOOLS_VARNAME.gawk=		AWK
 _TOOLS_VARNAME.gem=		GEM
+_TOOLS_VARNAME.git=		GIT
 _TOOLS_VARNAME.gm4=		M4
 _TOOLS_VARNAME.gmake=		GMAKE
 _TOOLS_VARNAME.grep=		GREP
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 788240f3a47f..21cb39727f4b 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.303 2024/04/12 19:55:49 riastradh Exp $
+# $NetBSD: replace.mk,v 1.304 2024/07/03 13:27:16 cheusov Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -431,6 +431,16 @@ TOOLS_PATH.gem=			${TOOLBASE}/bin/gem${RUBY_SUFFIX}
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.git) && !empty(_USE_TOOLS:Mgit)
+.  if ${PKGPATH} == devel/git-base
+MAKEFLAGS+=			TOOLS_IGNORE.git=
+.  elif !empty(_TOOLS_USE_PKGSRC.git:M[yY][eE][sS])
+TOOLS_DEPENDS.git?=		git-base-[0-9]*:../../devel/git-base
+TOOLS_CREATE+=			git
+TOOLS_PATH.git=		${TOOLBASE}/bin/git
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.gm4) && !empty(_USE_TOOLS:Mgm4)
 .  if ${PKGPATH} == devel/m4
 MAKEFLAGS+=			TOOLS_IGNORE.gm4=
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 458b55e93eb2..c3f810986083 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.66 2024/03/22 18:59:04 schmonz Exp $
+# $NetBSD: tools.Darwin.mk,v 1.67 2024/07/03 13:27:16 cheusov Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -62,6 +62,9 @@ TOOLS_PLATFORM.ftp?=		/usr/bin/ftp
 TOOLS_PLATFORM.gerep?=		/usr/bin/egrep
 TOOLS_PLATFORM.gfrep?=		/usr/bin/fgrep
 TOOLS_PLATFORM.ggrep?=		/usr/bin/grep
+.if exists(/usr/bin/git)
+TOOLS_PLATFORM.git?=		/usr/bin/git
+.endif
 #
 # Avoid using the native gnumake and gm4.  On systems up to and including Big
 # Sur, the version of GNU m4 is from 2006 and unable to build autoconf 2.70.
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 43c0e9184ec6..fe38cc7bf0c9 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.69 2023/05/09 12:16:01 thor Exp $
+# $NetBSD: tools.Linux.mk,v 1.70 2024/07/03 13:27:16 cheusov Exp $
 #
 # System-supplied tools for the Linux operating system.
 #
@@ -96,6 +96,9 @@ TOOLS_PLATFORM.find?=		${_path}/find
 .  if exists(${_path}/gettext)
 TOOLS_PLATFORM.gettext?=	${_path}/gettext
 .  endif
+.  if exists(${_path}/git)
+TOOLS_PLATFORM.git?=		${_path}/git
+.  endif
 .  if exists(${_path}/m4)
 TOOLS_PLATFORM.m4?=		${_path}/m4
 .  endif