From 252f7fe153bb76d1bc79559e6bb50a17f81cff1d Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sun, 13 Dec 1998 01:31:07 +0000
Subject: Upgrade to version 0.95.

Note that Muttrc and mime.types have moved from
PREFIX/share/misc -> PREFIX/etc
---
 mail/mutt14/files/patch-01 | 12 -------
 mail/mutt14/files/patch-02 | 54 ++++++++++++++++++++++++-------
 mail/mutt14/files/patch-03 | 13 ++------
 mail/mutt14/files/patch-05 | 81 ----------------------------------------------
 4 files changed, 44 insertions(+), 116 deletions(-)
 delete mode 100644 mail/mutt14/files/patch-01
 delete mode 100644 mail/mutt14/files/patch-05

(limited to 'mail/mutt14/files')

diff --git a/mail/mutt14/files/patch-01 b/mail/mutt14/files/patch-01
deleted file mode 100644
index 785ac27..0000000
--- a/mail/mutt14/files/patch-01
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	Thu Jun 25 15:16:03 1998
-+++ Makefile.in	Wed Jul 15 01:44:35 1998
-@@ -61,6 +61,9 @@
- mutt: keymap_defs.h $(OBJS) $(REGEX)
- 	$(CC) -o mutt $(OBJS) $(REGEX) $(LDFLAGS) $(LIBS)
- 
-+docs:
-+	cd doc && make fbsd
-+
- keymap_defs.h: Makefile $(OPS)
- 	rm -f keymap_defs.h
- 	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02
index 137e76f..fab6261 100644
--- a/mail/mutt14/files/patch-02
+++ b/mail/mutt14/files/patch-02
@@ -1,24 +1,54 @@
---- doc/Makefile.in.orig	Mon Jul 13 03:50:37 1998
-+++ doc/Makefile.in	Fri Jul 17 11:23:21 1998
-@@ -21,6 +21,8 @@
+--- 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
  
- all: manual.txt manual.html
  
-+fbsd: manual.latin1 manual.html
+-all: mutt.man dotlock.man try-html try-txt
++all: mutt.man dotlock.man try-html try-txt try-latin1
+ 
+ complete: all html
+ 
+@@ -57,19 +57,22 @@
+ try-txt:
+ 	-$(MAKE) manual.txt
+ 
++try-latin1:
++	-$(MAKE) manual.latin1
 +
- install: mutt.man manual.txt
- 	../mkinstalldirs $(mandir)/man1
- 	$(INSTALL) -m 644 mutt.man $(mandir)/man1/mutt.1
-@@ -36,7 +38,11 @@
- 	sgml2txt manual
+ html: manual.html
+ 
+ install: dotlock.man mutt.man 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
+-	$(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
  
  manual.html: manual.sgml
 -	sgml2html manual
-+	# sgml2html manual
++	@# sgml2html manual
 +	sgmlfmt -f html manual
 +
 +manual.latin1: manual.sgml
 +	sgmlfmt -f latin1 manual.sgml
  
  clean: 
- 	rm -f *~ *.html *.orig *.rej
+ 	rm -f *~ *.html *.orig *.rej *.man manual.sgml
diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03
index ec8e6e1..8257138 100644
--- a/mail/mutt14/files/patch-03
+++ b/mail/mutt14/files/patch-03
@@ -1,5 +1,5 @@
---- doc/manual.sgml.orig	Fri Jul 10 22:10:27 1998
-+++ doc/manual.sgml	Sun Jul 19 15:52:04 1998
+--- 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 @@
 -<!doctype linuxdoc system>
 +<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -9,12 +9,3 @@
  
  <article>
  
-@@ -451,7 +454,7 @@
- ^F	forget-passphrase	whipe PGP passphrase from memory
- </verb></tscreen>
- 
--<sect2>Editing the message header<label id="edit_headers">
-+<sect2>Editing the message header<label id="editing_headers">
- <p>
- When editing the header of your outgoing message, there are a couple of
- special features available.
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
deleted file mode 100644
index 51d1db2..0000000
--- a/mail/mutt14/files/patch-05
+++ /dev/null
@@ -1,81 +0,0 @@
---- acconfig.h.orig	Tue Mar 11 17:04:02 1997
-+++ acconfig.h	Sat Mar 15 22:23:06 1997
-@@ -18,6 +18,9 @@
- #undef DOMAIN
- @TOP@
- 
-+/* gethostname() can be used to obtain the domain name */
-+#undef GETHOSTNAME_DOMAIN
-+
- /* use dotlocking to lock mailboxes? */
- #undef USE_DOTLOCK
- 
---- config.h.in.orig	Wed Mar 12 17:46:39 1997
-+++ config.h.in	Sat Mar 15 22:27:01 1997
-@@ -18,6 +18,9 @@
- /* What is your domain name? */
- #undef DOMAIN
- 
-+/* gethostname() can be used to obtain the domain name */
-+/* #define GETHOSTNAME_DOMAIN 1 */
-+
- /* Define as the return type of signal handlers (int or void).  */
- #undef RETSIGTYPE
- 
---- init.c.orig	Tue Mar 11 17:29:14 1997
-+++ init.c	Sat Mar 15 22:26:44 1997
-@@ -961,6 +961,19 @@
-   if (debuglevel > 0) start_debug();
- #endif
- 
-+#ifdef GETHOSTNAME_DOMAIN
-+  /* Get host and domain name */
-+  gethostname (Hostname, sizeof (Hostname));
-+  Hostname[sizeof (Hostname) - 1] = 0;
-+  if ((p = strchr (Hostname, '.')) == NULL)
-+    /* blech */
-+	domain = "";
-+  else
-+    {
-+	  *p++ = 0;
-+	  domain = p;
-+    }
-+#else
-   /* And about the host... */
-   uname (&utsname);
-   strfcpy (Hostname, utsname.nodename, sizeof (Hostname));
-@@ -971,6 +984,7 @@
-     *p++ = 0;
-     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
-   }
-+#endif
- 
- #ifdef USE_DOMAIN
- 
---- globals.h.orig	Mon Mar 10 14:34:27 1997
-+++ globals.h	Sat Mar 15 22:29:01 1997
-@@ -130,6 +130,13 @@
- WHERE gid_t UserGid;
- #endif /* USE_SETGID */
- 
-+/* if your gethostname() returns the domainname too */
-+#ifdef GETHOSTNAME_DOMAIN
-+WHERE char *domain;
-+#undef DOMAIN
-+#define DOMAIN domain
-+#endif
-+
- #ifdef MAIN_C
- const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
- const char *Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "ERR" };
---- main.c.orig	Fri Mar  7 18:57:24 1997
-+++ main.c	Sat Mar 15 22:28:14 1997
-@@ -114,7 +114,7 @@
- 
-   puts ("\n\nCompile time definitions:");
- 
--#ifdef DOMAIN
-+#if defined(DOMAIN) && !defined(GETHOSTNAME_DOMAIN)
-   printf ("DOMAIN=\"%s\"\n", DOMAIN);
- #else
-   puts ("-DOMAIN");
-- 
cgit v1.1