From a5461a42a18dc85f6c7cec913d247d7087dc02a9 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 28 Apr 1999 23:50:02 +0000
Subject: [PATCH] - style fixes with Makefile - fix patches so they are cleanly
 applied

---
 mail/mutt/Makefile                      | 38 ++++++++++++-------------
 mail/mutt/patches/patch-do_not_automove |  8 +++---
 mail/mutt/patches/patch-timezone        | 14 ++++-----
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index d383caa91c5..92204ed9d1a 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,30 +1,28 @@
-# $OpenBSD: Makefile,v 1.13 1999/04/02 00:37:50 turan Exp $
+# $OpenBSD: Makefile,v 1.14 1999/04/28 23:50:02 brad Exp $
 
-DISTNAME=		mutt-0.95.4i
-CATEGORIES=     	mail
-WRKSRC=			${WRKDIR}/mutt-0.95.4
+DISTNAME=	mutt-0.95.4i
+CATEGORIES=     mail
+WRKSRC=		${WRKDIR}/mutt-0.95.4
 
-#MIRROR_DISTFILE=	no
+MAINTAINER=	turan@openbsd.org
 
-MAINTAINER=		turan@cvs.openbsd.org
+MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/ \
+		ftp://riemann.iam.uni-bonn.de/pub/mutt/ \
+		ftp://ftp.gbnet.net/pub/mutt-international/ \
+		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
+		ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ 
 
-MASTER_SITES=		ftp://ftp.guug.de/pub/mutt/ \
-			ftp://riemann.iam.uni-bonn.de/pub/mutt/ \
-			ftp://ftp.gbnet.net/pub/mutt-international/ \
-			ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
-			ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ 
+GNU_CONFIGURE=	yes
+SYSCONFDIR=	${PREFIX}/share/mutt
+CONFIGURE_ARGS=	--prefix=/usr/local \
+		--with-slang=/usr/local \
+		--with-docdir=/usr/local/share/doc/mutt \
+		--with-sharedir=/usr/local/share/mutt
 
-GNU_CONFIGURE=		yes
-SYSCONFDIR=		${PREFIX}/share/mutt
-CONFIGURE_ARGS=		--prefix=/usr/local \
-			--with-slang=/usr/local \
-			--with-docdir=/usr/local/share/doc/mutt \
-			--with-sharedir=/usr/local/share/mutt
+LIB_DEPENDS=	slang.1.22:${PORTSDIR}/devel/libslang
 
-LIB_DEPENDS=    slang.1.22:${PORTSDIR}/devel/libslang
-
-.if !defined(NO_WARNINGS)
 pre-fetch:
+.if !defined(NO_WARNINGS)
 	@${ECHO}
 	@${ECHO} '**********************************************************'
 	@${ECHO} '* This software contains cryptographic enabling code.    *'
diff --git a/mail/mutt/patches/patch-do_not_automove b/mail/mutt/patches/patch-do_not_automove
index 8ea8c357846..bbcef706b80 100644
--- a/mail/mutt/patches/patch-do_not_automove
+++ b/mail/mutt/patches/patch-do_not_automove
@@ -1,7 +1,7 @@
---- init.h.orig	Fri Jun 26 06:31:22 1998
-+++ init.h	Sat Nov  7 05:52:34 1998
-@@ -141,7 +141,7 @@
-   { "mime_forward",	DT_QUAD, R_NONE, OPT_MIMEFWD, 0 },
+--- init.h.orig	Tue Apr 27 23:31:08 1999
++++ init.h	Tue Apr 27 23:31:26 1999
+@@ -151,7 +151,7 @@
+   { "mime_forward",	DT_QUAD, R_NONE, OPT_MIMEFWD, M_NO },
    { "mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, 0 },
    { "mime_fwd",		DT_SYN,  R_NONE, UL "mime_forward", 0 },
 -  { "move",		DT_QUAD, R_NONE, OPT_MOVE, M_ASKNO },
diff --git a/mail/mutt/patches/patch-timezone b/mail/mutt/patches/patch-timezone
index 256b82001cf..3459f329fce 100644
--- a/mail/mutt/patches/patch-timezone
+++ b/mail/mutt/patches/patch-timezone
@@ -1,10 +1,10 @@
---- sendlib.c	1999/04/21 21:05:38	2.19
-+++ sendlib.c	1999/04/21 21:18:53
+--- sendlib.c.orig	Tue Apr 27 23:33:22 1999
++++ sendlib.c	Tue Apr 27 23:35:24 1999
 @@ -1149,10 +1149,12 @@
-   struct tm *l =3D localtime (&t);
-   time_t tz =3D mutt_local_tz (t);
-
-+  tz /=3D 60;
+   struct tm *l = localtime (&t);
+   time_t tz = mutt_local_tz (t);
+ 
++  tz /= 60;
 +
    snprintf (s, len,  "Date: %s, %d %s %d %02d:%02d:%02d %+03d%02d\n",
  	    Weekdays[l->tm_wday], l->tm_mday, Months[l->tm_mon],
@@ -13,4 +13,4 @@
 +	    tz / 60, abs (tz) % 60);
    return (s);
  }
-
+