From 5c636ba4142230cf35bf70d9402eb117f56a58ee Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 13 May 2000 15:36:47 +0000 Subject: Update to the 1.2 release. Submitted by: Udo Schweigert --- mail/mutt14/files/patch-01 | 10 ---- mail/mutt14/files/patch-02 | 106 ++++++++++++++++++++++-------------- mail/mutt14/files/patch-03 | 10 ++-- mail/mutt14/files/patch-05 | 6 +- mail/mutt14/files/patch-08 | 21 ++++--- mail/mutt14/files/patch-Makefile.in | 11 ++++ 6 files changed, 94 insertions(+), 70 deletions(-) delete mode 100644 mail/mutt14/files/patch-01 create mode 100644 mail/mutt14/files/patch-Makefile.in (limited to 'mail/mutt14/files') diff --git a/mail/mutt14/files/patch-01 b/mail/mutt14/files/patch-01 deleted file mode 100644 index 2233a67..0000000 --- a/mail/mutt14/files/patch-01 +++ /dev/null @@ -1,10 +0,0 @@ ---- charsets/charsets.alias.orig Mon Jan 4 15:55:56 1999 -+++ charsets/charsets.alias Sat Jan 9 10:45:04 1999 -@@ -21,6 +21,7 @@ - iso-ir-47 bs-viewdata - ms-ee cp1250 - ms-cyrl cp1251 -+windows-1251 cp1251 - ms-ansi cp1252 - ms-greek cp1253 - ms-turk cp1254 diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02 index fab6261..b82a36a 100644 --- a/mail/mutt14/files/patch-02 +++ b/mail/mutt14/files/patch-02 @@ -1,54 +1,76 @@ ---- doc/Makefile.in.orig Thu Nov 19 06:10:19 1998 -+++ doc/Makefile.in Sat Dec 12 11:10:45 1998 -@@ -43,7 +43,7 @@ - DOCFILES = manual.txt +--- doc/Makefile.in.orig Wed Mar 29 11:42:49 2000 ++++ doc/Makefile.in Fri May 12 13:12:32 2000 +@@ -58,13 +58,16 @@ + topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ + README NEWS TODO README.SECURITY README.SSL README.UPGRADE +-all: muttrc.man try-html try-txt ++all: muttrc.man try-html try-txt try-latin1 --all: mutt.man dotlock.man try-html try-txt -+all: mutt.man dotlock.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 ./ - complete: all html - -@@ -57,19 +57,22 @@ - try-txt: - -$(MAKE) manual.txt - -+try-latin1: -+ -$(MAKE) manual.latin1 + try-txt: ../makedoc +- test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ ++ $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ + - html: manual.html ++try-latin1: ++ $(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./ - install: dotlock.man mutt.man all + install: all $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 644 mutt.man $(DESTDIR)$(mandir)/man1/mutt.1 - $(INSTALL) -m 644 dotlock.man $(DESTDIR)$(mandir)/man1/mutt_dotlock.1 +@@ -73,18 +76,18 @@ + $(INSTALL) -m 644 $(srcdir)/dotlock.man \ + $(DESTDIR)$(mandir)/man1/mutt_dotlock.1 + $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir) -- for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done -- for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done -- for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done -- if [ -f manual.html ] ; then \ -- $(MAKE) install-html ; \ -- fi -+ #$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir) -+ #for f in $(DOCFILES) ; do $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; done -+ #for f in $(srcdir_DOCFILES) ; do $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; done -+ #for f in $(topsrcdir_DOCFILES) ; do $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; done -+ #if [ -f manual.html ] ; then \ -+ # $(MAKE) install-html ; \ -+ #fi - - install-html: html - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html -@@ -84,7 +87,11 @@ - sgml2txt -c latin manual +- for f in $(srcdir_DOCFILES) ; do \ +- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ +- done +- for f in $(topsrcdir_DOCFILES) ; do \ +- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ +- done +- $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true +- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html +- for file in manual*.html ; do \ +- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\ +- done ++ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir) ++ # for f in $(srcdir_DOCFILES) ; do \ ++ # $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ ++ # done ++ # for f in $(topsrcdir_DOCFILES) ; do \ ++ # $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ ++ # done ++ # $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true ++ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html ++ # for file in manual*.html ; do \ ++ # $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\ ++ # done + + uninstall: + -rm -f $(DESTDIR)$(mandir)/man1/mutt.1 +@@ -93,14 +96,18 @@ + -rm -rf $(DESTDIR)$(docdir) + + manual.txt: manual.sgml +- if sgml2txt -c latin manual ; then \ +- uniq < manual.txt | expand > _manual.txt ; \ +- rm manual.txt ; \ ++ if sgmlfmt -f ascii manual; then \ ++ uniq < manual.ascii | expand > _manual.txt ; \ ++ rm -f manual.txt manual.ascii; \ + mv _manual.txt manual.txt ;\ + fi manual.html: manual.sgml -- sgml2html manual -+ @# sgml2html manual -+ sgmlfmt -f html manual +- sgml2html manual || true ++ @# sgml2html manual || true ++ sgmlfmt -f html manual || true + +manual.latin1: manual.sgml -+ sgmlfmt -f latin1 manual.sgml ++ sgmlfmt -f latin1 manual || true - clean: - rm -f *~ *.html *.orig *.rej *.man manual.sgml + manual.ps: manual.sgml + sgml2latex --output=ps manual || true diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03 index 8257138..b870f7f 100644 --- a/mail/mutt14/files/patch-03 +++ b/mail/mutt14/files/patch-03 @@ -1,11 +1,13 @@ ---- doc/manual.sgml.in.orig Tue Dec 8 13:20:07 1998 -+++ doc/manual.sgml.in Sat Dec 12 09:03:23 1998 -@@ -1,4 +1,7 @@ +--- doc/manual.sgml.orig Tue May 9 17:15:26 2000 ++++ doc/manual.sgml Fri May 12 11:05:40 2000 +@@ -1,5 +1,8 @@ - +- + +]> + - ++
+ The Mutt E-Mail Client diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05 index 6b295ff..364bc49 100644 --- a/mail/mutt14/files/patch-05 +++ b/mail/mutt14/files/patch-05 @@ -74,9 +74,9 @@ { case 1: /* (e)ncrypt */ bits |= PGPENCRYPT; ---- lib.c.orig Wed Jul 7 02:25:45 1999 -+++ lib.c Sun Sep 26 23:46:25 1999 -@@ -859,7 +859,7 @@ +--- muttlib.c.orig Sun Apr 9 14:39:02 2000 ++++ muttlib.c Fri May 12 11:26:58 2000 +@@ -671,7 +671,7 @@ if (*append == 0 && access (fname, F_OK) == 0) { switch (mutt_multi_choice diff --git a/mail/mutt14/files/patch-08 b/mail/mutt14/files/patch-08 index 2d607bc..3e50cbd 100644 --- a/mail/mutt14/files/patch-08 +++ b/mail/mutt14/files/patch-08 @@ -1,11 +1,10 @@ ---- Muttrc.in.original Wed Jul 22 10:47:49 1998 -+++ Muttrc.in Wed Jul 22 10:48:02 1998 -@@ -60,7 +60,7 @@ - # unset fcc_attach - # set folder="~/Mail" - # set folder_format="%N %F %2l %-8.8u %-8.8g %8s %d %f" --# set followup_to -+unset followup_to - # unset force_name - # set forward_decode - # set forward_format="[%a: %s]" +--- Muttrc.orig Sat May 13 08:30:44 2000 ++++ Muttrc Sat May 13 08:32:05 2000 +@@ -629,6 +629,7 @@ + # Type: boolean + # Default: yes + # ++set followup_to=no + # + # Controls whether or not the Mail-Followup-To header field is + # generated when sending mail. When set, Mutt will generate this diff --git a/mail/mutt14/files/patch-Makefile.in b/mail/mutt14/files/patch-Makefile.in new file mode 100644 index 0000000..5e33d7c --- /dev/null +++ b/mail/mutt14/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Tue May 9 17:15:37 2000 ++++ Makefile.in Fri May 12 13:53:08 2000 +@@ -210,7 +210,7 @@ + SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) + OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS) + +-all: all-redirect ++all: $(BUILT_SOURCES) all-redirect + .SUFFIXES: + .SUFFIXES: .S .c .o .s + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cgit v1.1