pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail/mutt Improve handling of options related to the t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0040a41a6291
branches:  trunk
changeset: 520076:0040a41a6291
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat Oct 14 20:34:36 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/options.mk |  28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r c4ea492d052b -r 0040a41a6291 mail/mutt/options.mk
--- a/mail/mutt/options.mk      Sat Oct 14 19:33:45 2006 +0000
+++ b/mail/mutt/options.mk      Sat Oct 14 20:34:36 2006 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.10 2006/08/08 16:17:50 tron Exp $
+# $NetBSD: options.mk,v 1.11 2006/10/14 20:34:36 tron Exp $
 
 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 buffy-size
-PKG_SUGGESTED_OPTIONS=         ssl
+PKG_SUGGESTED_OPTIONS=         ssl curses
 
 .include "../../mk/bsd.options.mk"
 
@@ -26,6 +26,26 @@
 .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
 ###
 .if !empty(PKG_OPTIONS:Mssl)



Home | Main Index | Thread Index | Old Index