[pkgsrc/trunk]: pkgsrc/mail/neomutt Clean up options -- remove ones that are ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f193c99f8a1
branches:  trunk
changeset: 364111:9f193c99f8a1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jun 21 07:10:56 2017 +0000

description:
Clean up options -- remove ones that are now default-on and not supported
as options any longer.
Remove references to removed mutt_dotlock.

diffstat:

 mail/neomutt/Makefile   |   6 +-----
 mail/neomutt/options.mk |  45 ++++++---------------------------------------
 2 files changed, 7 insertions(+), 44 deletions(-)

diffs (91 lines):

diff -r 9a5d1ac7e315 -r 9f193c99f8a1 mail/neomutt/Makefile
--- a/mail/neomutt/Makefile     Wed Jun 21 06:13:14 2017 +0000
+++ b/mail/neomutt/Makefile     Wed Jun 21 07:10:56 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/06/14 16:07:12 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2017/06/21 07:10:56 wiz Exp $
 
 DISTNAME=              neomutt-20170609
 CATEGORIES=            mail
@@ -14,12 +14,8 @@
 
 BUILD_DEPENDS+=                gettext-tools-[0-9]*:../../devel/gettext-tools
 
-SPECIAL_PERMS+=                bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-external-dotlock
-CONFIGURE_ARGS+=       --enable-imap
 CONFIGURE_ARGS+=       --enable-notmuch
-CONFIGURE_ARGS+=       --enable-pop
 #CONFIGURE_ARGS+=      CFLAGS="-g -O0"
 
 EGDIR=                 ${PREFIX}/share/examples/mutt
diff -r 9a5d1ac7e315 -r 9f193c99f8a1 mail/neomutt/options.mk
--- a/mail/neomutt/options.mk   Wed Jun 21 06:13:14 2017 +0000
+++ b/mail/neomutt/options.mk   Wed Jun 21 07:10:56 2017 +0000
@@ -1,20 +1,13 @@
-# $NetBSD: options.mk,v 1.6 2017/03/12 20:58:20 wiz Exp $
-
-# Global and legacy options
+# $NetBSD: options.mk,v 1.7 2017/06/21 07:10:56 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=   display
 PKG_OPTIONS_GROUP.display=     slang ncurses ncursesw curses
 PKG_SUPPORTED_OPTIONS= debug gpgme gssapi idn ssl smime sasl
-PKG_SUPPORTED_OPTIONS+=        mutt-hcache tokyocabinet mutt-smtp
-PKG_SUPPORTED_OPTIONS+=        mutt-compressed-mbox
-PKG_SUPPORTED_OPTIONS+=        mutt-sidebar
-PKG_SUGGESTED_OPTIONS= ncursesw gpgme idn mutt-hcache mutt-smtp sasl smime ssl
+PKG_SUPPORTED_OPTIONS+=        mutt-hcache tokyocabinet
+PKG_SUGGESTED_OPTIONS= ncursesw gpgme idn mutt-hcache sasl smime ssl
 PKG_SUGGESTED_OPTIONS+=        gssapi
-PKG_SUGGESTED_OPTIONS+=        mutt-compressed-mbox
-PKG_SUGGESTED_OPTIONS+=        mutt-hcache tokyocabinet mutt-smtp
-PKG_SUGGESTED_OPTIONS+=        mutt-compressed-mbox
-PKG_SUGGESTED_OPTIONS+=        mutt-sidebar
+PKG_SUGGESTED_OPTIONS+=        mutt-hcache tokyocabinet
 
 .include "../../mk/bsd.options.mk"
 
@@ -125,25 +118,8 @@
 CONFIGURE_ARGS+=       --disable-hcache
 .endif
 
-###
-### Compressed mail boxes
-###
-PLIST_VARS+=           compressed_mbox
-.if !empty(PKG_OPTIONS:Mmutt-compressed-mbox)
-CONFIGURE_ARGS+=       --enable-compressed
-# add xsltproc to be able to regenerate the documentation
-BUILD_DEPENDS+=                libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-.endif
-
-###
-### Internal SMTP relay support
-###
-.if !empty(PKG_OPTIONS:Mmutt-smtp)
-CONFIGURE_ARGS+=       --enable-smtp
-.else
-CONFIGURE_ARGS+=       --disable-smtp
-.endif
+#BUILD_DEPENDS+=               libxslt-[0-9]*:../../textproc/libxslt
+#BUILD_DEPENDS+=               docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
 ###
 ### Internationalized Domain Names
@@ -173,12 +149,3 @@
 .else
 CONFIGURE_ARGS+=       --disable-gpgme
 .endif
-
-###
-### sidebar support
-###
-.if !empty(PKG_OPTIONS:Mmutt-sidebar)
-CONFIGURE_ARGS+=       --enable-sidebar
-.else
-CONFIGURE_ARGS+=       --disable-sidebar
-.endif