From nobody Fri Dec 08 23:31:01 2023 X-Original-To: dev-commits-ports-main@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 4Sn6pF4n2Rz53c1k; Fri, 8 Dec 2023 23:31:01 +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 4Sn6pF4Mvqz3DSJ; Fri, 8 Dec 2023 23:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702078261; 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=7swqOn5ufxVJK83E0LIBB8u9uxfaT2oK8xpDqt+4zU4=; b=ijINezTxEBtxxP8pZsE8O5nhOHYu/L9YSm0jLl9IdHgmVgpPB9SywGQKvb0ySfrqgFaLxQ O1MqKiIoY2PeXup4LVNH63xuZLYxRKFBDC6CB5AZ9tHSKZQDqBKYgA1CB7Fbb+z7/P1qWB rA/zbfRCDntarhJ53xnmCONYguRi0M3WQiK3OwplKMCqygPeZ12HWGTRcF6Qegd6eSpOGg vfrck3VbGREXC7BJnsj/YZnKDXtlS5ejTtf8mW5Gm82Pnt85CFC9BIR0VstofGLx7oJfUC mYxoeAK5x1O+nM9lEdGme+kw7Qr7ckVCFzwOhglRoM+lPR8N2PsrkrrQHdEcJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702078261; a=rsa-sha256; cv=none; b=wC1CXJL1D1/s53eRyZAcR6G48ZbUQIBL5I+e01PPkxwjk7+MjfNuP9yQSwhbwWV+hCHOVw v55RA/OoU2XUbAsrmxEyN9NXVcBqu7g9F0/XuxRO/h0PYbAwEFM+q1B/TowUSnA5JwMw/c qlrSQBFnMubPBBBXtPHAQNmWspWNBqXXywwpUR8cqofnHoNVEXEhkzZoHWiEB/e5u6V4cl rQMB0N+rDTekyk9PpPnxBE6Ld5ckM5vRwN4QcFLQ7370edtR7gwy+cq1Ig4yuccefaUFWN BOGzevF49+uvFr1+J01WlF5uW8lFqJt6zbcMWWUZp7E/vrlfqL+cT8dS52TEZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702078261; 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=7swqOn5ufxVJK83E0LIBB8u9uxfaT2oK8xpDqt+4zU4=; b=IRshur8dmMeZmauHFxRwZp9Ft+a8NHiozfXlsJlwYHobJMcpqz/2+XVIwTGLjaSrE3wJds BF0lF9d3RLRyoNpccFw9Q4ZPvE58KvOlLkGqwAXbw1PvM773xSEujO8OXBNU4VhkbqzY/r 3Yl2mkLfufzMprbdJT56Wc3HKNgNQpG+0X3tA4rlshgtfbYwgz6aurUw311O4HgX1rHR+E 91rLUayPsNAghQPAha1F09LHEE4+3xaGXQitK/XAwaRjHQ7yTasCO9gc84iKiwwVgP9nl5 xpnGHntxR97CL1gKOUR7KPffok2zKd4/KI7cZvll5Zo/Ix0171BgIXIFD2RWRg== 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 4Sn6pF3SKKzgbD; Fri, 8 Dec 2023 23:31:01 +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 3B8NV16h067382; Fri, 8 Dec 2023 23:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8NV1lQ067379; Fri, 8 Dec 2023 23:31:01 GMT (envelope-from git) Date: Fri, 8 Dec 2023 23:31:01 GMT Message-Id: <202312082331.3B8NV1lQ067379@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 975ef9b92524 - main - textproc/msort: remove unnecessicary sbrk use List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 975ef9b925241898716a6782a26b4b775bb957f1 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=975ef9b925241898716a6782a26b4b775bb957f1 commit 975ef9b925241898716a6782a26b4b775bb957f1 Author: Brooks Davis AuthorDate: 2023-12-07 00:28:20 +0000 Commit: Brooks Davis CommitDate: 2023-12-08 23:29:38 +0000 textproc/msort: remove unnecessicary sbrk use --- textproc/msort/Makefile | 5 +---- textproc/msort/files/patch-msort.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile index 575c51b0e61a..9f22d2bf9d18 100644 --- a/textproc/msort/Makefile +++ b/textproc/msort/Makefile @@ -1,6 +1,6 @@ PORTNAME= msort PORTVERSION= 8.53 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= http://billposer.org/Software/Downloads/ @@ -11,9 +11,6 @@ WWW= https://billposer.org/Software/msort.html LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_aarch64= fails to link: missing sbrk -BROKEN_riscv64= fails to link: missing sbrk - LIB_DEPENDS= libtre.so:textproc/libtre \ libuninum.so:devel/libuninum \ libutf8proc.so:textproc/utf8proc diff --git a/textproc/msort/files/patch-msort.c b/textproc/msort/files/patch-msort.c new file mode 100644 index 000000000000..16c6763655b0 --- /dev/null +++ b/textproc/msort/files/patch-msort.c @@ -0,0 +1,38 @@ +--- msort.c.orig ++++ msort.c +@@ -639,7 +639,6 @@ + char *endptr; /* Used by strtol */ + char * tmpstr; + char *FirstLocale = NULL; +- void *InitialBreak; + int lgoindex; /* Unused but needed by getopt_long */ + char t; + #ifndef USEUTF8PROC +@@ -720,7 +719,6 @@ + xav = av; + xac = ac; + +- InitialBreak = sbrk(0); + #ifdef HAVE_SETLOCALE + (void) setlocale(LC_ALL,""); + #endif +@@ -1946,18 +1944,14 @@ + + if(LogP) { + +- /* Record random number generator seed, dynamic memory usage and number of comparisons */ ++ /* Record random number generator seed and number of comparisons */ + #ifdef HAVE_PRINTF_THSEP +- PrintLog(_("Dynamically allocated memory: %'15d bytes\n"), +- ((char *)sbrk(0) - (char *)InitialBreak)); + PrintLog(_("Random number generator seed: %15u\n"),RandomSeed); + #ifndef NOCOMPARISONCNT + PrintLog(_("Comparisons: %'15llu\n"),ComparisonCnt); + if(VerboseP) fprintf(stderr,_("Comparisons: %'15llu\n"),ComparisonCnt); + #endif + #else +- PrintLog("Dynamically allocated memory: %d bytes\n", +- ((char *)sbrk(0) - (char *)InitialBreak)); + PrintLog(_("Random number generator seed: %15u\n"),RandomSeed); + #ifndef NOCOMPARISONCNT + PrintLog(_("Comparisons: %'14llu\n"),ComparisonCnt);