Date: Thu, 19 Dec 2024 14:39:05 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 04574e7e7386 - main - lang/s7: update to 11.2.g20241217 Message-ID: <202412191439.4BJEd5r8003769@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=04574e7e73867af56cf8dfc9e7684e229c513ae6 commit 04574e7e73867af56cf8dfc9e7684e229c513ae6 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2024-12-17 12:58:47 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2024-12-19 14:38:38 +0000 lang/s7: update to 11.2.g20241217 - convert to SETENVI - ship more documentation - pass -fno-math-errno as per instructions in s7.c - try to get the test suite working; unfortunately it hard codes the assumption that HOME=/home/${USER}, which we cannot support; author is informed Changelog: https://cm-gitlab.stanford.edu/bil/s7/-/commits/master/?ref_type=HEADS --- lang/s7/Makefile | 24 ++++++++++++++++-------- lang/s7/distinfo | 6 +++--- lang/s7/pkg-plist | 1 + 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/lang/s7/Makefile b/lang/s7/Makefile index 62377ce7e9a7..0e307c4c0859 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.g20240910 +PORTVERSION= 11.2.g20241217 CATEGORIES= lang lisp MAINTAINER= fuz@FreeBSD.org @@ -11,22 +11,27 @@ 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 @@ -44,7 +49,7 @@ 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: @@ -62,7 +67,9 @@ do-install: 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/ @@ -71,6 +78,7 @@ 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 @@ -39,6 +39,7 @@ lib/libs7.so %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412191439.4BJEd5r8003769>