CVS commit: pkgsrc/mail/mutt

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Wed Jan  4 16:13:20 UTC 2017

Modified Files:
        pkgsrc/mail/mutt: Makefile options.mk

Log Message:
Use the curses framework.


To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 pkgsrc/mail/mutt/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/mutt/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/mutt/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.184 pkgsrc/mail/mutt/Makefile:1.185
--- pkgsrc/mail/mutt/Makefile:1.184     Mon Dec  5 07:52:33 2016
+++ pkgsrc/mail/mutt/Makefile   Wed Jan  4 16:13:20 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.184 2016/12/05 07:52:33 tron Exp $
+# $NetBSD: Makefile,v 1.185 2017/01/04 16:13:20 roy Exp $
 
 DISTNAME=              mutt-1.7.2
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          ftp://ftp.mutt.org/pub/mutt/
 

Index: pkgsrc/mail/mutt/options.mk
diff -u pkgsrc/mail/mutt/options.mk:1.25 pkgsrc/mail/mutt/options.mk:1.26
--- pkgsrc/mail/mutt/options.mk:1.25    Sun Nov 20 21:13:46 2016
+++ pkgsrc/mail/mutt/options.mk Wed Jan  4 16:13:20 2017
@@ -1,19 +1,34 @@
-# $NetBSD: options.mk,v 1.25 2016/11/20 21:13:46 joerg Exp $
+# $NetBSD: options.mk,v 1.26 2017/01/04 16:13:20 roy Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
-PKG_OPTIONS_GROUP.display=     slang ncurses ncursesw curses
+PKG_OPTIONS_GROUP.display=     curses wide-curses slang
 PKG_SUPPORTED_OPTIONS= debug gpgme idn ssl smime sasl
 PKG_SUPPORTED_OPTIONS+=        mutt-hcache tokyocabinet mutt-smtp
 PKG_SUPPORTED_OPTIONS+=        mutt-compressed-mbox
 PKG_SUGGESTED_OPTIONS= curses gpgme mutt-hcache mutt-smtp smime ssl
 # patch does not apply
 #PKG_SUGGESTED_OPTIONS+=       mutt-compressed-mbox
+PKG_OPTIONS_LEGACY_OPTS+=      ncurses:curses ncursesw:wide-curses
 
 .include "../../mk/bsd.options.mk"
 
+### curses
+###
+.if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
+.  include "../../mk/curses.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-curses=${BUILDLINK_PREFIX.curses}
+.  if !empty(CURSES_TYPE:Mcurses)
+OPSYSVARS+=                    BUILDLINK_PASSTHRU_DIRS
+BUILDLINK_PASSTHRU_DIRS.SunOS+=        /usr/xpg4
+CONFIGURE_ARGS.SunOS+=         --with-curses=/usr/xpg4
+LDFLAGS.SunOS+=                        -L/usr/xpg4/lib${LIBABISUFFIX}
+LDFLAGS.SunOS+=                        ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
+.  endif
+.endif
+
 ###
 ### Slang
 ###
@@ -23,15 +38,6 @@ CONFIGURE_ARGS+=     --with-slang=${BUILDLIN
 .endif
 
 ###
-### ncurses
-###
-.if !empty(PKG_OPTIONS:Mncurses)
-USE_NCURSES=           yes
-.  include "../../devel/ncurses/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-curses=${BUILDLINK_PREFIX.ncurses}
-.endif
-
-###
 ### SASLv2
 ###
 .if !empty(PKG_OPTIONS:Msasl)
@@ -39,30 +45,6 @@ CONFIGURE_ARGS+=     --with-curses=${BUILDLI
 CONFIGURE_ARGS+=       --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 .endif
 
-### curses
-###
-.if !empty(PKG_OPTIONS:Mcurses)
-.  include "../../mk/curses.buildlink3.mk"
-OPSYSVARS+=                    BUILDLINK_PASSTHRU_DIRS
-BUILDLINK_PASSTHRU_DIRS.SunOS+=        /usr/xpg4
-CONFIGURE_ARGS.SunOS+=         --with-curses=/usr/xpg4
-LDFLAGS.SunOS+=                        -L/usr/xpg4/lib${LIBABISUFFIX}
-LDFLAGS.SunOS+=                        ${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
-.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
-SUBST_SED.curse=       -e 's,for lib in ncurses ncursesw,for lib in ncurses,'
-.endif
-
 ###
 ### SSL
 ###