* Honor PKGINFODIR.

* List the info files directly in the PLIST.

63 files changed, 179 insertions, 131 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 894680749ee..e388077450a 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/08/06 06:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=		autoconf-2.59
 PKGREVISION=		2
@@ -23,7 +23,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-lispdir
 
 TEXINFO_REQD=		4.0
-INFO_FILES=		autoconf.info standards.info
+INFO_FILES=		# PLIST
 
 AUTOMAKE_OVERRIDE=	NO
 
diff --git a/devel/autoconf/PLIST b/devel/autoconf/PLIST
index 71d8efa1a10..bf508c1ba0b 100644
--- a/devel/autoconf/PLIST
+++ b/devel/autoconf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/02/13 08:26:03 seb Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/30 03:44:42 jlam Exp $
 bin/autoconf
 bin/autoheader
 bin/autom4te
@@ -6,6 +6,8 @@ bin/autoreconf
 bin/autoscan
 bin/autoupdate
 bin/ifnames
+info/autoconf.info
+info/standards.info
 man/man1/autoconf.1
 man/man1/autoheader.1
 man/man1/autom4te.1
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index e34b5a3f404..5b229b091f4 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/05 16:27:23 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=       autoconf-2.13
 PKGNAME=	autoconf213-2.13
@@ -19,7 +19,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--program-transform-name='s/$$/-2.13/'
-
-INFO_FILES=		autoconf213.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/autoconf213/PLIST b/devel/autoconf213/PLIST
index 74455f176d6..991882cddbf 100644
--- a/devel/autoconf213/PLIST
+++ b/devel/autoconf213/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/13 08:26:03 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/30 03:44:42 jlam Exp $
 bin/autoconf-2.13
 bin/autoheader-2.13
 bin/autoreconf-2.13
 bin/autoscan-2.13
 bin/autoupdate-2.13
 bin/ifnames-2.13
+info/autoconf213.info
 share/autoconf/acconfig.h
 share/autoconf/acfunctions
 share/autoconf/acgeneral.m4
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 7769e3c76b3..f59f4e3a705 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/09 20:45:20 kristerw Exp $
+# $NetBSD: Makefile,v 1.23 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=	autogen-5.8.3
 CATEGORIES=	devel
@@ -12,7 +12,7 @@ COMMENT=	The Automated Text and Program Generation Tool
 USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-INFO_FILES=		autogen.info
+INFO_FILES=		# PLIST
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/autoopts
diff --git a/devel/autogen/PLIST b/devel/autogen/PLIST
index f50f08b5cda..b514c67287f 100644
--- a/devel/autogen/PLIST
+++ b/devel/autogen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/03/09 20:45:20 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/30 03:44:42 jlam Exp $
 bin/autogen
 bin/autoopts-config
 bin/columns
@@ -6,6 +6,7 @@ bin/getdefs
 bin/xml2ag
 include/autoopts/options.h
 include/autoopts/usage-txt.h
+info/autogen.info
 lib/libguileopts.la
 lib/libopts.la
 lib/pkgconfig/autoopts.pc
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index bd0c87a6135..4e9edde3ccc 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/12/05 20:50:02 rillig Exp $
+# $NetBSD: Makefile,v 1.70 2006/03/30 03:44:42 jlam Exp $
 #
 
 DISTNAME=	automake-1.9.6
@@ -20,8 +20,7 @@ USE_TOOLS+=	gm4:run perl:run
 PLIST_SUBST+=		PKG_DIR_VERSION=1.9
 GNU_CONFIGURE=		YES
 _STRIPFLAG_INSTALL=	# none
-
-INFO_FILES=		automake.info
+INFO_FILES=		# PLIST
 
 # doesn't work because buildlink3 hides scripts
 # from autoconf too well
diff --git a/devel/automake/PLIST b/devel/automake/PLIST
index 94cab583639..ac80df53fb8 100644
--- a/devel/automake/PLIST
+++ b/devel/automake/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.10 2004/08/13 13:27:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/03/30 03:44:42 jlam Exp $
 bin/aclocal
 bin/aclocal-${PKG_DIR_VERSION}
 bin/automake
 bin/automake-${PKG_DIR_VERSION}
+info/automake.info
 share/aclocal-${PKG_DIR_VERSION}/amversion.m4
 share/aclocal-${PKG_DIR_VERSION}/as.m4
 share/aclocal-${PKG_DIR_VERSION}/auxdir.m4
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 96ed111b29e..7a0dd67c2fa 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/30 03:44:42 jlam Exp $
 #
 
 DISTNAME=	automake-1.4-p6
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		YES
 _STRIPFLAG_INSTALL=	# none
 
 USE_TOOLS+=		makeinfo perl:run
-INFO_FILES=		automake14.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/devel/automake14/PLIST b/devel/automake14/PLIST
index e384150d12e..4a54da55b38 100644
--- a/devel/automake14/PLIST
+++ b/devel/automake14/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/13 08:26:03 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/30 03:44:42 jlam Exp $
 bin/aclocal-1.4
 bin/automake-1.4
+info/automake14.info
 share/aclocal-1.4/amversion.m4
 share/aclocal-1.4/ccstdc.m4
 share/aclocal-1.4/cond.m4
diff --git a/devel/avl/Makefile b/devel/avl/Makefile
index 0aef1772ead..6dfa87ec60e 100644
--- a/devel/avl/Makefile
+++ b/devel/avl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:29:12 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/03/30 03:44:42 jlam Exp $
 #
 
 DISTNAME=	avl-1.4.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.msu.edu/user/pfaffben/avl/
 COMMENT=	Library for manipulation of balanced binary trees
 
 GNU_CONFIGURE=	YES
-INFO_FILES=	avl.info
+INFO_FILES=	# PLIST
 
 # The text and html files documentation are not installed so just touch
 # them and makeinfo and texi2html are not needed at build time.
diff --git a/devel/avl/PLIST b/devel/avl/PLIST
index ea2abdc7628..943fd9dac8e 100644
--- a/devel/avl/PLIST
+++ b/devel/avl/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/26 21:54:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/30 03:44:42 jlam Exp $
 include/avl.h
 include/avlt.h
 include/avltr.h
 include/rb.h
+info/avl.info
 lib/libavl.a
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index d918471f7df..b8de4b6f295 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=	binutils-2.16.1
 CATEGORIES=	devel
@@ -27,7 +27,7 @@ PLIST_SRC=	${PKGDIR}/PLIST.common
 PLIST_SRC+=	${WRKDIR}/PLIST_DYNAMIC
 PLIST_SRC+=	${PKGDIR}/PLIST.common_end
 
-INFO_FILES=	as.info bfd.info binutils.info ld.info
+INFO_FILES=	# PLIST
 
 # gprof (XXX: and others?) cannot be built on all platforms
 #
@@ -36,7 +36,6 @@ INFO_FILES=	as.info bfd.info binutils.info ld.info
 PLIST_SUBST+=	NO_GPROF="@comment "
 .else
 PLIST_SUBST+=	NO_GPROF=""
-INFO_FILES+=	gprof.info
 .endif
 
 # Prevent the need to run texi2pod.pl and pod2man hence
diff --git a/devel/binutils/PLIST.common b/devel/binutils/PLIST.common
index 43726be1ff3..f7894595158 100644
--- a/devel/binutils/PLIST.common
+++ b/devel/binutils/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.10 2006/01/07 23:59:46 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.11 2006/03/30 03:44:42 jlam Exp $
 ${MACHINE_GNU_PLATFORM}/bin/ar
 ${MACHINE_GNU_PLATFORM}/bin/as
 ${MACHINE_GNU_PLATFORM}/bin/ld
@@ -69,6 +69,11 @@ include/bfd.h
 include/bfdlink.h
 include/dis-asm.h
 include/symcat.h
+info/as.info
+info/bfd.info
+info/binutils.info
+${NO_GPROF}info/gprof.info
+info/ld.info
 lib/libbfd.la
 lib/libiberty.a
 lib/libopcodes.la
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index c883034d597..9abd5a6dd0e 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/11/07 10:05:50 cjep Exp $
+# $NetBSD: Makefile,v 1.57 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=		bison-2.1
 CATEGORIES=		devel
@@ -15,8 +15,7 @@ BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gm4:run
-
-INFO_FILES=		bison.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/devel/bison/PLIST b/devel/bison/PLIST
index ccf8072c42c..3084d9b205a 100644
--- a/devel/bison/PLIST
+++ b/devel/bison/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.12 2005/09/30 13:51:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/03/30 03:44:42 jlam Exp $
 bin/bison
+info/bison.info
 lib/liby.a
 man/man1/bison.1
 share/aclocal/bison-i18n.m4
diff --git a/devel/cflow/Makefile b/devel/cflow/Makefile
index c44781e233f..900db80509e 100644
--- a/devel/cflow/Makefile
+++ b/devel/cflow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/02 20:33:49 rpaulo Exp $
+# $NetBSD: Makefile,v 1.3 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=	cflow-1.0
 CATEGORIES=	devel
@@ -10,6 +10,7 @@ COMMENT=	Code-path flow analyzer for C
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		yacc lex
+INFO_FILES=		# PLIST
 
 SUBST_CLASSES+=		emacs
 SUBST_MESSAGE.emacs=	Removing cflow Emacs mode
@@ -17,6 +18,4 @@ SUBST_STAGE.emacs=	pre-configure
 SUBST_FILES.emacs=	Makefile.in
 SUBST_SED.emacs=	-e 's| elisp||g'
 
-INFO_FILES=		cflow.info
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cflow/PLIST b/devel/cflow/PLIST
index 51d11505e7b..d4c2ab75260 100644
--- a/devel/cflow/PLIST
+++ b/devel/cflow/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/02 20:33:49 rpaulo Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/30 03:44:42 jlam Exp $
 bin/cflow
+info/cflow.info
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile
index fa2d0cbae0b..bee2f01abab 100644
--- a/devel/cssc/Makefile
+++ b/devel/cssc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/30 03:44:42 jlam Exp $
 #
 
 DISTNAME=	CSSC-1.0.1
@@ -19,6 +19,6 @@ USE_TOOLS+=	diff makeinfo
 TEST_TARGET=	check
 
 TEXINFO_REQD=	4.0
-INFO_FILES=	cssc.info
+INFO_FILES=	# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cssc/PLIST b/devel/cssc/PLIST
index 33625428c90..df2c9fa6d6e 100644
--- a/devel/cssc/PLIST
+++ b/devel/cssc/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/12 18:34:57 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:44:42 jlam Exp $
 bin/sccs
+info/cssc.info
 libexec/cssc/admin
 libexec/cssc/cdc
 libexec/cssc/delta
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index b2bb0f99332..319706db1db 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.92 2006/03/30 03:44:42 jlam Exp $
 #
 
 DISTNAME=	cvs-1.11.21
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV+=	perl_path=${PERL5:Q}
 
-INFO_FILES=	cvs.info cvsclient.info
+INFO_FILES=	# PLIST
 USE_TOOLS+=	makeinfo
 TEXINFO_REQD?=	4.0
 
diff --git a/devel/cvs/PLIST b/devel/cvs/PLIST
index 7716ff36b39..cc278b19d5c 100644
--- a/devel/cvs/PLIST
+++ b/devel/cvs/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2004/02/13 08:26:03 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/30 03:44:42 jlam Exp $
 bin/cvs
 bin/cvsbug
 bin/rcs2log
+info/cvs.info
+info/cvsclient.info
 man/man1/cvs.1
 man/man5/cvs.5
 man/man8/cvsbug.8
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 78d843d3908..d61a0692a2e 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2006/02/17 07:30:13 martti Exp $
+# $NetBSD: Makefile,v 1.71 2006/03/30 03:44:42 jlam Exp $
 #
 
 DISTNAME=	ddd-3.3.11
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnu.org/software/ddd/
 COMMENT=	Data Display Debugger -- graphical front-end for GDB/DBX/XDB
 
 GNU_CONFIGURE=		YES
-INFO_FILES=		ddd-themes.info ddd.info
+INFO_FILES=		# PLIST
 TEST_TARGET=		check
 USE_TOOLS+=		gmake gzip
 USE_LANGUAGES=		c c++
diff --git a/devel/ddd/PLIST b/devel/ddd/PLIST
index 62304f9ec48..80ab9e111d8 100644
--- a/devel/ddd/PLIST
+++ b/devel/ddd/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2005/01/11 09:04:16 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/30 03:44:42 jlam Exp $
 bin/ddd
+info/ddd-themes.info
+info/ddd.info
 man/man1/ddd.1
 share/${PKGNAME}/COPYING
 share/${PKGNAME}/NEWS
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index 82d5444b335..6ab802c43d2 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:14 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/30 03:44:42 jlam Exp $
 #
 
 DISTNAME=		diffutils-2.8.1
@@ -12,7 +12,7 @@ COMMENT=		GNU diff utilities - find the differences between files
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
-INFO_FILES=		diff.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/diffutils/PLIST b/devel/diffutils/PLIST
index 7fc1d22b9c6..9035732b8ad 100644
--- a/devel/diffutils/PLIST
+++ b/devel/diffutils/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/15 19:42:01 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/30 03:44:42 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}cmp
 bin/${GNU_PROGRAM_PREFIX}diff
 bin/${GNU_PROGRAM_PREFIX}diff3
 bin/${GNU_PROGRAM_PREFIX}sdiff
+info/diff.info
 man/man1/${GNU_PROGRAM_PREFIX}cmp.1
 man/man1/${GNU_PROGRAM_PREFIX}diff.1
 man/man1/${GNU_PROGRAM_PREFIX}diff3.1
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index fe8b17f12a5..8b076fc6b0a 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=	g-wrap-1.9.6
 PKGREVISION=	1
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake makeinfo pkg-config
 USE_LIBTOOL=		YES
 TEST_TARGET=		check
-INFO_FILES=		g-wrap.info
+INFO_FILES=		# PLIST
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site/g-wrap/guile/ws
diff --git a/devel/g-wrap/PLIST b/devel/g-wrap/PLIST
index acb7655dfc9..d5098ce5815 100644
--- a/devel/g-wrap/PLIST
+++ b/devel/g-wrap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/03/02 21:50:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/30 03:44:42 jlam Exp $
 bin/g-wrap-config
 include/ffi.h
 include/ffitarget.h
@@ -8,6 +8,7 @@ include/g-wrap/ffi-support.h
 include/g-wrap/guile-compatibility.h
 include/g-wrap/guile-runtime.h
 include/g-wrap/guile-wct.h
+info/g-wrap.info
 lib/libffi.la
 lib/libgw-guile-gw-glib.la
 lib/libgw-guile-standard.la
diff --git a/devel/g-wrap1/Makefile b/devel/g-wrap1/Makefile
index b1bce9acf2d..a03842e3fb8 100644
--- a/devel/g-wrap1/Makefile
+++ b/devel/g-wrap1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=	g-wrap-1.3.4
 PKGREVISION=	7
@@ -15,7 +15,7 @@ DEPENDS+=	guile-slib>=2.4.2nb6:../../devel/guile-slib
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake makeinfo
 USE_LIBTOOL=		YES
-INFO_FILES=		g-wrap.info
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/share/guile
 CONFIGURE_ENV+=		ac_cv_path_RSCHEME="nope"
diff --git a/devel/g-wrap1/PLIST b/devel/g-wrap1/PLIST
index 428a8c73c70..b9cfb11cbfc 100644
--- a/devel/g-wrap1/PLIST
+++ b/devel/g-wrap1/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/04 16:23:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/30 03:44:42 jlam Exp $
 bin/g-wrap-config
 include/g-wrap/g-wrap-compatibility.h
 include/g-wrap/g-wrap-glib.h
 include/g-wrap/g-wrap-wct.h
+info/g-wrap.info
 lib/libgw-glib.la
 lib/libgw-gtk.la
 lib/libgw-standard.la
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 4aca1511fe2..175d19e6d54 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=		gcvs-1.0
 PKGREVISION=		3
@@ -15,7 +15,7 @@ CONFLICTS=		cvs-[0-9]*
 
 USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
-INFO_FILES=		cvs.info cvsclient.info
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--with-tclinclude="${BUILDLINK_PREFIX.tcl}/include" \
 			--with-tcllib="${BUILDLINK_PREFIX.tcl}/lib"
diff --git a/devel/gcvs/PLIST b/devel/gcvs/PLIST
index 3a26032103d..e7f3e8486ae 100644
--- a/devel/gcvs/PLIST
+++ b/devel/gcvs/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/08 16:21:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:44:42 jlam Exp $
 bin/cvs
 bin/cvsbug
 bin/cvstree
 bin/gcvs
 bin/rcs2log
+info/cvs.info
+info/cvsclient.info
 lib/cvs/contrib/README
 lib/cvs/contrib/clmerge
 lib/cvs/contrib/cln_hist
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index a9ef4c3da6f..36d29c5a7a5 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/03/30 03:44:42 jlam Exp $
 #
 
 DISTNAME=       gdb-5.3
@@ -20,9 +20,9 @@ USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 USE_TOOLS+=		gmake
 REPLACE_LOCALEDIR_PATTERNS+=	Make-in
-INSTALL_TARGET=	install install-info
-TEST_TARGET=	check
-INFO_FILES=		bfd.info gdb.info gdbint.info mmalloc.info stabs.info
+INSTALL_TARGET=		install install-info
+TEST_TARGET=		check
+INFO_FILES=		# PLIST.common
 CONFIGURE_ENV+=         CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/devel/gdb/PLIST.common b/devel/gdb/PLIST.common
index 433ba67858b..688588895b9 100644
--- a/devel/gdb/PLIST.common
+++ b/devel/gdb/PLIST.common
@@ -1,14 +1,20 @@
-@comment $NetBSD: PLIST.common,v 1.3 2004/09/22 08:09:25 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2006/03/30 03:44:42 jlam Exp $
 bin/gdb
 include/ansidecl.h
 include/bfd.h
 include/bfdlink.h
 include/dis-asm.h
 include/symcat.h
+info/bfd.info
+info/gdb.info
+info/gdbint.info
+info/mmalloc.info
+info/stabs.info
 lib/libbfd.la
 lib/libiberty.a
 lib/libmmalloc.a
 lib/libopcodes.la
+man/man1/gdb.1
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bfd.mo
@@ -22,4 +28,3 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bfd.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/bfd.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/opcodes.mo
-man/man1/gdb.1
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index e3b76d69048..03a38b11deb 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/14 00:47:50 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/30 03:44:42 jlam Exp $
 #
 
 DISTNAME=		gdb-6.2.1
@@ -23,10 +23,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/gdb6
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/gdb6
 CONFIGURE_ARGS+=	--enable-libada
-
-INFO_FILES=		annotate.info bfd.info configure.info
-INFO_FILES+=		gdb.info gdbint.info mmalloc.info
-INFO_FILES+=		stabs.info standards.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/gdb6/PLIST b/devel/gdb6/PLIST
index c506c6a4e5e..e16a8779e8f 100644
--- a/devel/gdb6/PLIST
+++ b/devel/gdb6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:25 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/30 03:44:42 jlam Exp $
 bin/gdb
 bin/gdbtui
 include/gdb6/ansidecl.h
@@ -6,6 +6,14 @@ include/gdb6/bfd.h
 include/gdb6/bfdlink.h
 include/gdb6/dis-asm.h
 include/gdb6/symcat.h
+info/annotate.info
+info/bfd.info
+info/configure.info
+info/gdb.info
+info/gdbint.info
+info/mmalloc.info
+info/stabs.info
+info/standards.info
 lib/gdb6/libbfd.la
 lib/gdb6/libiberty.a
 lib/gdb6/libmmalloc.a
diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
index 2f3754cce6c..a5c392f598d 100644
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/20 14:04:45 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/03/30 03:44:42 jlam Exp $
 
 DISTNAME=		gettext-0.14.5
 PKGNAME=		gettext-tools-0.14.5
@@ -17,8 +17,7 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool
 CONFIGURE_ARGS+=	--without-included-gettext
-
-INFO_FILES=		gettext.info
+INFO_FILES=		# PLIST
 
 BROKEN_GETTEXT_DETECTION=	yes
 USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
diff --git a/devel/gettext-tools/PLIST b/devel/gettext-tools/PLIST
index 2a6240c59ea..2f67428608c 100644
--- a/devel/gettext-tools/PLIST
+++ b/devel/gettext-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/30 03:44:43 jlam Exp $
 bin/envsubst
 bin/gettext
 bin/gettext.sh
@@ -19,6 +19,7 @@ bin/msguniq
 bin/ngettext
 bin/xgettext
 include/gettext-po.h
+info/gettext.info
 lib/libgettextlib.la
 lib/libgettextpo.la
 lib/libgettextsrc.la
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 6dce21a768f..dfe18757f2e 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/03/30 03:44:43 jlam Exp $
 #
 
 DISTNAME=	indent-2.2.8a
@@ -16,8 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-
-INFO_FILES=	indent.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/gindent/PLIST b/devel/gindent/PLIST
index db819831068..a66ffdf2eea 100644
--- a/devel/gindent/PLIST
+++ b/devel/gindent/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/15 21:42:19 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/30 03:44:43 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}indent
 bin/${GNU_PROGRAM_PREFIX}texinfo2man
+info/indent.info
 man/man1/${GNU_PROGRAM_PREFIX}indent.1
 share/doc/indent/indent.html
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/indent.mo
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 3ffc6c0ad5a..67a53d25016 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2006/01/12 19:49:15 joerg Exp $
+# $NetBSD: Makefile,v 1.79 2006/03/30 03:44:43 jlam Exp $
 
 DISTNAME=		glib-1.2.10
 PKGREVISION=		9
@@ -22,8 +22,7 @@ PKGCONFIG_OVERRIDE=	glib.pc.in
 PKGCONFIG_OVERRIDE+=	gmodule.pc.in
 PKGCONFIG_OVERRIDE+=	gthread.pc.in
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-
-INFO_FILES=		glib.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/devel/glib/PLIST b/devel/glib/PLIST
index db936ba0ff5..850ffbcfa35 100644
--- a/devel/glib/PLIST
+++ b/devel/glib/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:25 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/30 03:44:43 jlam Exp $
 bin/glib-config
 include/glib/glib-1.2/glib.h
 include/glib/glib-1.2/gmodule.h
+info/glib.info
 lib/glib/include/glibconfig.h
 lib/libglib.la
 lib/libgmodule.la
diff --git a/devel/global/Makefile b/devel/global/Makefile
index 8bac62509c3..db5a6cc7848 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/30 03:44:43 jlam Exp $
 #
 
 DISTNAME=	global-4.8
@@ -12,7 +12,7 @@ COMMENT=	Source code tag system including web browser output
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		perl:run
-INFO_FILES=		global.info
+INFO_FILES=		# PLIST
 
 LDFLAGS+=	-L../libutil
 MAKE_ENV+=      LIBDIR="${PREFIX}/lib"
diff --git a/devel/global/PLIST b/devel/global/PLIST
index 702436fd23e..1877bcface3 100644
--- a/devel/global/PLIST
+++ b/devel/global/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/24 19:25:38 abs Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/30 03:44:43 jlam Exp $
 bin/gctags
 bin/global
 bin/gozilla
 bin/gtags
 bin/htags
 bin/htags.pl
+info/global.info
 man/man1/gctags.1
 man/man1/global.1
 man/man1/gozilla.1
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 5fb709cdbb0..463315f4906 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2006/03/30 03:44:43 jlam Exp $
 
 DISTNAME=	make-3.80
 PKGNAME=	gmake-3.80
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
 TEXINFO_REQD=		4.0
-INFO_FILES=		make.info
+INFO_FILES=		# PLIST
 
 # NOTE:  the 'test' target requires perl, but since gmake does
 # not otherwise require it, perl is not listed as an explicit
diff --git a/devel/gmake/PLIST b/devel/gmake/PLIST
index 63b74f42503..f1b5253c9b2 100644
--- a/devel/gmake/PLIST
+++ b/devel/gmake/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/25 23:31:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/30 03:44:43 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}make
 ${GMAKE_LINK}bin/gmake
+info/make.info
 man/man1/${GNU_PROGRAM_PREFIX}make.1
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index cabd99171f8..991e8045640 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/03/30 03:44:43 jlam Exp $
 
 DISTNAME=	gmp-4.1.4
 PKGREVISION=	1
@@ -17,8 +17,7 @@ USE_TOOLS+=		gm4
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-cxx --without-readline
-
-INFO_FILES=		gmp.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/devel/gmp/PLIST b/devel/gmp/PLIST
index 1e0f3938d46..d355a4cda80 100644
--- a/devel/gmp/PLIST
+++ b/devel/gmp/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:09:25 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/30 03:44:43 jlam Exp $
 include/gmp.h
 include/gmpxx.h
+info/gmp.info
 lib/libgmp.la
 lib/libgmpxx.la
diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index 4d593780869..6fe265f7e34 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/30 03:44:43 jlam Exp $
 #
 
 DISTNAME=	gperf-3.0.1
@@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
 
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
-
-INFO_FILES=		gperf.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gperf/PLIST b/devel/gperf/PLIST
index e7224f63c2b..b487bbb8e35 100644
--- a/devel/gperf/PLIST
+++ b/devel/gperf/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/15 22:18:26 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:44:43 jlam Exp $
 bin/gperf
+info/gperf.info
 man/man1/gperf.1
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index c3cbd2f71db..910471bec05 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/30 03:44:43 jlam Exp $
 #
 
 DISTNAME=		guile-gtk-0.40.91
@@ -15,8 +15,7 @@ USE_TOOLS+=		makeinfo
 
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-
-INFO_FILES=		guile-gtk.info
+INFO_FILES=		# PLIST
 
 # Skip glade, because it pulls in gnome-libs.
 # Later, make a new package for just the glade parts,
diff --git a/devel/guile-gtk/PLIST b/devel/guile-gtk/PLIST
index 7c667046515..dae7e3b576b 100644
--- a/devel/guile-gtk/PLIST
+++ b/devel/guile-gtk/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2006/02/22 21:25:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:44:43 jlam Exp $
 bin/build-guile-gtk
 bin/build-guile-gtk-1.2
 include/guile-gtk.h
+info/guile-gtk.info
 lib/libguilegdkpixbuf-1.2.la
 lib/libguilegtk-1.2.la
 share/guile-gtk/gdk-1.2.defs
diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile
index 90187f0d7e0..10e54070aac 100644
--- a/devel/guile-lib/Makefile
+++ b/devel/guile-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/30 03:44:43 jlam Exp $
 
 DISTNAME=	guile-lib-0.1.2
 PKGREVISION=	1
@@ -12,23 +12,27 @@ COMMENT=	Library functions for Guile, implemented in Scheme
 # This package may not be built from the src directory (arch configure
 # rules).  The build directory must be created by hand; see the
 # pre-configure target.
-HAS_CONFIGURE=	yes
-CONFIGURE_DIRS=	${WRKSRC}/build
-BUILD_DIRS=	${WRKSRC}/build
+#
+HAS_CONFIGURE=		yes
+CONFIGURE_DIRS=		${WRKSRC}/build
+BUILD_DIRS=		${WRKSRC}/build
 CONFIGURE_SCRIPT=	../src/configure
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--with-pkginfodir=${PKGINFODIR:Q}
 
 USE_TOOLS+=	gmake makeinfo
 TEXINFO_REQD=	4.2
-INFO_FILES=	guile-library.info
+INFO_FILES=	# PLIST
 TEST_TARGET=	test
 
+.include "../../lang/guile/buildlink3.mk"
+
 pre-configure:
 	${MKDIR} ${WRKSRC}/build
-	${RM} ${WRKSRC}/src/build-tools/gnu/config.guess
-	${LN} -s ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/src/build-tools/gnu/config.guess
-	${RM} ${WRKSRC}/src/build-tools/gnu/config.sub
-	${LN} -s ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/src/build-tools/gnu/config.sub
+.for FILE in config.guess config.sub
+	${RM} ${WRKSRC}/src/build-tools/gnu/${FILE}
+	${LN} -s ${PKGSRCDIR}/mk/gnu-config/${FILE}			\
+		${WRKSRC}/src/build-tools/gnu/${FILE}
+.endfor
 
-.include "../../lang/guile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-lib/PLIST b/devel/guile-lib/PLIST
index 2aa46f55683..e2892f0786b 100644
--- a/devel/guile-lib/PLIST
+++ b/devel/guile-lib/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/03 16:50:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/30 03:44:43 jlam Exp $
+info/guile-library.info
 share/guile/site/config/load.scm
 share/guile/site/container/delay-tree.scm
 share/guile/site/container/nodal-tree.scm
diff --git a/devel/guile-lib/distinfo b/devel/guile-lib/distinfo
index f73753d9057..fe12cb53fbd 100644
--- a/devel/guile-lib/distinfo
+++ b/devel/guile-lib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:16 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/03/30 03:44:43 jlam Exp $
 
 SHA1 (guile-lib-0.1.2.tar.gz) = 79551b4b78c3deb5ae82d60f1b3ed1f9e32a25ea
 RMD160 (guile-lib-0.1.2.tar.gz) = f4514ca6075fc0bfdaddf34596432bd8acdb8ad9
 Size (guile-lib-0.1.2.tar.gz) = 404372 bytes
-SHA1 (patch-aa) = 0a7d3eaf4c28e48d338fc9979cf5f3e45b109778
+SHA1 (patch-aa) = 1ffda820e008c156fe8cdbe72c137443c6764915
+SHA1 (patch-ab) = 466bef5a334693d1b851e2e1d8c600325d8e3ab0
diff --git a/devel/guile-lib/patches/patch-aa b/devel/guile-lib/patches/patch-aa
index 66ac925e205..5abf80a0070 100644
--- a/devel/guile-lib/patches/patch-aa
+++ b/devel/guile-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/03 16:50:22 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/03/30 03:44:43 jlam Exp $
 
 --- src/guile-lib/doc/Makefile.in.orig	2004-08-04 10:38:19.000000000 -0400
 +++ src/guile-lib/doc/Makefile.in
@@ -7,16 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/12/03 16:50:22 wiz Exp $
  
  theinfo := guile-library.info
 -info-install-dir := $(destdir)$(prefix)/share/info
-+info-install-dir := $(destdir)$(prefix)/info
++info-install-dir := $(destdir)$(prefix)/$(cfg__pkginfodir)
  
  all: $(theinfo)
  
-@@ -19,7 +19,7 @@ clean-doc-info:
- 	rm -rf $(theinfo)
- 
- %.info: %.texi
--	makeinfo --force -I $(srcdir) -o $@ $<
-+	makeinfo --no-split --force -I $(srcdir) -o $@ $<
- 
- # arch-tag: 385d1967-44cf-41eb-b991-cea96c3f3971
- 
diff --git a/devel/guile-lib/patches/patch-ab b/devel/guile-lib/patches/patch-ab
new file mode 100644
index 00000000000..242979600ef
--- /dev/null
+++ b/devel/guile-lib/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2006/03/30 03:44:43 jlam Exp $
+
+--- src/PLUGIN/options.orig	2004-08-04 10:38:15.000000000 -0400
++++ src/PLUGIN/options
+@@ -25,4 +25,7 @@ string		package-framework-bug-mail	lord@
+ 	To what email address should package-framework bug reports be
+ 	sent?
+ 
++string		pkginfodir	info
++	In what subdirectory should info files be stored?
++
+ 
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 605e9978b74..b361fd9c5ec 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/04 21:29:18 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/03/30 03:44:43 jlam Exp $
 
 DISTNAME=	m4-1.4.4
 CATEGORIES=	devel
@@ -11,7 +11,7 @@ COMMENT=	GNU version of UNIX m4 macro language processor
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-INFO_FILES=		m4.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/devel/m4/PLIST b/devel/m4/PLIST
index 4cdb5ebaf39..e5e3aea4fb2 100644
--- a/devel/m4/PLIST
+++ b/devel/m4/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/16 13:05:45 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:44:43 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}m4
 ${GM4_LINK}bin/gm4
+info/m4.info
 share/examples/m4/capitalize.m4
 share/examples/m4/comments.m4
 share/examples/m4/ddivert.m4
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 41ae662c38e..c46f57c9aef 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/04 21:29:29 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/03/30 03:44:43 jlam Exp $
 #
 
 DISTNAME=	readline-5.1
@@ -18,10 +18,9 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+INFO_FILES=		# PLIST
 
 BUILD_TARGET=		all-libtool
 INSTALL_TARGET=		install-libtool
 
-INFO_FILES=		history.info readline.info rluserman.info
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/readline/PLIST b/devel/readline/PLIST
index 8ccdcb1fd05..6b2ea228ce1 100644
--- a/devel/readline/PLIST
+++ b/devel/readline/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/30 03:44:43 jlam Exp $
 include/readline/chardefs.h
 include/readline/history.h
 include/readline/keymaps.h
@@ -7,6 +7,9 @@ include/readline/rlconf.h
 include/readline/rlstdc.h
 include/readline/rltypedefs.h
 include/readline/tilde.h
+info/history.info
+info/readline.info
+info/rluserman.info
 lib/libhistory.la
 lib/libreadline.la
 man/man3/history.3
diff --git a/devel/rx/Makefile b/devel/rx/Makefile
index 0ec8ed8c0a7..84d60818df8 100644
--- a/devel/rx/Makefile
+++ b/devel/rx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:29 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/30 03:44:43 jlam Exp $
 
 DISTNAME=	rx-1.5
 PKGREVISION=	1
@@ -12,8 +12,7 @@ COMMENT=	Fast replacement for the GNU regex library
 
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
-
-INFO_FILES=	rx.info
+INFO_FILES=	# PLIST
 
 # When the API changes and breaks binary-compatibility with the previous
 # version, increment the MAJOR by 1 and reset the MINOR to 0.  Otherwise,
@@ -23,7 +22,12 @@ RX_MAJOR=	0
 RX_MINOR=	0
 MAKE_ENV+=	RX_MAJOR=${RX_MAJOR:Q} RX_MINOR=${RX_MINOR:Q}
 
+INSTALLATION_DIRS=	${PKGINFODIR}
+
 post-install:
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info
+	cd ${WRKSRC}/doc; for f in rx.info rx.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rx/PLIST b/devel/rx/PLIST
index 2169a55655f..b058bb6e499 100644
--- a/devel/rx/PLIST
+++ b/devel/rx/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:44:43 jlam Exp $
 include/rxposix.h
+info/rx.info
 lib/librx.la