From nobody Thu Apr 11 06:15:16 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 4VFTvS4gjNz5GmQY; Thu, 11 Apr 2024 06:15:16 +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 4VFTvS49c0z4MKh; Thu, 11 Apr 2024 06:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712816116; 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=WLc2bvzIkro7cwAgCyZj2jHYZARsuK78FwYCtuSOR8U=; b=bPQSyLEYsA8l1n1t+kAYHBp4gCSK+LoT8fqflnJUE47gb3w6zTcyzoefBXy5am6sG0XKNn Sx2cKCzyC6P4sLXa7mjS9scOxsQLneG75c60snK9WiRvq749jr/dHwY4jrIFpJfEpxS4Dn 2sjPjKJ5L2xleiNtNknA2MY5hOcyyeOtRem8MjwhNvw8+bDY+J23SO+NY0vd/KjVfQXdok fm0hrsn2nmSaRcPYtENCzwVWOp5VNZd8KRdsZm4VlX/fDiHDP7PF2nzklOQelURILhTDwA RBVKqvlp6iN7HXlcs3B5Md7+Slro0xuQGPOi43+G0L2vS4Cwiv6NwKisgIIjVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712816116; a=rsa-sha256; cv=none; b=oYVv1jX99DgMmv1aN/QFvIm0c+OoLVa0P2n+ZXv1wXqZljuBqc/f6b1djhWG920K7eKVEw /S4Rx+Zv3eXLNO/GdiUrjFviJEYz3Fb6F/cNl0Np9JjIMadVpiuDHdPZLrU2KYRXcMWVbq hrASfAMmD3goawToZ/KQZiV6Y/v3Vo4JWs/vZU6xle8gb8G1gUr+X1cMy9gVcsz8Tlp/gZ YZwwZaGmyOmtFn0gDvPlJOymZWQpxuKQXCeKHwKyWMaHuwrHQz1nDD3PSydY/9Ec9okY3o g0ci+tBN7FCwkXk8U/rJXLBJpN1ZRwJY3MtkbMXzBXQQ8N28peG4QM6y29Hhag== 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=1712816116; 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=WLc2bvzIkro7cwAgCyZj2jHYZARsuK78FwYCtuSOR8U=; b=X2QTKrWXBEtxDKIVMMqnBjSArZgwoUTzyGc1GN99gvTQy7AIVzQ44bIzZPXkXKXmXwcoxA NAyxCR8qC5pw3Kc0PebltBI+TBPkLlBs5gsWbX0C8mPn9pSZm5u77KCgonhnBPC9MEeBMF ukgMAQRAY/LxM1Ww7IkDJEdQ13UgAswZ0l+wQ3KC26vr6NCX7qYBW0rbN8aVWV1BsFgbQP wv7/QD1p6nmjPcv6dsCts08c5YFt6QlMm54HVUx3UydeW4ruwTsEuvo8fBrejROe/XstnV EQVl5MvX1dIHWfx1qe6r9Iz6Yef+TWMbmnRXHJ64BBLeItwzXsiSYQCl7HZkXA== 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 4VFTvS3mnYz199j; Thu, 11 Apr 2024 06:15:16 +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 43B6FGv2016128; Thu, 11 Apr 2024 06:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43B6FGv5016125; Thu, 11 Apr 2024 06:15:16 GMT (envelope-from git) Date: Thu, 11 Apr 2024 06:15:16 GMT Message-Id: <202404110615.43B6FGv5016125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 37579ae72a82 - main - editors/mg: Update to 20240405 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: dev-commits-ports-all+owner@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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37579ae72a820c019ca16792b56274b5aa4c5544 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=37579ae72a820c019ca16792b56274b5aa4c5544 commit 37579ae72a820c019ca16792b56274b5aa4c5544 Author: Mark Willson AuthorDate: 2024-04-08 16:54:47 +0000 Commit: Fernando Apesteguía CommitDate: 2024-04-11 06:14:33 +0000 editors/mg: Update to 20240405 ChangeLog: https://cvsweb.openbsd.org/src/usr.bin/mg/ * Reinstate space-to-tabstop entry in manpage * Call vttidy in the exit path for batch mode * Fix hang for (regexp-replace "^.*$" "") PR: 278248 Reported by: cdr.nil@gmail.com --- editors/mg/Makefile | 3 +-- editors/mg/distinfo | 6 +++--- editors/mg/files/patch-main.c | 26 ++++++-------------------- editors/mg/files/patch-re_search.c | 15 +++++++++++++++ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/editors/mg/Makefile b/editors/mg/Makefile index eb6a19211330..a2d846277840 100644 --- a/editors/mg/Makefile +++ b/editors/mg/Makefile @@ -1,6 +1,5 @@ PORTNAME= mg -DISTVERSION= 20231016 -PORTREVISION= 1 +DISTVERSION= 20240405 PORTEPOCH= 1 CATEGORIES= editors MASTER_SITES= https://hydrus.org.uk/downloads/ diff --git a/editors/mg/distinfo b/editors/mg/distinfo index 1ba3033376f9..9bfb9834cce3 100644 --- a/editors/mg/distinfo +++ b/editors/mg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698048672 -SHA256 (mg-20231016.tar.gz) = ef16fb32aae1dc132d4250039eb0a057826c7e888beb39bdf4748c0a4b0179e9 -SIZE (mg-20231016.tar.gz) = 154296 +TIMESTAMP = 1712395301 +SHA256 (mg-20240405.tar.gz) = abda55c6c53e8316324d56a9851865ada13f9cd82295f3757de7cb4b83bead57 +SIZE (mg-20240405.tar.gz) = 156768 diff --git a/editors/mg/files/patch-main.c b/editors/mg/files/patch-main.c index ec956ee56e0c..f712ba61ff81 100644 --- a/editors/mg/files/patch-main.c +++ b/editors/mg/files/patch-main.c @@ -1,4 +1,4 @@ ---- main.c.orig 2023-10-20 07:56:18 UTC +--- main.c.orig 2023-10-24 10:26:02 UTC +++ main.c @@ -16,7 +16,7 @@ #include @@ -9,7 +9,7 @@ #include "def.h" #include "kbd.h" -@@ -43,6 +43,10 @@ struct mgwin *wheadp; /* MGWIN listhead */ +@@ -43,6 +43,10 @@ char pat[NPAT]; /* pattern */ struct vhead varhead; /* Variable list head */ char pat[NPAT]; /* pattern */ @@ -20,28 +20,14 @@ static void edinit(struct buffer *); static void pty_init(void); static __dead void usage(void); -@@ -71,10 +75,6 @@ main(int argc, char **argv) +@@ -70,10 +74,6 @@ main(int argc, char **argv) + int o, i, nfiles; int nobackups = 0; struct buffer *bp = NULL; - +- - if (pledge("stdio rpath wpath cpath fattr chown getpw tty proc exec", - NULL) == -1) - err(1, "pledge"); -- + while ((o = getopt(argc, argv, "nRb:f:u:")) != -1) switch (o) { - case 'b': -@@ -167,9 +167,11 @@ main(int argc, char **argv) - ffclose(ffp, NULL); - } - -- if (batch) -+ if (batch) { -+ vttidy(); - return (0); -- -+ } -+ - /* - * Now ensure any default buffer modes from the startup file are - * given to any files opened when parsing the startup file. diff --git a/editors/mg/files/patch-re_search.c b/editors/mg/files/patch-re_search.c new file mode 100644 index 000000000000..a37c830b014a --- /dev/null +++ b/editors/mg/files/patch-re_search.c @@ -0,0 +1,15 @@ +--- re_search.c.orig 2024-04-06 09:29:51 UTC ++++ re_search.c +@@ -342,10 +342,9 @@ re_forwsrch(void) + if (tbo == clp->l_used) + /* + * Don't start matching past end of line -- must move to +- * beginning of next line, unless line is empty or at +- * end of file. ++ * beginning of next line, unless at end of file. + */ +- if (clp != curbp->b_headp && llength(clp) != 0) { ++ if (clp != curbp->b_headp) { + clp = lforw(clp); + tdotline++; + tbo = 0;