Received: by mail.netbsd.org (Postfix, from userid 605) id 1F61A84DA1; Tue, 24 Mar 2020 06:55:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9A5E784D6E for ; Tue, 24 Mar 2020 06:55:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id RdhK7LogkOsp for ; Tue, 24 Mar 2020 06:55:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D5E0384D5E for ; Tue, 24 Mar 2020 06:55:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D2C3FFB27; Tue, 24 Mar 2020 06:55:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585032934119540" MIME-Version: 1.0 Date: Tue, 24 Mar 2020 06:55:34 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/misc/screen To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20200324065534.D2C3FFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1585032934119540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Tue Mar 24 06:55:34 UTC 2020 Modified Files: pkgsrc/misc/screen: Makefile distinfo pkgsrc/misc/screen/patches: patch-ao patch-ap Added Files: pkgsrc/misc/screen/patches: patch-display.h Log Message: misc/screen: fix paths in example files, fix array subscript The warnings in the patches are no longer necessary since pkglint 19.4.13 reports an error for these cases. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 pkgsrc/misc/screen/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/misc/screen/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/screen/patches/patch-ao cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/screen/patches/patch-ap cvs rdiff -u -r0 -r1.1 pkgsrc/misc/screen/patches/patch-display.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1585032934119540 Content-Disposition: inline Content-Length: 7055 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/screen/Makefile diff -u pkgsrc/misc/screen/Makefile:1.113 pkgsrc/misc/screen/Makefile:1.114 --- pkgsrc/misc/screen/Makefile:1.113 Fri Feb 7 12:18:59 2020 +++ pkgsrc/misc/screen/Makefile Tue Mar 24 06:55:34 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.113 2020/02/07 12:18:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.114 2020/03/24 06:55:34 rillig Exp $ DISTNAME= screen-4.8.0 +PKGREVISION= 1 CATEGORIES= misc shells MASTER_SITES= ${MASTER_SITE_GNU:=screen/} Index: pkgsrc/misc/screen/distinfo diff -u pkgsrc/misc/screen/distinfo:1.50 pkgsrc/misc/screen/distinfo:1.51 --- pkgsrc/misc/screen/distinfo:1.50 Fri Feb 7 12:18:59 2020 +++ pkgsrc/misc/screen/distinfo Tue Mar 24 06:55:34 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.50 2020/02/07 12:18:59 ryoon Exp $ +$NetBSD: distinfo,v 1.51 2020/03/24 06:55:34 rillig Exp $ SHA1 (screen-4.8.0.tar.gz) = 2328927e10e68d357bdfec7bd740726011e834e9 RMD160 (screen-4.8.0.tar.gz) = 43888fa00f708a8a9aa226e0df39abd7181b15ae @@ -13,8 +13,9 @@ SHA1 (patch-ak) = 1aaf82f7fe666d86a9f4ab SHA1 (patch-al) = caabc33ee51922d97edac19346ad9d80fabb164b SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1 SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552 -SHA1 (patch-ao) = 91eecb62351aff720447eb48ea85aae70b62f9b6 -SHA1 (patch-ap) = 1f11b50826b3e4d61540351911d21214d3ab83cc +SHA1 (patch-ao) = a45ae3186cd9bddeb915bad890f1be5abc315dd3 +SHA1 (patch-ap) = 0ecc71f5623ca4b799369b12da8523d03a86eb1a +SHA1 (patch-display.h) = 889394ff36b6924b026490086a0e37164730cc8a SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8 SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d SHA1 (patch-tty.sh) = 711e10879250de4b0e04bc2ec00472edeaf6aada Index: pkgsrc/misc/screen/patches/patch-ao diff -u pkgsrc/misc/screen/patches/patch-ao:1.6 pkgsrc/misc/screen/patches/patch-ao:1.7 --- pkgsrc/misc/screen/patches/patch-ao:1.6 Mon Jun 20 16:04:44 2016 +++ pkgsrc/misc/screen/patches/patch-ao Tue Mar 24 06:55:34 2020 @@ -1,21 +1,14 @@ -$NetBSD: patch-ao,v 1.6 2016/06/20 16:04:44 ryoon Exp $ +$NetBSD: patch-ao,v 1.7 2020/03/24 06:55:34 rillig Exp $ Replace configurable paths with tags. -BE CAREFUL IF YOU WANT TO REGENERATE THIS PATCH! -YOU MUST RUN DIFF BEFORE SUBSTITUTIONS! - -% make clean && make extract && make pre-patch && make do-patch - -RUNNING "make patch" TAKES YOU TOO FAR. - --- etc/etcscreenrc.orig 2015-09-05 19:28:22.000000000 +0000 +++ etc/etcscreenrc @@ -1,6 +1,6 @@ # # This is an example for the global screenrc file. -# You may want to install this file as /usr/local/etc/screenrc. -+# You may want to install this file as /usr/pkg/etc/screenrc. ++# You may want to install this file as @PKG_SYSCONFDIR@/screenrc. # Check config.h for the exact location. # # Flaws of termcap and standard settings are done here. Index: pkgsrc/misc/screen/patches/patch-ap diff -u pkgsrc/misc/screen/patches/patch-ap:1.8 pkgsrc/misc/screen/patches/patch-ap:1.9 --- pkgsrc/misc/screen/patches/patch-ap:1.8 Tue Jul 18 23:02:18 2017 +++ pkgsrc/misc/screen/patches/patch-ap Tue Mar 24 06:55:34 2020 @@ -1,14 +1,7 @@ -$NetBSD: patch-ap,v 1.8 2017/07/18 23:02:18 kim Exp $ +$NetBSD: patch-ap,v 1.9 2020/03/24 06:55:34 rillig Exp $ Replace configurable paths with tags. -BE CAREFUL IF YOU WANT TO REGENERATE THIS PATCH! -YOU MUST RUN DIFF BEFORE SUBSTITUTIONS! - -% make clean && make extract && make pre-patch && make do-patch - -RUNNING "make patch" TAKES YOU TOO FAR. - --- doc/screen.1.orig 2017-07-10 19:26:25.000000000 +0000 +++ doc/screen.1 2017-07-18 22:44:38.000000000 +0000 @@ -712,7 +712,7 @@ @@ -25,7 +18,7 @@ RUNNING "make patch" TAKES YOU TOO FAR. .I screen is invoked, it executes initialization commands from the files -\*Q/usr/local/etc/screenrc\*U and -+\*Q/usr/pkg/etc/screenrc\*U and ++\*Q@PKG_SYSCONFDIR@/screenrc\*U and \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's defaults\*U that can be overridden in the following ways: for the global screenrc file @@ -34,7 +27,7 @@ RUNNING "make patch" TAKES YOU TOO FAR. .PP Two configuration files are shipped as examples with your screen distribution: -\*Qetc/screenrc\*U and \*Qetc/etcscreenrc\*U. They contain a number of -+\*Q/usr/pkg/share/examples/screen/screenrc\*U and \*Q/usr/pkg/share/examples/screen/etcscreenrc\*U. They contain a number of ++\*Q@EXAMPLES@/screenrc\*U and \*Q@EXAMPLES/etcscreenrc\*U. They contain a number of useful examples for various commands. .PP Customization can also be done 'on-line'. To enter the command mode type @@ -43,13 +36,13 @@ RUNNING "make patch" TAKES YOU TOO FAR. distribution package for private and global initialization files. .IP $SYSSCREENRC -.IP /usr/local/etc/screenrc -+.IP /usr/pkg/etc/screenrc ++.IP @PKG_SYSCONFDIR@/screenrc .I screen initialization commands .IP $SCREENRC .IP $HOME/.screenrc -Read in after /usr/local/etc/screenrc -+Read in after /usr/pkg/etc/screenrc ++Read in after @PKG_SYSCONFDIR@/screenrc .IP $SCREENDIR/S\- -.IP /local/screens/S\- +.IP /tmp/screens/S\- Added files: Index: pkgsrc/misc/screen/patches/patch-display.h diff -u /dev/null pkgsrc/misc/screen/patches/patch-display.h:1.1 --- /dev/null Tue Mar 24 06:55:34 2020 +++ pkgsrc/misc/screen/patches/patch-display.h Tue Mar 24 06:55:34 2020 @@ -0,0 +1,33 @@ +$NetBSD: patch-display.h,v 1.1 2020/03/24 06:55:34 rillig Exp $ + +display.c: In function 'disp_readev_fn': +display.c:3590:39: error: array subscript has type 'char' [-Werror=char-subscripts] + D_mouse_parse.params[D_mouse_parse.state] = 0; + ^ +display.c:3605:43: error: array subscript has type 'char' [-Werror=char-subscripts] + D_mouse_parse.params[D_mouse_parse.state] *= 10; + ^ +display.c:3606:43: error: array subscript has type 'char' [-Werror=char-subscripts] + D_mouse_parse.params[D_mouse_parse.state] += c - '0'; + ^ +display.c:3618:43: error: array subscript has type 'char' [-Werror=char-subscripts] + D_mouse_parse.params[D_mouse_parse.state] = 0; + ^ +display.c:3626:39: error: array subscript has type 'char' [-Werror=char-subscripts] + D_mouse_parse.params[D_mouse_parse.state++] = c; + ^ + +The constants for the state are from an anonymous enum at the top of +display.c. They are all small nonnegative numbers. + +--- display.h.orig 2020-02-05 20:09:38.000000000 +0000 ++++ display.h +@@ -61,7 +61,7 @@ struct win; /* forward declaration */ + struct mouse_parse + { + char sgrmode; /* non-zero if parsing an SGR sequence */ +- char state; /* current state of parsing */ ++ int state; /* current state of parsing */ + int params[3]; /* parsed params: button, x, y */ + }; + --_----------=_1585032934119540--