Tue Jul 18 23:02:18 2017 UTC ()
Upgrade misc/screen to version 4.6.1

Version 4.6.1 (10/07/2017):
  * Fixes:
    - problems with starting session in some cases
    - parallel make install
    - segfault when querying info on nonUTF locale

Version 4.6.0 (28/06/2017):
  * Update Unicode wide tables to 9.0
  * Support more serial speeds
  * Improved namespaces support
  * Migrate from fifos to sockets
  * Start viewing scrollback at first line of output


(kim)
diff -r1.102 -r1.103 pkgsrc/misc/screen/Makefile
diff -r1.46 -r1.47 pkgsrc/misc/screen/distinfo
diff -r1.6 -r1.7 pkgsrc/misc/screen/patches/patch-ae
diff -r1.7 -r1.8 pkgsrc/misc/screen/patches/patch-ai
diff -r1.7 -r1.8 pkgsrc/misc/screen/patches/patch-ap
diff -r1.9 -r1.10 pkgsrc/misc/screen/patches/patch-aj
diff -r1.8 -r1.9 pkgsrc/misc/screen/patches/patch-ak
diff -r1.1 -r0 pkgsrc/misc/screen/patches/patch-doc_screen.texinfo
diff -r1.4 -r1.5 pkgsrc/misc/screen/patches/patch-screen.c
diff -r1.2 -r1.3 pkgsrc/misc/screen/patches/patch-socket.c
diff -r1.3 -r1.4 pkgsrc/misc/screen/patches/patch-tty.sh
cvs diff -r1.102 -r1.103 pkgsrc/misc/screen/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/screen/Makefile 2017/07/18 10:35:28 1.102
+++ pkgsrc/misc/screen/Makefile 2017/07/18 23:02:18 1.103
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.102 2017/07/18 10:35:28 kim Exp $ 1# $NetBSD: Makefile,v 1.103 2017/07/18 23:02:18 kim Exp $
2 2
3DISTNAME= screen-4.5.1 3DISTNAME= screen-4.6.1
4#PKGREVISION= 1 4#PKGREVISION= 1
5CATEGORIES= misc shells 5CATEGORIES= misc shells
6MASTER_SITES= ${MASTER_SITE_GNU:=screen/} 6MASTER_SITES= ${MASTER_SITE_GNU:=screen/}
7 7
8MAINTAINER= kimmo@suominen.com 8MAINTAINER= kimmo@suominen.com
9HOMEPAGE= http://www.gnu.org/software/screen/screen.html 9HOMEPAGE= http://www.gnu.org/software/screen/screen.html
10COMMENT= Multi-screen window manager 10COMMENT= Multi-screen window manager
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13EXTRACT_USING= bsdtar 13EXTRACT_USING= bsdtar
14 14
15# In file included from list_display.c:36: 15# In file included from list_display.c:36:
16# In file included from ./screen.h:150: 16# In file included from ./screen.h:150:
cvs diff -r1.46 -r1.47 pkgsrc/misc/screen/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/screen/distinfo 2017/04/15 22:31:49 1.46
+++ pkgsrc/misc/screen/distinfo 2017/07/18 23:02:18 1.47
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1$NetBSD: distinfo,v 1.46 2017/04/15 22:31:49 kim Exp $ 1$NetBSD: distinfo,v 1.47 2017/07/18 23:02:18 kim Exp $
2 2
3SHA1 (screen-4.5.1.tar.gz) = d096ea40c7a349ec46f3bd4fcc02fd6a873318e6 3SHA1 (screen-4.6.1.tar.gz) = 444dae1c6d2ff0b7dfd774b4e53e49c69de811ee
4RMD160 (screen-4.5.1.tar.gz) = 2e8aa5ec158fc7d240df176dff0b9ddfcbfc9056 4RMD160 (screen-4.6.1.tar.gz) = a1177ec2938c06d9d660cc7c05d002c9a702b014
5SHA512 (screen-4.5.1.tar.gz) = ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804 5SHA512 (screen-4.6.1.tar.gz) = e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
6Size (screen-4.5.1.tar.gz) = 963153 bytes 6Size (screen-4.6.1.tar.gz) = 848979 bytes
7SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc 7SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc
8SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3 8SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3
9SHA1 (patch-ae) = 8792f7877c0a29701d7d0643e93360813ed7db0f 9SHA1 (patch-ae) = 2a9b19c52cafe238c923977c9952af0ec0b0d9f6
10SHA1 (patch-ai) = d93147f4e8a2026a1892c3cbd14a929d81e0e635 10SHA1 (patch-ai) = edefc44e47066dc89bda22a94d417511f46f0190
11SHA1 (patch-aj) = e9996135629085c44867b9264648b2b507e91f98 11SHA1 (patch-aj) = 446b07f7f418dd0c83fb5bc6246a01cc4417b03b
12SHA1 (patch-ak) = 31982e692cabf25be31bd1758fe1aeb1a4787629 12SHA1 (patch-ak) = 1aaf82f7fe666d86a9f4ab7d6f7222e895a17bba
13SHA1 (patch-al) = caabc33ee51922d97edac19346ad9d80fabb164b 13SHA1 (patch-al) = caabc33ee51922d97edac19346ad9d80fabb164b
14SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1 14SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1
15SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552 15SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552
16SHA1 (patch-ao) = 91eecb62351aff720447eb48ea85aae70b62f9b6 16SHA1 (patch-ao) = 91eecb62351aff720447eb48ea85aae70b62f9b6
17SHA1 (patch-ap) = 4176e95502754206d6840ce228c61371df947650 17SHA1 (patch-ap) = 1f11b50826b3e4d61540351911d21214d3ab83cc
18SHA1 (patch-doc_screen.texinfo) = ddce313668c7f9d27973e62042dcdc11f23307b5 18SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8
19SHA1 (patch-screen.c) = fa54bfdbefcf74944a677ab4b6636d0072e57267 19SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d
20SHA1 (patch-socket.c) = 09683cee3685a5c6d625e86aa97f6a09f4280b56 20SHA1 (patch-tty.sh) = 6d0d8f60740a3f7167d3d064a8979858a9b01bb0
21SHA1 (patch-tty.sh) = 93b1fe856cf16640295cb822d60118dbd3734602 
cvs diff -r1.6 -r1.7 pkgsrc/misc/screen/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/misc/screen/patches/patch-ae 2015/02/13 04:44:40 1.6
+++ pkgsrc/misc/screen/patches/patch-ae 2017/07/18 23:02:18 1.7
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-ae,v 1.6 2015/02/13 04:44:40 rodent Exp $ 1$NetBSD: patch-ae,v 1.7 2017/07/18 23:02:18 kim Exp $
2 2
3Don't pollute G1 to allow 8-bit encondings. 3Don't pollute G1 to allow 8-bit encondings.
4 4
5The original code made the TERMCAP env var longer than 1023 bytes, 5The original code made the TERMCAP env var longer than 1023 bytes,
6which causes problems. This is a quick hack but works with our termcap. 6which causes problems. This is a quick hack but works with our termcap.
7 7
8--- termcap.c.orig 2014-04-26 10:58:35.000000000 +0000 8--- termcap.c.orig 2017-07-10 19:26:25.000000000 +0000
9+++ termcap.c 9+++ termcap.c 2017-07-18 22:44:38.000000000 +0000
10@@ -80,7 +80,7 @@ static const char TermcapConst[] = "\\\n 10@@ -79,7 +79,7 @@
11 \t:DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:UP=\\E[%dA:bs:bt=\\E[Z:\\\n\ 11 \t:DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:UP=\\E[%dA:bs:bt=\\E[Z:\\\n\
12 \t:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:ct=\\E[3g:\\\n\ 12 \t:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:ct=\\E[3g:\\\n\
13 \t:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\\\n\ 13 \t:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\\\n\
14-\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E)0:"; 14-\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E)0:";
15+\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E(B:"; 15+\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E(B:";
16  16
17 char * 17 char *
18 gettermcapstring(s) 18 gettermcapstring(s)
19@@ -826,7 +826,7 @@ char *s; 19@@ -825,7 +825,7 @@
20 { 20 {
21 register int n; 21 register int n;
22  22
23- if (tcLineLen + (n = strlen(s)) > 55 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1) 23- if (tcLineLen + (n = strlen(s)) > 55 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1)
24+ if (tcLineLen + (n = strlen(s)) > 69 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1) 24+ if (tcLineLen + (n = strlen(s)) > 69 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1)
25 { 25 {
26 strcpy(Termcap + Termcaplen, "\\\n\t:"); 26 strcpy(Termcap + Termcaplen, "\\\n\t:");
27 Termcaplen += 4; 27 Termcaplen += 4;
cvs diff -r1.7 -r1.8 pkgsrc/misc/screen/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/misc/screen/patches/patch-ai 2016/06/20 16:04:44 1.7
+++ pkgsrc/misc/screen/patches/patch-ai 2017/07/18 23:02:18 1.8
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ai,v 1.7 2016/06/20 16:04:44 ryoon Exp $ 1$NetBSD: patch-ai,v 1.8 2017/07/18 23:02:18 kim Exp $
2 2
3This glues in the code from patch-am (see also path-al and patch-an). 3This glues in the code from patch-am (see also patch-al and patch-an).
4 4
5--- os.h.orig 2016-06-19 19:41:03.000000000 +0000 5--- os.h.orig 2016-06-19 19:41:03.000000000 +0000
6+++ os.h 6+++ os.h
7@@ -71,9 +71,6 @@ 7@@ -71,9 +71,6 @@
8 # undef exit 8 # undef exit
9 #endif /* sun */ 9 #endif /* sun */
10  10
11-#ifndef linux /* all done in <errno.h> */ 11-#ifndef linux /* all done in <errno.h> */
12-extern int errno; 12-extern int errno;
13-#endif /* linux */ 13-#endif /* linux */
14 #ifndef HAVE_STRERROR 14 #ifndef HAVE_STRERROR
15 /* No macros, please */ 15 /* No macros, please */
16 #undef strerror 16 #undef strerror
cvs diff -r1.7 -r1.8 pkgsrc/misc/screen/patches/patch-ap (expand / switch to unified diff)

--- pkgsrc/misc/screen/patches/patch-ap 2016/06/20 16:04:44 1.7
+++ pkgsrc/misc/screen/patches/patch-ap 2017/07/18 23:02:18 1.8
@@ -1,54 +1,54 @@ @@ -1,54 +1,54 @@
1$NetBSD: patch-ap,v 1.7 2016/06/20 16:04:44 ryoon Exp $ 1$NetBSD: patch-ap,v 1.8 2017/07/18 23:02:18 kim Exp $
2 2
3Replace configurable paths with tags. 3Replace configurable paths with tags.
4 4
5BE CAREFUL IF YOU WANT TO REGENERATE THIS PATCH! 5BE CAREFUL IF YOU WANT TO REGENERATE THIS PATCH!
6YOU MUST RUN DIFF BEFORE SUBSTITUTIONS! 6YOU MUST RUN DIFF BEFORE SUBSTITUTIONS!
7 7
8% make clean && make extract && make pre-patch && make do-patch 8% make clean && make extract && make pre-patch && make do-patch
9 9
10RUNNING "make patch" TAKES YOU TOO FAR. 10RUNNING "make patch" TAKES YOU TOO FAR.
11 11
12--- doc/screen.1.orig 2016-06-19 19:41:03.000000000 +0000 12--- doc/screen.1.orig 2017-07-10 19:26:25.000000000 +0000
13+++ doc/screen.1 13+++ doc/screen.1 2017-07-18 22:44:38.000000000 +0000
14@@ -636,7 +636,7 @@ Show a listing of all currently attached 14@@ -712,7 +712,7 @@
15  15
16 .SH CUSTOMIZATION 16 .SH CUSTOMIZATION
17 The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to 17 The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to
18-/tmp/screens or preferably to /usr/local/screens chosen at compile-time. If 18-/tmp/screens or preferably to /usr/local/screens chosen at compile-time. If
19+/tmp/screens. This is chosen at compile-time. If 19+/tmp/screens. This is chosen at compile-time. If
20 .I screen 20 .I screen
21 is installed setuid-root, then the administrator 21 is installed setuid-root, then the administrator
22 should compile 22 should compile
23@@ -649,7 +649,7 @@ in the environment variable $SCREENDIR. 23@@ -725,7 +725,7 @@
24 When 24 When
25 .I screen 25 .I screen
26 is invoked, it executes initialization commands from the files 26 is invoked, it executes initialization commands from the files
27-\*Q/usr/local/etc/screenrc\*U and 27-\*Q/usr/local/etc/screenrc\*U and
28+\*Q/usr/pkg/etc/screenrc\*U and 28+\*Q/usr/pkg/etc/screenrc\*U and
29 \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's 29 \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's
30 defaults\*U that can be overridden in the following ways: for the 30 defaults\*U that can be overridden in the following ways: for the
31 global screenrc file  31 global screenrc file
32@@ -679,7 +679,7 @@ variable substitution shall be performed 32@@ -755,7 +755,7 @@
33 protected from variable substitution. 33 protected from variable substitution.
34 .PP 34 .PP
35 Two configuration files are shipped as examples with your screen distribution: 35 Two configuration files are shipped as examples with your screen distribution:
36-\*Qetc/screenrc\*U and \*Qetc/etcscreenrc\*U. They contain a number of 36-\*Qetc/screenrc\*U and \*Qetc/etcscreenrc\*U. They contain a number of
37+\*Q/usr/pkg/share/examples/screen/screenrc\*U and \*Q/usr/pkg/share/examples/screen/etcscreenrc\*U. They contain a number of 37+\*Q/usr/pkg/share/examples/screen/screenrc\*U and \*Q/usr/pkg/share/examples/screen/etcscreenrc\*U. They contain a number of
38 useful examples for various commands. 38 useful examples for various commands.
39 .PP 39 .PP
40 Customization can also be done 'on-line'. To enter the command mode type 40 Customization can also be done 'on-line'. To enter the command mode type
41@@ -4903,14 +4903,14 @@ Examples in the  41@@ -5017,14 +5017,14 @@
42 .I screen 42 .I screen
43 distribution package for private and global initialization files. 43 distribution package for private and global initialization files.
44 .IP $SYSSCREENRC  44 .IP $SYSSCREENRC
45-.IP /usr/local/etc/screenrc 45-.IP /usr/local/etc/screenrc
46+.IP /usr/pkg/etc/screenrc 46+.IP /usr/pkg/etc/screenrc
47 .I screen 47 .I screen
48 initialization commands 48 initialization commands
49 .IP $SCREENRC 49 .IP $SCREENRC
50 .IP $HOME/.screenrc 50 .IP $HOME/.screenrc
51-Read in after /usr/local/etc/screenrc 51-Read in after /usr/local/etc/screenrc
52+Read in after /usr/pkg/etc/screenrc 52+Read in after /usr/pkg/etc/screenrc
53 .IP $SCREENDIR/S\-<login> 53 .IP $SCREENDIR/S\-<login>
54-.IP /local/screens/S\-<login> 54-.IP /local/screens/S\-<login>
cvs diff -r1.9 -r1.10 pkgsrc/misc/screen/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/misc/screen/patches/patch-aj 2015/09/01 13:34:47 1.9
+++ pkgsrc/misc/screen/patches/patch-aj 2017/07/18 23:02:18 1.10
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-aj,v 1.9 2015/09/01 13:34:47 kim Exp $ 1$NetBSD: patch-aj,v 1.10 2017/07/18 23:02:18 kim Exp $
2 2
3Include curses header when testing tgetent in order to prevent 3Include curses header when testing tgetent in order to prevent
4crash on 64-bit architectures. 4crash on 64-bit architectures.
5 5
6Detect getutent correctly on NetBSD with utmpx. 6Detect getutent correctly on NetBSD with utmpx.
7 7
8--- configure.ac.orig 2015-06-28 21:22:55.000000000 +0000 8--- configure.ac.orig 2017-07-10 19:26:25.000000000 +0000
9+++ configure.ac 2015-09-01 12:49:26.000000000 +0000 9+++ configure.ac 2017-07-18 22:50:46.000000000 +0000
10@@ -687,6 +687,8 @@ 10@@ -661,6 +661,8 @@
11 AC_MSG_ERROR(!!! no tgetent - no screen))))))))) 11 AC_MSG_ERROR(!!! no tgetent - no screen)))))))))
12  12
13 AC_TRY_RUN([ 13 AC_TRY_RUN([
14+#include <curses.h> 14+#include <curses.h>
15+ 15+
16 main() 16 main()
17 { 17 {
18 exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); 18 exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
19@@ -838,9 +840,16 @@ 19@@ -812,9 +814,16 @@
20 AC_TRY_LINK([ 20 AC_TRY_LINK([
21 #include <time.h> /* to get time_t on SCO */ 21 #include <time.h> /* to get time_t on SCO */
22 #include <sys/types.h> 22 #include <sys/types.h>
23-#if defined(SVR4) && !defined(DGUX) 23-#if defined(SVR4) && !defined(DGUX)
24+#include <sys/param.h> 24+#include <sys/param.h>
25+#if (defined(SVR4) && !defined(DGUX)) \ 25+#if (defined(SVR4) && !defined(DGUX)) \
26+ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)) \ 26+ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)) \
27+ || (defined(__DragonFly__) && (__DragonFly_version >= 200902)) 27+ || (defined(__DragonFly__) && (__DragonFly_version >= 200902))
28 #include <utmpx.h> 28 #include <utmpx.h>
29 #define utmp utmpx 29 #define utmp utmpx
30+# if defined(__NetBSD__) || defined(__DragonFly__) 30+# if defined(__NetBSD__) || defined(__DragonFly__)
31+# define pututline pututxline 31+# define pututline pututxline
32+# define getutent getutxent 32+# define getutent getutxent
cvs diff -r1.8 -r1.9 pkgsrc/misc/screen/patches/Attic/patch-ak (expand / switch to unified diff)

--- pkgsrc/misc/screen/patches/Attic/patch-ak 2015/09/01 13:34:47 1.8
+++ pkgsrc/misc/screen/patches/Attic/patch-ak 2017/07/18 23:02:18 1.9
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-ak,v 1.8 2015/09/01 13:34:47 kim Exp $ 1$NetBSD: patch-ak,v 1.9 2017/07/18 23:02:18 kim Exp $
2 2
3Patch configure after configure.ac (see patch-aj). 3Patch configure after configure.ac (see patch-aj).
4 4
5Include curses header when testing tgetent in order to prevent 5Include curses header when testing tgetent in order to prevent
6crash on 64-bit architectures. 6crash on 64-bit architectures.
7 7
8Detect getutent correctly on NetBSD with utmpx. 8Detect getutent correctly on NetBSD with utmpx.
9 9
10--- configure.orig 2015-06-28 21:42:40.000000000 +0000 10--- configure.orig 2017-07-10 19:26:25.000000000 +0000
11+++ configure 2015-09-01 13:12:22.000000000 +0000 11+++ configure 2017-07-18 22:50:46.000000000 +0000
12@@ -5018,6 +5018,8 @@ 12@@ -4985,6 +4985,8 @@
13 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14 /* end confdefs.h. */ 14 /* end confdefs.h. */
15  15
16+#include <curses.h> 16+#include <curses.h>
17+ 17+
18 main() 18 main()
19 { 19 {
20 exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); 20 exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
21@@ -5414,9 +5416,16 @@ 21@@ -5381,9 +5383,16 @@
22  22
23 #include <time.h> /* to get time_t on SCO */ 23 #include <time.h> /* to get time_t on SCO */
24 #include <sys/types.h> 24 #include <sys/types.h>
25-#if defined(SVR4) && !defined(DGUX) 25-#if defined(SVR4) && !defined(DGUX)
26+#include <sys/param.h> 26+#include <sys/param.h>
27+#if (defined(SVR4) && !defined(DGUX)) \ 27+#if (defined(SVR4) && !defined(DGUX)) \
28+ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)) \ 28+ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)) \
29+ || (defined(__DragonFly__) && (__DragonFly_version >= 200902)) 29+ || (defined(__DragonFly__) && (__DragonFly_version >= 200902))
30 #include <utmpx.h> 30 #include <utmpx.h>
31 #define utmp utmpx 31 #define utmp utmpx
32+# if defined(__NetBSD__) || defined(__DragonFly__) 32+# if defined(__NetBSD__) || defined(__DragonFly__)
33+# define pututline pututxline 33+# define pututline pututxline
34+# define getutent getutxent 34+# define getutent getutxent
File Deleted: pkgsrc/misc/screen/patches/Attic/patch-doc_screen.texinfo
cvs diff -r1.4 -r1.5 pkgsrc/misc/screen/patches/patch-screen.c (expand / switch to unified diff)

--- pkgsrc/misc/screen/patches/patch-screen.c 2017/04/15 22:31:49 1.4
+++ pkgsrc/misc/screen/patches/patch-screen.c 2017/07/18 23:02:18 1.5
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-screen.c,v 1.4 2017/04/15 22:31:49 kim Exp $ 1$NetBSD: patch-screen.c,v 1.5 2017/07/18 23:02:18 kim Exp $
2 2
3Use standard headers. 3Use standard headers.
4 4
5--- screen.c.orig 2017-01-17 19:28:29.000000000 +0000 5--- screen.c.orig 2017-07-10 19:26:25.000000000 +0000
6+++ screen.c 6+++ screen.c 2017-07-18 22:40:56.000000000 +0000
7@@ -88,6 +88,8 @@ 7@@ -95,6 +95,8 @@
8 # include <langinfo.h> 8 # include <langinfo.h>
9 #endif 9 #endif
10  10
11+#include <limits.h> 11+#include <limits.h>
12+ 12+
13 #include "screen.h" 13 #include "screen.h"
14 #ifdef HAVE_BRAILLE 14 #ifdef HAVE_BRAILLE
15 # include "braille.h" 15 # include "braille.h"
cvs diff -r1.2 -r1.3 pkgsrc/misc/screen/patches/patch-socket.c (expand / switch to unified diff)

--- pkgsrc/misc/screen/patches/patch-socket.c 2015/09/01 13:34:47 1.2
+++ pkgsrc/misc/screen/patches/patch-socket.c 2017/07/18 23:02:18 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-socket.c,v 1.2 2015/09/01 13:34:47 kim Exp $ 1$NetBSD: patch-socket.c,v 1.3 2017/07/18 23:02:18 kim Exp $
2 2
3--- socket.c.orig 2015-06-28 21:22:56.000000000 +0000 3--- socket.c.orig 2017-07-10 19:26:25.000000000 +0000
4+++ socket.c 2015-09-01 12:42:34.000000000 +0000 4+++ socket.c 2017-07-18 22:35:40.000000000 +0000
5@@ -32,9 +32,7 @@ 5@@ -34,9 +34,7 @@
 6 #include <sys/stat.h>
6 #include <fcntl.h> 7 #include <fcntl.h>
7 #if !defined(NAMEDPIPE) 
8 # include <sys/socket.h> 8 # include <sys/socket.h>
9-# ifdef _OpenBSD_ 9-# ifdef _OpenBSD_
10-# include <sys/uio.h> 10-# include <sys/uio.h>
11-# endif 11-# endif
12+# include <sys/uio.h> 12+# include <sys/uio.h>
13 # include <sys/un.h> 13 # include <sys/un.h>
14 #endif 
15  14
 15 #ifndef SIGINT
cvs diff -r1.3 -r1.4 pkgsrc/misc/screen/patches/patch-tty.sh (expand / switch to unified diff)

--- pkgsrc/misc/screen/patches/patch-tty.sh 2016/06/20 16:04:44 1.3
+++ pkgsrc/misc/screen/patches/patch-tty.sh 2017/07/18 23:02:18 1.4
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-tty.sh,v 1.3 2016/06/20 16:04:44 ryoon Exp $ 1$NetBSD: patch-tty.sh,v 1.4 2017/07/18 23:02:18 kim Exp $
2 2
3Change condition for using TIOCSCTTY. 3Change condition for using TIOCSCTTY.
4 4
5NetBSD on the netbsd-5 branch insists on a non-NULL second argument 5NetBSD on the netbsd-5 branch insists on a non-NULL second argument
6to the realpath() function. Make it so. 6to the realpath() function. Make it so.
7 7
8--- tty.sh.orig 2016-06-19 19:41:03.000000000 +0000 8--- tty.sh.orig 2017-07-10 19:26:25.000000000 +0000
9+++ tty.sh 9+++ tty.sh 2017-07-18 22:40:56.000000000 +0000
10@@ -813,7 +813,8 @@ int fd; 10@@ -813,7 +813,8 @@
11 /* 11 /*
12 * Under BSD we have to set the controlling terminal again explicitly. 12 * Under BSD we have to set the controlling terminal again explicitly.
13 */ 13 */
14-# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__GNU__)) && defined(TIOCSCTTY) 14-# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__GNU__)) && defined(TIOCSCTTY)
15+# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) \ 15+# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) \
16+ || defined(__GNU__) || (BSD >= 199103)) && defined(TIOCSCTTY) 16+ || defined(__GNU__) || (BSD >= 199103)) && defined(TIOCSCTTY)
17 ioctl(fd, TIOCSCTTY, (char *)0); 17 ioctl(fd, TIOCSCTTY, (char *)0);
18 # endif 18 # endif
19  19
20@@ -1510,8 +1511,10 @@ char *tty; 20@@ -1521,8 +1522,10 @@
21 char realbuf[PATH_MAX]; 21 char realbuf[PATH_MAX];
22 const char *real; 22 const char *real;
23 int rc; 23 int rc;
24+ char *ttynamebuf; 24+ char *ttynamebuf;
25  25
26- real = realpath(tty, realbuf); 26- real = realpath(tty, realbuf);
27+ ttynamebuf = malloc(MAXPATHLEN); 27+ ttynamebuf = malloc(MAXPATHLEN);
28+ real = realpath(tty, ttynamebuf); 28+ real = realpath(tty, ttynamebuf);
29 if (!real) 29 if (!real)
30 return -1; 30 return -1;
31 realbuf[sizeof(realbuf)-1]='\0'; 31 realbuf[sizeof(realbuf)-1]='\0';