Add patch which includes <sys/uio.h> to fix build on OpenBSD.

Defuzz patchset.

13 files changed, 71 insertions, 58 deletions

diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 3d88b5894b5..2dea6380d95 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.36 2015/01/13 08:27:28 he Exp $
+$NetBSD: distinfo,v 1.37 2015/02/13 04:44:40 rodent Exp $
 
 SHA1 (screen-4.2.1.tar.gz) = 21eadf5f1d64120649f3390346253c6bc8a5103c
 RMD160 (screen-4.2.1.tar.gz) = 20ddf4a33f91e60a42a31f02aa2a30a9c5cba9b5
 Size (screen-4.2.1.tar.gz) = 1062485 bytes
-SHA1 (patch-aa) = 776eafabda01f8bc7a748e7d8dc1ffa706cd4c9d
-SHA1 (patch-ab) = bbbdb1494beb1fcde9388f8e0ab628a841a076e8
-SHA1 (patch-ae) = fbdd06a56bfeaa6d02f13075c8a0363c8d0fbf93
-SHA1 (patch-ai) = f8615e11bdfa8a7882a7c1feb75ac1a40d6c7ab7
-SHA1 (patch-aj) = 4b2ec0f3d7a275a17d535fe31e0bccb297b5bc49
-SHA1 (patch-ak) = 28fb1de315b9622de4babd065eda06c516f786c2
-SHA1 (patch-al) = d06f52323c7f8343fdea1296e9942391cbbde75e
-SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9
-SHA1 (patch-an) = 2984db4597a1b09450a6632d0b9b7fb05a0ccb06
-SHA1 (patch-ao) = d5d0eca07045b83ec06ee284e754c24ae90b405c
-SHA1 (patch-ap) = 5082cf450f4cfa85570540504f1691ee2676dec4
+SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc
+SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3
+SHA1 (patch-ae) = 8792f7877c0a29701d7d0643e93360813ed7db0f
+SHA1 (patch-ai) = a6aafe822d7222398494e5733106b3d78c5836fc
+SHA1 (patch-aj) = 00cf67ceedb8ab48a554c9b5ce855ae5d7fd7474
+SHA1 (patch-ak) = 8e54df7a6bd648e60f2b6cfd6f01ed34040f1932
+SHA1 (patch-al) = f49e179dd814c826e283949c40497067e56398c4
+SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1
+SHA1 (patch-an) = 98cbcbff81af04a171348e851a393b74d9be5e19
+SHA1 (patch-ao) = d234091ca54162b47017bf690af5fb86a8d6ba08
+SHA1 (patch-ap) = 80ea5287e4e74962c37b0b9bc6983179eed705ac
+SHA1 (patch-socket.c) = b82504e75afa7a18f3335692848794a65f3b242f
 SHA1 (patch-tty.sh) = f93a3e2063df25c2610c6e84a623f3dc2046761b
diff --git a/misc/screen/patches/patch-aa b/misc/screen/patches/patch-aa
index 15fb9c269d4..8b9d9d14fc7 100644
--- a/misc/screen/patches/patch-aa
+++ b/misc/screen/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-aa,v 1.13 2015/02/13 04:44:40 rodent Exp $
 
 --- pty.c.orig	2014-04-26 10:58:35.000000000 +0000
-+++ pty.c	2014-08-25 17:55:13.000000000 +0000
-@@ -318,6 +318,45 @@
++++ pty.c
+@@ -318,6 +318,45 @@ char **ttyn;
  
  /***************************************************************/
  
diff --git a/misc/screen/patches/patch-ab b/misc/screen/patches/patch-ab
index dd9589303bc..941a1e17251 100644
--- a/misc/screen/patches/patch-ab
+++ b/misc/screen/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.12 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-ab,v 1.13 2015/02/13 04:44:40 rodent Exp $
 
 Always use varargs on NetBSD
 
 --- config.h.in.orig	2014-04-26 10:58:46.000000000 +0000
-+++ config.h.in	2014-08-25 18:07:27.000000000 +0000
++++ config.h.in
 @@ -498,6 +498,15 @@
   */
  #undef USEVARARGS
diff --git a/misc/screen/patches/patch-ae b/misc/screen/patches/patch-ae
index f3bfe0e66f3..806f0534681 100644
--- a/misc/screen/patches/patch-ae
+++ b/misc/screen/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-ae,v 1.6 2015/02/13 04:44:40 rodent Exp $
 
 Don't pollute G1 to allow 8-bit encondings.
 
@@ -6,8 +6,8 @@ The original code made the TERMCAP env var longer than 1023 bytes,
 which causes problems.  This is a quick hack but works with our termcap.
 
 --- termcap.c.orig	2014-04-26 10:58:35.000000000 +0000
-+++ termcap.c	2014-08-25 17:55:13.000000000 +0000
-@@ -80,7 +80,7 @@
++++ termcap.c
+@@ -80,7 +80,7 @@ static const char TermcapConst[] = "\\\n
  \t:DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:UP=\\E[%dA:bs:bt=\\E[Z:\\\n\
  \t:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:ct=\\E[3g:\\\n\
  \t:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\\\n\
@@ -16,7 +16,7 @@ which causes problems.  This is a quick hack but works with our termcap.
  
  char *
  gettermcapstring(s)
-@@ -826,7 +826,7 @@
+@@ -826,7 +826,7 @@ char *s;
  {
    register int n;
  
diff --git a/misc/screen/patches/patch-ai b/misc/screen/patches/patch-ai
index b709e6ce69b..34bb7d5f56f 100644
--- a/misc/screen/patches/patch-ai
+++ b/misc/screen/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.4 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-ai,v 1.5 2015/02/13 04:44:40 rodent Exp $
 
 This glues in the code from patch-am (see also path-al and patch-an).
 
 --- os.h.orig	2014-04-26 10:58:35.000000000 +0000
-+++ os.h	2014-08-25 17:55:13.000000000 +0000
++++ os.h
 @@ -71,9 +71,6 @@
  # undef exit
  #endif /* sun */
@@ -14,7 +14,7 @@ This glues in the code from patch-am (see also path-al and patch-an).
  #ifndef HAVE_STRERROR
  /* No macros, please */
  #undef strerror
-@@ -250,9 +247,18 @@
+@@ -250,9 +247,18 @@ extern int errno;
  #endif
  
  #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
diff --git a/misc/screen/patches/patch-aj b/misc/screen/patches/patch-aj
index 9db57f6101d..6f015c2b510 100644
--- a/misc/screen/patches/patch-aj
+++ b/misc/screen/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.7 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-aj,v 1.8 2015/02/13 04:44:40 rodent Exp $
 
 Include curses header when testing tgetent in order to prevent
 crash on 64-bit architectures.
@@ -6,8 +6,8 @@ crash on 64-bit architectures.
 Detect getutent correctly on NetBSD with utmpx.
 
 --- configure.in.orig	2014-04-26 10:58:35.000000000 +0000
-+++ configure.in	2014-08-25 18:20:27.000000000 +0000
-@@ -686,6 +686,8 @@
++++ configure.in
+@@ -686,6 +686,8 @@ AC_TRY_LINK(,tgetent((char *)0, (char *)
  AC_MSG_ERROR(!!! no tgetent - no screen)))))))))
  
  AC_TRY_RUN([
@@ -16,7 +16,7 @@ Detect getutent correctly on NetBSD with utmpx.
  main()
  {
   exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-@@ -837,9 +839,16 @@
+@@ -837,9 +839,16 @@ AC_CHECKING(getutent)
  AC_TRY_LINK([
  #include <time.h> /* to get time_t on SCO */
  #include <sys/types.h>
diff --git a/misc/screen/patches/patch-ak b/misc/screen/patches/patch-ak
index 979cf7cc3d0..311fbdbce79 100644
--- a/misc/screen/patches/patch-ak
+++ b/misc/screen/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.6 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-ak,v 1.7 2015/02/13 04:44:40 rodent Exp $
 
 Patch configure after configure.in (see patch-aj).
 
@@ -8,8 +8,8 @@ crash on 64-bit architectures.
 Detect getutent correctly on NetBSD with utmpx.
 
 --- configure.orig	2014-04-26 10:58:46.000000000 +0000
-+++ configure	2014-08-25 18:24:13.000000000 +0000
-@@ -5017,6 +5017,8 @@
++++ configure
+@@ -5017,6 +5017,8 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
@@ -18,7 +18,7 @@ Detect getutent correctly on NetBSD with utmpx.
  main()
  {
   exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-@@ -5413,9 +5415,16 @@
+@@ -5413,9 +5415,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
  
  #include <time.h> /* to get time_t on SCO */
  #include <sys/types.h>
diff --git a/misc/screen/patches/patch-al b/misc/screen/patches/patch-al
index df3a0ab1f53..81b672614bd 100644
--- a/misc/screen/patches/patch-al
+++ b/misc/screen/patches/patch-al
@@ -1,12 +1,12 @@
-$NetBSD: patch-al,v 1.3 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-al,v 1.4 2015/02/13 04:44:40 rodent Exp $
 
 Make extra calls to remove utmp entries when utmpx is used.
 For non-login entries we only update utmpx, as it stores
 more information, and utilities are reading both.
 
 --- utmp.c.orig	2014-04-26 16:22:09.000000000 +0000
-+++ utmp.c	2014-08-25 17:55:13.000000000 +0000
-@@ -48,6 +48,12 @@
++++ utmp.c
+@@ -48,6 +48,12 @@ extern char *LoginName;
  extern int real_uid, eff_uid;
  
  
@@ -19,7 +19,7 @@ more information, and utilities are reading both.
  /*
   *  UTNOKEEP: A (ugly) hack for apollo that does two things:
   *    1) Always close and reopen the utmp file descriptor. (I don't know
-@@ -315,6 +321,9 @@
+@@ -315,6 +321,9 @@ RemoveLoginSlot()
  
    ASSERT(display);
    debug("RemoveLoginSlot: removing your logintty\n");
@@ -29,7 +29,7 @@ more information, and utilities are reading both.
    D_loginslot = TtyNameSlot(D_usertty);
    if (D_loginslot == (slot_t)0 || D_loginslot == (slot_t)-1)
      return;
-@@ -379,6 +388,9 @@
+@@ -379,6 +388,9 @@ RestoreLoginSlot()
  
    debug("RestoreLoginSlot()\n");
    ASSERT(display);
diff --git a/misc/screen/patches/patch-am b/misc/screen/patches/patch-am
index 1d4842772ad..1bee5a5431b 100644
--- a/misc/screen/patches/patch-am
+++ b/misc/screen/patches/patch-am
@@ -1,11 +1,11 @@
-$NetBSD: patch-am,v 1.1 2002/09/15 06:51:39 kim Exp $
+$NetBSD: patch-am,v 1.2 2015/02/13 04:44:40 rodent Exp $
 
 Code to handle the login slot in utmp when utmpx is available.
 Daemons shipped with NetBSD tend to write to both, while 3rd
 party software might write to only one.
 
---- /dev/null	Sun Sep 15 02:36:51 2002
-+++ utmp-netbsd.c	Sun Sep 15 02:38:27 2002
+--- utmp-netbsd.c.orig	2015-02-13 04:30:05.000000000 +0000
++++ utmp-netbsd.c
 @@ -0,0 +1,79 @@
 +#include <sys/param.h>
 +#if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)
diff --git a/misc/screen/patches/patch-an b/misc/screen/patches/patch-an
index de72428be16..aa120587850 100644
--- a/misc/screen/patches/patch-an
+++ b/misc/screen/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.4 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-an,v 1.5 2015/02/13 04:44:40 rodent Exp $
 
 Remove GNU Make conditional.  @ETCSCREENRC@ appears to get
 replaced always. If it doesn't in some cases, please fix
@@ -9,8 +9,8 @@ Setting the setuid bit is handled by the package Makefile.
 Don't try to leave "screen.old" behind on install.
 
 --- Makefile.in.orig	2014-04-26 10:58:35.000000000 +0000
-+++ Makefile.in	2014-08-25 19:05:49.000000000 +0000
-@@ -26,9 +26,6 @@
++++ Makefile.in
+@@ -26,9 +26,6 @@ GIT_REV = "`git describe --always 2>/dev
  DEFS = @DEFS@ -DGIT_REV=\"$(GIT_REV)\"
  
  ETCSCREENRC = @ETCSCREENRC@
@@ -20,7 +20,7 @@ Don't try to leave "screen.old" behind on install.
  SCREENENCODINGS = $(datadir)/screen/utf8encodings
  
  CC = @CC@
-@@ -65,12 +62,12 @@
+@@ -65,12 +62,12 @@ CFILES=	screen.c ansi.c fileio.c mark.c 
  	termcap.c input.c attacher.c pty.c process.c display.c comm.c \
  	kmapdef.c acls.c braille.c braille_tsi.c logfile.c layer.c \
  	sched.c teln.c nethack.c encoding.c canvas.c layout.c viewport.c \
@@ -35,7 +35,7 @@ Don't try to leave "screen.old" behind on install.
  	sched.o teln.o nethack.o encoding.o canvas.o layout.o viewport.o
  
  all:	screen
-@@ -86,9 +83,6 @@
+@@ -86,9 +83,6 @@ install_bin: .version screen
  	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
  		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
  	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
diff --git a/misc/screen/patches/patch-ao b/misc/screen/patches/patch-ao
index ee4a9616cec..c5dd58b374b 100644
--- a/misc/screen/patches/patch-ao
+++ b/misc/screen/patches/patch-ao
@@ -1,14 +1,14 @@
-$NetBSD: patch-ao,v 1.2 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-ao,v 1.3 2015/02/13 04:44:40 rodent Exp $
 
 Replace configurable paths with tags.
 
---- etc/etcscreenrc.orig	Sun Apr 29 01:25:34 2001
+--- etc/etcscreenrc.orig	2014-04-25 19:08:40.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 @PKG_SYSCONFDIR@/screenrc.
++# You may want to install this file as /usr/pkgsrc/pkg/etc/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 f34826b18d4..34daea1fb96 100644
--- a/misc/screen/patches/patch-ap
+++ b/misc/screen/patches/patch-ap
@@ -1,10 +1,10 @@
-$NetBSD: patch-ap,v 1.3 2014/08/25 20:02:32 kim Exp $
+$NetBSD: patch-ap,v 1.4 2015/02/13 04:44:40 rodent Exp $
 
 Replace configurable paths with tags.
 
 --- doc/screen.1.orig	2014-04-27 22:10:01.000000000 +0000
-+++ doc/screen.1	2014-08-25 18:42:29.000000000 +0000
-@@ -625,7 +625,7 @@
++++ doc/screen.1
+@@ -625,7 +625,7 @@ Show a listing of all currently attached
  
  .SH CUSTOMIZATION
  The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to
@@ -13,36 +13,36 @@ Replace configurable paths with tags.
  .I screen
  is installed setuid-root, then the administrator
  should compile
-@@ -638,7 +638,7 @@
+@@ -638,7 +638,7 @@ in the environment variable $SCREENDIR.
  When
  .I screen
  is invoked, it executes initialization commands from the files
 -\*Q/usr/local/etc/screenrc\*U and
-+\*Q@PKG_SYSCONFDIR@/screenrc\*U and
++\*Q/usr/pkgsrc/pkg/etc/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 
-@@ -668,7 +668,7 @@
+@@ -668,7 +668,7 @@ variable substitution shall be performed
  protected from variable substitution.
  .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@EXAMPLES@/screenrc\*U and \*Q@EXAMPLES@/etcscreenrc\*U. They contain a number of
++\*Q/usr/pkgsrc/pkg/share/examples/screen/screenrc\*U and \*Q/usr/pkgsrc/pkg/share/examples/screen/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
-@@ -4857,14 +4857,14 @@
+@@ -4857,14 +4857,14 @@ Examples in the 
  .I screen
  distribution package for private and global initialization files.
  .IP $SYSSCREENRC 
 -.IP /usr/local/etc/screenrc
-+.IP @PKG_SYSCONFDIR@/screenrc
++.IP /usr/pkgsrc/pkg/etc/screenrc
  .I screen
  initialization commands
  .IP $SCREENRC
  .IP $HOME/.screenrc
 -Read in after /usr/local/etc/screenrc
-+Read in after @PKG_SYSCONFDIR@/screenrc
++Read in after /usr/pkgsrc/pkg/etc/screenrc
  .IP $SCREENDIR/S\-<login>
 -.IP /local/screens/S\-<login>
 +.IP /tmp/screens/S\-<login>
diff --git a/misc/screen/patches/patch-socket.c b/misc/screen/patches/patch-socket.c
new file mode 100644
index 00000000000..c4d6aefafed
--- /dev/null
+++ b/misc/screen/patches/patch-socket.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-socket.c,v 1.1 2015/02/13 04:44:40 rodent Exp $
+
+--- socket.c.orig	2014-04-26 16:22:43.000000000 +0000
++++ socket.c
+@@ -30,6 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <sys/uio.h>
+ #if !defined(NAMEDPIPE)
+ #include <sys/socket.h>
+ #include <sys/un.h>