From 5cdeabbf751db75331651aabce6cf887778398a1 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 20 Feb 2008 22:53:49 +0000
Subject: One second thought, just let "wide-curses" toggle whether or not we
 use wide curses or narrow curses.  Cone will always need a curses library
 regardless, so if we're not using one, we're using the other.

---
 mail/cone/options.mk | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'mail/cone')

diff --git a/mail/cone/options.mk b/mail/cone/options.mk
index 077234122f9..c6987beb15a 100644
--- a/mail/cone/options.mk
+++ b/mail/cone/options.mk
@@ -1,11 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2008/02/20 22:31:06 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2008/02/20 22:53:49 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.cone
-PKG_SUPPORTED_OPTIONS=		aspell ldap
-PKG_OPTIONS_REQUIRED_GROUPS=	display tls
-PKG_OPTIONS_GROUP.display=	curses wide-curses
+PKG_SUPPORTED_OPTIONS=		aspell ldap wide-curses
+PKG_OPTIONS_REQUIRED_GROUPS=	tls
 PKG_OPTIONS_GROUP.tls=		gnutls ssl
-PKG_SUGGESTED_OPTIONS=		aspell curses ldap ssl
+PKG_SUGGESTED_OPTIONS=		aspell ldap ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,14 +18,6 @@ PKG_SUGGESTED_OPTIONS=		aspell curses ldap ssl
 CONFIGURE_ARGS+=	--with-spellcheck=aspell
 .endif
 
-###
-### Curses display
-###
-.if !empty(PKG_OPTIONS:Mcurses)
-USE_NCURSES=	yes	# termattrs()
-.  include "../../devel/ncurses/buildlink3.mk"
-.endif
-
 ###
 ### FAM (file alteration monitor) support
 ###
@@ -62,4 +53,7 @@ CONFIGURE_ARGS+=	--with-gnutls
 .if !empty(PKG_OPTIONS:Mwide-curses)
 USE_NCURSESW=	yes	# termattrs()
 .  include "../../devel/ncursesw/buildlink3.mk"
+.else
+USE_NCURSES=	yes	# termattrs()
+.  include "../../devel/ncurses/buildlink3.mk"
 .endif
-- 
cgit v1.2.3