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.

5 files changed, 46 insertions, 25 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index a429048c107..63ae59de1a5 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -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/}
 
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 0d9fa6d424e..cc6d128a285 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -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) = 1aaf82f7fe666d86a9f4ab7d6f7222e895a17bba
 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
diff --git a/misc/screen/patches/patch-ao b/misc/screen/patches/patch-ao
index db398c2e4c6..5bceaf9744b 100644
--- a/misc/screen/patches/patch-ao
+++ b/misc/screen/patches/patch-ao
@@ -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.
diff --git a/misc/screen/patches/patch-ap b/misc/screen/patches/patch-ap
index e98e0b2deff..3bc44c2e72a 100644
--- a/misc/screen/patches/patch-ap
+++ b/misc/screen/patches/patch-ap
@@ -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\-<login>
 -.IP /local/screens/S\-<login>
 +.IP /tmp/screens/S\-<login>
diff --git a/misc/screen/patches/patch-display.h b/misc/screen/patches/patch-display.h
new file mode 100644
index 00000000000..581fee4a65f
--- /dev/null
+++ b/misc/screen/patches/patch-display.h
@@ -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 */
+ };
+