diff options
| author | wiz <wiz@pkgsrc.org> | 2017-06-21 07:10:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-06-21 07:10:56 +0000 |
| commit | 656cbbbe91aa61dcd1110ad8787f5616840142d8 (patch) | |
| tree | e1600ace197132544cd0e568a6c57e0976352075 /mail/neomutt | |
| parent | 44be4f6ba51004433fd8a331c078b886a9ea4396 (diff) | |
| download | pkgsrc-656cbbbe91aa61dcd1110ad8787f5616840142d8.tar.gz | |
Clean up options -- remove ones that are now default-on and not supported
as options any longer.
Remove references to removed mutt_dotlock.
Diffstat (limited to 'mail/neomutt')
| -rw-r--r-- | mail/neomutt/Makefile | 6 | ||||
| -rw-r--r-- | mail/neomutt/options.mk | 45 |
2 files changed, 7 insertions, 44 deletions
diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile index 4b5d36f2f8c..27e73cd09b5 100644 --- a/mail/neomutt/Makefile +++ b/mail/neomutt/Makefile @@ -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 @@ USE_TOOLS+= autoconf automake autoreconf msgfmt gmake 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 --git a/mail/neomutt/options.mk b/mail/neomutt/options.mk index 18676061422..74f83ab06f1 100644 --- a/mail/neomutt/options.mk +++ b/mail/neomutt/options.mk @@ -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_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q} 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 @@ CONFIGURE_ARGS+= --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme} .else CONFIGURE_ARGS+= --disable-gpgme .endif - -### -### sidebar support -### -.if !empty(PKG_OPTIONS:Mmutt-sidebar) -CONFIGURE_ARGS+= --enable-sidebar -.else -CONFIGURE_ARGS+= --disable-sidebar -.endif |