List the info pages directly in the PLIST and ensure that we honor

PKGINFODIR.

8 files changed, 26 insertions, 16 deletions

diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 4564da0b875..ce8ed91581f 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/03/04 21:30:27 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=		a2ps-4.13b
 PKGNAME=		a2ps-4.13.0.2
@@ -34,8 +34,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 EGDIR=			${PREFIX}/share/examples/a2ps
 CONF_FILES=		${EGDIR}/a2ps-site.cfg ${PKG_SYSCONFDIR}/a2ps-site.cfg
 CONF_FILES+=		${EGDIR}/a2ps.cfg ${PKG_SYSCONFDIR}/a2ps.cfg
-
-INFO_FILES=		a2ps.info ogonkify.info regex.info
+INFO_FILES=		# PLIST
 
 pre-build:
 	${TOUCH} ${WRKSRC}/doc/*.info
diff --git a/print/a2ps/PLIST b/print/a2ps/PLIST
index 8995c1d84dd..b91b407be2c 100644
--- a/print/a2ps/PLIST
+++ b/print/a2ps/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:50 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/31 23:56:28 jlam Exp $
 bin/a2ps
 bin/card
 bin/composeglyphs
@@ -10,6 +10,9 @@ bin/psmandup
 bin/psset
 bin/texi2dvi4a2ps
 include/liba2ps.h
+info/a2ps.info
+info/ogonkify.info
+info/regex.info
 lib/liba2ps.la
 man/man1/a2ps.1
 man/man1/card.1
diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile
index daed3ae0bd5..609956f1186 100644
--- a/print/gimp-print-lib/Makefile
+++ b/print/gimp-print-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:30:29 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/31 23:56:29 jlam Exp $
 
 DISTNAME=	gimp-print-4.2.7
 PKGNAME=	gimp-print-lib-4.2.7
@@ -13,7 +13,7 @@ COMMENT=	Drivers for Canon, Epson, Lexmark, and PCL printers
 USE_TOOLS+=		gmake lex
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-INFO_FILES=		gimpprint.info
+INFO_FILES=		# PLIST
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-cups
diff --git a/print/gimp-print-lib/PLIST b/print/gimp-print-lib/PLIST
index 6b6b9eb5332..a03fd4f95a4 100644
--- a/print/gimp-print-lib/PLIST
+++ b/print/gimp-print-lib/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.14 2004/09/27 11:33:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/03/31 23:56:29 jlam Exp $
 bin/gimpprint-config
 include/gimp-print/gimp-print.h
+info/gimpprint.info
 lib/libgimpprint.la
 man/man1/gimpprint-config.1
 man/man3/gimpprint.3
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index a09ba25345c..b99d65212fc 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: Makefile,v 1.67 2006/03/31 23:56:29 jlam Exp $
 
 DISTNAME=	tetex-src-${TETEX_BIN_VERS}
 PKGNAME=	teTeX-bin-${TETEX_BIN_VERS}
@@ -13,11 +13,11 @@ COMMENT=	TeX distribution for UNIX compatible systems - executables, version 2
 # games/omega previously installed an omega executable too
 CONFLICTS+=	teTeX2-bin-[0-9]* omega<0.90.4nb1
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 DEPENDS+=	teTeX-share>=2.0.2:../../print/teTeX-share
 DEPENDS+=	dialog>=0.6z:../../misc/dialog
 
-INFO_FILES=	latex.info dvips.info web2c.info kpathsea.info
+USE_TOOLS+=	bison
+INFO_FILES=	# PLIST
 
 REPLACE_PERL=	texk/xdvik/t1mapper \
 		texk/oxdvik/t1mapper
diff --git a/print/teTeX-bin/PLIST b/print/teTeX-bin/PLIST
index a47391bd2ac..632c6673c4e 100644
--- a/print/teTeX-bin/PLIST
+++ b/print/teTeX-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/09 19:59:09 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/31 23:56:29 jlam Exp $
 @comment There are three files in this package that teTeX-share installs
 @comment and that teTeX-bin modifies. Take care of this:
 bin/MakeTeXPK
@@ -188,6 +188,10 @@ include/kpathsea/types.h
 include/kpathsea/variable.h
 include/kpathsea/xopendir.h
 include/kpathsea/xstat.h
+info/dvips.info
+info/kpathsea.info
+info/latex.info
+info/web2c.info
 lib/libkpathsea.a
 man/man1/MakeTeXPK.1
 man/man1/access.1
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index 72addbba866..451cbd5e596 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:32 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/31 23:56:29 jlam Exp $
 
 DISTNAME=	teTeX-src-1.0.7
 PKGNAME=	teTeX-bin-1.0.7
@@ -10,7 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	TeX distribution for UNIX compatible systems - executables
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 DEPENDS+=	teTeX-share-1.0.[2-9]*:../../print/teTeX1-share
 DEPENDS+=	dialog>=0.6z:../../misc/dialog
 
@@ -22,11 +21,11 @@ DIST_SUBDIR=		teTeX
 BUILD_TARGET=		all
 INSTALL_TARGET=		install strip
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		bison gmake
 USE_LANGUAGES=		c c++
 CFLAGS+=		-Dunix
 
-INFO_FILES=		latex.info dvips.info web2c.info kpathsea.info
+INFO_FILES=		# PLIST
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-texinfo
diff --git a/print/teTeX1-bin/PLIST b/print/teTeX1-bin/PLIST
index daaa77e5dd3..4de5e6e77a9 100644
--- a/print/teTeX1-bin/PLIST
+++ b/print/teTeX1-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/09 20:08:07 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/31 23:56:29 jlam Exp $
 @comment There are three files in this package that teTeX-share installs
 @comment and that teTeX-bin modifies. Take care of this:
 lib/libkpathsea.a
@@ -54,6 +54,10 @@ include/kpathsea/c-ctype.h
 include/kpathsea/c-auto.h
 include/kpathsea/absolute.h
 @dirrm include/kpathsea
+info/dvips.info
+info/kpathsea.info
+info/latex.info
+info/web2c.info
 @comment also in teTeX-share; touched but unmodified: share/texmf/fontname/linot-cd.map
 @comment also in teTeX-share; touched but unmodified: share/texmf/fontname/itc.map
 @comment also in teTeX-share; touched but unmodified: share/texmf/fontname/softkey.map