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

PKGINFODIR.

62 files changed, 147 insertions, 119 deletions

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 9c24133c42b..c637ea4831a 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/31 17:11:54 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	aalib-1.4rc5
 PKGNAME=	${DISTNAME:S/rc5/.0.5/}
@@ -15,6 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=			${WRKDIR}/aalib-1.4.0
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
+INFO_FILES=		# PLIST
 
 CONFIGURE_ENV+=		SLANG_PREFIX=${BUILDLINK_PREFIX.libslang:Q}
 CONFIGURE_ENV+=		NCURSES_PREFIX=${BUILDLINK_PREFIX.ncurses:Q}
@@ -27,8 +28,6 @@ SUBST_FILES.malloc=	src/aalinux.c src/aax.c src/aaxkbd.c		\
 			src/aamoureg.c src/aados.c src/aadoskbd.c
 SUBST_SED.malloc=	-e 's|<malloc.h>|<stdlib.h>|g'
 
-INFO_FILES=	aalib.info
-
 .include "options.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib/PLIST b/graphics/aalib/PLIST
index ecee6e2882b..812897a6159 100644
--- a/graphics/aalib/PLIST
+++ b/graphics/aalib/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 23:56:28 jlam Exp $
 bin/aafire
 bin/aainfo
 bin/aalib-config
 bin/aasavefont
 bin/aatest
 include/aalib.h
+info/aalib.info
 lib/libaa.la
 man/man1/aafire.1
 man/man3/aa_attrs.3
diff --git a/graphics/plotutils-nox11/Makefile b/graphics/plotutils-nox11/Makefile
index 56022c693ed..2a4dd870cb9 100644
--- a/graphics/plotutils-nox11/Makefile
+++ b/graphics/plotutils-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/31 17:28:11 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/31 23:56:28 jlam Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -18,8 +18,7 @@ PATCHDIR=		${.CURDIR}/../../graphics/plotutils/patches
 
 USE_LANGUAGES=		c c++
 
-INFO_FILES=	plotutils.info
-
+INFO_FILES=		# PLIST
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-libplotter
diff --git a/graphics/plotutils-nox11/PLIST b/graphics/plotutils-nox11/PLIST
index a68eec2c1c7..3cb2107ea96 100644
--- a/graphics/plotutils-nox11/PLIST
+++ b/graphics/plotutils-nox11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 23:56:28 jlam Exp $
 bin/double
 bin/graph
 bin/ode
@@ -10,6 +10,7 @@ bin/tek2plot
 include/plot.h
 include/plotcompat.h
 include/plotter.h
+info/plotutils.info
 lib/libplot.la
 lib/libplotter.la
 man/man1/ode.1
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 298b9879fa9..aba407cb60e 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/03/31 17:28:11 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2006/03/31 23:56:28 jlam Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -16,8 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		c c++
 
-INFO_FILES=	plotutils.info
-
+INFO_FILES=		# PLIST
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-libplotter
diff --git a/graphics/plotutils/PLIST b/graphics/plotutils/PLIST
index 5f39bdb0ea0..98f51e98cc3 100644
--- a/graphics/plotutils/PLIST
+++ b/graphics/plotutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 23:56:28 jlam Exp $
 bin/double
 bin/graph
 bin/ode
@@ -10,6 +10,7 @@ bin/tek2plot
 include/plot.h
 include/plotcompat.h
 include/plotter.h
+info/plotutils.info
 lib/libplot.la
 lib/libplotter.la
 man/man1/ode.1
diff --git a/lang/pnet/Makefile b/lang/pnet/Makefile
index 00f8c216f18..56aa24965ab 100644
--- a/lang/pnet/Makefile
+++ b/lang/pnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/05 16:27:26 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	pnet-0.6.6
 PKGREVISION=	2
@@ -16,8 +16,7 @@ CONFLICTS=	mono-[0-9]*
 USE_TOOLS+=	gmake makeinfo
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
-
-INFO_FILES=	pnettools.info
+INFO_FILES=	# PLIST
 
 PTHREAD_OPTS+=	require native
 
diff --git a/lang/pnet/PLIST b/lang/pnet/PLIST
index 372877ce66e..498a5ed961d 100644
--- a/lang/pnet/PLIST
+++ b/lang/pnet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 23:56:28 jlam Exp $
 bin/al
 bin/cli-unknown-ar
 bin/cli-unknown-cpp
@@ -85,6 +85,7 @@ include/pnet/il_values.h
 include/pnet/il_writer.h
 include/pnet/il_xml.h
 include/pnet/leak_detector.h
+info/pnettools.info
 lib/cscc/plugins/cscc-b
 lib/cscc/plugins/cscc-bf
 lib/cscc/plugins/cscc-c-s
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 3cf27f7fbf2..ce99c98b42c 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/12 16:33:32 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	cln-1.1.9
 PKGREVISION=	2
@@ -17,7 +17,6 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE+=	libtool
 PKGCONFIG_OVERRIDE=	cln.pc.in
-
-INFO_FILES=	cln.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/cln/PLIST b/math/cln/PLIST
index e0aeffa4856..6047271c8a4 100644
--- a/math/cln/PLIST
+++ b/math/cln/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/03/12 16:33:32 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 23:56:28 jlam Exp $
 bin/cln-config
 include/cln/GV.h
 include/cln/GV_complex.h
@@ -78,6 +78,7 @@ include/cln/univpoly_modint.h
 include/cln/univpoly_rational.h
 include/cln/univpoly_real.h
 include/cln/version.h
+info/cln.info
 lib/libcln.la
 lib/pkgconfig/cln.pc
 man/man1/cln-config.1
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index a6964abaa0f..486d1ce5069 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	fftw-3.1
 PKGREVISION=	1
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 
 PKGCONFIG_OVERRIDE+=	fftw.pc.in
-INFO_FILES=		fftw3.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/math/fftw/PLIST b/math/fftw/PLIST
index 87af138f408..68fca0ce769 100644
--- a/math/fftw/PLIST
+++ b/math/fftw/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/31 23:56:28 jlam Exp $
 bin/fftw-wisdom
 bin/fftw-wisdom-to-conf
 include/fftw3.f
 include/fftw3.h
+info/fftw3.info
 lib/libfftw3.la
 lib/pkgconfig/fftw3.pc
 man/man1/fftw-wisdom-to-conf.1
diff --git a/math/fftw2/PLIST b/math/fftw2/PLIST
index cd886533bc7..f60e95c4892 100644
--- a/math/fftw2/PLIST
+++ b/math/fftw2/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 23:56:28 jlam Exp $
 include/fftw.h
 include/rfftw.h
+info/fftw.info
 lib/libfftw.la
 lib/librfftw.la
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index ee90964c166..9601ebe6601 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/31 18:57:28 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	gsl-1.7
 CATEGORIES=	math devel
@@ -10,7 +10,7 @@ COMMENT=	The GNU Scientific Library
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-INFO_FILES=		gsl-ref.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/math/gsl/PLIST b/math/gsl/PLIST
index d86a86dace9..70e4c285905 100644
--- a/math/gsl/PLIST
+++ b/math/gsl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/09/30 12:31:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/03/31 23:56:28 jlam Exp $
 bin/gsl-config
 bin/gsl-histogram
 bin/gsl-randist
@@ -215,6 +215,7 @@ include/gsl/gsl_vector_ushort.h
 include/gsl/gsl_version.h
 include/gsl/gsl_wavelet.h
 include/gsl/gsl_wavelet2d.h
+info/gsl-ref.info
 lib/libgsl.la
 lib/libgslcblas.la
 lib/pkgconfig/gsl.pc
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
index 147e13d6153..d56851c7dcd 100644
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/02 19:09:39 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/31 23:56:28 jlam Exp $
 #
 
 DISTNAME=		mpfr-2.2.0
@@ -17,7 +17,7 @@ COMMENT=		GMP-based library for multiple-precision floating-point computations
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 TEST_TARGET=		check
-INFO_FILES=		mpfr.info
+INFO_FILES=		# PLIST
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 560e8b2fe07..a77401d0662 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/05 16:27:27 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	yorick-1.6.02
 PKGREVISION=	1
@@ -15,7 +15,7 @@ BUILD_DIRS=	${WRKSRC} ${WRKSRC}/doc
 INSTALL_DIRS=	${WRKSRC}
 
 USE_TOOLS+=	gmake makeinfo
-INFO_FILES=	yorick.info
+INFO_FILES=	# PLIST
 
 .include "../../mk/x11.buildlink3.mk"
 
@@ -26,11 +26,14 @@ post-patch:
 	done
 
 post-install:
-	for f in yorick gist; do \
-	cd ${PREFIX}/bin && ${LN} -sf ../lib/yorick/1.6/bin/$$f $$f; \
+	cd ${PREFIX}/bin; for f in yorick gist; do			\
+		${LN} -sf ../lib/yorick/1.6/bin/$$f $$f;		\
 	done
-	${INSTALL_DATA} ${WRKSRC}/doc/yorick.info* ${PREFIX}/info
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
+	cd ${WRKSRC}; for f in yorick.info yorick.info-[0-9]*; do	\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
+	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/${PKGMANDIR}/man1
 	cd ${PREFIX}/share/doc && ${LN} -sf ../yorick/1.6/doc yorick
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/emacs/*.el ${PREFIX}/share/emacs/site-lisp
diff --git a/math/yorick/PLIST b/math/yorick/PLIST
index 67739612817..f393554d3d3 100644
--- a/math/yorick/PLIST
+++ b/math/yorick/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2005/05/31 18:02:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/31 23:56:28 jlam Exp $
 bin/gist
 bin/yorick
+info/yorick.info
 lib/yorick/1.6/Make.cfg
 lib/yorick/1.6/Makedll
 lib/yorick/1.6/Makeexe
diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index 5272686e7a6..428ece63821 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:10:12 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	libcdio-0.76
 PKGREVISION=	1
@@ -20,8 +20,7 @@ PKGCONFIG_OVERRIDE+=	libcdio_paranoia.pc.in
 PKGCONFIG_OVERRIDE+=	libiso9660.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-versioned-libs
-
-INFO_FILES=		libcdio.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/libcdio/PLIST b/misc/libcdio/PLIST
index 5f04996e966..eb9648ec7aa 100644
--- a/misc/libcdio/PLIST
+++ b/misc/libcdio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/05/31 17:05:36 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/03/31 23:56:28 jlam Exp $
 bin/cd-drive
 bin/cd-info
 bin/cd-paranoia
@@ -30,6 +30,7 @@ include/cdio/types.h
 include/cdio/util.h
 include/cdio/version.h
 include/cdio/xa.h
+info/libcdio.info
 lib/libcdio.la
 lib/libcdio_cdda.la
 lib/libcdio_paranoia.la
diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile
index bb72dc398a4..260a92c1f84 100644
--- a/multimedia/libassetml/Makefile
+++ b/multimedia/libassetml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/31 23:56:28 jlam Exp $
 #
 
 DISTNAME=		libassetml-1.2.1
@@ -10,16 +10,14 @@ MAINTAINER=		reed@reedmedia.net
 HOMEPAGE=		http://www.ofset.org/assetml/
 COMMENT=		Library for sharing image and audio files between projects
 
-BUILD_DEPENDS+=	texi2html-[0-9]*:../../textproc/texi2html
-
 USE_DIRS+=		gnome2-1.5	# share/gnome/help
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake pkg-config texi2html
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/src/libassetml.pc.in
 GNU_CONFIGURE=		yes
-INFO_FILES=		libassetml.info
+INFO_FILES=		# PLIST
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/multimedia/libassetml/PLIST b/multimedia/libassetml/PLIST
index d6de21f3a3f..f174ec93827 100644
--- a/multimedia/libassetml/PLIST
+++ b/multimedia/libassetml/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/16 18:38:41 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/31 23:56:28 jlam Exp $
 bin/assetml-query
 include/libassetml-1.0/libassetml/assetml.h
+info/libassetml.info
 lib/libassetml.la
 lib/pkgconfig/libassetml.pc
 share/gnome/help/libassetml/C/libassetml.html
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index bd1ed9a78ba..df932fee047 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/09 21:04:45 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	mjpegtools-1.8.0
 PKGREVISION=	3
@@ -19,6 +19,7 @@ USE_TOOLS+=		bash:run pkg-config
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE+=	libtool
 PKGCONFIG_OVERRIDE=	mjpegtools.pc.in
+INFO_FILES=		# PLIST
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-libquicktime
@@ -27,15 +28,15 @@ CONFIGURE_ARGS+=	--with-lame-includes=${BUILDLINK_PREFIX.lame}
 
 .include "options.mk"
 
-INFO_FILES=		mjpeg-howto.info
-
 .include "../../audio/lame/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+#
 # GTK+ support is disabled to avoid a dependency on GTK+ when building GNOME2.
 # This only disables the "glav" program.  If you really need it, please add an
 # external package for it.
+#
 #.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/mjpegtools/PLIST b/multimedia/mjpegtools/PLIST
index 8ca6558d57e..41434d6fc83 100644
--- a/multimedia/mjpegtools/PLIST
+++ b/multimedia/mjpegtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/01/30 08:44:25 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/31 23:56:28 jlam Exp $
 bin/anytovcd.sh
 bin/jpeg2yuv
 bin/lav2avi.sh
@@ -96,6 +96,7 @@ include/mjpegtools/mplex/stream_params.hpp
 include/mjpegtools/mplex/systems.hpp
 include/mjpegtools/mplex/videostrm.hpp
 include/mjpegtools/yuv4mpeg.h
+info/mjpeg-howto.info
 lib/liblavfile.la
 lib/liblavjpeg.la
 lib/liblavplay.la
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 93dc8617480..560ade8c458 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2006/03/04 21:30:16 jlam Exp $
+# $NetBSD: Makefile,v 1.119 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	ORBit-0.5.17
 PKGREVISION=	1
@@ -23,7 +23,7 @@ CONFIGURE_ENV+=	LIB_WRAP="-lwrap"
 PKGCONFIG_OVERRIDE+=	ORBit.pc.in
 PKGCONFIG_OVERRIDE+=	libIDL/libIDL.pc.in
 
-INFO_FILES=		libIDL.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/ORBit/PLIST b/net/ORBit/PLIST
index 8ee3756264d..d074eaead5a 100644
--- a/net/ORBit/PLIST
+++ b/net/ORBit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/09/22 08:09:46 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/03/31 23:56:28 jlam Exp $
 bin/libIDL-config
 bin/name-client
 bin/old-name-server
@@ -64,6 +64,7 @@ include/orbit-1.0/orb/poa.h
 include/orbit-1.0/orb/sequences.h
 include/orbit-1.0/orb/typecode.h
 include/orbit-1.0/orbit-idl2.h
+info/libIDL.info
 lib/libIDL.la
 lib/libIDLConf.sh
 lib/libIIOP.la
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index 69b308c71c4..c0dfdee1f33 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	libIDL-0.8.6
 PKGREVISION=	1
@@ -17,7 +17,7 @@ USE_TOOLS+=		bison flex pkg-config
 PKGCONFIG_OVERRIDE=	libIDL-2.0.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		HAVE_YACC=yes
-INFO_FILES=		libIDL2.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/compiler.mk"
 
diff --git a/net/libIDL/PLIST b/net/libIDL/PLIST
index c8b732f58b6..3cd39a3528e 100644
--- a/net/libIDL/PLIST
+++ b/net/libIDL/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:47 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 23:56:28 jlam Exp $
 bin/libIDL-config-2
 include/libIDL-2.0/libIDL/IDL.h
+info/libIDL2.info
 lib/libIDL-2.la
 lib/pkgconfig/libIDL-2.0.pc
 @dirrm include/libIDL-2.0/libIDL
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
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 9c7afa28ce9..4607fb0e64b 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/31 23:20:29 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		dirmngr-0.9.3
@@ -23,6 +23,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gawk
 USE_PKGLOCALEDIR=	yes
 RCD_SCRIPTS=		dirmngr
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
@@ -58,8 +59,6 @@ post-build:
 post-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/runDirmngr ${PREFIX}/sbin
 
-INFO_FILES=		dirmngr.info
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/security/dirmngr/PLIST b/security/dirmngr/PLIST
index bb4e2de6a56..a86a1b47c99 100644
--- a/security/dirmngr/PLIST
+++ b/security/dirmngr/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2006/03/31 23:20:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/31 23:56:29 jlam Exp $
 bin/dirmngr
 bin/dirmngr-client
+info/dirmngr.info
 libexec/dirmngr_ldap
 sbin/runDirmngr
 share/examples/rc.d/dirmngr
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 2986561e9e6..1472c0ad774 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/03/09 17:25:54 cube Exp $
+# $NetBSD: Makefile,v 1.47 2006/03/31 23:56:29 jlam Exp $
 
 DISTNAME=	gnutls-1.3.5
 CATEGORIES=	security devel
@@ -19,8 +19,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
-
-INFO_FILES=		gnutls.info
+INFO_FILES=		# PLIST
 
 PKGCONFIG_OVERRIDE=	lib/gnutls.pc.in
 PKGCONFIG_OVERRIDE+=	libextra/gnutls-extra.pc.in
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 0d5434f0d7a..96893180635 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2006/03/09 17:25:54 cube Exp $
+@comment $NetBSD: PLIST,v 1.19 2006/03/31 23:56:29 jlam Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -14,6 +14,7 @@ include/gnutls/openpgp.h
 include/gnutls/openssl.h
 include/gnutls/pkcs12.h
 include/gnutls/x509.h
+info/gnutls.info
 lib/libgnutls-extra.la
 lib/libgnutls-openssl.la
 lib/libgnutls.la
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 0d9ce00da58..026d40b2f0a 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/03/01 16:22:20 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=	gpgme-1.0.3
@@ -16,6 +16,7 @@ DEPENDS+=		gnupg>=1.2.2:../../security/gnupg
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
+INFO_FILES=		# PLIST
 
 SUBST_CLASSES+=		pthread
 SUBST_FILES.pthread=	gpgme/gpgme-config.in
@@ -44,8 +45,6 @@ TEST_TARGET=		check
 CONFIGURE_ARGS+=	--without-pth --without-pth-test
 .endif
 
-INFO_FILES=		gpgme.info
-
 .include "../../security/libgpg-error/buildlink3.mk"
 
 # we want the getenv_r() semantics of NetBSD-current
diff --git a/security/gpgme/PLIST b/security/gpgme/PLIST
index f936292a9df..e3c771310d0 100644
--- a/security/gpgme/PLIST
+++ b/security/gpgme/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.13 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/03/31 23:56:29 jlam Exp $
 bin/gpgme-config
 include/gpgme.h
+info/gpgme.info
 lib/libgpgme-pthread.la
 lib/libgpgme.la
 share/aclocal/gpgme.m4
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 6505c8b8289..b634714ae12 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/31 23:56:29 jlam Exp $
 
 DISTNAME=		gsasl-0.2.5
 PKGREVISION=		1
@@ -18,12 +18,11 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 TEST_TARGET=		check
 
-INFO_FILES=		gsasl.info
-
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 PKGCONFIG_OVERRIDE+=    libgsasl.pc.in
+INFO_FILES=		# PLIST
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
diff --git a/security/gsasl/PLIST b/security/gsasl/PLIST
index bb591799b81..c19523cb02a 100644
--- a/security/gsasl/PLIST
+++ b/security/gsasl/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2005/02/28 13:29:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/31 23:56:29 jlam Exp $
 bin/gsasl
 include/gsasl-compat.h
 include/gsasl-mech.h
 include/gsasl.h
+info/gsasl.info
 lib/libgsasl.la
 lib/pkgconfig/libgsasl.pc
 man/man1/gsasl.1
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 7aafccb4bb9..771909d5ee5 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/31 23:44:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		gss-0.0.15
@@ -17,9 +17,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+INFO_FILES=		# PLIST
 
 PKGCONFIG_OVERRIDE+=    gss.pc.in
 
-INFO_FILES=		gss.info
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gss/PLIST b/security/gss/PLIST
index 280f02a880d..59fe5bc946d 100644
--- a/security/gss/PLIST
+++ b/security/gss/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 23:56:29 jlam Exp $
 bin/gss
 include/gss.h
 include/gss/api.h
 include/gss/ext.h
+info/gss.info
 lib/libgss.la
 lib/pkgconfig/gss.pc
 man/man1/gss.1
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index bba154cbf41..aa852a3081d 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/02/20 23:01:03 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		krb4-1.2.1
@@ -42,8 +42,7 @@ CONFIGURE_ARGS+=	--program-transform=${KTH_KRB4_TRANSFORM:Q}
 MANINSTALL=		maninstall
 .endif
 
-INFO_FILES=		kth-krb.info
-
+INFO_FILES=		# PLIST
 EXAMPLEDIR=		${PREFIX}/share/examples/kth-krb4
 
 # this hangs while compiling one of the files, at least with the
diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST
index b81a676741c..286d7b4bd42 100644
--- a/security/kth-krb4/PLIST
+++ b/security/kth-krb4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/02/20 23:01:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/31 23:56:29 jlam Exp $
 bin/afslog
 bin/compile_et
 bin/k4ftp
@@ -67,6 +67,7 @@ include/kerberosIV/sha.h
 include/kerberosIV/sl.h
 include/kerberosIV/ss/ss.h
 include/kerberosIV/xdbm.h
+info/kth-krb.info
 lib/libacl.la
 lib/libcom_err.la
 lib/libdes.la
diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile
index 8b53aee2914..a427b364bc9 100644
--- a/security/libassuan/Makefile
+++ b/security/libassuan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		libassuan-0.6.10
@@ -13,8 +13,7 @@ COMMENT=		The IPC library used by some GnuPG related software
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-
-INFO_FILES=		assuan.info
+INFO_FILES=		# PLIST
 
 BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
diff --git a/security/libassuan/PLIST b/security/libassuan/PLIST
index 7952df0de44..ad855f265e6 100644
--- a/security/libassuan/PLIST
+++ b/security/libassuan/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/05 17:00:51 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/31 23:56:29 jlam Exp $
 bin/libassuan-config
 include/assuan.h
+info/assuan.info
 lib/libassuan.a
 share/aclocal/libassuan.m4
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 19bbb390415..e8751ce7c9a 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/31 23:56:29 jlam Exp $
 
 DISTNAME=	libgcrypt-1.2.2
 PKGREVISION=	1
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		yes
 TEST_TARGET=		check
 
 TEXINFO_REQD=		4.0
-INFO_FILES=		gcrypt.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/libgcrypt/PLIST b/security/libgcrypt/PLIST
index 0a06bfa908d..ba921886811 100644
--- a/security/libgcrypt/PLIST
+++ b/security/libgcrypt/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/31 23:56:29 jlam Exp $
 bin/libgcrypt-config
 include/gcrypt-module.h
 include/gcrypt.h
+info/gcrypt.info
 lib/libgcrypt.la
 share/aclocal/libgcrypt.m4
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 701e924eb93..3cb21acd8c5 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=	libksba-0.9.13
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	YES
 TEST_TARGET=	check
 
 TEXINFO_REQD=	4.0
-INFO_FILES=	ksba.info
+INFO_FILES=	# PLIST
 
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
diff --git a/security/libksba/PLIST b/security/libksba/PLIST
index 5db775545b4..98f5de6dc2f 100644
--- a/security/libksba/PLIST
+++ b/security/libksba/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/31 23:56:29 jlam Exp $
 bin/ksba-config
 include/ksba.h
+info/ksba.info
 lib/libksba.la
 share/aclocal/ksba.m4
diff --git a/security/libksba04/Makefile b/security/libksba04/Makefile
index ffe7dd93bfc..f38d46b79fd 100644
--- a/security/libksba04/Makefile
+++ b/security/libksba04/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=	libksba-0.4.7
@@ -16,6 +16,6 @@ GNU_CONFIGURE=	YES
 TEST_TARGET=	check
 
 TEXINFO_REQD=	4.0
-INFO_FILES=	ksba.info
+INFO_FILES=	# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libksba04/PLIST b/security/libksba04/PLIST
index 5db775545b4..98f5de6dc2f 100644
--- a/security/libksba04/PLIST
+++ b/security/libksba04/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/31 23:56:29 jlam Exp $
 bin/ksba-config
 include/ksba.h
+info/ksba.info
 lib/libksba.la
 share/aclocal/ksba.m4
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 8480c14175e..c401ffe1b6a 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:46 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		pinentry-0.7.1
@@ -13,7 +13,7 @@ COMMENT=		Applications for entering PINs or Passphrases
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 
-INFO_FILES=		pinentry.info
+INFO_FILES=		# PLIST
 
 # XXX This usage of bsd.options.mk is wrong and has to be fixed.  The
 # package has to be splitted into different packages, such as pinentry-gtk
diff --git a/security/pinentry/PLIST b/security/pinentry/PLIST
index 861562fa09c..e99f26b0dd7 100644
--- a/security/pinentry/PLIST
+++ b/security/pinentry/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/05 17:19:54 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/31 23:56:29 jlam Exp $
 bin/pinentry-curses
+info/pinentry.info
 ${USE_GTK}bin/pinentry-gtk
 ${USE_QT}bin/pinentry-qt
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index 8c2d5bbd945..eb014b44952 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/03/31 23:56:30 jlam Exp $
 #
 
 DISTNAME=	vcdimager-0.7.23
@@ -13,7 +13,7 @@ COMMENT=	Mastering suite for Video CDs
 USE_TOOLS+=	gmake pkg-config
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
-INFO_FILES=	vcd-info.info vcdimager.info vcdxrip.info
+INFO_FILES=	# PLIST
 PKGCONFIG_OVERRIDE+= libvcdinfo.pc.in
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/vcdimager-devel/PLIST b/sysutils/vcdimager-devel/PLIST
index 0b3f3177558..3d741958721 100644
--- a/sysutils/vcdimager-devel/PLIST
+++ b/sysutils/vcdimager-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/31 23:56:30 jlam Exp $
 bin/cdxa2mpeg
 bin/vcd-info
 bin/vcdimager
@@ -14,6 +14,9 @@ include/libvcd/logging.h
 include/libvcd/sector.h
 include/libvcd/types.h
 include/libvcd/version.h
+info/vcd-info.info
+info/vcdimager.info
+info/vcdxrip.info
 lib/libvcdinfo.la
 lib/pkgconfig/libvcdinfo.pc
 man/man1/cdxa2mpeg.1
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 4161027ba91..e4da2072948 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/09 11:14:50 ghen Exp $
+# $NetBSD: Makefile,v 1.42 2006/03/31 23:56:30 jlam Exp $
 #
 
 DISTNAME=		aspell-0.60.4
@@ -18,8 +18,7 @@ USE_TOOLS+=		gmake
 USE_TOOLS+=		perl:run
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
-
-INFO_FILES=		aspell-dev.info aspell.info
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--enable-doc-dir=${PREFIX}/share/doc/aspell
 CONFIGURE_ARGS+=	--enable-curses=ncurses
diff --git a/textproc/aspell/PLIST b/textproc/aspell/PLIST
index fc3d9e9b1ea..94b665fc7a2 100644
--- a/textproc/aspell/PLIST
+++ b/textproc/aspell/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/01/29 22:02:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/31 23:56:30 jlam Exp $
 bin/aspell
 bin/aspell-import
 bin/precat
@@ -10,6 +10,8 @@ bin/run-with-aspell
 bin/word-list-compress
 include/aspell.h
 include/pspell/pspell.h
+info/aspell-dev.info
+info/aspell.info
 lib/aspell/ccpp.amf
 lib/aspell/comment.amf
 ${FILTER}lib/aspell/context-filter.la