From nobody Fri Dec 20 11:39:41 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 4YF5721cWyz5hqNW; Fri, 20 Dec 2024 11:39:42 +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 4YF57175cwz4Wdd; Fri, 20 Dec 2024 11:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734694782; 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=TJOeCjrmTxX0ALtYcSyoROubVLJUevTlP1VUW21VrtY=; b=ZYgQ2yKbr0rIbQ6Otj4pHpnd8KDRspADwAajGwRDc36SzDXUL0/ZO/UKWHJE7GGmPONIJ9 u97fRWfIPITQZS28nspvFbLFerSAGKcIl19ecyW/j1IQI/Q/TTlx1uqXarhppV0XsBlM/6 7vb4XXs5bCxefFq2h4mIEN5gLuiLN085dsm8Z/45k0eyrFHAP5RNQIEOEZanHM2VBvLxXz ZPZIBDXsQxUjzx+bweCR0Y/zf/M0C1QJ3TYNpjAFnrziOzQXW7gbScTh7MeL99XqGB1mqE KXQaPywFrC7mHlv0Te64W6qsLqo6HDkqs7mlZ09wnY25QN6/H12kX7ktU3ddZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734694782; 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=TJOeCjrmTxX0ALtYcSyoROubVLJUevTlP1VUW21VrtY=; b=TTm3lw9YJEIp3IgKXU05/EJOglTD0A3/KS0JnjyvjMAcHlLdtyKKUfWo9eOsi0M+Bzp4t9 EwhHvcMMsuh0KgzPIBj4MSmJNNmcU6t1o/2EQSZ5xh1enkk66eiJiD17IfS1UddjN5ltO5 q7wfK+dp//1ZRp8CLMZwTP6TEXqZ5Wj1qFPqLyZDWLLMMod/Ff+Si144SO2jDVQItQn2gJ 5N8K6Xne0z/sIJNmXXMnLuSztaq77keX29hc1y+huZT9XxrW3rc8SP+l0Z4b8WlW2tgDQd CujykVX7DcsEv9C9ynSZlse4mWi1Pgcw7MqR/M35vAniqsHR3AX4FGY8kJvDUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734694782; a=rsa-sha256; cv=none; b=m3mrOW40ABB4XLURf4YqHulBv3xYVQepvAJcJnkBE4o/mCI5E4yCrVWNl73MaoeyRN/6gx pkF+IKrZea4llDKOGTJoAnCGbO+20XmtD2SAZVgI12ctNfsWI5E3wiSLRx/5MEh0kiqJZE Cm36aqgMpcqZo/qTmiygokbjJ0tGwUhcKzAghMVQXxG1Ak/taNcM49jLZ10Lnb9N4Pwte1 LpPhMJpUx3Q15bd2BtoUpo730iFmiK7+FfFjuTJS4SzyuUJ5Uo/Rh2Xc+iqw6oxmLckhG4 re6Us1N2quHaF9Lz7CtcS0Ju30J7tPk3qtYYAPtcZvwVXJN+StyKBvLehDHQWg== 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 4YF5716VcbzcG9; Fri, 20 Dec 2024 11:39:41 +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 4BKBdfdP059356; Fri, 20 Dec 2024 11:39:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BKBdfIM059353; Fri, 20 Dec 2024 11:39:41 GMT (envelope-from git) Date: Fri, 20 Dec 2024 11:39:41 GMT Message-Id: <202412201139.4BKBdfIM059353@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: b8ade68801ea - main - lang/s7-nrepl: notcurses-based repl for lang/s7 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: b8ade68801ea34a9a2e3a39de431de311e3b480e Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8ade68801ea34a9a2e3a39de431de311e3b480e commit b8ade68801ea34a9a2e3a39de431de311e3b480e Author: Robert Clausecker AuthorDate: 2024-12-19 16:57:37 +0000 Commit: Robert Clausecker CommitDate: 2024-12-20 11:39:11 +0000 lang/s7-nrepl: notcurses-based repl for lang/s7 This slave port has the s7-nrepl binary from lang/s7 so it can be installed independently by binary package users. s7-repl remains in lang/s7 as it's only ~6 kB in size and doesn't hurt to always install. --- lang/Makefile | 1 + lang/s7-nrepl/Makefile | 18 ++++++++++++++++++ lang/s7-nrepl/pkg-descr | 5 +++++ lang/s7/Makefile | 38 ++------------------------------------ lang/s7/Makefile.master | 30 ++++++++++++++++++++++++++++++ lang/s7/pkg-plist | 1 - 6 files changed, 56 insertions(+), 37 deletions(-) diff --git a/lang/Makefile b/lang/Makefile index 272e0cee08f5..93a545c55643 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -340,6 +340,7 @@ SUBDIR += rust182 SUBDIR += rustpython SUBDIR += s7 + SUBDIR += s7-nrepl SUBDIR += sagittarius-scheme SUBDIR += sather-specification SUBDIR += sather-tutorial diff --git a/lang/s7-nrepl/Makefile b/lang/s7-nrepl/Makefile new file mode 100644 index 000000000000..3ce4300ee03f --- /dev/null +++ b/lang/s7-nrepl/Makefile @@ -0,0 +1,18 @@ +PKGNAMESUFFIX= -nrepl + +COMMENT= Notcurses REPL for s7 + +LIB_DEPENDS= libnotcurses-core.so:devel/notcurses \ + libs7.so:lang/s7 + +MASTERDIR= ${.CURDIR}/../../lang/s7 + +PLIST_FILES= bin/s7-nrepl + +do-build: + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${WRKDIR}/s7-nrepl ${WRKSRC}/nrepl.c -ls7 -lnotcurses-core + +do-install: + ${INSTALL_PROGRAM} ${WRKDIR}/s7-nrepl ${STAGEDIR}${PREFIX}/bin/ + +.include "${MASTERDIR}/Makefile.master" diff --git a/lang/s7-nrepl/pkg-descr b/lang/s7-nrepl/pkg-descr new file mode 100644 index 000000000000..a8bc964a80dc --- /dev/null +++ b/lang/s7-nrepl/pkg-descr @@ -0,0 +1,5 @@ +Nrepl is a notcurses-based repl for S7. + +Unlike repl, nrepl has support for the mouse, traversable, scrollable, +and resizable panes, built-in ties to lint.scm, debug.scm, and +profile.scm, and various other enhancements. diff --git a/lang/s7/Makefile b/lang/s7/Makefile index 8fa4ad76e7f8..85a63f07b62b 100644 --- a/lang/s7/Makefile +++ b/lang/s7/Makefile @@ -1,49 +1,21 @@ -PORTNAME= s7 -# S7_MAJOR_VERSION / S7_MINOR_VERSION / S7_DATE from s7.h -PORTVERSION= 11.2.g20241220 -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_ACCOUNT= bil -GL_TAGNAME= a5515d455f5aca49d5275a5a35ac88935f3ad401 USE_LDCONFIG= yes - -CFLAGS+= -DS7_LOAD_PATH=\"${DATADIR}\" \ - -DHAVE_COMPLEX_NUMBERS \ - -DHAVE_COMPLEX_TRIG \ - -DWITH_SYSTEM_EXTRAS \ - -DWITH_C_LOADER \ - -fno-math-errno \ - -Wno-parentheses-equality - -LDFLAGS+= -Wl,-export-dynamic LIBS+= -lm LIBS7= ${WRKDIR}/libs7.so.0 S7LIBS= c dl m -MAKE_ENV+= LD_LIBRARY_PATH=${WRKDIR} - PORTDOCS= s7.html s7-ffi.html s7-scm.html -OPTIONS_DEFINE= DOCS GMP REPL NREPL +OPTIONS_DEFINE= DOCS GMP REPL 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} -Wl,--soname=libs7.so.0 \ @@ -53,9 +25,6 @@ do-build: (cd ${WRKDIR} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${WRKDIR}/s7-repl ${WRKSRC}/lib$l.scm) .endfor -post-build-NREPL-on: - ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${WRKDIR}/s7-nrepl ${WRKSRC}/nrepl.c ${LIBS7} -lnotcurses-core - do-install: ${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 @@ -74,9 +43,6 @@ do-install-DOCS-on: ${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/ @@ -86,4 +52,4 @@ do-test: ${MKDIR} ${WRKDIR}/test (cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${WRKDIR}/s7-repl s7test.scm) -.include +.include "Makefile.master" diff --git a/lang/s7/Makefile.master b/lang/s7/Makefile.master new file mode 100644 index 000000000000..13950759b9f6 --- /dev/null +++ b/lang/s7/Makefile.master @@ -0,0 +1,30 @@ +PORTNAME= s7 +CATEGORIES= lang lisp +# S7_MAJOR_VERSION / S7_MINOR_VERSION / S7_DATE from s7.h +PORTVERSION= 11.2.g20241220 + +MAINTAINER?= fuz@FreeBSD.org +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_ACCOUNT= bil +GL_TAGNAME= a5515d455f5aca49d5275a5a35ac88935f3ad401 + +CFLAGS+= -DS7_LOAD_PATH=\"${DATADIR}\" \ + -DHAVE_COMPLEX_NUMBERS \ + -DHAVE_COMPLEX_TRIG \ + -DWITH_SYSTEM_EXTRAS \ + -DWITH_C_LOADER \ + -fno-math-errno \ + -Wno-parentheses-equality +LDFLAGS+= -Wl,-export-dynamic +MAKE_ENV+= LD_LIBRARY_PATH=${WRKDIR} + +DESCR?= ${.CURDIR}/pkg-descr +PLIST?= ${.CURDIR}/pkg-plist + +.include diff --git a/lang/s7/pkg-plist b/lang/s7/pkg-plist index e615b1463ac4..957ea1032f90 100644 --- a/lang/s7/pkg-plist +++ b/lang/s7/pkg-plist @@ -1,4 +1,3 @@ -%%NREPL%%bin/s7-nrepl %%REPL%%bin/s7-repl include/s7.h lib/libs7.so