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

10 files changed, 28 insertions, 24 deletions

diff --git a/print/dvipng/Makefile b/print/dvipng/Makefile
index 65705e13668..ca12916e4dc 100644
--- a/print/dvipng/Makefile
+++ b/print/dvipng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/04/06 15:57:32 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 18:18:15 jlam Exp $
 
 DISTNAME=	dvipng-1.7
 CATEGORIES=	textproc converters
@@ -13,8 +13,7 @@ CONFLICTS+=	teTeX-bin-[3-9].* teTeX-bin-[1-9][0-9]*
 USE_TOOLS+=		makeinfo
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-
-INFO_FILES=		dvipng.info
+INFO_FILES=		# PLIST
 
 BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.3
 
diff --git a/print/dvipng/PLIST b/print/dvipng/PLIST
index fa61ec83091..32c946cf4d5 100644
--- a/print/dvipng/PLIST
+++ b/print/dvipng/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/13 20:31:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/06 18:18:15 jlam Exp $
 bin/dvigif
 bin/dvipng
+info/dvipng.info
 man/man1/dvigif.1
 man/man1/dvipng.1
diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index 763e7d2794b..1b0a3e601c8 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/04/06 16:16:38 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/04/06 18:18:15 jlam Exp $
 #
 
 DISTNAME=		enscript-1.6.3
@@ -16,7 +16,7 @@ USE_TOOLS+=		gmake
 BROKEN_GETTEXT_DETECTION=	yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-INFO_FILES=		enscript.info
+INFO_FILES=		# PLIST
 
 EGDIR=			${PREFIX}/share/examples/enscript
 CONF_FILES=		${EGDIR}/enscript.cfg ${PKG_SYSCONFDIR}/enscript.cfg
diff --git a/print/enscript/PLIST b/print/enscript/PLIST
index 423037c5a88..bdeaabc68fb 100644
--- a/print/enscript/PLIST
+++ b/print/enscript/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2005/03/17 12:24:13 salo Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/06 18:18:15 jlam Exp $
 bin/diffpp
 bin/enscript
 bin/mkafmmap
 bin/over
 bin/sliceprint
 bin/states
+info/enscript.info
 man/man1/diffpp.1
 man/man1/enscript.1
 man/man1/sliceprint.1
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 2266eb7d64f..2e9bcd92e64 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2006/03/05 16:27:28 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2006/04/06 18:18:15 jlam Exp $
 
 DISTNAME=	gv-3.6.1
 PKGREVISION=	1
@@ -13,7 +13,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake gs:run makeinfo
 
 TEXINFO_REQD=		4.2
-INFO_FILES=		gv.info
+INFO_FILES=		# PLIST
 
 # this pkg does not work with std xaw, but xpm and xaw3d work
 XAW_TYPE?=		3d
@@ -26,7 +26,6 @@ XAW_TYPE=		3d
 .  include "../../pkgtools/libnbcompat/buildlink3.mk"
 post-extract:
 	cd ${WRKSRC}/src && ${LN} -s ${PREFIX}/include/nbcompat.h getopt.h
-
 .endif
 
 .include "../../mk/xaw.buildlink3.mk"
diff --git a/print/gv/PLIST b/print/gv/PLIST
index 54b3af2dcd6..572b9080d03 100644
--- a/print/gv/PLIST
+++ b/print/gv/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2004/12/30 21:04:25 snj Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/06 18:18:15 jlam Exp $
 bin/gv
+info/gv.info
 lib/gv/GV
 lib/gv/gv_class.ad
 lib/gv/gv_copyright.dat
diff --git a/print/latex-mk/Makefile b/print/latex-mk/Makefile
index c348d2702ac..034d7be447e 100644
--- a/print/latex-mk/Makefile
+++ b/print/latex-mk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/04 23:21:30 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/06 18:18:15 jlam Exp $
 #
 
 DISTNAME=	latex-mk-1.6
@@ -18,7 +18,7 @@ CONFIGURE_ENV+=	BMAKE=${MAKE_PROGRAM:Q}
 CONFIGURE_ENV+=	GZCAT=${GZCAT:Q}
 CONFIGURE_ENV+=	GZIP=${GZIP_CMD:Q}
 
-INFO_FILES=	latex-mk.info
+INFO_FILES=	# PLIST
 
 TEST_DIRS=	${WRKSRC}
 TEST_TARGET=	check
diff --git a/print/latex-mk/PLIST b/print/latex-mk/PLIST
index d84674aee46..09e3b42d480 100644
--- a/print/latex-mk/PLIST
+++ b/print/latex-mk/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2006/01/28 05:46:02 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/04/06 18:18:15 jlam Exp $
 bin/ieee-copyout
 bin/latex-mk
+info/latex-mk.info
 share/latex-mk/dated_draft.ps
 share/latex-mk/example/README-example.txt
 share/latex-mk/example/biblio.tex
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 5826f26e0a0..773f22656e3 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/04/06 16:27:30 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2006/04/06 18:18:15 jlam Exp $
 #
 
 DISTNAME=	lilypond-2.4.3
@@ -20,15 +20,14 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison gmake gs:run makeinfo
 MAKEFILE=		GNUmakefile
 
-TEXINFO_REQD=	4.7
-GCC_REQD+=	3.0.5
-INFO_DIR=	info/lilypond
-INFO_FILES=	lilypond.info lilypond-internals.info music-glossary.info
-CONFIGURE_HAS_INFODIR=	NO
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
+TEXINFO_REQD=		4.7
+GCC_REQD+=		3.0.5
+GNU_CONFIGURE_INFODIR=	${PREFIX}/${PKGINFODIR}
+INFO_DIR=		${GNU_CONFIGURE_INFODIR}
+INFO_FILES=		# PLIST
 
-CONFIGURE_ARGS+=--disable-optimising
-CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
+CONFIGURE_ARGS+=	--disable-optimising
+CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 PYTHON_VERSIONS_ACCEPTED= 21 23
 # 22 has some regular expression problem
 
diff --git a/print/lilypond/PLIST b/print/lilypond/PLIST
index b7aaf2d92c5..0824f53b86d 100644
--- a/print/lilypond/PLIST
+++ b/print/lilypond/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/02/02 14:38:12 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/04/06 18:18:15 jlam Exp $
 bin/abc2ly
 bin/convert-ly
 bin/etf2ly
@@ -8,6 +8,9 @@ bin/lilypond-latex
 bin/midi2ly
 bin/mup2ly
 bin/ps2png
+info/lilypond/lilypond-internals.info
+info/lilypond/lilypond.info
+info/lilypond/music-glossary.info
 lib/lilypond/${PKGVERSION}/python/midi.so
 man/man1/abc2ly.1
 man/man1/convert-ly.1