pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/mutt-devel Improve handling of options related to...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e63fdfe00da4
branches:  trunk
changeset: 520291:e63fdfe00da4
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Wed Oct 18 19:46:35 2006 +0000

description:
Improve handling of options related to the terminal library used by this
package and add support for "ncursesw".

Patch supplied by Ben Collver pkg/34777.

diffstat:

 mail/mutt-devel/options.mk |  27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r bac913a7d84e -r e63fdfe00da4 mail/mutt-devel/options.mk
--- a/mail/mutt-devel/options.mk        Wed Oct 18 19:43:00 2006 +0000
+++ b/mail/mutt-devel/options.mk        Wed Oct 18 19:46:35 2006 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.19 2006/08/19 18:43:02 tonio Exp $
+# $NetBSD: options.mk,v 1.20 2006/10/18 19:46:35 tonio Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mutt
-PKG_OPTIONS_OPTIONAL_GROUPS=   display
-PKG_OPTIONS_GROUP.display=     slang ncurses
+PKG_OPTIONS_REQUIRED_GROUPS=   display
+PKG_OPTIONS_GROUP.display=     slang ncurses ncursesw curses
 PKG_SUPPORTED_OPTIONS= ssl sasl mutt-hcache idn mutt-compressed-mbox
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= ssl curses
 
 .include "../../mk/bsd.options.mk"
 
@@ -35,6 +35,25 @@
 CONFIGURE_ARGS+=       --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 .endif
 
+### curses
+###
+.if !empty(PKG_OPTIONS:Mcurses)
+.  include "../../mk/curses.buildlink3.mk"
+.endif
+
+###
+### ncursesw
+###
+.if !empty(PKG_OPTIONS:Mncursesw)
+.  include "../../devel/ncursesw/buildlink3.mk"
+.else
+SUBST_CLASSES+=                curse
+SUBST_MESSAGE.curse=   Fixing mutt to avoid ncursesw
+SUBST_STAGE.curse=     post-patch
+SUBST_FILES.curse=     configure.in configure
+SUBST_SED.curse=       -e 's,for lib in ncurses ncursesw,for lib in ncurses,'
+.endif
+
 ###
 ### SSL
 ###



Home | Main Index | Thread Index | Old Index