Update mail/mutt to 1.5.23_2

- Update sidebar patch to most recent upstream version
  (patch-1.5.23.sidebar.20140412)
- Ammend default options by IDN, LOCALES_FIX, SIDEBAR_PATCH, SASL,
  and TRASH_PATCH as requested by the community
- Bump portrevision to reflect new default options

PR:		ports/188544
Submitted by:	Udo Schweigert <udo.schweigert@siemens.com>
Reviewed by:	bdrewery
Approved by:	eadler (mentor)
This commit is contained in:
Jonathan Chu 2014-06-02 22:37:02 +00:00
parent 9024af45d6
commit 1853a1f843
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=356256
5 changed files with 4489 additions and 2706 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= mutt
PORTVERSION= 1.5.23
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES+= mail ipv6
MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
ftp://ftp.mutt.org/mutt/devel/ \
@ -106,11 +106,12 @@ TOKYOCABINET_DESC= Use tokyocabinet instead of Berkley DB
TRASH_PATCH_DESC= Trash folder support
XML_DESC= Use XML tools for rebuilding documentation
OPTIONS_DEFAULT= COMPRESSED_FOLDERS HTML ICONV IFDEF_PATCH \
IMAP_HEADER_CACHE MAILBOX_MANPAGES MAILDIR_HEADER_CACHE \
MAILDIR_MTIME_PATCH NLS NCURSES PARENT_CHILD_MATCH_PATCH \
QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
SMIME_OUTLOOK_COMPAT SMTP XML
OPTIONS_DEFAULT= COMPRESSED_FOLDERS HTML ICONV IDN IFDEF_PATCH \
IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH NLS \
NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
REVERSE_REPLY_PATCH SIDEBAR_PATCH SMART_DATE \
SMIME_OUTLOOK_COMPAT SASL SMTP TRASH_PATCH XML
.endif
.include <bsd.port.options.mk>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,22 @@
--- doc/Makefile.am.orig 2013-10-18 06:48:24.000000000 +0200
+++ doc/Makefile.am 2013-12-22 00:01:17.000000000 +0100
@@ -106,9 +106,7 @@
--- doc/Makefile.am.orig 2014-05-31 14:09:54.000000000 +0200
+++ doc/Makefile.am 2014-05-31 14:12:07.000000000 +0200
@@ -77,14 +77,7 @@
-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
+ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
uninstall-local:
for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
@@ -107,9 +100,7 @@
check:
manual.txt: manual.html

View file

@ -9,9 +9,7 @@ bin/mutt_dotlock
bin/pgpewrap
bin/pgpring
bin/smime_keys
@unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi
etc/Muttrc.dist
@exec if [ ! -f %D/etc/Muttrc ]; then install -m 644 %D/etc/Muttrc.dist %D/etc/Muttrc; fi
@sample etc/Muttrc.sample
man/man1/flea.1.gz
man/man1/mutt.1.gz
man/man1/mutt_dotlock.1.gz