List the info files directly in the PLIST, and honor PKGINFODIR and

PKGMANDIR.

28 files changed, 99 insertions, 74 deletions

diff --git a/lang/a60/Makefile b/lang/a60/Makefile
index 4e35fefe4aa..a34b7f3e874 100644
--- a/lang/a60/Makefile
+++ b/lang/a60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=	a60-0.20a
 CATEGORIES=	lang
@@ -11,16 +11,22 @@ GNU_CONFIGURE=	yes
 
 CPPFLAGS+= 	-Dunix
 
-INFO_FILES=	RRA60.info a60.info
+INFO_FILES=	# PLIST
 
-INSTALLATION_DIRS=	bin info man/man1
+INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/a60 ${PREFIX}/bin/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/a60/
 	${INSTALL_DATA} ${WRKSRC}/a60-mkc.inc ${PREFIX}/share/a60/
-	cd ${WRKSRC} && ${INSTALL_DATA} a60.info RRA60.info ${PREFIX}/info
-	${INSTALL_MAN} ${WRKSRC}/a60.man ${PREFIX}/man/man1/a60.1
+	cd ${WRKSRC}; for f in						\
+		RRA60.info RRA60.info-[0-9]*				\
+		a60.info a60.info-[0-9]*;				\
+	do								\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
+	${INSTALL_MAN} ${WRKSRC}/a60.man ${PREFIX}/${PKGMANDIR}/man1/a60.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/a60/
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} *.a60 README		\
 		${PREFIX}/share/examples/a60/
diff --git a/lang/a60/PLIST b/lang/a60/PLIST
index d895102bb2a..be68103e9e0 100644
--- a/lang/a60/PLIST
+++ b/lang/a60/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/21 18:27:06 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/05 06:27:41 jlam Exp $
 bin/a60
+info/RRA60.info
+info/a60.info
 man/man1/a60.1
 share/a60/a60-mkc.inc
 share/doc/a60/a60.ps
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 0eb035aa726..f995a4540fb 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:29:53 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/05 06:27:41 jlam Exp $
 #
 
 DISTNAME=	chicken-2.2
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 
-INFO_FILES=	chicken.info
+INFO_FILES=	# PLIST
 MAKE_FLAGS+=	MAKEINFO=${TRUE:Q}
 
 # Avoid an ICE in gcc2 on sparc64
diff --git a/lang/chicken/PLIST b/lang/chicken/PLIST
index 2fd0e16a10c..8125df2734e 100644
--- a/lang/chicken/PLIST
+++ b/lang/chicken/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/11/16 22:36:40 rillig Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/04/05 06:27:41 jlam Exp $
 bin/chicken
 bin/chicken-config
 bin/chicken-profile
@@ -10,6 +10,7 @@ bin/csi-static
 include/c_defaults.h
 include/chicken-config.h
 include/chicken.h
+info/chicken.info
 lib/libchicken.la
 lib/libuchicken.la
 man/man1/chicken-config.1
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 15cb4872575..b364ecf191b 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/04/04 16:53:59 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=		cim-3.30
 PKGREVISION=		1
@@ -13,6 +13,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		libtool_path=${PKG_LIBTOOL:Q}
 USE_TOOLS+=		perl:run
 USE_LIBTOOL=		YES
-INFO_FILES=		cim.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/cim/PLIST b/lang/cim/PLIST
index 756aa07b374..6477b7c6f19 100644
--- a/lang/cim/PLIST
+++ b/lang/cim/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/05 06:27:41 jlam Exp $
 bin/cim
 bin/cim2latex
 bin/cim2ps
 bin/cimindent
 include/cim.h
+info/cim.info
 lib/libcim-atr.a
 lib/libcim.la
 man/man1/cim.1
diff --git a/lang/classpath/Makefile b/lang/classpath/Makefile
index 25b5953bf90..b88b57d93d7 100644
--- a/lang/classpath/Makefile
+++ b/lang/classpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/05 06:27:41 jlam Exp $
 
 .include "Makefile.common"
 
@@ -6,7 +6,7 @@ PKGREVISION=		1
 
 BUILD_DEPENDS+=		zip>=2.3:../../archivers/zip
 
-INFO_FILES=		hacking.info vmintegration.info
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--disable-gtk-peer
 
diff --git a/lang/classpath/PLIST b/lang/classpath/PLIST
index 84720c59fc0..136521efead 100644
--- a/lang/classpath/PLIST
+++ b/lang/classpath/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/27 18:17:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/05 06:27:41 jlam Exp $
+info/hacking.info
+info/vmintegration.info
 lib/awt/font.properties
 lib/classpath/libjavaio.la
 lib/classpath/libjavalang.la
diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile
index 66ab8af47c3..4224d7249ef 100644
--- a/lang/elisp-manual/Makefile
+++ b/lang/elisp-manual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/12/03 15:15:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=	elisp-manual-21-2.8
 CATEGORIES=	lang
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 COMMENT=	The Emacs Lisp Reference Manual for GNU Emacs Version 20.3
 
 GNU_CONFIGURE=	YES
-INFO_FILES=	elisp
+INFO_FILES=	# PLIST
 
 BUILD_TARGET=	elisp
 
diff --git a/lang/elisp-manual/PLIST b/lang/elisp-manual/PLIST
index e5e594841ae..cdc4ce16a16 100644
--- a/lang/elisp-manual/PLIST
+++ b/lang/elisp-manual/PLIST
@@ -1 +1,2 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/22 14:43:44 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/05 06:27:41 jlam Exp $
+info/elisp
diff --git a/lang/elisp-manual/distinfo b/lang/elisp-manual/distinfo
index 7ed635f9167..2985e446f6a 100644
--- a/lang/elisp-manual/distinfo
+++ b/lang/elisp-manual/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:06 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/04/05 06:27:41 jlam Exp $
 
 SHA1 (elisp-manual-21-2.8.tar.gz) = 252fd99132f6b7c553a8737d9ba0a8b82636641c
 RMD160 (elisp-manual-21-2.8.tar.gz) = a0d9aa30c032e3e227cc931e6da711ade194f7d0
 Size (elisp-manual-21-2.8.tar.gz) = 2455995 bytes
-SHA1 (patch-aa) = 04f2e87d932fe78bf22a136fca1b685c36b98d0e
diff --git a/lang/elisp-manual/patches/patch-aa b/lang/elisp-manual/patches/patch-aa
deleted file mode 100644
index df821978af3..00000000000
--- a/lang/elisp-manual/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/06/19 22:18:05 seb Exp $
-
---- Makefile.in.orig	2002-01-18 10:34:49.000000000 +0000
-+++ Makefile.in
-@@ -12,8 +12,6 @@ srcdir = @srcdir@
- TEX=tex
- MAKE=make
- SHELL=/bin/sh
--INSTALL_INFO = install-info
--MAKEINFO=makeinfo
- 
- # Where the TeX macros are kept:
- texmacrodir = /usr/local/lib/tex/macros
diff --git a/lang/ja-gawk/Makefile b/lang/ja-gawk/Makefile
index 681bda2d2bc..014591b1c8f 100644
--- a/lang/ja-gawk/Makefile
+++ b/lang/ja-gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/11 13:04:07 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=	gawk-3.0.6
 PKGNAME=	ja-gawk-3.0.6
@@ -15,7 +15,7 @@ COMMENT=	GNU awk + multi-byte extension
 
 CONFLICTS=	gawk-[0-9]*
 
-INFO_FILES=	gawk.info
+INFO_FILES=	# PLIST
 
 GNU_CONFIGURE=	yes
 
diff --git a/lang/ja-gawk/PLIST b/lang/ja-gawk/PLIST
index 57d5166fbb0..77a4feb1b0f 100644
--- a/lang/ja-gawk/PLIST
+++ b/lang/ja-gawk/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/02 12:01:52 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/05 06:27:41 jlam Exp $
 bin/jgawk
 bin/jigawk
+info/gawk.info
 libexec/awk/grcat
 libexec/awk/pwcat
 man/man1/jgawk.1
diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile
index 1c460a7401d..e3ce6d6f36b 100644
--- a/lang/japhar/Makefile
+++ b/lang/japhar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/05 06:27:41 jlam Exp $
 #
 
 DISTNAME=		japhar-0.08
@@ -18,7 +18,7 @@ USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/lib/libffi/ltconfig
 
-INFO_FILES=	japhar.info
+INFO_FILES=	# PLIST
 
 # The japhar tar archive uses ././@LongLink GNU tar hacks
 EXTRACT_USING=		nbtar
diff --git a/lang/japhar/PLIST b/lang/japhar/PLIST
index 8b7e7e8122e..5b377e7d15c 100644
--- a/lang/japhar/PLIST
+++ b/lang/japhar/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/05 06:27:41 jlam Exp $
+info/japhar.info
 lib/libarch.la
 lib/libffi.la
 lib/libjni.la
diff --git a/lang/ksi/Makefile b/lang/ksi/Makefile
index e1a213e26a9..8c9e881cabc 100644
--- a/lang/ksi/Makefile
+++ b/lang/ksi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/04/04 17:45:08 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=		ksi-3.4.1
 PKGREVISION=		4
@@ -12,7 +12,7 @@ COMMENT=		Portable, embeddable Scheme implementation written in C
 CPPFLAGS+=		-Dunix
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		makeinfo
-INFO_FILES=		ksi-lang.info ksi-lib.info ksi.info
+INFO_FILES=		# PLIST
 MAKE_ENV+=		GC_PREFIX=${BUILDLINK_PREFIX.boehm-gc:Q}
 USE_GNU_READLINE=	# uses rl_event_hook() interface
 USE_LIBTOOL=		yes
diff --git a/lang/ksi/PLIST b/lang/ksi/PLIST
index 84875a26e08..34a3e07ad6f 100644
--- a/lang/ksi/PLIST
+++ b/lang/ksi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/05 06:27:41 jlam Exp $
 bin/ksi
 bin/ksi-compile
 bin/ksi-config
@@ -13,6 +13,9 @@ include/ksi/ksi_type.h
 include/ksi/ksi_ver.h
 include/ksi/ksi_vtab.h
 include/ksi/ksi_z.h
+info/ksi-lang.info
+info/ksi-lib.info
+info/ksi.info
 lib/ksi/libksi.la
 lib/ksi/libregexp.la
 lib/ksi/libzip.la
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 37373ed36c1..0cead074f31 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/05 06:27:41 jlam Exp $
 
 DISTNAME=		mercury-compiler-0.11.0
 PKGNAME=		mercury-0.11.0
@@ -14,10 +14,7 @@ COMMENT=		Modern logic/functional programming language
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_GNU_READLINE=	yes	# rl_prep_term_function
-
-INFO_FILES=		mercury.info mercury_faq.info mercury_library.info
-INFO_FILES+=		mercury_ref.info mercury_trans_guide.info
-INFO_FILES+=		mercury_user_guide.info
+INFO_FILES=		# PLIST
 
 # Some of the scripts test CC and use special settings for gcc.
 CONFIGURE_ENV+=		CC=gcc
@@ -27,6 +24,16 @@ USE_TOOLS+=		hostname
 
 MAKE_ENV+=		READLINE_PREFIX=${BUILDLINK_PREFIX.readline}
 
+INSTALL_PREFIX=		${WRKSRC}/tmp
+BUILD_MAKE_FLAGS=	${MAKE_FLAGS}
+BUILD_MAKE_FLAGS+=	INSTALL_PREFIX=${INSTALL_PREFIX:Q}
+BUILD_MAKE_FLAGS+=	INSTALL_INFO_DIR=${INSTALL_PREFIX:Q}/${PKGINFODIR:Q}
+BUILD_MAKE_FLAGS+=	INSTALL_MAN_DIR=${INSTALL_PREFIX:Q}/${PKGMANDIR:Q}
+BUILD_MAKE_FLAGS+=	MERCURY_COMPILER=${INSTALL_PREFIX:Q}/lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+
 post-patch:
 	${TOUCH} \
 		${WRKSRC}/library/table_builtin.date3		\
@@ -37,9 +44,7 @@ post-patch:
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${MAKE} INSTALL_PREFIX=${WRKSRC}/tmp \
-			MERCURY_COMPILER=${WRKSRC}/tmp/lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile \
-		install
+		${MAKE} ${BUILD_MAKE_FLAGS} install
 
 do-install:
 	cd ${WRKSRC}/tmp && ${PAX} -rw . ${PREFIX}
@@ -48,6 +53,4 @@ do-install:
 	${FIND} ${WRKSRC} -type f -name ".cvsignore" -print | ${XARGS} ${RM} -f
 	cd ${WRKSRC}/samples && ${PAX} -rw . ${PREFIX}/share/examples/mercury
 
-.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST
index 4d36f4686a6..15adc62309d 100644
--- a/lang/mercury/PLIST
+++ b/lang/mercury/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/04/05 11:17:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/04/05 06:27:41 jlam Exp $
 bin/c2init
 bin/canonical_grade
 bin/info_to_mdb
@@ -17,6 +17,12 @@ bin/mprof
 bin/mprof_merge_runs
 bin/mtags
 bin/vpath_find
+info/mercury.info
+info/mercury_faq.info
+info/mercury_library.info
+info/mercury_ref.info
+info/mercury_trans_guide.info
+info/mercury_user_guide.info
 lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile
 lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_profile
 lib/mercury/inc/array.mh
diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile
index b3252bb043f..fbf131b9911 100644
--- a/lang/sablevm-classpath/Makefile
+++ b/lang/sablevm-classpath/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/05 06:27:42 jlam Exp $
 #
 
 .include "Makefile.common"
 
 PKGREVISION=		4
 
-INFO_FILES=		hacking.info vmintegration.info
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--disable-gtk-peer
 
diff --git a/lang/sablevm-classpath/PLIST b/lang/sablevm-classpath/PLIST
index df38560863c..e1fca1ac652 100644
--- a/lang/sablevm-classpath/PLIST
+++ b/lang/sablevm-classpath/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/05 06:27:42 jlam Exp $
+info/hacking.info
+info/vmintegration.info
 java/sablevm/lib/sablevm/awt/font.properties
 java/sablevm/lib/sablevm/logging.properties
 java/sablevm/lib/sablevm/sablevm-classpath/libjavaawt.la
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index bc6507da1b2..6580baf9e12 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/05 16:27:26 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/05 06:27:42 jlam Exp $
 
 DISTNAME=		sather-1.2.1
 PKGREVISION=		6
@@ -12,8 +12,7 @@ COMMENT=		Compiler for the Sather object oriented programming language
 USE_TOOLS+=		gmake makeinfo
 
 BUILD_TARGET=		full optional
-
-INFO_FILES=		sather.info sather-tutorial.info sather-mode.info
+INFO_FILES=		# PLIST
 
 REPLACE_PERL=		Browser/Web/ps2gif
 
@@ -53,9 +52,10 @@ post-patch:
 	cd ${WRKSRC}/System/Platforms && ${CP} -r netbsd dragonfly
 
 post-build:
-	cd ${WRKSRC}/Emacs; ${MAKEINFO} sather.texinfo; 		\
-		${MAKEINFO} sather-tutorial.texinfo; 			\
-		${MAKEINFO} sather-mode.texinfo
+	cd ${WRKSRC}/Emacs;						\
+		makeinfo sather.texinfo; 				\
+		makeinfo sather-tutorial.texinfo; 			\
+		makeinfo sather-mode.texinfo
 	${RM} -fr ${WRKSRC}/System/Platforms/dualgui/dual_gui_server.code
 
 do-install:
@@ -82,12 +82,15 @@ do-install:
 		${PREFIX}/lib/sather/System
 	${FIND} ${PREFIX}/lib/sather -name \*.config -o -name Makefile 	\
 		-o -name \*.orig -print | ${XARGS} ${RM} -f
-	${INSTALL_DATA} ${WRKSRC}/Emacs/*.info* ${PREFIX}/info
+	cd ${WRKSRC}/Emacs; for f in *.info *.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sather
 	cd ${WRKSRC}/Doc && ${PAX} -rw -s ',.*/man.*,,' .		\
 		${PREFIX}/share/doc/sather
-	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sabrowse.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sabrowse.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Emacs/*.el ${PREFIX}/share/emacs/site-lisp
 
diff --git a/lang/sather/PLIST b/lang/sather/PLIST
index 8d91ad6088d..c1a0a6db8e0 100644
--- a/lang/sather/PLIST
+++ b/lang/sather/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/07 09:29:04 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/05 06:27:42 jlam Exp $
 bin/sabrowse
 bin/sacomp
+info/sather-mode.info
+info/sather-tutorial.info
+info/sather.info
 lib/sather/Bin/PP
 lib/sather/Bin/bin-wrapper
 lib/sather/Bin/gen_html
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index bef734fb77e..797108f0ac4 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/04/04 20:47:21 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/05 06:27:42 jlam Exp $
 #
 # Convert the version number as follows 2d2 -> 2.4.2, where the d is
 # changed to a 4, representing the 4th letter.
@@ -23,14 +23,13 @@ USE_TOOLS+=	gmake
 
 WRKSRC=		${WRKDIR}/scm
 EVAL_PREFIX+=	SLIB_PREFIX=slib
+INFO_FILES=	# PLIST
 
 BUILD_TARGET=	scmlit libscm.a
 INSTALL_TARGET=	install installlib
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} mandir=${PREFIX:Q}/${PKGMANDIR:Q}/
 
-INFO_FILES=	scm.info hobbit.info Xlibscm.info
-
 INSTALLATION_DIRS=	${PKGINFODIR} share/scm
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/lang/scm/PLIST b/lang/scm/PLIST
index 9f62258c333..88273e2cd7d 100644
--- a/lang/scm/PLIST
+++ b/lang/scm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/10/25 09:32:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/05 06:27:42 jlam Exp $
 bin/scm
 bin/scmlit
 include/patchlvl.h
@@ -6,6 +6,9 @@ include/scm.h
 include/scmfig.h
 include/scmflags.h
 include/scmhob.h
+info/Xlibscm.info
+info/hobbit.info
+info/scm.info
 lib/libscm.a
 man/man1/scm.1
 share/scm/COPYING
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index def7fc9bcf3..e13fef53be1 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/04/05 06:01:21 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2006/04/05 06:27:42 jlam Exp $
 
 DISTNAME=	smalltalk-2.1.9
 PKGREVISION=	2
@@ -26,8 +26,7 @@ CONFIGURE_ARGS+=	--without-emacs
 #CONFIGURE_ENV+=		CFLAGS="-O2 -fsigned-char"
 
 IGNORE_LIBTOOLIZE=	lib/smalltalk/libc.la
-
-INFO_FILES=		gst-base.info gst-libs.info gst.info
+INFO_FILES=		# PLIST
 TEST_TARGET=		check
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST
index 216dd14e3cf..0a762e007c0 100644
--- a/lang/smalltalk/PLIST
+++ b/lang/smalltalk/PLIST
@@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/05 06:01:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/04/05 06:27:42 jlam Exp $
 bin/gst
 bin/gst-config
 bin/gst-package
 include/gst.h
 include/gstpub.h
 include/sigsegv.h
+info/gst-base.info
+info/gst-libs.info
+info/gst.info
 lib/libgst.a
 lib/libgst.la
 lib/smalltalk/blox-tk.la