From df6cc05a4aa6c068c57adbb5402a2d0920865899 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 23 May 2025 15:21:28 +0200
Subject: [PATCH] git: new versions added

---
 Tools/git/build             |  9 +++++----
 Tools/git/build-git-lfs     |  2 --
 Tools/git/files/config.yaml | 29 ++++++-----------------------
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/Tools/git/build b/Tools/git/build
index ebc480e..c05a15c 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -6,10 +6,11 @@ pbuild::pre_configure_Darwin() {
 
 pbuild::pre_configure() {
 	#pbuild::add_configure_args "LIBS=-lintl"
+	#pbuild::add_configure_args "LDFLAGS=-lintl"
 	pbuild::add_configure_args "--with-tcltk"
 	pbuild::add_configure_args "--with-iconv=${GETTEXT_PREFIX}"
 	pbuild::add_configure_args "--with-perl=${PERL_PREFIX}/bin/perl"
-	:
+	make configure
 }
 
 pbuild::post_compile() {
@@ -17,9 +18,9 @@ pbuild::post_compile() {
 }
 
 pbuild::post_install() {
-        make install-doc V=1 XMLTO_EXTRA='--skip-validation'
-	make -C contrib/subtree prefix="${PREFIX}" install
-	make -C contrib/subtree prefix="${PREFIX}" install-doc XMLTO="xmlto --skip-validation"
+        make install-doc V=1 USE_ASCIIDOCTOR=1 XMLTO_EXTRA='--skip-validation'
+	make -C contrib/subtree prefix="${PREFIX}" install USE_ASCIIDOCTOR=1 
+	make -C contrib/subtree prefix="${PREFIX}" install-doc USE_ASCIIDOCTOR=1 XMLTO="xmlto --skip-validation"
 }
 
 # Local Variables:
diff --git a/Tools/git/build-git-lfs b/Tools/git/build-git-lfs
index ca4de42..0be7d65 100755
--- a/Tools/git/build-git-lfs
+++ b/Tools/git/build-git-lfs
@@ -1,7 +1,5 @@
 #!/usr/bin/env modbuild
 
-unset -f pbuild::configure
-unset -f pbuild::compile
 pbuild::install(){
 	install -m 0755 git-lfs "${PREFIX}/bin"
 	install -m 0755 -d  "${PREFIX}/share/man/man{1,5,7}"
diff --git a/Tools/git/files/config.yaml b/Tools/git/files/config.yaml
index 1885092..3e849d5 100644
--- a/Tools/git/files/config.yaml
+++ b/Tools/git/files/config.yaml
@@ -20,12 +20,10 @@ git:
     git-2.8.1.tar.xz: e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc
     git-2.3.3.tar.gz: c189e4a48d8805482f450db666330c79bcefae37e0d035c7717517126ddf4305
   versions:
-    2.45.2:
+    2.49.0;2.46.4;2.45.3;2.43.6;2.42.4:
       config:
-        runtime_deps: [TclTk/8.6.9, openssl/1.1.1w]
-        build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8]
-        relstage: unstable
-        overlay: devel
+        runtime_deps: [TclTk/8.6.16, openssl/3.4.1]
+        build_requires: [gcc/10.4.0, curl/8.13.0, perl/5.40.2, asciidoctor/2.0.23, gettext/0.19.8, xmlto/0.0.28]
         docfiles: [COPYING, README.md]
         configure_args:
           - --with-tcltk
@@ -35,24 +33,6 @@ git:
           - name: git-lfs
             version: 3.5.1
             build_args:
-    2.43.1:
-      config:
-        runtime_deps: [TclTk/8.6.9]
-        build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8, openssl/1.1.1w]
-        relstage: unstable
-        overlay: devel
-        docfiles: [COPYING, README.md]
-        configure_args:
-          - --with-tcltk
-          - --with-iconv=${GETTEXT_PREFIX}
-          - --with-perl=${PERL_PREFIX}/bin/perl
-    2.42.0:
-      config:
-        runtime_deps: [TclTk/8.6.9]
-        build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8]
-        relstage: unstable
-        overlay: devel
-        docfiles: [COPYING, README.md]
     2.39.1;2.37.2;2.37.0;2.33.1;2.30.0;2.22.0;2.21.0:
       config:
         runtime_deps: [TclTk/8.6.9]
@@ -74,3 +54,6 @@ git-lfs:
           target_cpus: [x86_64]
           urls:
             - url: https://github.com/git-lfs/git-lfs/releases/download/v3.5.1/git-lfs-linux-amd64-v3.5.1.tar.gz
+          build_functions:
+            configure: []
+            compile: []