From nobody Fri Dec 20 11:39:40 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 4YF5711DbFz5hqQK; Fri, 20 Dec 2024 11:39:41 +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 4YF5705tWrz4WqP; Fri, 20 Dec 2024 11:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734694780; 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=O+d6gd0aiGSLrF4z9EJLQlomI0HT6eNSR8LWtQPyijc=; b=BfeZBz39qYQlfEhIqHB8PAaJ+vt4tGOn5wCE2QAcUNTurGh3ZQ7G/nNtJbrpNrzpU5ibUU hjNDsO5gDLnnOE4USGfqVhSFIKzQPNcsVmsymxtyBqn0hgegsbD08ZKOTVxOqaF2JPUg6Z wu9JF8WAf7WFlkVHxJy4oofNxnlRQqj90DR2D6haoAmTY10+SEWx7lIZBjkM/Cx65m43Ql GEt1nVRB+TXiqhPyxlyBanJ/AicU5GdeVSz2aiTh3KPEzQsEZequR41zmsFAYU0EwuwlNR 9+aRhK+pMgdNAqikxdH8OxdZtOo/uRJfEWfM6RsvcPyFf7Scl4nL88S8XVgnyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734694780; 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=O+d6gd0aiGSLrF4z9EJLQlomI0HT6eNSR8LWtQPyijc=; b=Xttja1g3p9snemd3Q8CJ4vic3evh4weOdrK6cSU+Yf2H155qJjSKq1Z7E7cCuUqAHWYZXE Hu85f71EJxdAtpDN5h+dbLtEqKvblTbJ1JQ2K1PSMo48Fi2VxkLgYmrofeSiRyJsNotaqD 7TIEZNkApzP4fOE5/8fXexfDBkL5fF0phwg9/8dTyS9xjw51acNw2ZG6Loez7kO1BfF2RJ RwC6qK/H0iM1mqxBEQh3u4eS8kTIV44q4c4I6KiEt+pECOOv/o4J738mB+MT/Lbp5+FauK m3v37n6d37ZyZS9y7ibez+eFUkPulCgG70oWjcBpxc44rqey4BvQGOujfSy9IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734694780; a=rsa-sha256; cv=none; b=GvucZCF2WZgczUvmHP9MHa4KLfhxqflzHlbu+5pFrUNtn4ZLp2Dv3A8elhy4yiJnGHzvrf F35mfpoxDiENRTLVJvK6EAcBIVoM7FJFmqZ3G9cphSiIFPaaPsfqjaGKjtj3BENFjEfxsp GcRJzg7O7HaMCQcgI8poo+pE53WRiOU9mAgPtjJV6cPl/CYis2gcHat7sabHt/Hpto2JPU cQgoH4Lrpc4B0kqRZkXrI7fFw0a7EY7YNNDWo9FawUZKXbRv9ZCEiE3TPA5R0hTODMFz9H cPT2ExgpTKCCvDGfGLcO4Fr5w6ZTy/u4HScY0B50JLxe9In4hmwxWvUgpZ16dw== 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 4YF5705VQ5zcG8; Fri, 20 Dec 2024 11:39:40 +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 4BKBdeQ5059314; Fri, 20 Dec 2024 11:39:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BKBdeE1059311; Fri, 20 Dec 2024 11:39:40 GMT (envelope-from git) Date: Fri, 20 Dec 2024 11:39:40 GMT Message-Id: <202412201139.4BKBdeE1059311@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: 144ef4109c80 - main - lang/s7: update to 11.2.g20241220 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: 144ef4109c80f74a93aa94216f0cb4e0def56ca0 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=144ef4109c80f74a93aa94216f0cb4e0def56ca0 commit 144ef4109c80f74a93aa94216f0cb4e0def56ca0 Author: Robert Clausecker AuthorDate: 2024-12-19 15:00:14 +0000 Commit: Robert Clausecker 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 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