From nobody Sat Jan 6 21:10:56 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 4T6tKF0Sy6z55Tjw; Sat, 6 Jan 2024 21:10:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T6tKF01v5z4CYC; Sat, 6 Jan 2024 21:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704575457; 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=xLe9tpfpzk9NhrW1Hu7balYFNIac+RvdnP9V08ggsQA=; b=TbruO5iPLkTCiozOCkg4HwVnSmIHiOUuzkEu/+zccviBP/ZmZG0wezSnMW+8v+jN5lCGhn pAbzSHV5ZMazsmCKEwbNjXCvH7cpN1qdr2n2H8IZCrjiXGUCSxhEO7yTw8xly03B7ECHR6 TSaqRVKdhx0ty2/DLPLcqrvB0vSkOFj9oPVbQgoyjxOa1Sz8BRb6uiEZbDpfeIYf8Bor+r XUMyzBQv8rFhTvQB2ETYjXtSv2TPNJL27Z8TLqxMTofLQ+L0W4dOCLgS/9qgSyNncQKnW5 x0iTizW/f8LMxBQU7hoZ++c5hiUk2ULySx96Ll/C/xzu+f+0PgLDZxJw2PA9ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704575457; 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=xLe9tpfpzk9NhrW1Hu7balYFNIac+RvdnP9V08ggsQA=; b=JNZ1CEYB4rvbgLgsfLb8Hhy237cB8UitKFwCSae9ZfGPgnVt+YgzEXR9ovA2PX1kz6ioAm XMHtK2n4uc93YeKPf2BC6LSRC7xWn21TjtnuCBLxFM3dMr/F7ZOyx6jk6i981dvwxbjEyL E1BTTHATtPYK2NzfXkhIHVgmItyyG81A+lTGN0+Ej/1Lv+hVOApRhWyG00bLY59OFLy+48 2UCjiN2R9vYB2g8F4ccI5wNkYkyPucgUbHKzZpju4pBMAcRyQuRDRQKnIRjMEvkHh8Gi+h Nz06Gpl/lAYlSkbWOwTXclsl2qALAXMAX6PHuvQ6c2KkGw0YaCIsFdJb2YLtBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704575457; a=rsa-sha256; cv=none; b=PzC5xZMJZ0Ecp0F7h4neNdyeh95M0/CAvlwIKv59mCh/X2LX0znsakOpN5CjImQdlQu+q2 owcIIkr/wnIyEcB6b8tU0i85cnc9ORNb4iqo/KA+T3KK0+SCWE4kVKLx6+QHk+kYGBwO5r Q1AmVsmXbv8+eI7T/wl3YdDUwjWGVQDcqFFzIZZcQ4xHKwUe08IOQY5OTGw07WHPzPSaOf qQF92M4uzs0P450bTJWrrZG0s3EDZEQCDtz9ge8dRD0xaQabKF6cvlTPunPSQSwafzcu9d 7jL/EfwWm9s59vcO85fE1cy0XJYykva4fWGlnNZjpxebZQ7/BlS8Le9a7mSAFg== 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 4T6tKD69y1zwf8; Sat, 6 Jan 2024 21:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 406LAuoQ044630; Sat, 6 Jan 2024 21:10:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 406LAufq044627; Sat, 6 Jan 2024 21:10:56 GMT (envelope-from git) Date: Sat, 6 Jan 2024 21:10:56 GMT Message-Id: <202401062110.406LAufq044627@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: f1858632125d - main - lang/scm: stop patching the unused gmalloc.c 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1858632125df1acfb81ae32c202e9b32489bdee Auto-Submitted: auto-generated The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1858632125df1acfb81ae32c202e9b32489bdee commit f1858632125df1acfb81ae32c202e9b32489bdee Author: Mikhail Teterin AuthorDate: 2024-01-06 21:09:37 +0000 Commit: Mikhail Teterin CommitDate: 2024-01-06 21:09:37 +0000 lang/scm: stop patching the unused gmalloc.c Also add a patch from Debian and (what seems like an improvement) from the upstream's CVS-repository. --- lang/scm/Makefile | 3 ++- lang/scm/files/patch-add-missing-edit-line-feature | 22 +++++++++++++++++++ lang/scm/files/patch-cvs | 25 ++++++++++++++++++++++ lang/scm/files/patch-warnings | 11 +--------- 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/lang/scm/Makefile b/lang/scm/Makefile index 5a8b882fae9b..3a0555a4054a 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -53,6 +53,8 @@ SCM_MODULES= byte.so bytenumb.so differ.so edline.so gsubr.so \ socket.so unix.so SCM_MODULES_X11=x.so +EXTRACT_AFTER_ARGS= --exclude gmalloc.c + post-extract: ${LN} -s ${LOCALBASE}/share/slib ${WRKDIR} @@ -85,7 +87,6 @@ post-patch: s|editline freebsd "" "|editline freebsd "${LIBEDIT_SUB1}| ; \ s|-lreadline")$$|${LIBEDIT_SUB2} -lreadline")| ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm - @${REINPLACE_CMD} -e 's|__osf__|__FreeBSD__|' ${WRKSRC}/gmalloc.c @${REINPLACE_CMD} -e 's|gnuregex\.h|gnu/regex.h|g' ${WRKSRC}/rgx.c @${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \ ${WRKSRC}/xgen.scm diff --git a/lang/scm/files/patch-add-missing-edit-line-feature b/lang/scm/files/patch-add-missing-edit-line-feature new file mode 100644 index 000000000000..0c3746e53331 --- /dev/null +++ b/lang/scm/files/patch-add-missing-edit-line-feature @@ -0,0 +1,22 @@ +Obtained from Debian... + + -mi + +Description: Add missing "edit-line" feature + Don't know why it was missing. +Author: astian +Forwarded: no +Last-Update: 2018-03-03 + +--- edline.c ++++ edline.c +@@ -65,6 +65,9 @@ void init_edline() + make_subr(s_def_outport, tc7_subr_0, def_outport); + make_subr(s_readline, tc7_subr_1, lreadline); + make_subr(s_add_history, tc7_subr_1, ladd_history); ++ ++ add_feature("edit-line"); ++ + if (scm_ldprog(s_Iedline)) + wta(*loc_errobj, "couldn't init", s_Iedline); + } diff --git a/lang/scm/files/patch-cvs b/lang/scm/files/patch-cvs new file mode 100644 index 000000000000..ab2a4e31b63b --- /dev/null +++ b/lang/scm/files/patch-cvs @@ -0,0 +1,25 @@ +A couple of fixes from upstream's CVS-repository. +--- sys.c 2017-10-22 19:48:07.000000000 -0400 ++++ sys.c 2023-07-21 18:36:30.000000000 -0400 +@@ -1523,5 +1523,5 @@ + info.name = name; + for (isubr = subrs_gra.len; 0 < isubr--;) { +- if (0==strcmp(((char **)subrs_gra.elts)[isubr], name)) { ++ if (0==strcmp(((subr_info *)subrs_gra.elts)[isubr].name, name)) { + scm_warn(s_redefining, (char *)name, UNDEFINED); + goto foundit; +@@ -1650,5 +1650,6 @@ + estk = scm_estk; + #else +- from[1] = BOOL_F; /* Can't write to parent stack */ ++ /* Can't write to parent stack, it is now shared. */ ++ SCM_ESTK_PARENT_WRITABLEP(scm_estk) = BOOL_F; + estk = must_malloc_cell((long)n*sizeof(SCM), + MAKE_LENGTH(n, tc7_vector), s_cont); +@@ -3166,5 +3188,5 @@ + (heap_cells - cells_allocated <= scm_ecache_len) || IMP(freelist)) { + alloc_some_heap(); +- growth_mon("number of heaps", (long)(hplim_ind/2), "segments", !0); ++ growth_mon(s_numheaps, (long)(hplim_ind/2), "segments", !0); + growth_mon(s_heap, heap_cells, s_cells, !0); + } diff --git a/lang/scm/files/patch-warnings b/lang/scm/files/patch-warnings index a5b615c13bbe..d889f63f3a24 100644 --- a/lang/scm/files/patch-warnings +++ b/lang/scm/files/patch-warnings @@ -1643,15 +1643,6 @@ + ((search = getenv("PATH")) == 0)) search = DEFAULT_PATH; ---- gmalloc.c 2008-01-30 22:44:00.000000000 -0500 -+++ gmalloc.c 2015-01-23 18:55:19.000000000 -0500 -@@ -1622,5 +1622,5 @@ - #endif - #else --#ifndef __osf__ /* declared in */ -+#ifndef __FreeBSD__ /* declared in */ - #ifndef hpux /* declared in */ - #ifndef __svr4__ /* declared in */ --- gsubr.c 2008-01-30 22:32:00.000000000 -0500 +++ gsubr.c 2015-01-23 18:55:19.000000000 -0500 @@ -31,35 +31,7 @@ @@ -5925,7 +5916,7 @@ + SCM z; info.name = name; for (isubr = subrs_gra.len; 0 < isubr--;) { - if (0==strcmp(((char **)subrs_gra.elts)[isubr], name)) { + if (0==strcmp(((subr_info *)subrs_gra.elts)[isubr].name, name)) { - scm_warn(s_redefining, (char *)name, UNDEFINED); + scm_warn(s_redefining, name, UNDEFINED); goto foundit;