From 9fe69b7f35b64ed792cdfa866ecd66cffd2dcb5a Mon Sep 17 00:00:00 2001
From: roy <roy@pkgsrc.org>
Date: Wed, 4 Jan 2017 22:45:33 +0000
Subject: Use the curses framework.

---
 news/tin/Makefile   |  4 ++--
 news/tin/options.mk | 28 ++++------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

(limited to 'news')

diff --git a/news/tin/Makefile b/news/tin/Makefile
index ebe693c154b..71124d7d76e 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2016/12/04 05:17:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2017/01/04 22:45:33 roy Exp $
 #
 
 DISTNAME=	tin-2.2.1
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
 		ftp://ftp.funet.fi/pub/unix/news/tin-unoff/ \
diff --git a/news/tin/options.mk b/news/tin/options.mk
index b1e5804727d..0cf94e3f5c8 100644
--- a/news/tin/options.mk
+++ b/news/tin/options.mk
@@ -1,36 +1,16 @@
-# $NetBSD: options.mk,v 1.14 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.15 2017/01/04 22:45:33 roy Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.tin
 PKG_SUPPORTED_OPTIONS=		icu inet6 tin-use-inn-spool
-PKG_OPTIONS_OPTIONAL_GROUPS=	display
-PKG_OPTIONS_GROUP.display=	curses ncurses ncursesw
-PKG_SUGGESTED_OPTIONS=		curses inet6
+PKG_SUGGESTED_OPTIONS=		inet6
 # untested
 #PKG_SUPPORTED_OPTIONS+=	socks
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mcurses)
-.  include "../../mk/curses.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-screen=curses
-.  if !empty(BUILDLINK_PREFIX.curses)
+.include "../../mk/curses.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-screen=${CURSES_TYPE}
 CONFIGURE_ARGS+=	--with-curses-dir=${BUILDLINK_PREFIX.curses}
-.  endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mncurses)
-.  include "../../devel/ncurses/buildlink3.mk"
-USE_NCURSES=		yes
-CONFIGURE_ARGS+=	--with-screen=ncurses
-CONFIGURE_ARGS+=	--with-curses-dir=${BUILDLINK_PREFIX.ncurses}
-.endif
-
-.if !empty(PKG_OPTIONS:Mncursesw)
-.  include "../../devel/ncursesw/buildlink3.mk"
-USE_NCURSES=		yes
-CONFIGURE_ARGS+=	--with-screen=ncursesw
-CONFIGURE_ARGS+=	--with-curses-dir=${BUILDLINK_PREFIX.ncursesw}
-.endif
 
 .if !empty(PKG_OPTIONS:Micu)
 .include "../../textproc/icu/buildlink3.mk"
-- 
cgit v1.2.3