svn commit: r448799 - head/sysutils/screen

[Cy Schubert]

Author: cy
Date: Sun Aug 27 03:35:20 2017
New Revision: 448799
URL: https://svnweb.freebsd.org/changeset/ports/448799

Log:
  Allow the user to select dependency on ncurses in base (USES=ncurses:base)
  or devel/ncurses in ports (USES=ncurses:ports). The default option is to
  depend on ncurses in ports (if installed), otherwise depend on base
  (same as USES=ncurses).
  
  This works around the following problem when screen is linked with
  devel/ncurses:
  
  $ view /etc/passwd
  view: No terminal database found
  $
  
  To avoid the above problem either have screen depend on ncurses in base
  or set TERM=xterm when creating new screen window.
  
  Adding screeninfo.src from the screen tarball to terminfo.src in
  devel/ncurses does not resolve this issue.
  
  This problem does not affect packages built by poudriere.
  
  PR:		221829

Modified:
  head/sysutils/screen/Makefile

Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile	Sun Aug 27 03:26:47 2017	(r448798)
+++ head/sysutils/screen/Makefile	Sun Aug 27 03:35:20 2017	(r448799)
@@ -3,7 +3,7 @@
 
 PORTNAME=	screen
 PORTVERSION=	4.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ftp.gnu.org/gnu/screen/ \
 		ftp://ftp.gnu.org/gnu/screen/ \
@@ -21,9 +21,11 @@ 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_DEFAULT=	INFO MAN NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC \
+			NCURSES_DEFAULT
+OPTIONS_SINGLE=		IPC NCURSES
 OPTIONS_SINGLE_IPC=	SOCKETS NAMED_PIPES
+OPTIONS_SINGLE_NCURSES=	NCURSES_DEFAULT NCURSES_BASE NCURSES_PORTS
 INFO_DESC=		Build and install info documentation
 MAN_DESC=		Build and install man pages
 NETHACK_DESC=		Enable nethack-style messages
@@ -32,10 +34,17 @@ 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
+NCURSES_DEFAULT_DESC=	Depend on ncurses (ports if installed, otherwise base)
+NCURSES_BASE_DESC=	Depend on ncurses in base
+NCURSES_PORTS_DESC=	Depend on devel/ncurses in ports
 
+NCURSES_DEFAULT_USES=	ncurses
+NCURSES_BASE_USES=	ncurses:base
+NCURSES_PORTS_USES=	ncurses:ports
+
 OPTIONS_SUB=
 
-USES=		gmake cpe ncurses:base
+USES=		gmake cpe
 
 CPE_VENDOR=	gnu