[pkgsrc/trunk]: pkgsrc/mail Fix for PR 34018 (better ncurses handling).

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e302d66eaed6
branches:  trunk
changeset: 517036:e302d66eaed6
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Aug 03 17:07:04 2006 +0000

description:
Fix for PR 34018 (better ncurses handling).
Ok tron@

diffstat:

 mail/mutt-devel/options.mk |  19 ++++++++++++-------
 mail/mutt/options.mk       |  21 +++++++++++++--------
 2 files changed, 25 insertions(+), 15 deletions(-)

diffs (77 lines):

diff -r e93f24a59eb7 -r e302d66eaed6 mail/mutt-devel/options.mk
--- a/mail/mutt-devel/options.mk        Thu Aug 03 17:04:17 2006 +0000
+++ b/mail/mutt-devel/options.mk        Thu Aug 03 17:07:04 2006 +0000
@@ -1,23 +1,28 @@
-# $NetBSD: options.mk,v 1.15 2006/07/27 22:56:27 joerg Exp $
+# $NetBSD: options.mk,v 1.16 2006/08/03 17:07:04 wiz Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mutt
-PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl mutt-hcache idn mutt-compressed-mbox
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_OPTIONS_OPTIONAL_GROUPS=   display
+PKG_OPTIONS_GROUP.display=     slang ncurses
+PKG_SUPPORTED_OPTIONS= ssl sasl mutt-hcache idn mutt-compressed-mbox
+PKG_SUGGESTED_OPTIONS= ncurses ssl
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Slang and ncurses
+### Slang
 ###
 .if !empty(PKG_OPTIONS:Mslang)
 .  include "../../devel/libslang/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-slang=${BUILDLINK_PREFIX.libslang}
-.else
-.  if !empty(PKG_OPTIONS:Mncurses)
+.endif
+
+###
+### ncurses
+###
+.if !empty(PKG_OPTIONS:Mncurses)
 USE_NCURSES=           yes
-.  endif
 .  include "../../devel/ncurses/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-curses=${BUILDLINK_PREFIX.ncurses}
 .endif
diff -r e93f24a59eb7 -r e302d66eaed6 mail/mutt/options.mk
--- a/mail/mutt/options.mk      Thu Aug 03 17:04:17 2006 +0000
+++ b/mail/mutt/options.mk      Thu Aug 03 17:07:04 2006 +0000
@@ -1,21 +1,26 @@
-# $NetBSD: options.mk,v 1.8 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: options.mk,v 1.9 2006/08/03 17:07:04 wiz Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.mutt
-PKG_SUPPORTED_OPTIONS= slang ncurses ssl buffy-size
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_OPTIONS_VAR=               PKG_OPTIONS.mutt
+PKG_OPTIONS_OPTIONAL_GROUPS=   display
+PKG_OPTIONS_GROUP.display=     slang ncurses
+PKG_SUPPORTED_OPTIONS=         ssl buffy-size
+PKG_SUGGESTED_OPTIONS=         ncurses ssl
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Slang and ncurses
+### Slang
 ###
 .if !empty(PKG_OPTIONS:Mslang)
 .  include "../../devel/libslang/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-slang=${BUILDLINK_PREFIX.libslang}
-.else
-.  if !empty(PKG_OPTIONS:Mncurses)
+.endif
+
+###
+### ncurses
+###
+.if !empty(PKG_OPTIONS:Mncurses)
 USE_NCURSES=           yes
-.  endif
 .  include "../../devel/ncurses/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-curses=${BUILDLINK_PREFIX.ncurses}
 .endif