git: 144ef4109c80 - main - lang/s7: update to 11.2.g20241220

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=144ef4109c80f74a93aa94216f0cb4e0def56ca0

commit 144ef4109c80f74a93aa94216f0cb4e0def56ca0
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-12-19 15:00:14 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-20 11:39:11 +0000

    lang/s7: update to 11.2.g20241220
    
     - test suite now runs and passes on arm64
     - set SONAME and install library symlinks
    
    Changes:
     - https://cm-gitlab.stanford.edu/bil/s7/-/commit/f2fb4275a943c8be38ff275ce0e45373ce9007fd
     - https://cm-gitlab.stanford.edu/bil/s7/-/commit/a5515d455f5aca49d5275a5a35ac88935f3ad401
---
 lang/s7/Makefile  | 23 ++++++++++++++---------
 lang/s7/distinfo  |  6 +++---
 lang/s7/pkg-plist |  2 ++
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/lang/s7/Makefile b/lang/s7/Makefile
index 0e307c4c0859..8fa4ad76e7f8 100644
--- a/lang/s7/Makefile
+++ b/lang/s7/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	s7
-# S7_MAJOR_VERSION / S7_MINOR_VERSION from s7.h
-PORTVERSION=	11.2.g20241217
+# S7_MAJOR_VERSION / S7_MINOR_VERSION / S7_DATE from s7.h
+PORTVERSION=	11.2.g20241220
 CATEGORIES=	lang lisp
 
 MAINTAINER=	fuz@FreeBSD.org
@@ -13,7 +13,7 @@ USES=		localbase:ldflags
 USE_GITLAB=	yes
 GL_SITE=	https://cm-gitlab.stanford.edu
 GL_ACCOUNT=	bil
-GL_TAGNAME=	f09eadf4dab5b4e6f1c3c2d52e9d6bee6ed21175
+GL_TAGNAME=	a5515d455f5aca49d5275a5a35ac88935f3ad401
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-DS7_LOAD_PATH=\"${DATADIR}\" \
@@ -26,10 +26,10 @@ CFLAGS+=	-DS7_LOAD_PATH=\"${DATADIR}\" \
 
 LDFLAGS+=	-Wl,-export-dynamic
 LIBS+=		-lm
+LIBS7=		${WRKDIR}/libs7.so.0
 S7LIBS=		c dl m
 
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKDIR} \
-		USER=${USER}
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKDIR}
 
 PORTDOCS=	s7.html s7-ffi.html s7-scm.html
 
@@ -46,17 +46,20 @@ 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
+	${CC} -fpic -shared ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--soname=libs7.so.0 \
+		-o ${LIBS7} ${WRKSRC}/s7.c ${LIBS}
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${WRKDIR}/s7-repl ${WRKSRC}/repl.c ${LIBS7}
 .for l in ${S7LIBS}
 	(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
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${WRKDIR}/s7-nrepl ${WRKSRC}/nrepl.c ${LIBS7} -lnotcurses-core
 
 do-install:
-	${INSTALL_LIB} ${WRKDIR}/libs7.so ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_LIB} ${LIBS7} ${STAGEDIR}${PREFIX}/lib/libs7.so.0.0.0
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libs7.so.0.0.0 ${STAGEDIR}${PREFIX}/lib/libs7.so.0
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libs7.so.0.0.0 ${STAGEDIR}${PREFIX}/lib/libs7.so
 	${INSTALL_DATA} ${WRKSRC}/s7.h ${STAGEDIR}${PREFIX}/include/
 	${MKDIR} ${STAGEDIR}${DATADIR}/tools
 .for l in ${S7LIBS}
@@ -78,7 +81,9 @@ do-install-REPL-on:
 	${INSTALL_PROGRAM} ${WRKDIR}/s7-repl ${STAGEDIR}${PREFIX}/bin/
 
 do-test:
+	${RM} -r ${WRKDIR}/cl ${WRKDIR}/test
 	${RLN} ${WRKSRC} ${WRKDIR}/cl
+	${MKDIR} ${WRKDIR}/test
 	(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 f22930e812b5..1d946d3c61aa 100644
--- a/lang/s7/distinfo
+++ b/lang/s7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734438133
-SHA256 (bil-s7-f09eadf4dab5b4e6f1c3c2d52e9d6bee6ed21175_GL0.tar.gz) = b3cef4e7ec96e4b7563b0a2404e8c6a34ffd342b1ecb0f68a218cf5bf15cdcb2
-SIZE (bil-s7-f09eadf4dab5b4e6f1c3c2d52e9d6bee6ed21175_GL0.tar.gz) = 2786102
+TIMESTAMP = 1734651883
+SHA256 (bil-s7-a5515d455f5aca49d5275a5a35ac88935f3ad401_GL0.tar.gz) = 38a8a170755f27df512ff068fbdc2348db4cada3364d83761d04d9b8b2584b29
+SIZE (bil-s7-a5515d455f5aca49d5275a5a35ac88935f3ad401_GL0.tar.gz) = 2786435
diff --git a/lang/s7/pkg-plist b/lang/s7/pkg-plist
index 299c0ca877fe..e615b1463ac4 100644
--- a/lang/s7/pkg-plist
+++ b/lang/s7/pkg-plist
@@ -2,6 +2,8 @@
 %%REPL%%bin/s7-repl
 include/s7.h
 lib/libs7.so
+lib/libs7.so.0
+lib/libs7.so.0.0.0
 %%DATADIR%%/case.scm
 %%DATADIR%%/cload.scm
 %%DATADIR%%/debug.scm