Upgrade to 0.93

5 files changed, 38 insertions, 23 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 94a527f2512..7d6b6b48d39 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@NUXI.com)
 #
-# $Id: Makefile,v 1.42 1998/02/28 21:31:08 obrien Exp $
+# $Id: Makefile,v 1.43 1998/04/18 11:11:27 obrien Exp $
 
-DISTNAME=	mutt-0.91.1i
-PKGNAME=	mutt-0.91.1
+DISTNAME=	mutt-0.93i
+PKGNAME=	mutt-0.93
 CATEGORIES=	mail
 MASTER_SITES=	ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
 		ftp://ftp.gbnet.net/pub/mutt-international/  \
@@ -32,10 +32,18 @@ RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 DIST_SUBDIR=	mutt
 PATCH_DIST_STRIP=	-p1
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --enable-dsn --enable-pop --enable-flock \
-		--disable-fcntl --enable-hidden-host
+CONFIGURE_ARGS= --enable-dsn --enable-pop --enable-imap --enable-flock \
+		--disable-fcntl --enable-hidden-host \
+		--with-sharedir=${PREFIX}/share/misc \
+		--with-docdir=${PREFIX}/share/doc/mutt
 MAN1=		mutt.1
 
+post-patch:
+	@touch ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.txt
+
+pre-configure:
+	@${MKDIR} ${PREFIX}/share/misc
+
 post-install:
 	@strip ${PREFIX}/bin/mutt
 .if !defined(NOPORTDOCS)
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 8414cacbe41..f51f7a44e63 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.91.1i.tar.gz) = 5884ac5dbb5fe89f27987f203bc4395f
+MD5 (mutt/mutt-0.93i.tar.gz) = d3998c6791a306eefecb9f2de44a296d
diff --git a/mail/mutt/files/patch-01 b/mail/mutt/files/patch-01
index 15d01bf2091..785ac27f43d 100644
--- a/mail/mutt/files/patch-01
+++ b/mail/mutt/files/patch-01
@@ -1,12 +1,12 @@
---- Makefile.in.orig	Fri Nov  7 11:34:03 1997
-+++ Makefile.in	Sat Nov  8 13:03:32 1997
-@@ -55,6 +55,9 @@
- mutt: $(OBJS) $(REGEX)
+--- 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
 +
- install: mutt
- 	$(srcdir)/mkinstalldirs $(bindir)
- 	-mv -f $(bindir)/mutt $(bindir)/mutt.old
+ keymap_defs.h: Makefile $(OPS)
+ 	rm -f keymap_defs.h
+ 	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
diff --git a/mail/mutt/files/patch-02 b/mail/mutt/files/patch-02
index 31f55d48b01..75fc7affe6f 100644
--- a/mail/mutt/files/patch-02
+++ b/mail/mutt/files/patch-02
@@ -1,20 +1,27 @@
---- doc/makefile.orig	Thu Oct  3 16:40:44 1996
-+++ doc/makefile	Mon Jan 13 01:29:09 1997
-@@ -1,10 +1,16 @@
+--- doc/Makefile.in.orig	Sun Jun 21 00:13:02 1998
++++ doc/Makefile.in	Wed Jul 15 01:43:40 1998
+@@ -18,9 +18,10 @@
+ CFLAGS=@CFLAGS@ -DSHAREDIR=\"$(sharedir)\" $(XCPPFLAGS)
+ LDFLAGS=@LDFLAGS@
+ 
+-
+ all: manual.txt mutt.man manual.html
+ 
 +fbsd: manual.latin1 manual.html
 +
- all: manual.txt manual.html
- 
- manual.txt: manual.sgml
+ install: mutt.man manual.txt
+ 	../mkinstalldirs $(mandir)/man1
+ 	$(INSTALL) -m 644 mutt.man $(mandir)/man1/mutt.1
+@@ -36,7 +37,11 @@
  	sgml2txt 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 *~
+ mutt.man: mutt.sgml
+ 	sgml2txt -man mutt
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index 0dc8e631cdf..7d35eb9db41 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -3,7 +3,7 @@ man/man1/mutt.1.gz
 share/misc/Muttrc
 share/misc/mime.types
 share/doc/mutt/manual.txt
-share/doc/mutt/pgp-Notes.txt
+share/doc/mutt/PGP-Notes.txt
 share/doc/mutt/language.txt
 share/doc/mutt/language50.txt
 share/doc/mutt/sample.muttrc