* Nuke all references to and definitions of INFO_DIR in package Makefiles

  and replace with appropriate references to PKGINFODIR instead.

* Properly account for split info files during installation.

* Move info file listings directly into the package PLISTs.

This fixes info-file-related PLIST problems.

41 files changed, 153 insertions, 121 deletions

diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index a99a0c0645c..d68c8f60ec2 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:28:52 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/03/20 18:15:37 jlam Exp $
 #
 
 DISTNAME=       tar-1.15.1
@@ -12,16 +12,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
 COMMENT=	Info format documentation for the GNU tape archiver
 
-INFO_FILES=	tar.info
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
+INFO_FILES=	# PLIST
 
-INSTALLATION_DIRS=	${INFO_DIR}
+INSTALLATION_DIRS=	${PKGINFODIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/tar.info ${PREFIX}/${INFO_DIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/tar.info ${PREFIX}/${PKGINFODIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar-info/PLIST b/archivers/gtar-info/PLIST
index d1416ff28e6..1061f6d5556 100644
--- a/archivers/gtar-info/PLIST
+++ b/archivers/gtar-info/PLIST
@@ -1 +1,2 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/02 16:03:11 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/20 18:15:37 jlam Exp $
+info/tar.info
diff --git a/archivers/gzip-info/Makefile b/archivers/gzip-info/Makefile
index e9c1b53d27e..60f214f14b5 100644
--- a/archivers/gzip-info/Makefile
+++ b/archivers/gzip-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:28:52 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/20 18:15:37 jlam Exp $
 
 DISTNAME=	gzip-1.2.4a
 PKGNAME=	gzip-info-1.2.4a
@@ -13,14 +13,13 @@ COMMENT=	Info format documentation for the GZIP utility
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-INFO_FILES=	gzip.info
-
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
+INFO_FILES=	# PLIST
 
-INSTALLATION_DIRS=	${INFO_DIR}
+INSTALLATION_DIRS=	${PKGINFODIR}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/gzip.info ${PREFIX}/${INFO_DIR}
+	${INSTALL_DATA} ${WRKSRC}/gzip.info ${PREFIX}/${PKGINFODIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gzip-info/PLIST b/archivers/gzip-info/PLIST
index a923cc56416..b5c29c9cf78 100644
--- a/archivers/gzip-info/PLIST
+++ b/archivers/gzip-info/PLIST
@@ -1 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2004/01/02 16:03:11 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/20 18:15:37 jlam Exp $
+info/gzip.info
diff --git a/converters/latex2rtf/Makefile b/converters/latex2rtf/Makefile
index d6e51f10f98..3c116be8cf7 100644
--- a/converters/latex2rtf/Makefile
+++ b/converters/latex2rtf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:55 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/20 18:15:37 jlam Exp $
 #
 
 DISTNAME=	latex2rtf-1.9.16a
@@ -12,10 +12,14 @@ COMMENT=	LaTeX to RTF converter
 
 USE_TOOLS+=	perl
 MAKE_FLAGS+=	XCFLAGS=${CFLAGS:M*:Q}
-INFO_FILES=	latex2rtf.info
-INSTALLATION_DIRS=	share/doc/latex2rtf ${INFO_DIR}
+INFO_FILES=	# PLIST
+
+INSTALLATION_DIRS=	share/doc/latex2rtf ${PKGINFODIR}
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/latex2rtf.info ${PREFIX}/${INFO_DIR}/latex2rtf.info
+	cd ${WRKSRC}/doc; for f in *.info *.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_MAN} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/latex2rtf/PLIST b/converters/latex2rtf/PLIST
index bf97869db2c..64ab9ca8d21 100644
--- a/converters/latex2rtf/PLIST
+++ b/converters/latex2rtf/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2005/11/09 07:17:04 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/20 18:15:37 jlam Exp $
 bin/latex2png
 bin/latex2rtf
+info/latex2rtf.info
 man/man1/latex2png.1
 man/man1/latex2rtf.1
 share/latex2rtf/cfg/afrikaans.cfg
diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile
index 9f28f868e25..13fc91b546e 100644
--- a/cross/h8300-hms-binutils/Makefile
+++ b/cross/h8300-hms-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/05 16:27:23 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/20 18:15:37 jlam Exp $
 
 DISTNAME=		binutils-2.12.1
 PKGNAME=		cross-h8300-hms-binutils-2.12.1
@@ -23,15 +23,13 @@ CONFIGURE_SCRIPT=	${SRCDIR}/configure
 SRCDIR=			${WRKDIR}/${DISTNAME}
 BUILD_TARGET=		CFLAGS="-O2 -fomit-frame-pointer" all
 INFO_DIR=		libexec/cross-h8300-hms/binutils
-INFO_FILES=		as.info bfd.info binutils.info configure.info
-INFO_FILES+=		gasp.info ld.info standards.info
+INFO_FILES=		# PLIST
+
+INSTALLATION_DIRS=	${H8300_PREFIX}
 
 post-extract:
 	${MKDIR} ${WRKSRC}
 
-pre-install:
-	${MKDIR} ${H8300_PREFIX}
-
 post-install:
 	for f in h8300-hms-size      h8300-hms-objdump h8300-hms-ar \
 		 h8300-hms-strings   h8300-hms-ranlib  h8300-hms-objcopy \
diff --git a/cross/h8300-hms-binutils/PLIST b/cross/h8300-hms-binutils/PLIST
index d4113847dd7..29120ae634b 100644
--- a/cross/h8300-hms-binutils/PLIST
+++ b/cross/h8300-hms-binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/20 18:15:37 jlam Exp $
 bin/h8300-hms-addr2line
 bin/h8300-hms-ar
 bin/h8300-hms-as
@@ -16,6 +16,13 @@ bin/h8300-hms-srconv
 bin/h8300-hms-strings
 bin/h8300-hms-strip
 bin/h8300-hms-sysdump
+libexec/cross-h8300-hms/binutils/as.info
+libexec/cross-h8300-hms/binutils/bfd.info
+libexec/cross-h8300-hms/binutils/binutils.info
+libexec/cross-h8300-hms/binutils/configure.info
+libexec/cross-h8300-hms/binutils/gasp.info
+libexec/cross-h8300-hms/binutils/ld.info
+libexec/cross-h8300-hms/binutils/standards.info
 libexec/cross-h8300-hms/bin/h8300-hms-addr2line
 libexec/cross-h8300-hms/bin/h8300-hms-ar
 libexec/cross-h8300-hms/bin/h8300-hms-as
diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile
index 9eccc9a8603..5e0d489df49 100644
--- a/cross/h8300-hms-gcc/Makefile
+++ b/cross/h8300-hms-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/20 18:15:37 jlam Exp $
 
 DISTNAME=		gcc-core-3.1
 PKGNAME=		cross-h8300-hms-gcc-3.1
@@ -31,8 +31,7 @@ CONFIGURE_ARGS+=	--with-newlib
 CONFIGURE_SCRIPT=	${SRCDIR}/configure
 SRCDIR=			${WRKDIR}/gcc-3.1
 BUILD_TARGET=		CFLAGS="-O2 -fomit-frame-pointer" all
-INFO_DIR=		${H8300_PREFIX:S|${PREFIX}/||}/gcc
-INFO_FILES=             cpp.info cppinternals.info gcc.info gccint.info
+INFO_FILES=             # PLIST
 
 GCC_REQD+=		2.8.0
 
diff --git a/cross/h8300-hms-gcc/PLIST b/cross/h8300-hms-gcc/PLIST
index 1457953f8f5..294a8df89b8 100644
--- a/cross/h8300-hms-gcc/PLIST
+++ b/cross/h8300-hms-gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/13 17:48:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/20 18:15:37 jlam Exp $
 bin/h8300-hms-cpp
 bin/h8300-hms-gcc
 bin/h8300-hms-gccbug
@@ -7,6 +7,10 @@ libexec/cross-h8300-hms/bin/h8300-hms-cpp
 libexec/cross-h8300-hms/bin/h8300-hms-gcc
 libexec/cross-h8300-hms/bin/h8300-hms-gccbug
 libexec/cross-h8300-hms/bin/h8300-hms-gcov
+libexec/cross-h8300-hms/gcc/cpp.info
+libexec/cross-h8300-hms/gcc/cppinternals.info
+libexec/cross-h8300-hms/gcc/gcc.info
+libexec/cross-h8300-hms/gcc/gccint.info
 libexec/cross-h8300-hms/h8300-hms/bin/gcc
 libexec/cross-h8300-hms/h8300-hms/include/_ansi.h
 libexec/cross-h8300-hms/h8300-hms/include/_syslist.h
diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile
index a9a264914b8..3d026a6f135 100644
--- a/devel/dmalloc/Makefile
+++ b/devel/dmalloc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:29:14 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=		dmalloc-5.4.2
 CATEGORIES=		devel
@@ -14,14 +14,17 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shlib
 CFLAGS+=		-fPIC -DPIC
 CONFIGURE_ARGS+=	--enable-threads
-INSTALLATION_DIRS=	${INFO_DIR}
+INFO_FILES=		# PLIST
+
+INSTALLATION_DIRS=	${PKGINFODIR}
 
 # XXX the "installinfo" target is broken
 #INSTALL_TARGET=	install installinfo
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/docs/dmalloc.info ${PREFIX}/${INFO_DIR}/
-
-INFO_FILES=		dmalloc.info
+	cd ${WRKSRC}/docs; for f in *.info *.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/dmalloc/PLIST b/devel/dmalloc/PLIST
index 9cb0c7c5c12..91feec8ab1b 100644
--- a/devel/dmalloc/PLIST
+++ b/devel/dmalloc/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/15 19:51:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:15:38 jlam Exp $
 bin/dmalloc
 include/dmalloc.h
+info/dmalloc.info
 lib/libdmalloc.a
 lib/libdmalloc.so
 lib/libdmallocth.a
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index 5f21f16cb73..67bc60e6c3e 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/03/05 16:27:25 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2006/03/20 18:15:38 jlam Exp $
 #
 
 DISTNAME=	${OPENCM_VERSION}-2-src
@@ -15,7 +15,6 @@ COMMENT=	Secure, high-integrity replacement for CVS
 WRKSRC=		${WRKDIR}/${OPENCM_VERSION}/base
 USE_TOOLS+=	gmake gzip makeinfo
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/${INFO_DIR}
 CONFIGURE_ARGS+=	--with-ssl-dir=${BUILDLINK_PREFIX.openssl}
 
 OPENCM_VERSION=	opencm-0.1.2alpha8
@@ -23,13 +22,13 @@ OPENCM_VERSION=	opencm-0.1.2alpha8
 CONF_FILES=	${PREFIX}/share/examples/opencm/opencm.conf \
 		${PKG_SYSCONFDIR}/opencm.conf
 
-INFO_FILES=		opencm.info
+INFO_FILES=	# PLIST
 
 CPPFLAGS+=	-D__unix__
 MAKE_ENV+=	GZIP_CMD=${GZIP_CMD:Q}
 
 post-install:
-	gzip -d ${PREFIX}/info/opencm.info.gz
+	gzip -d ${PREFIX}/${PKGINFODIR}/opencm.info.gz
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/devel/opencm/PLIST b/devel/opencm/PLIST
index e63f25f4a4e..0cc0b51518e 100644
--- a/devel/opencm/PLIST
+++ b/devel/opencm/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2004/12/04 23:37:14 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:15:38 jlam Exp $
 bin/cm
+info/opencm.info
 share/examples/opencm/opencm.conf
 share/opencm/help/add.help
 share/opencm/help/adduser.help
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index 3cbaae78e5c..37fed677d6c 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/20 18:15:38 jlam Exp $
 #
 
 DISTNAME=		pvs-${VERSION}
@@ -24,8 +24,7 @@ VERSION=		3.2
 NO_BUILD=		yes
 CHECK_SHLIBS=		NO
 SHLIB_HANDLING=		NO
-INFO_DIR=		pvs/doc/release-notes
-INFO_FILES=		pvs-release-notes.info
+INFO_FILES=		# PLIST
 TEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
 
 LICENSE=        	pvs-license
diff --git a/devel/pvs/PLIST b/devel/pvs/PLIST
index d73fe80208f..8e96afdef46 100644
--- a/devel/pvs/PLIST
+++ b/devel/pvs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/09/02 02:27:11 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:15:38 jlam Exp $
 bin/pvs
 pvs/README
 pvs/bin/ix86-redhat5/runtime/file_utils.so
@@ -14,6 +14,7 @@ pvs/bin/relocate
 pvs/bin/tarmail
 pvs/bin/untarmail
 pvs/doc/release-notes/pvs-release-notes.html
+pvs/doc/release-notes/pvs-release-notes.info
 pvs/doc/release-notes/pvs-release-notes.pdf
 pvs/doc/release-notes/pvs-release-notes.ps
 pvs/emacs/README
diff --git a/devel/slib/Makefile b/devel/slib/Makefile
index 9eb39295ee7..27885fd8c8d 100644
--- a/devel/slib/Makefile
+++ b/devel/slib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:29:29 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=	slib3a2
 #
@@ -24,16 +24,18 @@ NO_BUILD=	yes
 
 SLIBDIR=	${PREFIX}/share/slib
 DOCDIR=		${PREFIX}/share/doc/slib
+INFO_FILES=	# PLIST
 
-INFO_FILES=	slib.info
-
-INSTALLATION_DIRS=	${INFO_DIR}
+INSTALLATION_DIRS=	${PKGINFODIR}
 
 do-install:
 	${INSTALL_DATA_DIR} ${SLIBDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} *.scm *.init ${SLIBDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} README FAQ ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/slib.info ${PREFIX}/${INFO_DIR}
+	cd ${WRKSRC}; for f in slib.info slib.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/slib/PLIST b/devel/slib/PLIST
index ea0cadfe40d..425084c9e97 100644
--- a/devel/slib/PLIST
+++ b/devel/slib/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2005/10/19 12:38:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/20 18:15:38 jlam Exp $
+info/slib.info
 share/doc/slib/FAQ
 share/doc/slib/README
 share/slib/Bev2slib.scm
diff --git a/editors/ed/Makefile b/editors/ed/Makefile
index 252afdcd18c..25643a2997a 100644
--- a/editors/ed/Makefile
+++ b/editors/ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:09 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=		ed-0.2
 PKGREVISION=		1
@@ -12,11 +12,11 @@ COMMENT=		GNU version of line-oriented text editor
 GNU_CONFIGURE=		YES
 CONFIGURE_HAS_INFODIR=	NO
 CONFIGURE_HAS_MANDIR=	NO
-MAKE_ENV+=		INFO_DIR=${INFO_DIR:Q}
+MAKE_ENV+=		PKGINFODIR=${PKGINFODIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-INFO_FILES=		${GNU_PROGRAM_PREFIX}ed.info
+INFO_FILES=		# PLIST
 
 .if defined(GNU_PROGRAM_PREFIX)
 # the ./configure accepts --program-prefix, but doesn't use
diff --git a/editors/ed/PLIST b/editors/ed/PLIST
index 2e508a9dc92..54c48858903 100644
--- a/editors/ed/PLIST
+++ b/editors/ed/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/08 00:59:31 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/20 18:15:38 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}ed
 bin/${GNU_PROGRAM_PREFIX}red
+info/${GNU_PROGRAM_PREFIX}ed.info
 man/man1/${GNU_PROGRAM_PREFIX}ed.1
 man/man1/${GNU_PROGRAM_PREFIX}red.1
diff --git a/editors/ed/distinfo b/editors/ed/distinfo
index 39abbb6410c..216566cc82a 100644
--- a/editors/ed/distinfo
+++ b/editors/ed/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/10/16 05:07:58 reed Exp $
+$NetBSD: distinfo,v 1.5 2006/03/20 18:15:38 jlam Exp $
 
 SHA1 (ed-0.2.tar.gz) = abb61231a3baeb988b145ffe97cdbaea8f651d93
 RMD160 (ed-0.2.tar.gz) = 7db3240d13311616df11621566f94241a3721ca2
 Size (ed-0.2.tar.gz) = 185913 bytes
 SHA1 (patch-aa) = 21e217b85b6f52d07df9ae7127aba94857c9633e
-SHA1 (patch-ab) = b9c9b36353e6fd64bd294a69fe70168519a5a95e
+SHA1 (patch-ab) = 1896cc7df57d3b229126e34b63ce0f04a6ec6c9e
diff --git a/editors/ed/patches/patch-ab b/editors/ed/patches/patch-ab
index 76d6a195306..77abff3f110 100644
--- a/editors/ed/patches/patch-ab
+++ b/editors/ed/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2005/10/16 05:07:58 reed Exp $
+$NetBSD: patch-ab,v 1.3 2006/03/20 18:15:38 jlam Exp $
 
 --- Makefile.in.orig	1994-11-19 04:45:32.000000000 -0800
 +++ Makefile.in	2005-10-15 16:09:14.000000000 -0700
@@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.2 2005/10/16 05:07:58 reed Exp $
  bindir = $(exec_prefix)/bin
 -infodir = $(prefix)/info
 -mandir = $(prefix)/man/man1
-+infodir = $(prefix)/$(INFO_DIR)
++infodir = $(prefix)/$(PKGINFODIR)
 +mandir = $(prefix)/$(PKGMANDIR)/man1
  manext = .1
  
diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index e56d38b8888..13a2112a3c3 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/20 07:42:28 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/03/20 18:15:38 jlam Exp $
 #
 
 DISTNAME=		ocrad-0.13
@@ -14,9 +14,8 @@ USE_LANGUAGES=		c++
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--infodir=${PREFIX:Q}/${PKGINFODIR:Q}
 CONFIGURE_ARGS+=	--mandir=${PREFIX:Q}/${PKGMANDIR:Q}
-CONFIGURE_ARGS+=	--infodir=${PREFIX:Q}/${INFO_DIR:Q}
-
-INFO_FILES=		ocrad.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ocrad/PLIST b/graphics/ocrad/PLIST
index ef7adbc0ae6..1aac3109399 100644
--- a/graphics/ocrad/PLIST
+++ b/graphics/ocrad/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/16 20:17:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/20 18:15:38 jlam Exp $
 bin/ocrad
+info/ocrad.info
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 8e8473a6049..49edf923b4c 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGNAME=		gcc-ssp-2.95.3.13
@@ -43,11 +43,12 @@ MAKE_ENV+=		ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
 CONFIGURE_DIRS=		${WRKDIR}/objdir
 BUILD_DIRS=		${CONFIGURE_DIRS}
 
-FILES_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV:Q} GCC_PREFIX=${GCC_PREFIX:Q}
+FILES_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV:Q}		\
+			GCC_PREFIX=${GCC_PREFIX:Q}
+PLIST_SUBST+=		GCC_PREFIX=${GCC_PREFIX:S|^${PREFIX}/||:Q}
 MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV}
 
-INFO_DIR=		${GCC_PREFIX:S|^${PREFIX}/||}/info
-INFO_FILES=		chill.info cpp.info g77.info gcc.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/gcc-ssp/PLIST b/lang/gcc-ssp/PLIST
index bdfed7871f6..32c8e9c3f5e 100644
--- a/lang/gcc-ssp/PLIST
+++ b/lang/gcc-ssp/PLIST
@@ -1,3 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2003/08/09 12:43:02 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:15:38 jlam Exp $
+${GCC_PREFIX}/info/chill.info
+${GCC_PREFIX}/info/cpp.info
+${GCC_PREFIX}/info/g77.info
+${GCC_PREFIX}/info/gcc.info
 share/examples/${PKGNAME}/mk.conf
 @dirrm share/examples/${PKGNAME}
+@dirrm share/examples/${PKGNAME}
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index cf2cd433ad7..17d4adb1e48 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.88 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGREVISION=		7
@@ -32,12 +32,13 @@ MAKE_ENV+=		ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
 CONFIGURE_DIRS=		${WRKDIR}/objdir
 BUILD_DIRS=		${CONFIGURE_DIRS}
 
-FILES_SUBST+=		DISTNAME=${DISTNAME:Q} GCC_PREFIX=${GCC_PREFIX:Q}
+FILES_SUBST+=		DISTNAME=${DISTNAME:Q}				\
+			GCC_PREFIX=${GCC_PREFIX:Q}
 MESSAGE_SUBST+=		DISTNAME=${DISTNAME}
-PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
+PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}				\
+			GCC_PREFIX=${GCC_PREFIX:S|^${PREFIX}/||:Q}
 
-INFO_DIR=		${GCC_PREFIX:S|^${PREFIX}/||}/info
-INFO_FILES=		chill.info cpp.info g77.info gcc.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST
index a2b60e6a9da..1304fe5b846 100644
--- a/lang/gcc/PLIST
+++ b/lang/gcc/PLIST
@@ -1,3 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2003/07/13 13:16:03 grant Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/03/20 18:15:38 jlam Exp $
+${GCC_PREFIX}/info/chill.info
+${GCC_PREFIX}/info/cpp.info
+${GCC_PREFIX}/info/g77.info
+${GCC_PREFIX}/info/gcc.info
 share/examples/${DISTNAME}/mk.conf
 @dirrm share/examples/${DISTNAME}
diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common
index 5f8debab053..d896acf0feb 100644
--- a/lang/gcc3/Makefile.common
+++ b/lang/gcc3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.22 2006/03/20 18:15:38 jlam Exp $
 
 GCC_VERSION=	3.3.5
 DISTNAME=	gcc-${GCC_VERSION}
@@ -37,10 +37,6 @@ MESSAGE_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
 
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${GCC_PREFIX}
 
-.if defined(INFO_FILES)
-INFO_DIR=	${GCC_SUBPREFIX}/info
-.endif
-
 # These come from $WRKSRC/Makefile.in
 ALL_GCC=	all-gcc
 ALL_GCC_C=	$$(ALL_GCC) all-target-newlib all-target-libgloss
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index c131814bc24..0c47007d3d8 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/16 23:52:30 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=		guile-1.4.1
 PKGNAME=		guile14-1.4.1
@@ -16,9 +16,7 @@ USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_GNU_READLINE=	YES
 PTHREAD_AUTO_VARS=	YES
-
-INFO_DIR=		guile/1.4/info
-INFO_FILES=		guile.info
+INFO_FILES=		# PLIST
 
 BUILDLINK_PASSTHRU_DIRS=	${PREFIX}/guile/1.4
 
diff --git a/lang/guile14/PLIST b/lang/guile14/PLIST
index dd5b8d34868..cdca374766e 100644
--- a/lang/guile14/PLIST
+++ b/lang/guile14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/20 18:15:38 jlam Exp $
 guile/1.4/bin/guile
 guile/1.4/bin/guile-config
 guile/1.4/bin/guile-snarf
@@ -89,6 +89,7 @@ guile/1.4/include/libguile/vectors.h
 guile/1.4/include/libguile/version.h
 guile/1.4/include/libguile/vports.h
 guile/1.4/include/libguile/weaks.h
+guile/1.4/info/guile.info
 guile/1.4/lib/libguile.la
 guile/1.4/lib/libguilereadline.la
 guile/1.4/share/aclocal/guile.m4
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index fd4ffb0759d..d09990533cf 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/03/09 18:48:29 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
@@ -45,8 +45,7 @@ CONFIGURE_ARGS+=	--disable-shared
 GNU_PLATFORM_DIR!=	${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM}
 PLIST_SUBST+=		GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q}
 
-INFO_FILES=	octave.info liboctave.info
-LIBOCTAVE_INFO=	liboctave.info liboctave.info-[0-9]*
+INFO_FILES=	# PLIST
 OCTAVE_DOC=	faq/Octave-FAQ.ps interpreter/octave.ps \
 		liboctave/liboctave.ps refcard/refcard-a4.ps \
 		refcard/refcard-legal.ps  refcard/refcard-letter.ps
@@ -74,9 +73,9 @@ post-build:
 
 post-install:
 	cd ${WRKSRC}/doc/liboctave;					\
-	for f in ${LIBOCTAVE_INFO}; do					\
+	for f in liboctave.info liboctave.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
-			${INSTALL_DATA} "$$f" ${PREFIX}/${INFO_DIR};	\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .for f in ${OCTAVE_DOC}
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 18a3a88d8fa..5c67eff65f5 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2006/01/06 22:41:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2006/03/20 18:15:38 jlam Exp $
 bin/mkoctfile-${PKGVERSION}
 bin/mkoctfile
 bin/octave
@@ -593,6 +593,8 @@ include/octave-${PKGVERSION}/octave/vx-s-crv.h
 include/octave-${PKGVERSION}/octave/xdiv.h
 include/octave-${PKGVERSION}/octave/xpow.h
 include/octave-${PKGVERSION}/octave/zfstream.h
+info/liboctave.info
+info/octave.info
 lib/libcruft.la
 lib/liboctave.la
 lib/liboctinterp.la
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 07ada8df0fb..59ba87b4233 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2006/03/09 15:43:46 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGREVISION=	1
@@ -42,8 +42,7 @@ CONFIGURE_ARGS+=	--enable-dl
 GNU_PLATFORM_DIR!=	${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM}
 PLIST_SUBST+=	GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q}
 
-INFO_FILES=	octave.info liboctave.info
-LIBOCTAVE_INFO=	liboctave.info liboctave.info-[0-9]*
+INFO_FILES=	# PLIST
 OCTAVE_DOC=	faq/Octave-FAQ.ps interpreter/octave.ps \
 		liboctave/liboctave.ps refcard/refcard-a4.ps \
 		refcard/refcard-legal.ps  refcard/refcard-letter.ps
@@ -73,9 +72,9 @@ post-build:
 
 post-install:
 	cd ${WRKSRC}/doc/liboctave;					\
-	for f in ${LIBOCTAVE_INFO}; do					\
+	for f in liboctave.info liboctave.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
-			${INSTALL_DATA} "$$f" ${PREFIX}/${INFO_DIR};	\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .for f in ${OCTAVE_DOC}
diff --git a/math/octave/PLIST b/math/octave/PLIST
index 936351b0405..c0faf168dc1 100644
--- a/math/octave/PLIST
+++ b/math/octave/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/11/29 13:11:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/20 18:15:38 jlam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -550,6 +550,8 @@ include/octave-${PKGVERSION}/octave/vx-s-ccv.h
 include/octave-${PKGVERSION}/octave/vx-s-crv.h
 include/octave-${PKGVERSION}/octave/xdiv.h
 include/octave-${PKGVERSION}/octave/xpow.h
+info/liboctave.info
+info/octave.info
 lib/libcruft.la
 lib/liboctave.la
 lib/liboctinterp.la
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 6531c3e7d41..711ee902480 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2006/03/05 16:27:28 jlam Exp $
+# $NetBSD: Makefile,v 1.75 2006/03/20 18:15:38 jlam Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 
 DISTNAME=	zebra-0.95
@@ -14,7 +14,6 @@ COMMENT=	Free multithreaded routing daemon software
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/${INFO_DIR}
 
 PKG_SYSCONFSUBDIR?=	zebra
 EGDIR=		${PREFIX}/share/examples/zebra
@@ -29,8 +28,7 @@ CFLAGS+=	-O0
 CONFLICTS+=		quagga-[0-9]*
 
 PLIST_SRC=		# empty
-
-INFO_FILES=		zebra.info
+INFO_FILES=		# PLIST
 
 BUILD_DEFS+=		USE_ZEBRA_VTYSH
 
@@ -74,7 +72,7 @@ pre-configure:
 #post-build:
 #	cd ${WRKSRC}/doc ; \
 #	${TOUCH} zebra.texi ; \
-#	${MAKEINFO} --no-split zebra.texi
+#	makeinfo zebra.texi
 
 post-install:
 	@${CHMOD} a+r ${PREFIX}/share/examples/zebra/*
diff --git a/net/zebra/PLIST b/net/zebra/PLIST
index 95c37f918d8..56d8804ec4c 100644
--- a/net/zebra/PLIST
+++ b/net/zebra/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/09 16:17:56 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/20 18:15:38 jlam Exp $
+info/zebra.info
 man/man8/bgpd.8
 man/man8/ospfd.8
 man/man8/ripd.8
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index df7e5276735..9dd622f0aaf 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/14 16:00:41 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/03/20 18:15:38 jlam Exp $
 
 DISTNAME=	krb5-1.4.2
 PKGNAME=	mit-${DISTNAME:S/-signed$//}
@@ -70,14 +70,14 @@ SUBST_STAGE.mit-krb5=	pre-configure
 SUBST_FILES.mit-krb5=	appl/bsd/Makefile.in include/krb5/stock/osconf.h
 SUBST_SED.mit-krb5=	-e "/KRB5_PATH_RLOGIN/s,/rlogin,/${KRB5_PREFIX}rlogin,g"
 
-INFO_FILES=	krb425.info krb5-admin.info krb5-install.info krb5-user.info
+INFO_FILES=		# PLIST
 
 OWN_DIRS_PERMS=		${MIT_KRB5_STATEDIR}/krb5kdc			\
 			${ROOT_USER} ${ROOT_GROUP} 0700
 RCD_SCRIPTS=		kadmind kdc
 
-INSTALLATION_DIRS=	bin include/gssapi include/gssrpc info lib	\
-			man/man1 man/man5 man/man8 sbin			\
+INSTALLATION_DIRS=	bin include/gssapi include/gssrpc ${PKGINFODIR}	\
+			lib man/man1 man/man5 man/man8 sbin		\
 			share/examples/krb5
 
 # The MIT krb5 distribution is actually a tar file that contains the
@@ -96,13 +96,9 @@ pre-configure:
 	done
 
 post-install:
-	cd ${WRKSRC}/../doc; for i in ${INFO_FILES}; do			\
-		${INSTALL_MAN} $$i ${PREFIX}/${INFO_DIR};		\
-		for f in $$i-[0-9]*; do					\
-			if ${TEST} -f "$$f"; then			\
-				${INSTALL_MAN} "$$f" ${PREFIX}/${INFO_DIR}; \
-			fi;						\
-		done;							\
+	cd ${WRKSRC}/../doc; for f in *.info *.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_MAN} "$$f" ${PREFIX}/${PKGINFODIR};		\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/mit-krb5/PLIST b/security/mit-krb5/PLIST
index fd7913d6bbd..689600a6dd7 100644
--- a/security/mit-krb5/PLIST
+++ b/security/mit-krb5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/13 03:54:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/20 18:15:38 jlam Exp $
 bin/compile_et
 bin/gss-client
 bin/kdestroy
@@ -38,6 +38,10 @@ include/gssrpc/types.h
 include/gssrpc/xdr.h
 include/krb5.h
 include/profile.h
+info/krb425.info
+info/krb5-admin.info
+info/krb5-install.info
+info/krb5-user.info
 lib/libcom_err.la
 lib/libdes425.la
 lib/libgssapi_krb5.la
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index d4ac6edae7d..172f65ba2e2 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/20 18:15:39 jlam Exp $
 #
 
 DISTNAME=		wdiff-0.5
@@ -15,8 +15,8 @@ CONFIGURE_HAS_INFODIR=	no
 CONFIGURE_HAS_MANDIR=	no
 
 USE_TOOLS+=		makeinfo
-INFO_FILES=		wdiff.info
-INSTALLATION_DIRS=	bin ${INFO_DIR} ${PKGMANDIR}/man1 share/doc/wdiff
+INFO_FILES=		# PLIST
+INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1 share/doc/wdiff
 
 # pkgsrc does not provide libtermcap, but ncurses does provide
 # libtermcap routines.
@@ -26,9 +26,12 @@ BUILDLINK_TRANSFORM+=	l:termcap:ncurses
 .endif
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/wdiff.1 ${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_MAN} ${WRKSRC}/wdiff.info ${PREFIX}/${INFO_DIR}/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wdiff/
-	${INSTALL_PROGRAM} ${WRKSRC}/wdiff ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/wdiff.1 ${PREFIX}/${PKGMANDIR}/man1
+	cd ${WRKSRC}; for f in wdiff.info wdiff.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_MAN} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wdiff
+	${INSTALL_PROGRAM} ${WRKSRC}/wdiff ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/wdiff/PLIST b/textproc/wdiff/PLIST
index 985f29f2611..36a76ef3f83 100644
--- a/textproc/wdiff/PLIST
+++ b/textproc/wdiff/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2005/10/08 19:06:25 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/20 18:15:39 jlam Exp $
 bin/wdiff
 man/man1/wdiff.1
+info/wdiff.info
 share/doc/wdiff/README
 @dirrm share/doc/wdiff