CVS commit: pkgsrc/mk/tools

["Aleksey Cheusov" <cheusov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cheusov
Date:           Wed Jul  3 13:27:16 UTC 2024

Modified Files:
        pkgsrc/mk/tools: defaults.mk replace.mk tools.Darwin.mk tools.Linux.mk

Log Message:
Add new tool "git", oked by gdt@ and wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/mk/tools/defaults.mk
cvs rdiff -u -r1.303 -r1.304 pkgsrc/mk/tools/replace.mk
cvs rdiff -u -r1.66 -r1.67 pkgsrc/mk/tools/tools.Darwin.mk
cvs rdiff -u -r1.69 -r1.70 pkgsrc/mk/tools/tools.Linux.mk

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

Modified files:

Index: pkgsrc/mk/tools/defaults.mk
diff -u pkgsrc/mk/tools/defaults.mk:1.65 pkgsrc/mk/tools/defaults.mk:1.66
--- pkgsrc/mk/tools/defaults.mk:1.65    Fri Apr 12 19:53:25 2024
+++ pkgsrc/mk/tools/defaults.mk Wed Jul  3 13:27:16 2024
@@ -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

Index: pkgsrc/mk/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.303 pkgsrc/mk/tools/replace.mk:1.304
--- pkgsrc/mk/tools/replace.mk:1.303    Fri Apr 12 19:55:49 2024
+++ pkgsrc/mk/tools/replace.mk  Wed Jul  3 13:27:16 2024
@@ -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${R
 .  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=

Index: pkgsrc/mk/tools/tools.Darwin.mk
diff -u pkgsrc/mk/tools/tools.Darwin.mk:1.66 pkgsrc/mk/tools/tools.Darwin.mk:1.67
--- pkgsrc/mk/tools/tools.Darwin.mk:1.66        Fri Mar 22 18:59:04 2024
+++ pkgsrc/mk/tools/tools.Darwin.mk     Wed Jul  3 13:27:16 2024
@@ -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.

Index: pkgsrc/mk/tools/tools.Linux.mk
diff -u pkgsrc/mk/tools/tools.Linux.mk:1.69 pkgsrc/mk/tools/tools.Linux.mk:1.70
--- pkgsrc/mk/tools/tools.Linux.mk:1.69 Tue May  9 12:16:01 2023
+++ pkgsrc/mk/tools/tools.Linux.mk      Wed Jul  3 13:27:16 2024
@@ -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