From b93c5a6deccad20f592fbff14ca300f5a76a91b9 Mon Sep 17 00:00:00 2001
From: Kexy Biscuit <kexybiscuit@aosc.io>
Date: Mon, 3 Feb 2025 14:45:14 +0800
Subject: [PATCH 1/2] git: try building with Meson

Signed-off-by: Kexy Biscuit <kexybiscuit@aosc.io>
---
 app-vcs/git/autobuild/build   | 35 -----------------------------------
 app-vcs/git/autobuild/defines |  7 ++++---
 app-vcs/git/spec              |  2 +-
 3 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 app-vcs/git/autobuild/build

diff --git a/app-vcs/git/autobuild/build b/app-vcs/git/autobuild/build
deleted file mode 100644
index d9b5ddc1f04..00000000000
--- a/app-vcs/git/autobuild/build
+++ /dev/null
@@ -1,35 +0,0 @@
-abinfo "Configuring Git ..."
-MAKE_DEF=(
-    prefix='/usr'
-    gitexecdir='/usr/lib/git-core'
-)
-
-MAKE_AFTER=(
-    CFLAGS="$CFLAGS"
-    LDFLAGS="$LDFLAGS"
-    INSTALL_SYMLINKS=1
-    MAN_BOLD_LITERAL=1
-    USE_LIBPCRE2=1
-    DEFAULT_EDITOR='/usr/bin/editor'
-)
-
-abinfo "Building main binaries and documents ..."
-make "${MAKE_DEF[@]}" \
-     "${MAKE_AFTER[@]}" all man
-
-abinfo "Building contribs and its documents ..."
-make -C "$SRCDIR"/contrib/subtree "${MAKE_DEF[@]}" all man
-
-abinfo "Installing main binaries, documents and other resources ..."
-make "${MAKE_DEF[@]}" \
-     "${MAKE_AFTER[@]}" \
-     DESTDIR="$PKGDIR" install install-man
-install -Dvm644 "$SRCDIR"/contrib/completion/git-completion.bash \
-    "$PKGDIR"/usr/share/bash-completion/completions/git
-install -Dvm644 "$SRCDIR"/contrib/completion/git-prompt.sh \
-    "$PKGDIR"/usr/share/git/git-prompt.sh
-
-abinfo "Installing contribs, documents and other resources ..."
-make -C "$SRCDIR"/contrib/subtree "${MAKE_DEF[@]}" \
-    DESTDIR="$PKGDIR" install install-man
-cp -av "$SRCDIR"/contrib/* "$PKGDIR"/usr/share/git/
diff --git a/app-vcs/git/autobuild/defines b/app-vcs/git/autobuild/defines
index 4d9a8c349e6..05ed9b966ef 100644
--- a/app-vcs/git/autobuild/defines
+++ b/app-vcs/git/autobuild/defines
@@ -1,10 +1,11 @@
 PKGNAME=git
 PKGSEC=vcs
+PKGDES="Fast distributed version control system"
 PKGDEP="curl expat openssl pcre2 perl perl-error cvsps perl-authen-sasl \
         libwww-perl perl-mime-tools perl-net-smtp-ssl perl-term-readkey \
         python-3 tk perl-dbi subversion brotli"
-BUILDDEP="gettext asciidoc xmlto emacs"
-PKGDES="Fast distributed version control system"
+PKGRECOM="git-lfs"
+BUILDDEP="gettext asciidoc xmlto emacs meson"
 
 PKGDEP__RETRO="curl expat openssl pcre2"
 PKGDEP__ARMV4="${PKGDEP__RETRO}"
@@ -25,4 +26,4 @@ BUILDDEP__M68K="${BUILDDEP__RETRO}"
 BUILDDEP__POWERPC="${BUILDDEP__RETRO}"
 BUILDDEP__PPC64="${BUILDDEP__RETRO}"
 
-PKGRECOM="git-lfs"
+ABTYPE=meson
diff --git a/app-vcs/git/spec b/app-vcs/git/spec
index ff1fc66d3f7..f54da70a748 100644
--- a/app-vcs/git/spec
+++ b/app-vcs/git/spec
@@ -1,7 +1,7 @@
 VER=2.48.1
 
 # Use this for stable releases.
-REL=1
+REL=2
 SRCS="https://cdn.kernel.org/pub/software/scm/git/git-$VER.tar.gz"
 
 # Use this for RC releases.

From 2a0c09322790b5c5e3e032cf244f279ce6f09019 Mon Sep 17 00:00:00 2001
From: Kexy Biscuit <kexybiscuit@aosc.io>
Date: Mon, 3 Feb 2025 15:10:43 +0800
Subject: [PATCH 2/2] git: enable docs building

Signed-off-by: Kexy Biscuit <kexybiscuit@aosc.io>
---
 app-vcs/git/autobuild/defines | 1 +
 app-vcs/git/spec              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-vcs/git/autobuild/defines b/app-vcs/git/autobuild/defines
index 05ed9b966ef..989cfbc2f24 100644
--- a/app-vcs/git/autobuild/defines
+++ b/app-vcs/git/autobuild/defines
@@ -27,3 +27,4 @@ BUILDDEP__POWERPC="${BUILDDEP__RETRO}"
 BUILDDEP__PPC64="${BUILDDEP__RETRO}"
 
 ABTYPE=meson
+MESON_AFTER="-Ddocs=man,html"
diff --git a/app-vcs/git/spec b/app-vcs/git/spec
index f54da70a748..8c99f8dd7f1 100644
--- a/app-vcs/git/spec
+++ b/app-vcs/git/spec
@@ -1,7 +1,7 @@
 VER=2.48.1
 
 # Use this for stable releases.
-REL=2
+REL=3
 SRCS="https://cdn.kernel.org/pub/software/scm/git/git-$VER.tar.gz"
 
 # Use this for RC releases.