List info files directly in the PLIST and honor PKG{INFO,MAN}DIR.

18 files changed, 43 insertions, 47 deletions

diff --git a/sysutils/cfengine2-doc/Makefile b/sysutils/cfengine2-doc/Makefile
index f59ef7d702f..a0cf24b8651 100644
--- a/sysutils/cfengine2-doc/Makefile
+++ b/sysutils/cfengine2-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/07 19:54:16 jlam Exp $
 #
 
 PKGNAME=	cfengine-doc-${CFENGINE_VERSION}
@@ -10,14 +10,16 @@ COMMENT=	Documentation for cfengine
 
 NO_CONFIGURE=   yes
 NO_BUILD=       yes
-INFO_FILES=	cfengine-Reference.info cfengine-Tutorial.info
-INFO_FILES+=	cfengine-Anomalies.info
+INFO_FILES=	# PLIST
 
-INSTALLATION_DIRS=	info
+HTMLDIR=		${PREFIX}/share/doc/html/cfengine
+INSTALLATION_DIRS=	${PKGINFODIR} ${HTMLDIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.info* ${PREFIX}/info
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/cfengine
-	${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.html ${PREFIX}/share/doc/html/cfengine
+	cd ${WRKSRC}/doc; for f in *.info *.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
+	${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.html ${HTMLDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cfengine2-doc/PLIST b/sysutils/cfengine2-doc/PLIST
index 3e14978a119..c9a4ca7eb66 100644
--- a/sysutils/cfengine2-doc/PLIST
+++ b/sysutils/cfengine2-doc/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/23 22:50:59 ben Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/07 19:54:16 jlam Exp $
+info/cfengine-Anomalies.info
+info/cfengine-Reference.info
+info/cfengine-Tutorial.info
 share/doc/html/cfengine/cfengine-Anomalies.html
 share/doc/html/cfengine/cfengine-Reference.html
 share/doc/html/cfengine/cfengine-Tutorial.html
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index f490ecd8839..64a3823d47d 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/12 12:37:30 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/07 19:54:16 jlam Exp $
 
 DISTNAME=	coreutils-5.2.1
 PKGREVISION=	2
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		YES
 USE_TOOLS+=		perl
 USE_PKGLOCALEDIR=	YES
 
-INFO_FILES=	coreutils.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/sysutils/coreutils/PLIST b/sysutils/coreutils/PLIST
index 66e0661701f..e7767717a68 100644
--- a/sysutils/coreutils/PLIST
+++ b/sysutils/coreutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/03/21 14:44:08 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/07 19:54:16 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}[
 bin/${GNU_PROGRAM_PREFIX}basename
 bin/${GNU_PROGRAM_PREFIX}cat
@@ -89,6 +89,7 @@ bin/${GNU_PROGRAM_PREFIX}wc
 bin/${GNU_PROGRAM_PREFIX}who
 bin/${GNU_PROGRAM_PREFIX}whoami
 bin/${GNU_PROGRAM_PREFIX}yes
+info/coreutils.info
 man/man1/${GNU_PROGRAM_PREFIX}basename.1
 man/man1/${GNU_PROGRAM_PREFIX}cat.1
 man/man1/${GNU_PROGRAM_PREFIX}chgrp.1
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 9d587b40ed5..5061c0321ae 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/05 16:27:28 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/07 19:54:16 jlam Exp $
 #
 
 DISTNAME=	e2fsprogs-1.32
@@ -14,7 +14,7 @@ COMMENT=	Second extended file system (ext2fs) management programs
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	makeinfo
-INFO_FILES=	libext2fs.info
+INFO_FILES=	# PLIST.common
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/e2fsprogs/PLIST.common b/sysutils/e2fsprogs/PLIST.common
index 8bad96dd73c..2c6b8581591 100644
--- a/sysutils/e2fsprogs/PLIST.common
+++ b/sysutils/e2fsprogs/PLIST.common
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST.common,v 1.3 2004/03/10 01:13:58 seb Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2006/04/07 19:54:16 jlam Exp $
 bin/chattr
 bin/lsattr
 bin/uuidgen
+info/libext2fs.info
 man/man1/chattr.1
 man/man1/lsattr.1
 man/man1/uuidgen.1
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 2d8c994ccea..d2a4a84b91e 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/01/13 18:14:54 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/04/07 19:54:16 jlam Exp $
 
 SHA1 (e2fsprogs-1.32.tar.gz) = 409bbdbc48b5f8ec5006e283962d8432d971d51f
 RMD160 (e2fsprogs-1.32.tar.gz) = eeaaee7dd9eb202a9f2abccdf1f3acb65c0f216d
@@ -6,7 +6,6 @@ Size (e2fsprogs-1.32.tar.gz) = 2894603 bytes
 SHA1 (patch-aa) = 61561b5c12345aceee3d8b46249b805a3f97822b
 SHA1 (patch-ab) = 932d19e15eed6589e124de60c35712b32e86eb83
 SHA1 (patch-ac) = 171e7e887f62831ebf8c48c6aa84cd3804f02067
-SHA1 (patch-ad) = 6aff39f1ca9ff0c43333168a190e16c4d7d98e2b
 SHA1 (patch-ae) = 85d394a64681882006854beee6826d4c6a6cd442
 SHA1 (patch-af) = dcdd61ea70b6eb322733249c9fb38d764243d6c4
 SHA1 (patch-ag) = 4afd200cd9a8a9afa429b15438e480d975312190
diff --git a/sysutils/e2fsprogs/patches/patch-ad b/sysutils/e2fsprogs/patches/patch-ad
deleted file mode 100644
index 82911146147..00000000000
--- a/sysutils/e2fsprogs/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/08/05 14:24:58 seb Exp $
-
---- doc/Makefile.in.orig	2002-02-24 21:03:58.000000000 +0000
-+++ doc/Makefile.in
-@@ -13,7 +13,7 @@ INSTALL = @INSTALL@
- 
- DVI=texi2dvi
- DVIPS=dvips -o "$@"
--INFO=makeinfo
-+INFO=$(MAKEINFO) --no-split
- HTML=texi2html
- 
- all:: libext2fs.info libext2fs.dvi
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 40b611703e2..c8d75afeeb5 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/04 21:30:41 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=	grub-0.97
@@ -14,8 +14,7 @@ ONLY_FOR_PLATFORM=	*-*-i386
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
-
-INFO_FILES=		grub.info multiboot.info
+INFO_FILES=		# PLIST
 
 BUILDLINK_TRANSFORM+=	rename:-fno-builtin:-ffreestanding
 
diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST
index 1a8c3a94a54..da0ceb4056a 100644
--- a/sysutils/grub/PLIST
+++ b/sysutils/grub/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2005/02/19 10:23:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/04/07 19:54:17 jlam Exp $
 bin/mbchk
+info/grub.info
+info/multiboot.info
 man/man1/mbchk.1
 man/man8/grub-install.8
 man/man8/grub-md5-crypt.8
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index 75d41c65aef..fccd63ad4f4 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/05 16:27:28 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/04/07 19:54:17 jlam Exp $
 
 DISTNAME=	mtools-3.9.10
 PKGREVISION=	1
@@ -14,7 +14,7 @@ NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64	# LP64 problem
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake makeinfo
-INFO_FILES=		mtools.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/mtools/PLIST b/sysutils/mtools/PLIST
index 5ef68892774..b6f56d4e025 100644
--- a/sysutils/mtools/PLIST
+++ b/sysutils/mtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/04/04 08:56:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/04/07 19:54:17 jlam Exp $
 bin/amuFormat.sh
 ${NOFLOPPYD}bin/floppyd
 ${NOFLOPPYD}bin/floppyd_installtest
@@ -33,6 +33,7 @@ bin/mxtar
 bin/mzip
 bin/tgz
 bin/uz
+info/mtools.info
 ${NOFLOPPYD}man/man1/floppyd.1
 ${NOFLOPPYD}man/man1/floppyd_installtest.1
 man/man1/mattrib.1
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index 20229baee05..c7e9dbe526a 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:42 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=		pv-0.8.6
@@ -16,8 +16,7 @@ BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
-
-INFO_FILES=		pv.info
+INFO_FILES=		# PLIST
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pv
diff --git a/sysutils/pv/PLIST b/sysutils/pv/PLIST
index e9fe9cacdb5..d594590461d 100644
--- a/sysutils/pv/PLIST
+++ b/sysutils/pv/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2004/10/27 22:45:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/07 19:54:17 jlam Exp $
 bin/pv
+info/pv.info
 man/man1/pv.1
 share/doc/pv/COPYING
 share/doc/pv/NEWS
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
index fa53587e29e..5b40eb8cb52 100644
--- a/sysutils/stow/Makefile
+++ b/sysutils/stow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=	stow-1.3.3
@@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	perl:run
-
-INFO_FILES=	stow.info
+INFO_FILES=	# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/stow/PLIST b/sysutils/stow/PLIST
index 47381706090..35f61b9ce05 100644
--- a/sysutils/stow/PLIST
+++ b/sysutils/stow/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/10 01:30:35 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/07 19:54:17 jlam Exp $
 bin/stow
+info/stow.info
 man/man8/stow.8
diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile
index 9ce08dba06d..f501333419e 100644
--- a/sysutils/vcdimager/Makefile
+++ b/sysutils/vcdimager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=	vcdimager-0.6.2
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
-INFO_FILES=	vcdimager.info
+INFO_FILES=	# PLIST
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
diff --git a/sysutils/vcdimager/PLIST b/sysutils/vcdimager/PLIST
index 15cc2cc8a68..56e981c0189 100644
--- a/sysutils/vcdimager/PLIST
+++ b/sysutils/vcdimager/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/10 01:32:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/07 19:54:17 jlam Exp $
 bin/vcdimager
 bin/vcdrip
+info/vcdimager.info
 man/man1/vcdimager.1
 man/man1/vcdrip.1