From nobody Thu Dec 19 14:39:05 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YDY8V3HpXz5hHd4; Thu, 19 Dec 2024 14:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YDY8T70Hjz4fqn; Thu, 19 Dec 2024 14:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734619146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rw326Ma7pc+9z/8aN4zUnhpMTlx9w7D1kf0aoOP5/TI=; b=Ec77EfNZ5Z7maZ7lPRRDJ7P38EK5TLJdb8MdO3lKpB1f7N4qXBVVGW+w+PviCWr6Efqh0o 3ewnE9dRSNivXpRz+nJWH19X7Lx2acyF5coiDhBCaSlej9TKcnwD9GbY72JBHoX3UrwhsG 9a2zesU6y55qt/kvyFrLpNuR5Jca3tfdA6SG2ircxfinh/citiJ74sqxHo4a83i5JHaC73 AD0yRfGvaF1l0o4vIUEVvsdAECxfRUsyMBcOGBFwf4YYv9Ij9DrXas3F0YBHb6EWVNhP9F YRaMIwRbHX0z9nDX6QneEXoDJ99ow6QtMiF8bMVh+a/1Jd7VAI8qEcy8eY7LEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734619146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rw326Ma7pc+9z/8aN4zUnhpMTlx9w7D1kf0aoOP5/TI=; b=o9clNYsMEYeH8DqmmKdGj24s3hc7LF4L8XKvTMrcNuXLVPyp5kiTubdHQwgCYnPuSDMckM 7N61yfcaZKRMfUr9WDZ9IX9OldrYIPoBl+BW7BtGKwyVlpQUmIpnx3/BqpAzpKMPwEI8Hj i76axnG7o3IXSQGTyxtO+5VKG1eEkUcC+I+QDZhikhMmWaJm2HqFGfELmxAPE0o7IcCGc6 AkFNdo5fOBdneYRBfOVj1cW0wKLHeTMlOrQdZF0KU9BCg14NXNhUSlq+9BMSjAOWk6TPwm xNq1LxzCSnj3N3t6wqXtMBf807vh2/EiolIqmkN81c9y3Wsek4ZW13Z7seIOCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734619146; a=rsa-sha256; cv=none; b=p2fuyJmGU7uSFlo+dhbgMwOwuUfp3Hd9zeyd5/6R8BtFEFtNXOH/S+427cE+JQ7fV4qA5A LyyG5lHhcqGCjuiyFyFuFrVdwMHJOu0TFbNBs8AtlVzK3OL1Qq1sabnnz4G28MK/MYQvOF qIMp+mz3vWyV+TmQOrIKcbGzM10/t5zb4ECarjSXjDzB/eTZ/Ib9Yk/xgoAmGYk46Ibh/S yO9S0GpBL4RSiBC1uO80lNXcUWyWKY/A0OkXsDmZhf1jD+io3F+og30lRoKQrL6Jxn1Ybp 1S8v8qLEUmbPG3ty2yWDpTnBNnVHW5vAJnwgftduOVM4+bwxIN/3PIyPHXN0wQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YDY8T6bcnzy02; Thu, 19 Dec 2024 14:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BJEd53g003772; Thu, 19 Dec 2024 14:39:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BJEd5r8003769; Thu, 19 Dec 2024 14:39:05 GMT (envelope-from git) Date: Thu, 19 Dec 2024 14:39:05 GMT Message-Id: <202412191439.4BJEd5r8003769@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 04574e7e7386 - main - lang/s7: update to 11.2.g20241217 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04574e7e73867af56cf8dfc9e7684e229c513ae6 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=04574e7e73867af56cf8dfc9e7684e229c513ae6 commit 04574e7e73867af56cf8dfc9e7684e229c513ae6 Author: Robert Clausecker AuthorDate: 2024-12-17 12:58:47 +0000 Commit: Robert Clausecker 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 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