diff --git a/lang/s7/Makefile b/lang/s7/Makefile
index 62377ce7e9a7..0e307c4c0859 100644
--- a/lang/s7/Makefile
+++ b/lang/s7/Makefile
@@ -1,76 +1,84 @@
 PORTNAME=	s7
 # S7_MAJOR_VERSION / S7_MINOR_VERSION from s7.h
-PORTVERSION=	11.2.g20240910
+PORTVERSION=	11.2.g20241217
 CATEGORIES=	lang lisp
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Scheme interpreter
 WWW=		https://ccrma.stanford.edu/software/snd/snd/s7.html
 
 LICENSE=	BSD0CLAUSE
 
 USES=		localbase:ldflags
 USE_GITLAB=	yes
-GL_SITE=	https://cm-gitlab.stanford.edu/
+GL_SITE=	https://cm-gitlab.stanford.edu
 GL_ACCOUNT=	bil
-GL_TAGNAME=	5c09cea71f6e619794d26d4d13c5d2905925d9e7
+GL_TAGNAME=	f09eadf4dab5b4e6f1c3c2d52e9d6bee6ed21175
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-DS7_LOAD_PATH=\"${DATADIR}\" \
 		-DHAVE_COMPLEX_NUMBERS \
 		-DHAVE_COMPLEX_TRIG \
 		-DWITH_SYSTEM_EXTRAS \
-		-DWITH_C_LOADER
+		-DWITH_C_LOADER \
+		-fno-math-errno \
+		-Wno-parentheses-equality
 
 LDFLAGS+=	-Wl,-export-dynamic
 LIBS+=		-lm
 S7LIBS=		c dl m
 
-PORTDOCS=	s7.html
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKDIR} \
+		USER=${USER}
+
+PORTDOCS=	s7.html s7-ffi.html s7-scm.html
 
 OPTIONS_DEFINE=	DOCS GMP REPL NREPL
 OPTIONS_DEFAULT=	GMP REPL
 OPTIONS_SUB=	yes
 NREPL_DESC=	install notcurses repl (s7-nrepl)
 REPL_DESC=	install simple repl (s7-repl)
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp \
 			libmpfr.so:math/mpfr \
 			libmpc.so:math/mpc
 GMP_CFLAGS=	-DWITH_GMP
 GMP_LIBS=	-lmpc -lmpfr -lgmp
 NREPL_LIB_DEPENDS=	libnotcurses-core.so:devel/notcurses
 
 do-build:
 	${CC} -fpic -shared ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${WRKDIR}/libs7.so ${WRKSRC}/s7.c ${LIBS}
 	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -L${WRKDIR} -o ${WRKDIR}/s7-repl ${WRKSRC}/repl.c -ls7
 .for l in ${S7LIBS}
-	(cd ${WRKDIR} && ${SETENV} LD_LIBRARY_PATH=${WRKDIR} ${WRKDIR}/s7-repl ${WRKSRC}/lib$l.scm)
+	(cd ${WRKDIR} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${WRKDIR}/s7-repl ${WRKSRC}/lib$l.scm)
 .endfor
 
 post-build-NREPL-on:
 	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -L${WRKDIR} -o ${WRKDIR}/s7-nrepl ${WRKSRC}/nrepl.c -ls7 -lnotcurses-core
 
 do-install:
 	${INSTALL_LIB} ${WRKDIR}/libs7.so ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/s7.h ${STAGEDIR}${PREFIX}/include/
 	${MKDIR} ${STAGEDIR}${DATADIR}/tools
 .for l in ${S7LIBS}
 	${INSTALL_LIB} ${WRKDIR}/lib$l_s7.so ${STAGEDIR}${DATADIR}/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${STAGEDIR}/${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/tools/*.scm ${STAGEDIR}/${DATADIR}/tools
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/s7.html ${STAGEDIR}${DOCSDIR}/
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}/
+.endfor
 
 do-install-NREPL-on:
 	${INSTALL_PROGRAM} ${WRKDIR}/s7-nrepl ${STAGEDIR}${PREFIX}/bin/
 
 do-install-REPL-on:
 	${INSTALL_PROGRAM} ${WRKDIR}/s7-repl ${STAGEDIR}${PREFIX}/bin/
 
 do-test:
-	(cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKDIR} ${WRKDIR}/s7-repl s7test.scm)
+	${RLN} ${WRKSRC} ${WRKDIR}/cl
+	(cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${WRKDIR}/s7-repl s7test.scm)
 
 .include <bsd.port.mk>
diff --git a/lang/s7/distinfo b/lang/s7/distinfo
index e9001367ccdd..f22930e812b5 100644
--- a/lang/s7/distinfo
+++ b/lang/s7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1726096599
-SHA256 (bil-s7-5c09cea71f6e619794d26d4d13c5d2905925d9e7_GL0.tar.gz) = 6184dc5d1b7929a8109a2abf99def32576bb59f4fb4cf7997a10de17563f8396
-SIZE (bil-s7-5c09cea71f6e619794d26d4d13c5d2905925d9e7_GL0.tar.gz) = 2765188
+TIMESTAMP = 1734438133
+SHA256 (bil-s7-f09eadf4dab5b4e6f1c3c2d52e9d6bee6ed21175_GL0.tar.gz) = b3cef4e7ec96e4b7563b0a2404e8c6a34ffd342b1ecb0f68a218cf5bf15cdcb2
+SIZE (bil-s7-f09eadf4dab5b4e6f1c3c2d52e9d6bee6ed21175_GL0.tar.gz) = 2786102
diff --git a/lang/s7/pkg-plist b/lang/s7/pkg-plist
index 2499add055a8..299c0ca877fe 100644
--- a/lang/s7/pkg-plist
+++ b/lang/s7/pkg-plist
@@ -1,85 +1,86 @@
 %%NREPL%%bin/s7-nrepl
 %%REPL%%bin/s7-repl
 include/s7.h
 lib/libs7.so
 %%DATADIR%%/case.scm
 %%DATADIR%%/cload.scm
 %%DATADIR%%/debug.scm
 %%DATADIR%%/dup.scm
 %%DATADIR%%/json.scm
 %%DATADIR%%/libc.scm
 %%DATADIR%%/libc_s7.so
 %%DATADIR%%/libdl.scm
 %%DATADIR%%/libdl_s7.so
 %%DATADIR%%/libgdbm.scm
 %%DATADIR%%/libgsl.scm
 %%DATADIR%%/libm.scm
 %%DATADIR%%/libm_s7.so
 %%DATADIR%%/libutf8proc.scm
 %%DATADIR%%/lint.scm
 %%DATADIR%%/loop.scm
 %%DATADIR%%/mockery.scm
 %%DATADIR%%/nrepl.scm
 %%DATADIR%%/profile.scm
 %%DATADIR%%/r7rs.scm
 %%DATADIR%%/reactive.scm
 %%DATADIR%%/repl.scm
 %%DATADIR%%/s7test.scm
 %%DATADIR%%/snd-lint.scm
 %%DATADIR%%/stuff.scm
 %%DATADIR%%/tools/auto-tester.scm
 %%DATADIR%%/tools/compare-calls.scm
 %%DATADIR%%/tools/concordance.scm
 %%DATADIR%%/tools/dup.scm
 %%DATADIR%%/tools/fbench.scm
 %%DATADIR%%/tools/make-nrepl-bits.scm
 %%DATADIR%%/tools/t101.scm
 %%DATADIR%%/tools/table.scm
 %%DATADIR%%/tools/tall.scm
 %%DATADIR%%/tools/tari.scm
 %%DATADIR%%/tools/tauto.scm
 %%DATADIR%%/tools/tbig.scm
+%%DATADIR%%/tools/tbit.scm
 %%DATADIR%%/tools/tcase.scm
 %%DATADIR%%/tools/tclo.scm
 %%DATADIR%%/tools/tcomplex.scm
 %%DATADIR%%/tools/tcopy.scm
 %%DATADIR%%/tools/teq.scm
 %%DATADIR%%/tools/texit.scm
 %%DATADIR%%/tools/tfft.scm
 %%DATADIR%%/tools/tform.scm
 %%DATADIR%%/tools/tgc.scm
 %%DATADIR%%/tools/tgen.scm
 %%DATADIR%%/tools/tgsl.scm
 %%DATADIR%%/tools/thash.scm
 %%DATADIR%%/tools/thook.scm
 %%DATADIR%%/tools/timp.scm
 %%DATADIR%%/tools/tio.scm
 %%DATADIR%%/tools/titer.scm
 %%DATADIR%%/tools/tlamb.scm
 %%DATADIR%%/tools/tleft.scm
 %%DATADIR%%/tools/tlet.scm
 %%DATADIR%%/tools/tlimit.scm
 %%DATADIR%%/tools/tlist.scm
 %%DATADIR%%/tools/tload.scm
 %%DATADIR%%/tools/tmac.scm
 %%DATADIR%%/tools/tmap-hash.scm
 %%DATADIR%%/tools/tmap.scm
 %%DATADIR%%/tools/tmat.scm
 %%DATADIR%%/tools/tmisc.scm
 %%DATADIR%%/tools/tmock.scm
 %%DATADIR%%/tools/tmv.scm
 %%DATADIR%%/tools/tnum.scm
 %%DATADIR%%/tools/tobj.scm
 %%DATADIR%%/tools/tpeak.scm
 %%DATADIR%%/tools/trclo.scm
 %%DATADIR%%/tools/tread.scm
 %%DATADIR%%/tools/trec.scm
 %%DATADIR%%/tools/tref.scm
 %%DATADIR%%/tools/tset.scm
 %%DATADIR%%/tools/tshoot.scm
 %%DATADIR%%/tools/tsort.scm
 %%DATADIR%%/tools/tstar.scm
 %%DATADIR%%/tools/tvect.scm
 %%DATADIR%%/tools/valcall.scm
 %%DATADIR%%/utf8-tests.scm
 %%DATADIR%%/write.scm