Upgrade to version 1.4[.0].

4 files changed, 45 insertions, 44 deletions

diff --git a/mail/mutt/files/patch-02 b/mail/mutt/files/patch-02
index 84fd2e11b1da..3717189e334f 100644
--- a/mail/mutt/files/patch-02
+++ b/mail/mutt/files/patch-02
@@ -1,35 +1,30 @@
---- doc/Makefile.in.orig	Wed Mar 29 11:42:49 2000
-+++ doc/Makefile.in	Mon Jun 12 16:50:51 2000
-@@ -58,13 +58,16 @@
+--- doc/Makefile.in.orig	Tue Nov  6 11:12:31 2001
++++ doc/Makefile.in	Fri Jun 21 12:00:28 2002
+@@ -60,13 +60,19 @@
  topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL README.UPGRADE
+ 	README NEWS TODO README.SECURITY README.SSL 
  
 -all: muttrc.man try-html try-txt
 +all: muttrc.man try-html try-txt try-latin1
  
  try-html: ../makedoc
 -	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	$(MAKE) manual.html || cp $(srcdir)/manual*.html ./
++	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
++	touch $@
  
  try-txt: ../makedoc
 -	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
 +	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
++	touch $@
 +
 +try-latin1: 
 +	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
++	touch $@
  
- install: all
+ install: all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -75,16 +78,16 @@
- 	$(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- 	for f in $(srcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+	 	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	for f in $(topsrcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+	 	$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+@@ -86,10 +92,10 @@
+ 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
  	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
 -	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
@@ -43,9 +38,9 @@
  
  uninstall:
  	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-@@ -93,14 +96,18 @@
- 	-rm -rf $(DESTDIR)$(docdir)
+@@ -99,14 +105,18 @@
  
+ check:
  manual.txt: manual.sgml
 -	if sgml2txt -c latin manual ; then \
 -		uniq < manual.txt | expand > _manual.txt ; \
diff --git a/mail/mutt/files/patch-05 b/mail/mutt/files/patch-05
index 364bc49a259d..13a52d9daa40 100644
--- a/mail/mutt/files/patch-05
+++ b/mail/mutt/files/patch-05
@@ -63,14 +63,14 @@
    {
    case -1: /* abort - don't resort */
      return -1;
---- compose.c.orig	Wed Aug 25 10:23:12 1999
-+++ compose.c	Sun Sep 26 23:46:25 1999
+--- compose.c.orig	Mon Feb 12 18:02:38 2001
++++ compose.c	Fri Mar 30 17:04:09 2001
 @@ -130,7 +130,7 @@
-   struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN);
+   char input_signas[SHORT_STRING];
  
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "),
--			     _("esabmf")))
-+			     N_("esabmf")))
+   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
+-			     _("esabf")))
++			     N_("esabf")))
    {
    case 1: /* (e)ncrypt */
      bits |= PGPENCRYPT;
diff --git a/mail/mutt/files/patch-charmaps.Makefile.am b/mail/mutt/files/patch-charmaps.Makefile.am
deleted file mode 100644
index 383b9d7039fd..000000000000
--- a/mail/mutt/files/patch-charmaps.Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
---- charmaps/Makefile.am.orig	Mon Aug 23 22:12:09 1999
-+++ charmaps/Makefile.am	Fri Dec  7 15:17:33 2001
-@@ -1,6 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- 
--noinst_DATA = charmap_notice
--
--charmap_notice:
--	@echo ; echo "For charmap support, please read INSTALL" ; echo
-+install:
-+	$(top_srcdir)/mkinstalldirs $(charmaps)
-+	for f in $(top_srcdir)/$(subdir)/maps/* ; do \
-+		$(INSTALL) -m 644 $$f $(charmaps)/ ; \
-+	done
diff --git a/mail/mutt/files/patch-configure.in b/mail/mutt/files/patch-configure.in
index c26517da78ac..88e89b063d73 100644
--- a/mail/mutt/files/patch-configure.in
+++ b/mail/mutt/files/patch-configure.in
@@ -1,9 +1,29 @@
---- configure.in.orig	Fri Jul 28 11:50:24 2000
-+++ configure.in	Wed Dec  5 12:18:13 2001
-@@ -610,4 +615,6 @@
- AC_SUBST(MUTTLOCALEDIR)
- AC_DEFINE_UNQUOTED(MUTTLOCALEDIR, "$MUTTLOCALEDIR")
+--- configure.in.orig	Fri Jun 21 14:52:03 2002
++++ configure.in	Fri Jun 21 14:54:07 2002
+@@ -515,7 +515,7 @@
+            AC_MSG_ERROR([SSL support is only useful with POP or IMAP support])
+           fi
+ 
+-          if test "$with_ssl" != "yes"
++          if test "$with_ssl" != "yes" && x$withval != x/usr
+           then
+            LDFLAGS="$LDFLAGS -L$withval/lib"
+            CPPFLAGS="$CPPFLAGS -I$withval/include"
+@@ -572,7 +572,7 @@
+         then
+           if test "$with_sasl" != "yes"
+           then
+-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
++            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
+             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
+           fi
+ 
+@@ -609,6 +609,8 @@
+         [if test $enableval = yes; then
+                 AC_DEFINE(USE_FLOCK,1, [ Define to use flock() to lock mailboxes. ])
+         fi])
 +
 +MUTTLIBS="$MUTTLIBS -lxpg4"
  
- AC_OUTPUT(Makefile intl/Makefile m4/Makefile dnl
+ mutt_cv_fcntl=yes
+ AC_ARG_ENABLE(fcntl, [  --disable-fcntl            Do NOT use fcntl() to lock files ],