Index: head/sysutils/screen/Makefile
===================================================================
--- head/sysutils/screen/Makefile	(revision 440860)
+++ head/sysutils/screen/Makefile	(revision 440861)
@@ -1,103 +1,106 @@
 # Created by: Andrey Chernov <ache@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	screen
 PORTVERSION=	4.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ftp.gnu.org/gnu/screen/ \
 		ftp://ftp.gnu.org/gnu/screen/ \
 		ftp://gnu.mirror.iweb.com/screen/ \
 		http://gnu.mirror.iweb.com/screen/ \
 		http://mirror.sdunix.com/gnu/ \
 		ftp://mirrors.kernel.org/gnu/screen/ \
 		http://komquats.com/distfiles/ \
 		http://people.freebsd.org/~cy/distfiles/ \
 		GNU
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Multi-screen window manager
 
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=		INFO MAN NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
 OPTIONS_DEFAULT=	INFO MAN NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC
 OPTIONS_SINGLE=		IPC
 OPTIONS_SINGLE_IPC=	SOCKETS NAMED_PIPES
 INFO_DESC=		Build and install info documentation
 MAN_DESC=		Build and install man pages
 NETHACK_DESC=		Enable nethack-style messages
 XTERM_256_DESC=		Enable support for 256 colour xterm
 SHOWENC_DESC=		Show encoding on the status line
 SOCKETS_DESC=		Use new (4.2.1+) sockets for IPC (default)
 NAMED_PIPES_DESC=	Use legacy (4.0.3) named pipes for IPC (override)
 SYSTEM_SCREENRC_DESC=	Install system screenrc with helpful status line
 
 OPTIONS_SUB=
 
 USES=		gmake cpe ncurses
 
 CPE_VENDOR=	gnu
 
 .include <bsd.port.options.mk>
 
 GNU_CONFIGURE=	yes
+CFLAGS+=	-I${NCURSESINC}
+LDFLAGS+=	-L${NCURSESLIB}
+
 .if ${PORT_OPTIONS:MMAN}
 MAKE_ARGS+=	WITH_MAN=1
 PLIST_SUB+=	MAN=""
 .else
 PLIST_SUB+=	MAN="@comment"
 .endif
 .if ${PORT_OPTIONS:MINFO}
 INFO=		screen
 MAKE_ARGS+=	WITH_INFO=1
 .endif
 
 # Enables support for 256 colour xterm.  Note that you may need to
 # set up a custom termcap entry or .screenrc which modifies termcap
 # to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm
 #
 .if ${PORT_OPTIONS:MXTERM_256}
 CFLAGS+=	-DCOLORS256
 .endif
 
 .if ! ${PORT_OPTIONS:MNETHACK}
 CFLAGS+=	-DNONETHACK
 .endif
 
 # show encoding on the status line via option "showenc"
 .if ${PORT_OPTIONS:MSHOWENC}
 EXTRA_PATCHES+=	${FILESDIR}/opt-showencoding
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/screen.info*
 	@${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure
 
 # Bug 191029:	Users can choose whether to use sockets or named pipes.
 # 		Choose sockets if you don't know what the difference is.
 # 		Choose named pipes if your environment is heterogeneous,
 #		using both screen 4.0.3 and 4.2.1.
 # Bug 191017
 post-configure-NAMED_PIPES-on:
 	@${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h
 	@${ECHO_CMD} User selected named pipes override set.
 
 ETCDIR?=	${PREFIX}/etc
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
 		${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-1
 	${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
 		${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-2
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 .if ${PORT_OPTIONS:MSYSTEM_SCREENRC}
 	${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
 		${STAGEDIR}${ETCDIR}/screenrc.sample
 .else
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
 		${STAGEDIR}${ETCDIR}/screenrc.sample
 .endif
 
 .include <bsd.port.mk>
Index: head/sysutils/screen/files/patch-configure
===================================================================
--- head/sysutils/screen/files/patch-configure	(revision 440860)
+++ head/sysutils/screen/files/patch-configure	(revision 440861)
@@ -1,125 +1,145 @@
 --- configure.orig	2014-04-26 03:58:46.000000000 -0700
-+++ configure	2014-04-29 19:47:03.900706999 -0700
-@@ -4857,46 +4857,6 @@
++++ configure	2017-05-13 09:29:58.991277000 -0700
+@@ -4858,63 +4858,6 @@
  
  else
    olibs="$LIBS"
 -LIBS="-lcurses $olibs"
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libcurses..." >&5
 -$as_echo "$as_me: checking libcurses..." >&6;}
 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -int
 -main ()
 -{
 -
 -#ifdef __hpux
 -__sorry_hpux_libcurses_is_totally_broken_in_10_10();
 -#else
 -tgetent((char *)0, (char *)0);
 -#endif
 -
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -if ac_fn_c_try_link "$LINENO"; then :
 -
 -else
 -  LIBS="-ltermcap $olibs"
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermcap..." >&5
 -$as_echo "$as_me: checking libtermcap..." >&6;}
 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -int
 -main ()
 -{
 -tgetent((char *)0, (char *)0);
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -if ac_fn_c_try_link "$LINENO"; then :
 -
 -else
-   LIBS="-ltermlib $olibs"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermlib..." >&5
- $as_echo "$as_me: checking libtermlib..." >&6;}
-@@ -5001,12 +4961,6 @@
+-  LIBS="-ltermlib $olibs"
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermlib..." >&5
+-$as_echo "$as_me: checking libtermlib..." >&6;}
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-tgetent((char *)0, (char *)0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-
+-else
+   LIBS="-lncursesw $olibs"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking libncursesw..." >&5
+ $as_echo "$as_me: checking libncursesw..." >&6;}
+@@ -4999,15 +4942,6 @@
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
 -fi
 -rm -f core conftest.err conftest.$ac_objext \
 -    conftest$ac_exeext conftest.$ac_ext
 -fi
 -rm -f core conftest.err conftest.$ac_objext \
 -    conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
  
  if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -5019,7 +4973,8 @@
+@@ -5020,7 +4954,8 @@
  
  main()
  {
 - exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
 + char *tgoto(const char *, int, int);
 + exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1);
  }
  _ACEOF
  if ac_fn_c_try_run "$LINENO"; then :
-@@ -5066,7 +5021,7 @@
+@@ -5067,7 +5002,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys..." >&5
  $as_echo "$as_me: checking for SVR4 ptys..." >&6;}
  sysvr4ptys=
 -if test -c /dev/ptmx ; then
 +if test -c /nonexistent ; then
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -5177,19 +5132,16 @@
+@@ -5178,19 +5113,16 @@
  fi
  rm -f conftest*
  
 -if test "$ptys" != "$pdir/pty??" ; then
 -p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
 -p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g'  | sort -u | tr -d '\012'`
 +# XXX: hardcoded, since port must be devfs and various setups independent
 +
  cat >>confdefs.h <<_ACEOF
 -#define PTYRANGE0 "$p0"
 +#define PTYRANGE0 "pqrsPQRSlmnoLMNO"
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
 -#define PTYRANGE1 "$p1"
 +#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
  _ACEOF
  
 -fi
 -
  
  # Check whether --with-pty-mode was given.
  if test "${with_pty_mode+set}" = set; then :
-@@ -5416,6 +5368,8 @@
+@@ -5417,6 +5349,8 @@
  #if defined(SVR4) && !defined(DGUX)
  #include <utmpx.h>
  #define utmp utmpx
 +#define pututline pututxline
 +#define getutent getutxent
  #else
  #include <utmp.h>
  #endif
-@@ -5484,6 +5438,10 @@
+@@ -5485,6 +5419,10 @@
  #if defined(SVR4) && !defined(DGUX)
  #include <utmpx.h>
  #define utmp utmpx
 +#define pututline pututxline
 +#define getutent getutxent
 +#define pututline pututxline
 +#define getutent getutxent
  #else
  #include <utmp.h>
  #endif