Convert to USE_NEW_TEXINFO.

Patch .texi file to add Info directory entry.

5 files changed, 35 insertions, 8 deletions

diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 66748fee9d7..96e6e1a7f0c 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:46:22 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/31 16:07:01 seb Exp $
 # FreeBSD Id: ports/mail/mailcrypt/Makefile,v 1.7 2000/05/14 05:21:52 billf Exp
 
 DISTNAME=	mailcrypt-3.5.6
@@ -15,6 +15,9 @@ EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
 GNU_CONFIGURE=	yes
 MAKE_ENV+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX}
 
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=	YES
+INFO_FILES=	mailcrypt.info
+
 .include "../../mk/emacs.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailcrypt/PLIST b/mail/mailcrypt/PLIST
index 4a7c6464f31..74bdaca3666 100644
--- a/mail/mailcrypt/PLIST
+++ b/mail/mailcrypt/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2003/07/09 14:24:36 seb Exp $
-@unexec ${INSTALL_INFO} --delete %D/info/mailcrypt.info %D/info/dir
+@comment $NetBSD: PLIST,v 1.4 2003/07/31 16:07:02 seb Exp $
 info/mailcrypt.info
 info/mailcrypt.info-1
 info/mailcrypt.info-2
-@exec   ${INSTALL_INFO}          %D/info/mailcrypt.info %D/info/dir
 ${EMACS_LISPPREFIX}/expect.el
 ${EMACS_LISPPREFIX}/expect.elc
 ${EMACS_LISPPREFIX}/mailcrypt.el
diff --git a/mail/mailcrypt/distinfo b/mail/mailcrypt/distinfo
index 3e8f6acf066..ab546ed51be 100644
--- a/mail/mailcrypt/distinfo
+++ b/mail/mailcrypt/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/07/09 14:24:36 seb Exp $
+$NetBSD: distinfo,v 1.3 2003/07/31 16:07:02 seb Exp $
 
 SHA1 (mailcrypt-3.5.6.tar.gz) = ac53c42c5e1b7f2200582204217f321a46b5f436
 Size (mailcrypt-3.5.6.tar.gz) = 158813 bytes
-SHA1 (patch-aa) = 172c852a96ecbad78fe6710190298d1bee2b2e53
+SHA1 (patch-aa) = 07f5da8d69707bab3a0c0f9b4e820a6131c3b270
+SHA1 (patch-ab) = 3d0dfd17ddef6b33c0364e391bdc25fb3e309712
diff --git a/mail/mailcrypt/patches/patch-aa b/mail/mailcrypt/patches/patch-aa
index 161ca9bbbc0..820c6b95cf0 100644
--- a/mail/mailcrypt/patches/patch-aa
+++ b/mail/mailcrypt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2003/07/09 14:24:36 seb Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/31 16:07:04 seb Exp $
 
 --- Makefile.in.orig	2000-10-29 10:41:52.000000000 +0000
 +++ Makefile.in
@@ -11,3 +11,11 @@ $NetBSD: patch-aa,v 1.1 2003/07/09 14:24:36 seb Exp $
  
  # Where to put the Info files
  infodir=$(prefix)/info
+@@ -27,7 +27,6 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_INFO = @INSTALL_INFO@
+ 
+ # Various auxiliary programs
+-MAKEINFO=makeinfo
+ DVIPS=dvips
+ TEXI2DVI=texi2dvi
+ TEXI2HTML=texi2html
diff --git a/mail/mailcrypt/patches/patch-ab b/mail/mailcrypt/patches/patch-ab
new file mode 100644
index 00000000000..6b67627a8b2
--- /dev/null
+++ b/mail/mailcrypt/patches/patch-ab
@@ -0,0 +1,17 @@
+$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}