commit 3a1bfd4c64d155121fd3dba955561065e02295ba
parent a5cd1e594e096dc3b35c629e16a2fcabaa478a8c
Author: Jaromil <jaromil@dyne.org>
Date: Fri, 31 Aug 2012 17:43:02 +0200
improved mutt build and configuration (now using s-lang)
Diffstat:
5 files changed, 23 insertions(+), 666 deletions(-)
diff --git a/build/build-gnu.sh b/build/build-gnu.sh
@@ -80,8 +80,9 @@ case $distro in
echo "Compiling mutt"
pushd src/mutt-1.5.21
CC="$cc" ./configure \
- --with-ssl --with-gnutls --enable-imap --disable-debug \
- --enable-hcache --with-regex --with-tokyocabinet
+ --with-ssl --with-gnutls --enable-imap --disable-debug --with-slang \
+ --enable-hcache --with-regex --with-tokyocabinet --with-mixmaster \
+ --with-mailpath=Mail --with-homespool=Mail/known --with-exec-shell=/usr/bin/zsh
make > /dev/null
popd
cp src/mutt-1.5.21/mutt build/gnu/mutt-jaro
diff --git a/src/mutt-1.5.21/doc/Makefile b/src/mutt-1.5.21/doc/Makefile
@@ -1,656 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# doc/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-
-pkgdatadir = $(datadir)/mutt
-pkgincludedir = $(includedir)/mutt
-pkglibdir = $(libdir)/mutt
-pkglibexecdir = $(libexecdir)/mutt
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-noinst_PROGRAMS = makedoc$(EXEEXT)
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/instdoc.sh.in TODO
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
- $(top_srcdir)/m4/curslib.m4 $(top_srcdir)/m4/funcdecl.m4 \
- $(top_srcdir)/m4/funcs.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gpgme.m4 \
- $(top_srcdir)/m4/gssapi.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/m4/types.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = instdoc.sh
-CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-makedoc_SOURCES = makedoc.c
-makedoc_OBJECTS = makedoc.$(OBJEXT)
-makedoc_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = makedoc.c
-DIST_SOURCES = makedoc.c
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/jrml/devel/jaromail/src/mutt-1.5.21/missing --run aclocal-1.11
-ALLOCA =
-AMTAR = ${SHELL} /home/jrml/devel/jaromail/src/mutt-1.5.21/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/jrml/devel/jaromail/src/mutt-1.5.21/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/jrml/devel/jaromail/src/mutt-1.5.21/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/jrml/devel/jaromail/src/mutt-1.5.21/missing --run automake-1.11
-AWK = gawk
-BUILD_INCLUDED_LIBINTL = no
-CATALOGS = de.gmo eu.gmo ru.gmo it.gmo es.gmo uk.gmo fr.gmo pl.gmo nl.gmo cs.gmo id.gmo sk.gmo ko.gmo el.gmo zh_TW.gmo zh_CN.gmo pt_BR.gmo eo.gmo gl.gmo sv.gmo da.gmo lt.gmo tr.gmo ja.gmo hu.gmo et.gmo ca.gmo bg.gmo ga.gmo
-CATOBJEXT = .gmo
-CC = /home/jrml/devel/jaromail/build/cc-static.zsh
-CCDEPMODE = depmode=gcc
-CFLAGS = -Wall -pedantic -Wno-long-long -g -O2
-CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/VERSION
-CPP = /home/jrml/devel/jaromail/build/cc-static.zsh -E
-CPPFLAGS = -I$(top_srcdir)/intl
-CYGPATH_W = echo
-DATADIRNAME = share
-DBX = no
-DEBUGGER = /usr/bin/gdb
-DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
-DEPDIR = .deps
-DOTLOCK_GROUP = mail
-DOTLOCK_PERMISSION = 2755
-DOTLOCK_TARGET = mutt_dotlock$(EXEEXT)
-DSLROOT =
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = /bin/grep -E
-EXEEXT =
-GDB = /usr/bin/gdb
-GENCAT = gencat
-GLIBC21 = yes
-GMOFILES = de.gmo eu.gmo ru.gmo it.gmo es.gmo uk.gmo fr.gmo pl.gmo nl.gmo cs.gmo id.gmo sk.gmo ko.gmo el.gmo zh_TW.gmo zh_CN.gmo pt_BR.gmo eo.gmo gl.gmo sv.gmo da.gmo lt.gmo tr.gmo ja.gmo hu.gmo et.gmo ca.gmo bg.gmo ga.gmo
-GMSGFMT = /usr/bin/msgfmt
-GPGME_CFLAGS =
-GPGME_CONFIG =
-GPGME_LIBS =
-GREP = /bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-INSTOBJEXT = .mo
-INTLBISON = bison
-INTLLIBS =
-INTLOBJS =
-INTL_LIBTOOL_SUFFIX_PREFIX =
-ISPELL = no
-KRB5CFGPATH =
-LDFLAGS =
-LIBICONV =
-LIBIMAP = -Limap -limap
-LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
-LIBOBJS = ${LIBOBJDIR}regex$U.o
-LIBS = -lidn
-LTLIBOBJS = ${LIBOBJDIR}regex$U.lo
-MAKEINFO = ${SHELL} /home/jrml/devel/jaromail/src/mutt-1.5.21/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-MKINSTALLDIRS = ./mkinstalldirs
-MSGFMT = /usr/bin/msgfmt
-MUTTLIBS = -lncurses -lssl -lcrypto -lz -ltokyocabinet
-MUTT_LIB_OBJECTS = pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o smime.o crypt-mod-smime-classic.o resize.o bcache.o account.o mutt_socket.o mutt_tunnel.o mutt_ssl.o hcache.o md5.o mutt_idna.o
-MUTT_MD5 = mutt_md5
-OBJEXT = o
-OPS = $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.SMIME $(srcdir)/OPS.CRYPT
-OSPCAT = none
-PACKAGE = mutt
-PACKAGE_BUGREPORT =
-PACKAGE_NAME =
-PACKAGE_STRING =
-PACKAGE_TARNAME =
-PACKAGE_URL =
-PACKAGE_VERSION =
-PATH_SEPARATOR = :
-PGPAUX_TARGET = pgpring$(EXEEXT) pgpewrap$(EXEEXT)
-POFILES = de.po eu.po ru.po it.po es.po uk.po fr.po pl.po nl.po cs.po id.po sk.po ko.po el.po zh_TW.po zh_CN.po pt_BR.po eo.po gl.po sv.po da.po lt.po tr.po ja.po hu.po et.po ca.po bg.po ga.po
-POSUB = po
-RANLIB = ranlib
-SDB = no
-SENDMAIL = /usr/sbin/sendmail
-SET_MAKE =
-SHELL = /bin/bash
-SMIMEAUX_TARGET = smime_keys
-STRIP =
-U =
-USE_INCLUDED_LIBINTL = no
-USE_NLS = yes
-VERSION = 1.5.21-jaromail
-XGETTEXT = /usr/bin/xgettext
-abs_builddir = /home/jrml/devel/jaromail/src/mutt-1.5.21/doc
-abs_srcdir = /home/jrml/devel/jaromail/src/mutt-1.5.21/doc
-abs_top_builddir = /home/jrml/devel/jaromail/src/mutt-1.5.21
-abs_top_srcdir = /home/jrml/devel/jaromail/src/mutt-1.5.21
-ac_ct_CC = /home/jrml/devel/jaromail/build/cc-static.zsh
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias =
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias =
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/jrml/devel/jaromail/src/mutt-1.5.21/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias =
-top_build_prefix = ../
-top_builddir = ..
-top_srcdir = ..
-subdir = doc
-AM_CPPFLAGS = -I. -I.. -I$(includedir) -I$(top_srcdir)
-MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C
-EXTRA_DIST = dotlock.man \
- smime_keys.man \
- muttbug.man \
- mutt.man \
- PGP-Notes.txt \
- applying-patches.txt \
- devel-notes.txt \
- gen-map-doc \
- muttrc.man.head \
- muttrc.man.tail \
- mbox.man \
- mmdf.man \
- manual.xml.head \
- manual.xml.tail \
- instdoc.sh.in \
- patch-notes.txt \
- smime-notes.txt \
- Muttrc Muttrc.head stamp-doc-rc \
- makedoc.c makedoc-defs.h \
- mutt.css mutt.xsl html.xsl chunk.xsl $(BUILT_DISTFILES)
-
-CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \
- configuration.html mimesupport.html advancedusage.html \
- optionalfeatures.html security.html tuning.html reference.html miscellany.html
-
-HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES)
-BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES)
-srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt \
- devel-notes.txt patch-notes.txt smime-notes.txt
-
-topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
- README NEWS TODO README.SECURITY README.SSL
-
-DISTCLEANFILES = manual.txt manual.html manual.xml manual.pdf html \
- instdoc Muttrc
-
-EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
- -e 's,@bindir\@,$(bindir),g' \
- -e 's,@docdir\@,$(docdir),g'
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-instdoc.sh: $(top_builddir)/config.status $(srcdir)/instdoc.sh.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-clean-noinstPROGRAMS:
- -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
- @rm -f makedoc$(EXEEXT)
- $(LINK) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-include ./$(DEPDIR)/makedoc.Po
-
-.c.o:
-# $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-# $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- source='$<' object='$@' libtool=no \
- DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
- $(COMPILE) -c $<
-
-.c.obj:
-# $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-# $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- source='$<' object='$@' libtool=no \
- DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
- $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-local clean-noinstPROGRAMS \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-local
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-local clean-noinstPROGRAMS ctags distclean \
- distclean-compile distclean-generic distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-local install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-local
-
-
-all: makedoc-all
-
-makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt
-
-install-data-local: makedoc-all instdoc
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
- ./instdoc smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
- ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
- ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1
- test xmutt_dotlock$(EXEEXT) = x || ./instdoc $(srcdir)/dotlock.man \
- $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
- ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
- ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- for f in $(topsrcdir_DOCFILES) ; do \
- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
- done
- for f in $(srcdir_DOCFILES) ; do \
- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- done
- -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
- -for f in $(HTML_DOCFILES) ; do \
- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
- done
- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
- -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
- mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
- elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
- mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
- elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
- fi
-
-uninstall-local:
- for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1; do \
- rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
- done
- for f in muttrc.5 mbox.5 mmdf.5 ; do \
- rm -f $(DESTDIR)$(mandir)/man5/$$f ; \
- done
- for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES) ; \
- do \
- rm -f $(DESTDIR)$(docdir)/$$f ; \
- done
- -rm -f $(DESTDIR)$(docdir)/manual.txt
- for i in Muttrc ; do \
- if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i ; then \
- rm $(DESTDIR)$(sysconfdir)/$$i ; \
- fi ; \
- rm $(DESTDIR)$(sysconfdir)/$${i}.dist ; \
- done
-
-check:
-manual.txt: manual.html
- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
- LC_ALL=C w3m -dump manual.html > $@ || \
- LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
-
-Muttrc: stamp-doc-rc
-
-stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head
- -rm -f Muttrc stamp-doc-rc
- sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc
- $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
- $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc
- touch stamp-doc-rc
-
-manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
- -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
-
-stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
- -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
- touch stamp-doc-chunked
-
-$(CHUNKED_DOCFILES): stamp-doc-chunked
-
-manual.pdf: manual.tex
- -if test -f manual.tex; then pdfjadetex manual.tex; fi
-
-manual.tex: stamp-doc-xml
- -if test -n "$(DSLROOT)"; then \
- openjade -t tex -D $(DSLROOT) -d print/docbook.dsl dtds/decls/xml.dcl manual.xml; \
- fi
-
-validate: stamp-doc-xml
- xmllint --noout --noblanks --postvalid manual.xml
-
-spellcheck:
- -aspell -d american --mode=sgml --encoding=utf-8 -p $(srcdir)/mutt.pwl check manual.xml.head
- -aspell -d american --mode=nroff --encoding=utf-8 -p $(srcdir)/mutt.pwl check muttrc.man.head
- -aspell -d american --mode=ccpp --encoding=utf-8 -p $(srcdir)/mutt.pwl check $(top_srcdir)/init.h
-
-sortcheck: manual.xml
- sed -n -e '1,/^<sect1 id="variables">/d' -e '1,/^<sect1 id="functions">/s/<sect2 id="\([^"]*\)">/\1/p' < manual.xml > vars.tmp.1
- sort < vars.tmp.1 > vars.tmp.2
- cmp -s vars.tmp.1 vars.tmp.2 || diff -u vars.tmp.1 vars.tmp.2 | less
- rm -rf vars.tmp.1 vars.tmp.2
-
-clean-local:
- rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 smime_keys.1 muttrc.man
- rm -f *.aux *.log *.tex *.out
-
-instdoc: instdoc.sh
- cat instdoc.sh > instdoc
- chmod a+x instdoc
-
-update-doc: stamp-doc-xml stamp-doc-chunked stamp-doc-rc manual.txt manual.html
-
-muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
- $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -m | \
- cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\
- > muttrc.man
-
-mutt.1: $(srcdir)/mutt.man
- $(EDIT) $(srcdir)/mutt.man > $@
-
-smime_keys.1: $(srcdir)/smime_keys.man
- $(EDIT) $(srcdir)/smime_keys.man > $@
-
-stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
- manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
- $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
- ( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \
- sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \
- $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -s && \
- $(MAKEDOC_CPP) $(top_srcdir)/functions.h | \
- perl $(srcdir)/gen-map-doc $(srcdir)/manual.xml.tail $(top_srcdir)/OPS* \
- ) > manual.xml
- touch stamp-doc-xml
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/mutt/colors b/src/mutt/colors
@@ -9,7 +9,7 @@
color normal white black
color tilde white black
color indicator brightgreen black
-color tree brightred black # the thread tree in the index menu
+color tree red black # the thread tree in the index menu
color status cyan black
color hdrdefault cyan black
color body magenta black "(ftp|http)://[^ ]+" # point out URLs
@@ -36,8 +36,8 @@ color quoted5 green black
color index cyan black "."
color index white black "~N" # New
color index brightcyan black "~O" # Unread
-color index brightgreen black "~N (~x jaromil@* | ~h \"^In-[Rr]eply-[Tt]o: .*jaromil@*")"
-color index yellow black "~f jaromil@*"
+# color index brightgreen black "~N (~x jaromil@* | ~h \"^In-[Rr]eply-[Tt]o: .*jaromil@*")"
+# color index yellow black "~f jaromil@*"
# color index brightblue black "~g" # gpg signed
color index brightgreen black "~G" # gpg encrypted
@@ -46,7 +46,8 @@ color index brightgreen black "~F" # Flagged
color index brightred black "~T" # Tagged
color index red black "~f MAILER-DAEMON@*"
color index red black "~f Mailer-Daemon@*"
-color index black brightblue "~v" # Collapsed thread with some unread
+color index brightwhite black "~v" # Collapsed thread
+# color index brightyellow black "~V" # Collapsed thread unread
diff --git a/src/mutt/formats b/src/mutt/formats
@@ -1,5 +1,4 @@
-# Postino's display format strings for Mutt
-# originally used by Jaromil
+# Jaro Mail display format strings for Mutt
set alias_format="%2n %t %-20.20a: %r"
@@ -26,3 +25,15 @@ set status_format="-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del
set forward_format = "[Fwd] %s"
set hdr_format="%Z %3C %{%b %d} %-19.19L (%5c) %s"
+
+
+ignore *
+unignore From:
+unignore To:
+unignore Cc:
+unignore Subject:
+unignore Date:
+unignore User-Agent:
+unignore X-BeenThere:
+unignore Organization:
+unignore List-Id:
diff --git a/src/mutt/general b/src/mutt/general
@@ -17,12 +17,12 @@ unset use_8bitmime
unset suspend
unset wait_key
-set send_charset=utf-8
+set send_charset = utf-8
set assumed_charset = us-ascii
#set charset = iso-8859-1
#set send_charset = us-ascii
-#set charset = utf-8
+set charset = utf-8
#set shell = retrieved from passwd file
#set simple_search = "~f %s | ~s %s"
