Install vanilla info files in a package specific directory

to avoid conflicting with Emacsen packages provided info files while
retaining consistent cross-references.
I.e a command like `$ INFOPATH=/usr/pkg/share/doc/gnus/info info' will
only give you access to the info files of_this_ version of GNUS.

Convert to USE_NEW_TEXINFO.

Bump PKGREVISION.

5 files changed, 41 insertions, 71 deletions

diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile
index 607382a8f8b..617d2805f43 100644
--- a/mail/gnus/Makefile
+++ b/mail/gnus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/05/31 13:56:41 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/08 09:58:53 seb Exp $
 
 DISTNAME=	gnus-5.10.2
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://quimby.gnus.org/gnus/dist/
 
@@ -13,11 +14,13 @@ COMMENT=	Gnus is a flexible message reader running under GNU Emacs
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-lispdir=${EMACS_LISPPREFIX}/gnus
 CONFIGURE_ARGS+=	--with-etcdir=${PREFIX}/share/gnus
+# Avoid conflicting with Emacsen provided gnus info files
+CONFIGURE_ARGS+=	--infodir=${PREFIX}/share/doc/gnus/info
 
-post-extract:
-	${MV} ${WRKSRC}/texi/gnus.texi ${WRKSRC}/texi/ognus.texi
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=		YES
+INFO_DIR=		share/doc/gnus/info
+INFO_FILES=		emacs-mime gnus message pgg sieve
 
 .include "../../mk/emacs.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/mail/gnus/PLIST b/mail/gnus/PLIST
index 6ad5d0fbbdb..1d4a1ce1ea8 100644
--- a/mail/gnus/PLIST
+++ b/mail/gnus/PLIST
@@ -1,40 +1,33 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/31 13:56:41 uebayasi Exp $
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ognus.info
-info/ognus
-info/ognus-1
-info/ognus-10
-info/ognus-11
-info/ognus-12
-info/ognus-13
-info/ognus-14
-info/ognus-15
-info/ognus-16
-info/ognus-17
-info/ognus-18
-info/ognus-19
-info/ognus-2
-info/ognus-20
-info/ognus-21
-info/ognus-22
-info/ognus-3
-info/ognus-4
-info/ognus-5
-info/ognus-6
-info/ognus-7
-info/ognus-8
-info/ognus-9
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ognus.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/message.info
-info/message
-info/message-1
-info/message-2
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/message.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/pgg.info
-info/pgg
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/pgg.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/sieve.info
-info/sieve
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/sieve.info
+@comment $NetBSD: PLIST,v 1.2 2003/07/08 09:58:53 seb Exp $
+share/doc/gnus/info/emacs-mime
+share/doc/gnus/info/gnus
+share/doc/gnus/info/gnus-1
+share/doc/gnus/info/gnus-10
+share/doc/gnus/info/gnus-11
+share/doc/gnus/info/gnus-12
+share/doc/gnus/info/gnus-13
+share/doc/gnus/info/gnus-14
+share/doc/gnus/info/gnus-15
+share/doc/gnus/info/gnus-16
+share/doc/gnus/info/gnus-17
+share/doc/gnus/info/gnus-18
+share/doc/gnus/info/gnus-19
+share/doc/gnus/info/gnus-2
+share/doc/gnus/info/gnus-20
+share/doc/gnus/info/gnus-21
+share/doc/gnus/info/gnus-22
+share/doc/gnus/info/gnus-3
+share/doc/gnus/info/gnus-4
+share/doc/gnus/info/gnus-5
+share/doc/gnus/info/gnus-6
+share/doc/gnus/info/gnus-7
+share/doc/gnus/info/gnus-8
+share/doc/gnus/info/gnus-9
+share/doc/gnus/info/message
+share/doc/gnus/info/message-1
+share/doc/gnus/info/message-2
+share/doc/gnus/info/pgg
+share/doc/gnus/info/sieve
 share/gnus/gnus-tut.txt
 share/gnus/gnus/bar.xbm
 share/gnus/gnus/bar.xpm
@@ -458,6 +451,8 @@ ${EMACS_LISPPREFIX}/gnus/uudecode.el
 ${EMACS_LISPPREFIX}/gnus/uudecode.elc
 ${EMACS_LISPPREFIX}/gnus/yenc.el
 ${EMACS_LISPPREFIX}/gnus/yenc.elc
+@dirrm share/doc/gnus/info
+@dirrm share/doc/gnus
 @dirrm share/gnus/smilies
 @dirrm share/gnus/gnus
 @dirrm share/gnus
diff --git a/mail/gnus/distinfo b/mail/gnus/distinfo
index 69aad76bc93..94bd9814232 100644
--- a/mail/gnus/distinfo
+++ b/mail/gnus/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/05/31 13:56:40 uebayasi Exp $
+$NetBSD: distinfo,v 1.2 2003/07/08 09:58:53 seb Exp $
 
 SHA1 (gnus-5.10.2.tar.gz) = e44fd0435ce56e82e532dd030d7a86542cbace06
 Size (gnus-5.10.2.tar.gz) = 2256225 bytes
-SHA1 (patch-aa) = 34633c278c4c715594552d7e89c34df3dbb53362
-SHA1 (patch-ab) = cdc54882b9c1179cd43a75b71f15d9e2a9968a61
diff --git a/mail/gnus/patches/patch-aa b/mail/gnus/patches/patch-aa
deleted file mode 100644
index 1381cf348c3..00000000000
--- a/mail/gnus/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/05/31 13:56:41 uebayasi Exp $
-
---- texi/Makefile.in.old	2003-02-07 15:27:59.000000000 +0100
-+++ texi/Makefile.in	2003-05-21 12:42:51.000000000 +0200
-@@ -18,7 +18,7 @@
- INSTALL_DATA = @INSTALL_DATA@
- SHELL = /bin/sh
- PAPERTYPE=a4
--INFO_DEPS=gnus message emacs-mime sieve pgg
-+INFO_DEPS=ognus message sieve pgg
- 
- all: $(INFO_DEPS)
- 
diff --git a/mail/gnus/patches/patch-ab b/mail/gnus/patches/patch-ab
deleted file mode 100644
index 0690a3c4ddd..00000000000
--- a/mail/gnus/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/05/31 13:56:41 uebayasi Exp $
-
---- texi/ognus.texi.old	2003-05-21 12:40:48.000000000 +0200
-+++ texi/ognus.texi	2003-05-21 12:43:57.000000000 +0200
-@@ -7,7 +7,7 @@
- @syncodeindex pg cp
- @dircategory Emacs
- @direntry
--* Gnus: (gnus).         The newsreader Gnus.
-+* Gnus: (ognus).         The newsreader Gnus.
- @end direntry
- @iftex
- @finalout