summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorwiz <wiz>2006-08-03 17:07:04 +0000
committerwiz <wiz>2006-08-03 17:07:04 +0000
commit36c3de1105152346ab097a3b2cba0e54d65f61ad (patch)
tree7b71ce90b151b770109c32c16e62e8233f6ed121 /mail
parentdcb916736340e0dab24eb509c6ffc7fb1cc8740c (diff)
downloadpkgsrc-36c3de1105152346ab097a3b2cba0e54d65f61ad.tar.gz
Fix for PR 34018 (better ncurses handling).
Ok tron@
Diffstat (limited to 'mail')
-rw-r--r--mail/mutt-devel/options.mk19
-rw-r--r--mail/mutt/options.mk21
2 files changed, 25 insertions, 15 deletions
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index aa4c991a262..703260ba50a 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -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 --git a/mail/mutt/options.mk b/mail/mutt/options.mk
index d0390af0eef..27eb47ef28e 100644
--- a/mail/mutt/options.mk
+++ b/mail/mutt/options.mk
@@ -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