From 174b62bc7029fe07f22ceb71e71d66c330b2ff40 Mon Sep 17 00:00:00 2001
From: Josh Megnauth <jo.sh@tutanota.com>
Date: Fri, 7 Mar 2025 15:30:49 +0000
Subject: [PATCH] fix: Vim's old FTP server is deprecated

---
 recipes/tools/vim/recipe.sh   | 39 -----------------------------------
 recipes/tools/vim/recipe.toml | 26 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 39 deletions(-)
 delete mode 100644 recipes/tools/vim/recipe.sh
 create mode 100644 recipes/tools/vim/recipe.toml

diff --git a/recipes/tools/vim/recipe.sh b/recipes/tools/vim/recipe.sh
deleted file mode 100644
index f2b157ba..00000000
--- a/recipes/tools/vim/recipe.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-VERSION=8.2
-# We use `https://ftp.nluug.nl` because `ftp.vim.org` doesn't support `https`
-# see https://www.vim.org/mirrors.php
-TAR=https://ftp.nluug.nl/pub/vim/unix/vim-$VERSION.tar.bz2
-
-BUILD_DEPENDS=(ncurses)
-DEPENDS="terminfo"
-
-function recipe_version {
-    echo "$VERSION"
-    skip=1
-}
-
-function recipe_build {
-    sysroot="$(realpath ../sysroot)"
-    export LDFLAGS="-L$sysroot/lib -static"
-    export CPPFLAGS="-I$sysroot/include"
-    export vim_cv_toupper_broken=no
-    export vim_cv_tgetent=zero
-    export vim_cv_terminfo=yes
-    export vim_cv_tty_group=world
-    export vim_cv_getcwd_broken=no
-    export vim_cv_stat_ignores_slash=yes
-    export vim_cv_memmove_handles_overlap=yes
-    ./configure --build=${BUILD} --host=${HOST} --prefix=/ --with-tlib=ncurses
-    "$REDOX_MAKE" -j"$($NPROC)"
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    dest="$(realpath $1)"
-    "$REDOX_MAKE" DESTDIR="$dest" ${MAKEFLAGS} install
-    skip=1
-}
diff --git a/recipes/tools/vim/recipe.toml b/recipes/tools/vim/recipe.toml
new file mode 100644
index 00000000..729291d3
--- /dev/null
+++ b/recipes/tools/vim/recipe.toml
@@ -0,0 +1,26 @@
+[source]
+tar = "https://github.com/vim/vim/archive/refs/tags/v8.2.5172.tar.gz"
+blake3 = "28a58578a6655e2e45078331569d6e6c96ed05189acda34c2a784581bf614cd2"
+patch = ["vim.patch"]
+
+[build]
+dependencies = ["ncurses"]
+template = "custom"
+script = """
+export vim_cv_toupper_broken=no
+export vim_cv_tgetent=zero
+export vim_cv_terminfo=yes
+export vim_cv_tty_group=world
+export vim_cv_getcwd_broken=no
+export vim_cv_stat_ignores_slash=yes
+export vim_cv_memmove_handles_overlap=yes
+export SRCDIR="${COOKBOOK_SOURCE}/src"
+
+COOKBOOK_CONFIGURE_FLAGS+=(
+    --with-tlib=ncurses
+)
+
+pushd "${SRCDIR}"
+cookbook_configure
+popd
+"""