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

15 files changed, 31 insertions, 25 deletions

diff --git a/textproc/eblook/Makefile b/textproc/eblook/Makefile
index c66fbfb946d..55a64114f38 100644
--- a/textproc/eblook/Makefile
+++ b/textproc/eblook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/04/07 18:59:30 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=	eblook-1.6.1
@@ -13,7 +13,7 @@ COMMENT=	Interactive command-line interface for EPWING electric dictionaries
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	YES
-INFO_FILES=	eblook.info
+INFO_FILES=	# PLIST
 CONFIGURE_ARGS+=--with-eb-conf=${PKG_SYSCONFDIR.eb}/eb.conf
 LIBS+=		${BUILDLINK_LDADD.iconv}
 
diff --git a/textproc/eblook/PLIST b/textproc/eblook/PLIST
index 252bb35043b..1c688986c37 100644
--- a/textproc/eblook/PLIST
+++ b/textproc/eblook/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/10 01:47:29 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/07 19:54:17 jlam Exp $
 bin/eblook
+info/eblook.info
diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index b05e0461b7f..4475f946d07 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/05 16:27:28 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=	grep-2.5.1
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--disable-perl-regexp
 
 USE_TOOLS+=		makeinfo
 TEXINFO_REQD=		4.0
-INFO_FILES=		grep.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/textproc/grep/PLIST b/textproc/grep/PLIST
index dc236da4f08..262026aaf23 100644
--- a/textproc/grep/PLIST
+++ b/textproc/grep/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/10 01:50:11 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/07 19:54:17 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}grep
 bin/${GNU_PROGRAM_PREFIX}egrep
 bin/${GNU_PROGRAM_PREFIX}fgrep
+info/grep.info
 man/man1/${GNU_PROGRAM_PREFIX}grep.1
 man/man1/${GNU_PROGRAM_PREFIX}fgrep.1
 man/man1/${GNU_PROGRAM_PREFIX}egrep.1
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index fec959a08d1..f05a6c8c243 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/03/12 16:26:09 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=	groff-1.19.2
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		PERLPATH=${PERL5:Q}
 USE_TOOLS+=		gs:run perl:run sed:run
 
-INFO_FILES=	groff
+INFO_FILES=		# PLIST
 
 REPLACE_INTERPRETER+=	sed
 REPLACE.sed.old=	.*/sed
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index be66b7231d1..dda8772d15a 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/03/05 19:23:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/04/07 19:54:17 jlam Exp $
 bin/addftinfo
 bin/afmtodit
 bin/${GNU_PREFIX}eqn
@@ -32,6 +32,7 @@ bin/${GNU_PREFIX}soelim
 bin/${GNU_PREFIX}tbl
 bin/tfmtodit
 bin/${GNU_PREFIX}troff
+info/groff
 lib/groff/groffer/groffer2.sh
 man/man1/addftinfo.1
 man/man1/afmtodit.1
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 10dc4565d52..3cea7db65e0 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:30:46 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=	sed-4.1.1
@@ -20,7 +20,7 @@ CONFIG_STATUS_OVERRIDE=	# empty
 # at least Solaris-2.9 has issues with grep/egrep
 USE_TOOLS+=		grep
 
-INFO_FILES=		sed.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 .include "../../mk/bsd.prefs.mk"
diff --git a/textproc/gsed/PLIST b/textproc/gsed/PLIST
index 3dfcbc93bd7..85abdb5c2fc 100644
--- a/textproc/gsed/PLIST
+++ b/textproc/gsed/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.9 2004/06/25 15:17:55 seb Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/04/07 19:54:17 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}sed
+info/sed.info
 man/man1/${GNU_PROGRAM_PREFIX}sed.1
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/sed.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/sed.mo
diff --git a/textproc/ja-grep/Makefile b/textproc/ja-grep/Makefile
index a1ddcf4b317..b2bf5945a4b 100644
--- a/textproc/ja-grep/Makefile
+++ b/textproc/ja-grep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/07 19:27:19 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/07 19:54:17 jlam Exp $
 
 DISTNAME=	grep-2.4.2
 PKGNAME=	ja-grep-2.4.2
@@ -19,8 +19,7 @@ GNU_CONFIGURE=	yes
 USE_PKGLOCALEDIR=	yes
 CONFIGURE_ARGS+=	--program-transform-name='s,^,j,'
 TEST_TARGET=	check
-
-INFO_FILES=	grep.info
+INFO_FILES=	# PLIST
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-grep
diff --git a/textproc/ja-grep/PLIST b/textproc/ja-grep/PLIST
index a97e94a5f05..9daa654147a 100644
--- a/textproc/ja-grep/PLIST
+++ b/textproc/ja-grep/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/11 13:10:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/07 19:54:17 jlam Exp $
 bin/jgrep
 bin/jegrep
 bin/jfgrep
+info/grep.info
 man/man1/jgrep.1
 man/man1/jegrep.1
 man/man1/jfgrep.1
diff --git a/textproc/ja-sed/Makefile b/textproc/ja-sed/Makefile
index 76b77cc39d7..23c7309611d 100644
--- a/textproc/ja-sed/Makefile
+++ b/textproc/ja-sed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/11 13:06:22 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/07 19:54:17 jlam Exp $
 
 DISTNAME=	sed-3.02
 PKGNAME=	ja-sed-3.02
@@ -14,13 +14,12 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/sed/sed.html
 COMMENT=	GNU sed + multi-byte extension
 
-INFO_FILES=	sed.info
-
 CONFLICTS+=	gsed-[0-9]*
 
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--program-transform-name='s,^,j,'
+INFO_FILES=	# PLIST
 
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-sed
diff --git a/textproc/ja-sed/PLIST b/textproc/ja-sed/PLIST
index a9667881609..c72e2a11576 100644
--- a/textproc/ja-sed/PLIST
+++ b/textproc/ja-sed/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/11 13:28:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/07 19:54:17 jlam Exp $
 bin/jsed
+info/sed.info
 man/man1/jsed.1
 share/doc/ja-sed/OREADME.MB
 share/doc/ja-sed/README.MB
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index 99ba44090d8..1e61e2c2ced 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/05 16:27:28 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=	ndtpd-3.1.5
@@ -16,7 +16,7 @@ USE_TOOLS+=	makeinfo
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
-INFO_FILES=	ndtpd-ja.info ndtpd.info
+INFO_FILES=	# PLIST
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${NDTPD_RUNDIR:Q}
diff --git a/textproc/ndtpd/PLIST b/textproc/ndtpd/PLIST
index 15c4e7dc111..94483c55cb8 100644
--- a/textproc/ndtpd/PLIST
+++ b/textproc/ndtpd/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2005/05/02 20:34:06 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/07 19:54:17 jlam Exp $
+info/ndtpd-ja.info
+info/ndtpd.info
 libexec/ndtpstat
 share/examples/ndtpd/ndtpd.conf.default
 sbin/ndtpd
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 40b232b3531..80a062cc742 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:51 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/07 19:54:17 jlam Exp $
 #
 
 DISTNAME=	source-highlight-2.1.2
@@ -14,7 +14,7 @@ COMMENT=	Highlight syntax of various languages source into HTML document
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
-INFO_FILES=	source-highlight.info
+INFO_FILES=	# PLIST
 
 # this is only really needed for the 'test' target
 USE_TOOLS+=	gmake gsed