Use curses framework.

3 files changed, 14 insertions, 28 deletions

diff --git a/www/apachetop/Makefile b/www/apachetop/Makefile
index 0082bbc5214..c96a56596e5 100644
--- a/www/apachetop/Makefile
+++ b/www/apachetop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/09/08 11:57:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/04 14:53:02 roy Exp $
 #
 
 DISTNAME=	apachetop-0.12.5
@@ -14,7 +14,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-logfile=${VARBASE}/log/httpd/access_log
 USE_LANGUAGES=		c c++
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 0751a405a16..338d355850b 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.124 2016/12/22 17:30:51 sevan Exp $
+# $NetBSD: Makefile,v 1.125 2017/01/04 14:49:38 roy Exp $
 
 DISTNAME=	lynx2.8.8rel.2
 PKGNAME=	${DISTNAME:S/lynx/lynx-/:S/rel//}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://lynx.isc.org/${SUBDIR:Q}/ \
 		ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index 359a6413732..5e0975229f6 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.17 2017/01/04 14:49:38 roy Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS=	inet6
@@ -7,7 +7,8 @@ PKG_OPTIONS_OPTIONAL_GROUPS=	socksproxy
 PKG_OPTIONS_GROUP.socksproxy=	dante socks4
 
 PKG_OPTIONS_REQUIRED_GROUPS=	screen
-PKG_OPTIONS_GROUP.screen=	ncurses ncursesw slang curses
+PKG_OPTIONS_GROUP.screen=	curses wide-curses slang
+PKG_OPTIONS_LEGACY_OPTS+=	ncurses:curses ncursesw:wide-curses
 
 PKG_SUGGESTED_OPTIONS=	curses inet6
 
@@ -21,12 +22,17 @@ PKG_SUGGESTED_OPTIONS=	curses inet6
 PKG_FAIL_REASON+=	"SOCKS may not be enabled together with the \"slang\"" \
 			"screen library.  If SOCKS support is desired," \
 			"please change ${PKG_OPTIONS_VAR} to include" \
-			"\"curses\" or \"ncurses\" instead."
+			"\"curses\" instead."
 .endif
 
 ###
-### Set the screen library to "slang", "ncurses", or plain "curses".
+### Set the screen library to "curses". "wide-curses" or "slang"
 ###
+.if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
+CONFIGURE_ARGS+=	--enable-color-style
+SCREENTYPE=		${CURSES_TYPE}
+.  include "../../mk/curses.buildlink3.mk"
+.endif
 .if !empty(PKG_OPTIONS:Mslang)
 SCREENTYPE=		slang
 .  include "../../devel/libslang/buildlink3.mk"
@@ -34,26 +40,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/samples/lynx.lss \
 		${DESTDIR}${PREFIX}/share/examples/lynx/lynx.lss
 .endif
-.if !empty(PKG_OPTIONS:Mncurses)
-SCREENTYPE=		ncurses
-USE_NCURSES=		YES # color
-.  include "../../devel/ncurses/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-color-style
-.endif
-.if !empty(PKG_OPTIONS:Mncursesw)
-SCREENTYPE=		ncursesw
-LIBS+=			-lncursesw
-BUILDLINK_ABI_DEPENDS.ncursesw+=	ncursesw>=5.9nb1
-.  include "../../devel/ncursesw/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-color-style
-.endif
-.if !empty(PKG_OPTIONS:Mcurses)
-SCREENTYPE=		curses
-.  include "../../mk/curses.buildlink3.mk"
-.  if !empty(MACHINE_PLATFORM:MNetBSD-1.[56]*-i386)
-CONFIGURE_ARGS+=	--enable-color-style
-.  endif
-.endif
 
 ###
 ### SOCKS support