4 files changed, 11 insertions, 30 deletions
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index dcc849d2b7d..275b6c01757 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/08/09 11:08:54 seb Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/11 15:57:42 seb Exp $
 # FreeBSD Id: ports/mail/mailcrypt/Makefile,v 1.7 2000/05/14 05:21:52 billf Exp
 
-DISTNAME=	mailcrypt-3.5.6
+DISTNAME=	mailcrypt-3.5.8
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mailcrypt/}
 
@@ -15,7 +15,6 @@ EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
 GNU_CONFIGURE=	yes
 MAKE_ENV+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX}
 
-USE_MAKEINFO=	YES
 INFO_FILES=	mailcrypt.info
 
 .include "../../mk/emacs.mk"
diff --git a/mail/mailcrypt/distinfo b/mail/mailcrypt/distinfo
index ab546ed51be..8a7a90e44cb 100644
--- a/mail/mailcrypt/distinfo
+++ b/mail/mailcrypt/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/07/31 16:07:02 seb Exp $
+$NetBSD: distinfo,v 1.4 2003/08/11 15:57:42 seb Exp $
 
-SHA1 (mailcrypt-3.5.6.tar.gz) = ac53c42c5e1b7f2200582204217f321a46b5f436
-Size (mailcrypt-3.5.6.tar.gz) = 158813 bytes
-SHA1 (patch-aa) = 07f5da8d69707bab3a0c0f9b4e820a6131c3b270
-SHA1 (patch-ab) = 3d0dfd17ddef6b33c0364e391bdc25fb3e309712
+SHA1 (mailcrypt-3.5.8.tar.gz) = 5c107c74150113bdb9ddd76dccf1ad62eec3c296
+Size (mailcrypt-3.5.8.tar.gz) = 213415 bytes
+SHA1 (patch-aa) = 6b44ca1ad6c13df2a85602c360f07fd741a2a3bd
diff --git a/mail/mailcrypt/patches/patch-aa b/mail/mailcrypt/patches/patch-aa
index 820c6b95cf0..cb944afd4ba 100644
--- a/mail/mailcrypt/patches/patch-aa
+++ b/mail/mailcrypt/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2003/07/31 16:07:04 seb Exp $
+$NetBSD: patch-aa,v 1.3 2003/08/11 15:57:43 seb Exp $
 
---- Makefile.in.orig	2000-10-29 10:41:52.000000000 +0000
+--- Makefile.in.orig	2002-09-25 04:57:03.000000000 +0000
 +++ Makefile.in
 @@ -12,7 +12,7 @@ exec_prefix = @exec_prefix@
  datadir = $(prefix)/share
  
  # Where to put the .el and .elc files
--lispdir=$(datadir)/emacs/site-lisp
-+lispdir=$(EMACS_LISPPREFIX)
+-lispdir = $(datadir)/emacs/site-lisp
++lispdir = $(EMACS_LISPPREFIX)
  
  # Where to put the Info files
- infodir=$(prefix)/info
+ infodir = @infodir@
 @@ -27,7 +27,6 @@ INSTALL_DATA = @INSTALL_DATA@
  INSTALL_INFO = @INSTALL_INFO@
  
diff --git a/mail/mailcrypt/patches/patch-ab b/mail/mailcrypt/patches/patch-ab
deleted file mode 100644
index 6b67627a8b2..00000000000
--- a/mail/mailcrypt/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/07/31 16:07:04 seb Exp $
-
---- mailcrypt.texi.orig	2001-05-22 06:45:04.000000000 +0000
-+++ mailcrypt.texi
-@@ -45,6 +45,12 @@ Software Foundation, 675 Mass Ave, Cambr
- 
- @end ifinfo
- 
-+@dircategory Emacs
-+@direntry
-+* Mailcrypt: (mailcrypt).        Emacs Interface to cryptographic functions
-+                                 for mail and news.
-+@end direntry
-+
- @titlepage
- @title Mailcrypt: An EMACS Interface to PGP
- @subtitle Version @value{VERSION}