From a89e56625fae23c1e71de8a1bc917c79afb56f38 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 28 Jul 2023 09:23:18 +0200
Subject: [PATCH 1/3] scheme48: add alternative for scheme-r5rs.

---
 srcpkgs/scheme48/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scheme48/template b/srcpkgs/scheme48/template
index 8f4307339a03c3..de31a1f79e294f 100644
--- a/srcpkgs/scheme48/template
+++ b/srcpkgs/scheme48/template
@@ -1,7 +1,7 @@
 # Template file for 'scheme48'
 pkgname=scheme48
 version=1.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Implementation of the R5RS Scheme standard"
 maintainer="rc-05 <rc23@email.it>"
@@ -12,9 +12,11 @@ checksum=9c4921a90e95daee067cd2e9cc0ffe09e118f4da01c0c0198e577c4f47759df4
 alternatives="
  scheme:scheme:/usr/bin/scheme48
  scheme:scheme.1:/usr/share/man/man1/scheme48.1
+ scheme:scheme-r5rs:/usr/bin/scheme48-r5rs
 "
 nocross="Failed to compile test program"
 
 post_install() {
 	vlicense COPYING
+	mv ${DESTDIR}/usr/bin/scheme-r5rs ${DESTDIR}/usr/bin/scheme48-r5rs
 }

From 372df3de69e48f81df559075117b0d624d444ae1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 27 Jul 2023 15:41:55 +0200
Subject: [PATCH 2/3] gambit: update to 4.9.5.

Add alternatives for scheme.
---
 srcpkgs/gambit/patches/tests.patch | 14 ++++++++++++++
 srcpkgs/gambit/template            | 14 ++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gambit/patches/tests.patch

diff --git a/srcpkgs/gambit/patches/tests.patch b/srcpkgs/gambit/patches/tests.patch
new file mode 100644
index 00000000000000..c74b293240bc46
--- /dev/null
+++ b/srcpkgs/gambit/patches/tests.patch
@@ -0,0 +1,14 @@
+Some unit-tests expect an installed version of Gambit, redirect to the
+local source.
+
+--- a/tests/run-unit-tests.scm
++++ b/tests/run-unit-tests.scm
+@@ -184,7 +184,7 @@
+ 
+       (case target
+         ((C)
+-         (run "../gsi/gsi" "-:debug-settings=-,io-settings=lu,~~=.." "-f" file))
++         (run "../gsi/gsi" "-:debug-settings=-,io-settings=lu,~~=..,~~lib=../lib" "-f" file))
+         (else
+          (let ((gsi (string-append "../gsi/gsi-" (symbol->string target))))
+            (run gsi "-f" file))))))
diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 27fbcbf793e6d9..bade05650ae512 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,6 +1,6 @@
 # Template file for 'gambit'
 pkgname=gambit
-version=4.9.4
+version=4.9.5
 revision=1
 build_style=gnu-configure
 # We only build core, since the rest doesn't cross-compile.
@@ -16,18 +16,20 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"
 homepage="https://gambitscheme.org/"
 distfiles="https://github.com/gambit/gambit/archive/v${version}.tar.gz"
-checksum=19fb44a65b669234f6c0467cdc3dbe2e2c95a442f38e4638e7d89c90e247bd08
+checksum=758da7b4afe6411e9c4fed14b0cc5ada39b5f1393c1edd4d3dd9c9a06127c310
+alternatives="
+ scheme:scheme:/usr/bin/gsi
+ scheme:scheme.1:/usr/share/man/man1/gsi.1
+ scheme:scheme-r5rs:/usr/bin/gsi
+"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-DNETDB_INTERNAL=-1 -DNETDB_SUCCESS=0";;
 esac
 
-post_patch() {
-	vsed -i 's/4\.9\.3/4.9.4/g' include/stamp-release.h
-}
-
 post_install() {
 	for f in ${DESTDIR}/usr/lib/gambit/lib*.so.*; do
 		ln -sfr $f ${DESTDIR}/usr/lib
 	done
+	rm ${DESTDIR}/usr/bin/scheme-r5rs
 }

From 779ab4ae6b054d9be5ba857d172d00cd51be12c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 27 Jul 2023 15:42:29 +0200
Subject: [PATCH 3/3] gerbil: rebuild for gambit-4.9.5, enable tests.

---
 srcpkgs/gerbil/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index 50f63094019e6e..791d80d7e89c6f 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.17
-revision=1
+revision=2
 build_style="gnu-configure"
 hostmakedepends="gambit rsync"
 makedepends="openssl-devel sqlite-devel zlib-devel"
@@ -17,6 +17,7 @@ do_build() {
 	export GERBIL_GSC=gambit-gsc
 	( cd src && ./build.sh )
 }
+
 do_install() {
 	vmkdir usr/bin
 	vmkdir usr/lib/gerbil
@@ -26,3 +27,8 @@ do_install() {
 	vinstall etc/gerbil-mode.el 0644 usr/share/emacs/site-lisp
 	find ${DESTDIR} -name .keep -delete
 }
+
+do_check() {
+	GERBIL_GSC=gambit-gsc GERBIL_HOME=$PWD PATH=$PWD/bin:$PATH \
+		./src/std/run-tests.ss
+}