Upgrade screen to version 4.2.1.

Version 4.2.1 (28/04/2014):
  * allow for terminal with long $TERM (up to 32 characters)
  * allow to use long logins
  * documentation fixes
  * runtime fixes

Version 4.2.0 (17/04/2014):
  New Commands:
  * 'unbindall' to unbind all commands
  * 'up', 'down', 'left', 'right' sub-commands for 'focus'
  * 'rendition' to specify rendition to use in caption/hardstatus for
    window-names that have bell/monitor/silence/so turned on.
  * 'layout', with the following sub-commands
	- 'title'
	- 'number'
	- 'autosave' ('autosave on' or 'autosave off')
	- 'new'
	- 'save' ('save <name>')
	- 'select'
	- 'next'
	- 'prev'
	- 'attach'
	- 'show'
	- 'remove'
	- 'dump'
  * 'group' for moving window(s) into a group.
  * 'defmousetrack' and 'mousetrack', to turn on/off mouse-tracking for
    displays. It's turned off by default. With mouse-tracking turned on, it's
    possible to switch to a region ('focus') using mouse clicks. It's also
    possible to select a text region in copy-mode using a mouse click to place
    a mark and the scroll wheel to scroll through the buffer. Additional
    features might be to allow clicking on window-titles in the caption to
    switch to that window.
  * All commands prefixed '@' are treated as 'quiet', i.e. '@'-prefixed commands
    do not trigger any display messages.

  Changed Commands:
  * '-v' parameter to 'split' command for vertical splits.
  * 'sorendition' deprecated in favour of 'rendition so'.
  * 'digraph' can take a second parameter to specify custom digraphs. For
    example,
	'digraph >= ≥' or 'digraph >= U+2265'
    Using '0' as the second parameter will remove the digraph.
  * 'stuff' will prompt for input if there's nothing to stuff.
  * The argument to ":number" can be prefixed with '+' or '-' to use it as a
    relative argument.
  * '-g' parameter to 'windowlist' to show nested list of windows.
  * '//group' parameter to 'screen' to create a grouped window.
  * 'blankerprg' shows the currently set command on no argument.
  * 'maxwin' can now be used to increase the number of maximum windows.

  .screenrc:
  * $PID expands to the PID of the screen session.
  * $PWD expands to the current working directory of the session.
  * $STY expands to the session name.
  * Tilde-expansion in pathnames (e.g. for the 'source' command)
  * C-style escapes can be used (e.g. "\n" to get a newline with 'stuff')
  * '%p' in caption/hardstatus string expands to the PID of the backend, and
    '%+p' expands to the PID of the frontend (display).
  * '%S' in caption/hardstatus string expands to the session name.
  * '%P' in the caption string evaluates to true if the region is in copy mode.
  * '%E' in the caption string evaluates to true if the escape character has
    currently been pressed.

  Window List:
  * Nested views when there are window groups (with 'windowlist -g').
  * Press 'm' to toggle the most-recent view.
  * Press 'g' to toggle nestedness.
  * Press 'a' to view all windows in the list.
  * Press '/' to search in the list.
  * Press ',' and '.' to re-order windows in the list.
  * Press 'K' to kill a window (requires confirmation).

  Display List:
  * Press 'd' to detach a display, 'D' to power-detach.

  Others:
  * Start using 'ChangeLog' for logging changes again.
  * Terminfo update for 256-color support.
  * Multiple input history (partially from Romain Francoise).
  * vi-like fFtT;, searching in copy mode.
  * In copy mode, search in reverse direction when 'N' is pressed.
  * Tab-completion for command input.
  * Some more readline-like bindings in input mode (e.g. ^W, ^D, ^P, ^N etc.)
  * Fix displaying unicode characters in the caption/hardstatus on UTF8 locale.
  * A revamped displays list (for 'displays' command)
  * Increased default maximum number of windows from 40 to 100.
  * Increased number color/attribute changes in caption/hardstatus string from 16 to 256.
  * Some commands can be remotely queried using the -Q command-line flag.

  In-Progress:
  * Scripting support (thanks to Google Summer of Code 2009 project by Rui Guo)

17 files changed, 126 insertions, 368 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 189fb079ba3..6e58aae0a08 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2014/07/05 11:21:29 tron Exp $
+# $NetBSD: Makefile,v 1.88 2014/08/25 20:02:32 kim Exp $
 
-DISTNAME=	screen-4.0.3
-PKGREVISION=	6
+DISTNAME=	screen-4.2.1
+#PKGREVISION=
 CATEGORIES=	misc shells
 MASTER_SITES=	${MASTER_SITE_GNU:=screen/}
 
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 8e0cb3bfa78..3634d383924 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.33 2012/09/15 09:14:53 apb Exp $
+$NetBSD: distinfo,v 1.34 2014/08/25 20:02:32 kim Exp $
 
-SHA1 (screen-4.0.3.tar.gz) = 7bc6e2f0959ffaae6f52d698c26c774e7dec3545
-RMD160 (screen-4.0.3.tar.gz) = 8c3903c1642ae30fd9d5706298919428552f7754
-Size (screen-4.0.3.tar.gz) = 840602 bytes
-SHA1 (patch-aa) = e8894dffc4a6d05fddcdb1f4091c5f41b7639fcf
-SHA1 (patch-ab) = f4fc914ad9c48cb83cf3633630cb83e4a8e90ff5
-SHA1 (patch-ac) = 36a1f3e465b511dc795ee9e7f016416b5312d6f0
-SHA1 (patch-ae) = dcdbb1ca08e36308f5659a90a5b6f31fb3a45691
-SHA1 (patch-ah) = 10af05907e368af17fa3bb5e24101aa4d260ab8a
-SHA1 (patch-ai) = 0775c95da8bab6d0c9218328aadcd30e3aa81885
-SHA1 (patch-aj) = 220ae716eb7b59dd76c7d7f111cc61cb17d0a414
-SHA1 (patch-ak) = f9029f0f49ea3b2ca8d15dea03b209e4c2fa4ef1
-SHA1 (patch-al) = 6ee93058847f3894a886346676e4a613c0bd134e
+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) = 44712ae5875c60eac0d4d6ba5cc3731dbfd4458b
-SHA1 (patch-ao) = 81b0d64dd5918cd4d6fbc02dff0470a441a200d4
-SHA1 (patch-ap) = fd3717b70f3ade08de486e4ffad9cac39c11d3bf
-SHA1 (patch-aq) = 997a0ce76086f1dd966868b1fc9ca3bb96b4b4fb
-SHA1 (patch-ar) = cbbcb6e098e966d73c4f0bbbb26e655d88152224
-SHA1 (patch-as) = a6105d64d46df079d3f80965140c1d83b3e72268
+SHA1 (patch-an) = 2984db4597a1b09450a6632d0b9b7fb05a0ccb06
+SHA1 (patch-ao) = d5d0eca07045b83ec06ee284e754c24ae90b405c
+SHA1 (patch-ap) = 5082cf450f4cfa85570540504f1691ee2676dec4
+SHA1 (patch-as) = 79af75200cbe428be9bb78ebf9aeba9f23a52eec
diff --git a/misc/screen/patches/patch-aa b/misc/screen/patches/patch-aa
index 181a0fe7972..15fb9c269d4 100644
--- a/misc/screen/patches/patch-aa
+++ b/misc/screen/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2012/09/15 09:14:53 apb Exp $
+$NetBSD: patch-aa,v 1.12 2014/08/25 20:02:32 kim Exp $
 
---- pty.c.orig	2003-09-08 14:26:18.000000000 +0000
-+++ pty.c
-@@ -34,7 +34,7 @@
- #endif
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
-+#ifdef HAVE_SYS_STROPTS_H
- # include <sys/stropts.h>
- #endif
- 
-@@ -313,6 +313,45 @@ char **ttyn;
+--- 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 @@
  
  /***************************************************************/
  
diff --git a/misc/screen/patches/patch-ab b/misc/screen/patches/patch-ab
index de183678ff5..dd9589303bc 100644
--- a/misc/screen/patches/patch-ab
+++ b/misc/screen/patches/patch-ab
@@ -1,23 +1,10 @@
-$NetBSD: patch-ab,v 1.11 2005/03/29 07:02:25 kim Exp $
+$NetBSD: patch-ab,v 1.12 2014/08/25 20:02:32 kim Exp $
 
-1. Check sys/stropts.h header
-2. Always use varargs on NetBSD
+Always use varargs on NetBSD
 
---- config.h.in.orig	2003-12-05 08:59:39.000000000 -0500
-+++ config.h.in	2005-03-29 01:58:39.000000000 -0500
-@@ -431,6 +431,11 @@
- #undef HAVE_DIRENT_H
- 
- /*
-+ * Define HAVE_SYS_STROPTS_H if your system has <sys/stropts.h>
-+ */
-+#undef HAVE_SYS_STROPTS_H
-+
-+/*
-  * If your system has getutent(), pututline(), etc. to write to the
-  * utmp file, define GETUTENT.
-  */
-@@ -514,6 +519,15 @@
+--- config.h.in.orig	2014-04-26 10:58:46.000000000 +0000
++++ config.h.in	2014-08-25 18:07:27.000000000 +0000
+@@ -498,6 +498,15 @@
   */
  #undef USEVARARGS
  
@@ -31,5 +18,5 @@ $NetBSD: patch-ab,v 1.11 2005/03/29 07:02:25 kim Exp $
 +#endif
 +
  /*
-  * If your system has strerror() define this.
-  */
+  * If the select return value doesn't treat a descriptor that is
+  * usable for reading and writing as two hits, define SELECT_BROKEN.
diff --git a/misc/screen/patches/patch-ac b/misc/screen/patches/patch-ac
deleted file mode 100644
index 43a2c2581ac..00000000000
--- a/misc/screen/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2010/01/01 19:38:44 spz Exp $
-
-Cast to long before int when casting a pointer.  It still "loses
-precision" but in this case it doesn't matter and it quiets the
-compiler.
-
---- process.c.orig	2003-09-18 08:53:54.000000000 -0400
-+++ process.c
-@@ -37,7 +37,7 @@
- #include "config.h"
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
--#ifdef SVR4
-+#ifdef HAVE_SYS_STROPTS_H
- # include <sys/stropts.h>
- #endif
- 
-@@ -5466,7 +5466,7 @@ char *data;	/* dummy */
-       *buf = 0;
-       return;
-     }
--  act.nr = (int)data;
-+  act.nr = (int)(long)data;
-   act.args = noargs;
-   act.argl = 0;
-   DoAction(&act, -1);
diff --git a/misc/screen/patches/patch-ae b/misc/screen/patches/patch-ae
index 92dd45a441e..f3bfe0e66f3 100644
--- a/misc/screen/patches/patch-ae
+++ b/misc/screen/patches/patch-ae
@@ -1,14 +1,13 @@
-$NetBSD: patch-ae,v 1.4 2002/11/04 22:39:18 hubertf Exp $
+$NetBSD: patch-ae,v 1.5 2014/08/25 20:02:32 kim Exp $
 
- 1. Don't pollute G1 to allow 8-bit encondings.
+Don't pollute G1 to allow 8-bit encondings.
 
- 2. The original code make the TERMCAP env var
-    longer than 1023 bytes, which cause problems.
-    This is a quick hack but works with our termcap.
+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	Wed Aug 21 11:24:41 2002
-+++ termcap.c	Mon Nov  4 23:10:06 2002
-@@ -75,7 +75,7 @@
+--- 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 @@
  \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\
@@ -17,7 +16,7 @@ $NetBSD: patch-ae,v 1.4 2002/11/04 22:39:18 hubertf Exp $
  
  char *
  gettermcapstring(s)
-@@ -705,7 +705,7 @@
+@@ -826,7 +826,7 @@
  {
    register int n;
  
diff --git a/misc/screen/patches/patch-ah b/misc/screen/patches/patch-ah
deleted file mode 100644
index 781917dec07..00000000000
--- a/misc/screen/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2010/01/01 19:38:44 spz Exp $
-
---- screen.c.orig	2003-09-08 14:26:41.000000000 +0000
-+++ screen.c
-@@ -50,7 +50,7 @@
- 
- #include "config.h"
- 
--#ifdef SVR4
-+#ifdef HAVE_SYS_STROPTS_H
- # include <sys/stropts.h>
- #endif
- 
diff --git a/misc/screen/patches/patch-ai b/misc/screen/patches/patch-ai
index a2bcc03011d..b709e6ce69b 100644
--- a/misc/screen/patches/patch-ai
+++ b/misc/screen/patches/patch-ai
@@ -1,8 +1,10 @@
-$NetBSD: patch-ai,v 1.3 2011/03/14 06:15:23 rumko Exp $
+$NetBSD: patch-ai,v 1.4 2014/08/25 20:02:32 kim Exp $
 
---- os.h.orig	2002-01-08 15:42:33.000000000 +0000
-+++ os.h
-@@ -62,9 +62,6 @@
+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
+@@ -71,9 +71,6 @@
  # undef exit
  #endif /* sun */
  
@@ -12,7 +14,7 @@ $NetBSD: patch-ai,v 1.3 2011/03/14 06:15:23 rumko Exp $
  #ifndef HAVE_STRERROR
  /* No macros, please */
  #undef strerror
-@@ -260,9 +257,18 @@
+@@ -250,9 +247,18 @@
  #endif
  
  #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
diff --git a/misc/screen/patches/patch-aj b/misc/screen/patches/patch-aj
index fd5a59952cb..9db57f6101d 100644
--- a/misc/screen/patches/patch-aj
+++ b/misc/screen/patches/patch-aj
@@ -1,13 +1,14 @@
-$NetBSD: patch-aj,v 1.6 2011/03/14 06:15:23 rumko Exp $
+$NetBSD: patch-aj,v 1.7 2014/08/25 20:02:32 kim Exp $
 
-Detect getutent correctly on NetBSD with utmpx.
 Include curses header when testing tgetent in order to prevent
 crash on 64-bit architectures.
 
---- configure.in.orig	2003-06-03 07:58:24.000000000 -0400
-+++ configure.in	2004-06-16 16:11:55.000000000 -0400
-@@ -664,6 +664,8 @@
- AC_MSG_ERROR(!!! no tgetent - no screen))))))
+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 @@
+ AC_MSG_ERROR(!!! no tgetent - no screen)))))))))
  
  AC_TRY_RUN([
 +#include <curses.h>
@@ -15,7 +16,7 @@ crash on 64-bit architectures.
  main()
  {
   exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-@@ -815,9 +817,16 @@
+@@ -837,9 +839,16 @@
  AC_TRY_LINK([
  #include <time.h> /* to get time_t on SCO */
  #include <sys/types.h>
@@ -33,11 +34,3 @@ crash on 64-bit architectures.
  #else
  #include <utmp.h>
  #endif
-@@ -1209,6 +1218,7 @@
- AC_TRY_LINK(,[vsprintf(0,0,0);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no))
- 
- AC_HEADER_DIRENT
-+AC_CHECK_HEADERS(sys/stropts.h)
- 
- AC_MSG_CHECKING(for setenv)
- AC_TRY_LINK(,[setenv((char *)0,(char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes);AC_DEFINE(USESETENV),
diff --git a/misc/screen/patches/patch-ak b/misc/screen/patches/patch-ak
index fde40b46042..979cf7cc3d0 100644
--- a/misc/screen/patches/patch-ak
+++ b/misc/screen/patches/patch-ak
@@ -1,12 +1,16 @@
-$NetBSD: patch-ak,v 1.5 2011/03/14 06:15:23 rumko Exp $
+$NetBSD: patch-ak,v 1.6 2014/08/25 20:02:32 kim Exp $
+
+Patch configure after configure.in (see patch-aj).
 
 Include curses header when testing tgetent in order to prevent
 crash on 64-bit architectures.
 
---- configure.orig	2003-12-05 08:46:53.000000000 -0500
-+++ configure	2004-06-16 16:12:06.000000000 -0400
-@@ -4925,6 +4925,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
+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 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 +#include <curses.h>
@@ -14,7 +18,7 @@ crash on 64-bit architectures.
  main()
  {
   exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-@@ -5572,9 +5574,16 @@
+@@ -5413,9 +5415,16 @@
  
  #include <time.h> /* to get time_t on SCO */
  #include <sys/types.h>
@@ -32,152 +36,3 @@ crash on 64-bit architectures.
  #else
  #include <utmp.h>
  #endif
-@@ -7502,6 +7511,148 @@
- fi
- 
- 
-+for ac_header in sys/stropts.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
- echo "$as_me:$LINENO: checking for setenv" >&5
- echo $ECHO_N "checking for setenv... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
diff --git a/misc/screen/patches/patch-al b/misc/screen/patches/patch-al
index 4b4e0cc736c..df3a0ab1f53 100644
--- a/misc/screen/patches/patch-al
+++ b/misc/screen/patches/patch-al
@@ -1,12 +1,12 @@
-$NetBSD: patch-al,v 1.2 2003/12/01 15:18:27 ben Exp $
+$NetBSD: patch-al,v 1.3 2014/08/25 20:02:32 kim 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	Tue Jan  8 10:44:37 2002
-+++ utmp.c	Sun Sep 15 02:36:15 2002
-@@ -47,6 +47,12 @@
+--- 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 @@
  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
-@@ -314,6 +320,9 @@
+@@ -315,6 +321,9 @@
  
    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;
-@@ -378,6 +387,9 @@
+@@ -379,6 +388,9 @@
  
    debug("RestoreLoginSlot()\n");
    ASSERT(display);
@@ -39,21 +39,3 @@ more information, and utilities are reading both.
    if (utmpok && D_loginslot != (slot_t)0 && D_loginslot != (slot_t)-1)
      {
        debug1(" logging you in again (slot %#x)\n", (int)D_loginslot);
-@@ -604,6 +616,7 @@
- char *line, *user;
- int pid;
- {
-+  time_t temp;
-   u->ut_type = USER_PROCESS;
-   strncpy(u->ut_user, user, sizeof(u->ut_user));
-   /* Now the tricky part... guess ut_id */
-@@ -618,7 +631,8 @@
- #endif /* sgi */
-   strncpy(u->ut_line, line, sizeof(u->ut_line));
-   u->ut_pid = pid;
--  (void)time((time_t *)&u->ut_time);
-+  (void)time(&temp);
-+  u->ut_time = temp;
- }
- 
- static slot_t
diff --git a/misc/screen/patches/patch-an b/misc/screen/patches/patch-an
index 455d6f26c70..de72428be16 100644
--- a/misc/screen/patches/patch-an
+++ b/misc/screen/patches/patch-an
@@ -1,23 +1,41 @@
-$NetBSD: patch-an,v 1.3 2009/03/05 09:59:12 jmmv Exp $
+$NetBSD: patch-an,v 1.4 2014/08/25 20:02:32 kim Exp $
 
---- Makefile.in.orig	2006-10-23 15:06:32.000000000 +0200
-+++ Makefile.in	2009-03-05 11:40:26.000000000 +0100
-@@ -55,12 +55,12 @@ CFILES=	screen.c ansi.c fileio.c mark.c 
- 	search.c tty.c term.c window.c utmp.c loadav.c putenv.c help.c \
+Remove GNU Make conditional.  @ETCSCREENRC@ appears to get
+replaced always. If it doesn't in some cases, please fix
+configure.in instead (and regen patch for configure as well).
+
+Add utmp-netbsd.c (created in patch-am) and utmp-netbsd.o.
+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 @@
+ DEFS = @DEFS@ -DGIT_REV=\"$(GIT_REV)\"
+ 
+ ETCSCREENRC = @ETCSCREENRC@
+-ifeq (${ETCSCREENRC}, )
+-ETCSCREENRC=$(prefix)/etc/screenrc
+-endif
+ SCREENENCODINGS = $(datadir)/screen/utf8encodings
+ 
+ CC = @CC@
+@@ -65,12 +62,12 @@
  	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
-+	sched.c teln.c nethack.c encoding.c utmp-netbsd.c
+ 	sched.c teln.c nethack.c encoding.c canvas.c layout.c viewport.c \
+-	list_display.c list_generic.c list_window.c
++	list_display.c list_generic.c list_window.c utmp-netbsd.c
  OFILES=	screen.o ansi.o fileio.o mark.o misc.o resize.o socket.o \
  	search.o tty.o term.o window.o utmp.o loadav.o putenv.o help.o \
  	termcap.o input.o attacher.o pty.o process.o display.o comm.o \
  	kmapdef.o acls.o braille.o braille_tsi.o logfile.o layer.o \
--	sched.o teln.o nethack.o encoding.o
-+	sched.o teln.o nethack.o encoding.o utmp-netbsd.o
+-	list_generic.o list_display.o list_window.o \
++	list_generic.o list_display.o list_window.o utmp-netbsd.o \
+ 	sched.o teln.o nethack.o encoding.o canvas.o layout.o viewport.o
  
  all:	screen
- 
-@@ -74,11 +74,8 @@ install_bin: .version screen
+@@ -86,9 +83,6 @@
  	-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)
@@ -25,8 +43,5 @@ $NetBSD: patch-an,v 1.3 2009/03/05 09:59:12 jmmv Exp $
 -# This doesn't work if $(bindir)/screen is a symlink
 -	-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
  	rm -f $(DESTDIR)$(bindir)/screen
--	(cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
-+	(cd $(DESTDIR)$(bindir) && ln -s -f $(SCREEN) screen)
+ 	(cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen)
  	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
- 
- ###############################################################################
diff --git a/misc/screen/patches/patch-ao b/misc/screen/patches/patch-ao
index f110168332a..ee4a9616cec 100644
--- a/misc/screen/patches/patch-ao
+++ b/misc/screen/patches/patch-ao
@@ -1,4 +1,6 @@
-$NetBSD: patch-ao,v 1.1 2002/12/23 13:13:04 grant Exp $
+$NetBSD: patch-ao,v 1.2 2014/08/25 20:02:32 kim Exp $
+
+Replace configurable paths with tags.
 
 --- etc/etcscreenrc.orig	Sun Apr 29 01:25:34 2001
 +++ etc/etcscreenrc
diff --git a/misc/screen/patches/patch-ap b/misc/screen/patches/patch-ap
index 8249f62d2f7..f34826b18d4 100644
--- a/misc/screen/patches/patch-ap
+++ b/misc/screen/patches/patch-ap
@@ -1,8 +1,10 @@
-$NetBSD: patch-ap,v 1.2 2005/12/28 17:53:24 reed Exp $
+$NetBSD: patch-ap,v 1.3 2014/08/25 20:02:32 kim Exp $
 
---- doc/screen.1.orig	2003-12-05 05:51:57.000000000 -0800
-+++ doc/screen.1	2005-12-27 13:54:30.000000000 -0800
-@@ -581,7 +581,7 @@
+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 @@
  
  .SH CUSTOMIZATION
  The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to
@@ -11,7 +13,7 @@ $NetBSD: patch-ap,v 1.2 2005/12/28 17:53:24 reed Exp $
  .I screen
  is installed setuid-root, then the administrator
  should compile
-@@ -594,7 +594,7 @@
+@@ -638,7 +638,7 @@
  When
  .I screen
  is invoked, it executes initialization commands from the files
@@ -20,7 +22,7 @@ $NetBSD: patch-ap,v 1.2 2005/12/28 17:53:24 reed Exp $
  \*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 
-@@ -624,7 +624,7 @@
+@@ -668,7 +668,7 @@
  protected from variable substitution.
  .PP
  Two configuration files are shipped as examples with your screen distribution:
@@ -29,7 +31,7 @@ $NetBSD: patch-ap,v 1.2 2005/12/28 17:53:24 reed Exp $
  useful examples for various commands.
  .PP
  Customization can also be done 'on-line'. To enter the command mode type
-@@ -4416,14 +4416,14 @@
+@@ -4857,14 +4857,14 @@
  .I screen
  distribution package for private and global initialization files.
  .IP $SYSSCREENRC 
@@ -41,9 +43,9 @@ $NetBSD: patch-ap,v 1.2 2005/12/28 17:53:24 reed Exp $
  .IP $HOME/.screenrc
 -Read in after /usr/local/etc/screenrc
 +Read in after @PKG_SYSCONFDIR@/screenrc
- .IP $SCREENDIR/S-<login>
--.IP /local/screens/S-<login>
-+.IP /tmp/screens/S-<login>
+ .IP $SCREENDIR/S\-<login>
+-.IP /local/screens/S\-<login>
++.IP /tmp/screens/S\-<login>
  Socket directories (default)
- .IP /usr/tmp/screens/S-<login>
+ .IP /usr/tmp/screens/S\-<login>
  Alternate socket directories.
diff --git a/misc/screen/patches/patch-aq b/misc/screen/patches/patch-aq
deleted file mode 100644
index 5bb7f3c2c76..00000000000
--- a/misc/screen/patches/patch-aq
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2005/12/10 23:28:13 rillig Exp $
-
-In Solaris 10, the setenv() function has been added.
-
---- misc.c.orig	2003-12-05 14:45:41.000000000 +0100
-+++ misc.c	2005-12-11 00:23:50.130241500 +0100
-@@ -613,7 +613,7 @@ char *value;
-    */
- # endif /* NEEDSETENV */
- #else /* USESETENV */
--# if defined(linux) || defined(__convex__) || (BSD >= 199103)
-+# if defined(linux) || defined(__convex__) || (BSD >= 199103) || defined(__sun)
-   setenv(var, value, 1);
- # else
-   setenv(var, value);
diff --git a/misc/screen/patches/patch-ar b/misc/screen/patches/patch-ar
deleted file mode 100644
index a84eb64eb75..00000000000
--- a/misc/screen/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2010/01/01 19:38:44 spz Exp $
-
---- tty.c.dist.orig	2006-10-23 13:04:42.000000000 +0000
-+++ tty.c.dist
-@@ -50,7 +50,7 @@
- #endif
- 
- #include "config.h"
--#ifdef SVR4
-+#ifdef HAVE_SYS_STROPTS_H
- #include <sys/stropts.h>	/* for I_POP */
- #endif
- 
diff --git a/misc/screen/patches/patch-as b/misc/screen/patches/patch-as
index 511e29210c5..f9a4031aaf8 100644
--- a/misc/screen/patches/patch-as
+++ b/misc/screen/patches/patch-as
@@ -1,13 +1,14 @@
-$NetBSD: patch-as,v 1.1 2010/01/01 19:38:44 spz Exp $
+$NetBSD: patch-as,v 1.2 2014/08/25 20:02:32 kim Exp $
 
---- tty.sh.orig	2003-09-08 14:24:25.000000000 +0000
-+++ tty.sh
-@@ -76,7 +76,7 @@ exit 0
- #endif
- 
- #include "config.h"
--#ifdef SVR4
-+#ifdef HAVE_SYS_STROPTS_H
- #include <sys/stropts.h>	/* for I_POP */
- #endif
+--- tty.sh.orig	2014-04-26 16:29:40.000000000 +0000
++++ tty.sh	2014-08-25 19:44:59.000000000 +0000
+@@ -812,7 +812,8 @@
+   /*
+    * Under BSD we have to set the controlling terminal again explicitly.
+    */
+-# if (defined(__FreeBSD_kernel__) || defined(__GNU__)) && defined(TIOCSCTTY)
++# if (defined(__FreeBSD_kernel__) || defined(__GNU__) || (BSD >= 199103)) \
++  && defined(TIOCSCTTY)
+   ioctl(fd, TIOCSCTTY, (char *)0);
+ # endif