diff --git a/general.ent b/general.ent
index d471962ddb..46774d2c13 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5b98b33061..904434b8cd 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
-->
+
+ September 2nd, 2015
+
+
+ [ken] - Update to mutt-1.5.24. Fixes
+ #6882.
+
+
+
+
September 1st, 2015
diff --git a/networking/mailnews/mutt.xml b/networking/mailnews/mutt.xml
index dc7cc6e943..13a5009122 100644
--- a/networking/mailnews/mutt.xml
+++ b/networking/mailnews/mutt.xml
@@ -6,11 +6,11 @@
-
-
-
+
+
+
-
+
]>
@@ -34,7 +34,7 @@
Agent. This is useful for reading, writing, replying to, saving, and
deleting your email.
- &lfs77_checked; &gcc5_checked;
+ &gcc5_checked;
Package Information
@@ -58,14 +58,14 @@
- Additional Downloads
+
Mutt Dependencies
@@ -119,9 +119,8 @@
program and fixes two issues in the current stable version of
Mutt: a segmentation fault that occurs under
certain conditions and a compilation problem when building with recent
- versions of GCC. To find the current
- stable release, please refer to the
- Mutt home page.
+ versions of GCC.
+
Mutt requires a group named
@@ -136,10 +135,16 @@
chgrp -v mail /var/mail
+ Mutt will rebuild the html documentation
+ if libxslt is present, then use that to update
+ the text manual - even if none of the specified browsers are present. That
+ will create an empty text file, so we will save the shipped file.
+
+
Install Mutt by running the following
commands:
-patch -Np1 -i ../mutt-&mutt-version;-upstream_fixes-1.patch &&
+cp -v doc/manual.txt{,.shipped} &&
./configure --prefix=/usr \
--sysconfdir=/etc \
--with-docdir=/usr/share/doc/mutt-&mutt-version; \
@@ -150,15 +155,8 @@
--with-gdbm \
--without-bdb \
--without-tokyocabinet &&
-make
-
-
+make &&
+test -s doc/manual.txt || mv -v doc/manual.txt{.shipped,}To generate the PDF manual with , run
the following command:
@@ -220,6 +218,10 @@ make -C doc -->
: Use S-Lang
instead of Ncurses.
+ :
+ if the text manual is now empty (libxslt is installed,
+ but without any of the specified text browsers), restore it from the copy.
+
diff --git a/packages.ent b/packages.ent
index 5bf64c923f..098ac80cfd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -398,7 +398,7 @@
-
+