diff --git a/shells/schemesh/Makefile b/shells/schemesh/Makefile index 19ae74a60477..fcff8742f13d 100644 --- a/shells/schemesh/Makefile +++ b/shells/schemesh/Makefile @@ -1,38 +1,38 @@ PORTNAME= schemesh DISTVERSIONPREFIX= v -DISTVERSION= 0.7.5 +DISTVERSION= 0.7.7 CATEGORIES= shells MAINTAINER= ashish@FreeBSD.org COMMENT= Unix shell and Lisp REPL, fused together WWW= https://github.com/cosmos72/schemesh LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= chez-scheme:lang/chez-scheme RUN_DEPENDS= chez-scheme:lang/chez-scheme LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libuuid.so:misc/e2fsprogs-libuuid USES= gmake ncurses USE_GITHUB= yes GH_ACCOUNT= cosmos72 CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes PLIST_FILES= bin/schemesh \ lib/schemesh/libschemesh_${DISTVERSION}.so post-patch: @${REINPLACE_CMD} -e 's,chezscheme,chez-scheme,' \ ${WRKSRC}/utils/find_chez_scheme_dir.sh @${REINPLACE_CMD} -r -e 's/^CC=cc/CC=${CC}/' \ -e 's,^(prefix.+)(=.+)$$,\1= ${PREFIX},' \ -e '/^LDFLAGS/s|$$| ${LDFLAGS}|' \ -e '/^CFLAGS/s|$$| ${CFLAGS}|' \ ${WRKSRC}/Makefile .include diff --git a/shells/schemesh/distinfo b/shells/schemesh/distinfo index 46817831aeaa..c582f4863e87 100644 --- a/shells/schemesh/distinfo +++ b/shells/schemesh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739715894 -SHA256 (cosmos72-schemesh-v0.7.5_GH0.tar.gz) = 4ea282f29e21938cece5a8d3c3f3420ff91786cdc755f80f02af26544ecb4798 -SIZE (cosmos72-schemesh-v0.7.5_GH0.tar.gz) = 254799 +TIMESTAMP = 1740864440 +SHA256 (cosmos72-schemesh-v0.7.7_GH0.tar.gz) = 9c7a7208c26877d9b66b7358b3321e05d3c721880fd7eedb6049d66654f39744 +SIZE (cosmos72-schemesh-v0.7.7_GH0.tar.gz) = 268871 diff --git a/shells/schemesh/files/patch-posix_posix.c b/shells/schemesh/files/patch-posix_posix.c index 592842e2547a..cd5646a3fb4f 100644 --- a/shells/schemesh/files/patch-posix_posix.c +++ b/shells/schemesh/files/patch-posix_posix.c @@ -1,28 +1,21 @@ ---- posix/posix.c.orig 2025-02-16 14:38:30 UTC +--- posix/posix.c.orig 2025-03-01 15:14:20 UTC +++ posix/posix.c -@@ -7,10 +7,6 @@ - * (at your option) any later version. - */ - --#define _POSIX_C_SOURCE 200809L /* fstatat() */ --#define _DEFAULT_SOURCE /* DT_* */ --#define _BSD_SOURCE /* DT_* */ -- - #include "posix.h" - #include "../containers/containers.h" /* schemesh_Sbytevector() */ - #include "../eval.h" /* eval() */ -@@ -817,8 +813,14 @@ static ptr c_get_hostname(void) { - +@@ -849,12 +849,18 @@ static ptr c_get_hostname(void) { + /** return Scheme string, or Scheme integer on error */ static ptr c_get_hostname(void) { +#ifdef __FreeBSD__ + int len = sysconf(_SC_HOST_NAME_MAX) + 1; + char* buf = alloca(len); + if (gethostname(buf, len) != 0) { +#else + #ifdef HOST_NAME_MAX char buf[HOST_NAME_MAX + 1]; + #else + char buf[256]; + #endif if (gethostname(buf, sizeof(buf)) != 0) { +#endif return Sinteger(c_errno()); } return schemesh_Sstring_utf8b(buf, -1); diff --git a/shells/schemesh/files/patch-posix_signal.h b/shells/schemesh/files/patch-posix_signal.h deleted file mode 100644 index 28774e535214..000000000000 --- a/shells/schemesh/files/patch-posix_signal.h +++ /dev/null @@ -1,16 +0,0 @@ ---- posix/signal.h.orig 2025-02-16 14:43:54 UTC -+++ posix/signal.h -@@ -138,11 +138,11 @@ static ptr c_signals_list(void) { - {SIGBUS, "sigbus"}, {SIGFPE, "sigfpe"}, {SIGKILL, "sigkill"}, - {SIGUSR1, "sigusr1"}, {SIGSEGV, "sigsegv"}, {SIGUSR2, "sigusr2"}, - {SIGPIPE, "sigpipe"}, {SIGALRM, "sigalrm"}, {SIGTERM, "sigterm"}, -- {SIGSTKFLT, "sigstkflt"}, {SIGCHLD, "sigchld"}, {SIGCONT, "sigcont"}, -+ /* {SIGSTKFLT, "sigstkflt"}, */ {SIGCHLD, "sigchld"}, {SIGCONT, "sigcont"}, - {SIGSTOP, "sigstop"}, {SIGTSTP, "sigtstp"}, {SIGTTIN, "sigttin"}, - {SIGTTOU, "sigttou"}, {SIGURG, "sigurg"}, {SIGXCPU, "sigxcpu"}, - {SIGXFSZ, "sigxfsz"}, {SIGVTALRM, "sigvtalrm"}, {SIGPROF, "sigprof"}, -- {SIGWINCH, "sigwinch"}, {SIGIO, "sigio"}, {SIGPWR, "sigpwr"}, -+ {SIGWINCH, "sigwinch"}, {SIGIO, "sigio"}, /* {SIGPWR, "sigpwr"}, */ - {SIGSYS, "sigsys"}}; - - ptr ret = Snil;