* Honor PKGINFODIR.

* List the info files directly in the PLIST.

12 files changed, 34 insertions, 25 deletions

diff --git a/audio/csound4/Makefile b/audio/csound4/Makefile
index f5cbac60cf2..3fb55ebe1ce 100644
--- a/audio/csound4/Makefile
+++ b/audio/csound4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/05 16:27:22 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/30 03:44:41 jlam Exp $
 #
 
 DISTNAME=		csound-4.23f13gbs.0
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 TEXINFO_REQD=		4.2
 CONFIGURE_ARGS+=	--enable-debug
 CFLAGS+=		-g
-INFO_FILES=		csoundgbs.info
+INFO_FILES=		# PLIST
 
 NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64	# Severe LP64 problems
 
diff --git a/audio/csound4/PLIST b/audio/csound4/PLIST
index a4fab607e9a..39aa783d45f 100644
--- a/audio/csound4/PLIST
+++ b/audio/csound4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/19 20:22:52 ben Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/30 03:44:41 jlam Exp $
 bin/csound
 bin/csound-config
 bin/cvanal
@@ -38,6 +38,7 @@ include/csound/sort.h
 include/csound/sysdep.h
 include/csound/text.h
 include/csound/version.h
+info/csoundgbs.info
 lib/csound/gabops.la
 lib/csound/metro.la
 lib/csound/newfils.la
diff --git a/audio/festival-doc/Makefile b/audio/festival-doc/Makefile
index 8ba68181406..1f4b5e064ff 100644
--- a/audio/festival-doc/Makefile
+++ b/audio/festival-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/03/30 03:44:41 jlam Exp $
 
 DISTNAME=	festdoc-1.4.0.1
 PKGNAME=	festival-doc-1.4.0.1
@@ -15,9 +15,9 @@ NO_BUILD=	yes
 
 DOC=		${PREFIX}/share/doc/festival
 
-INFO_FILES=	festival.info
+INFO_FILES=	# PLIST
 
-INSTALLATION_DIRS=	info
+INSTALLATION_DIRS=	${PKGINFODIR}
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
@@ -31,8 +31,8 @@ do-install:
 	cd ${WRKSRC};							\
 	${PAX} -rw speechtools ${DOC};					\
 	cd festival;							\
-	for f in info/*.info info/*.info-*; do				\
-	   ${INSTALL_DATA} $${f} ${PREFIX}/info;			\
+	for f in info/*.info info/*.info-[0-9]*; do			\
+		${INSTALL_DATA} $${f} ${PREFIX}/${PKGINFODIR};		\
 	done;								\
 	${PAX} -rw user-manual ${DOC};					\
 	${PAX} -rw src-manual ${DOC};					\
diff --git a/audio/festival-doc/PLIST b/audio/festival-doc/PLIST
index 836a93bb6a7..d73f4b20c72 100644
--- a/audio/festival-doc/PLIST
+++ b/audio/festival-doc/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/21 23:02:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/30 03:44:41 jlam Exp $
+info/festival.info
 share/doc/festival/festival.dvi
 share/doc/festival/festival.ps
 share/doc/festival/refcard.dvi
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 8fa13e1351c..1b8857faae0 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/03/17 22:37:34 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2006/03/30 03:44:41 jlam Exp $
 
 DISTNAME=		libmikmod-3.1.11
 PKGNAME=		libmikmod-3.1.11.1
@@ -19,7 +19,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-INFO_FILES=		mikmod.info
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--disable-threads
 
diff --git a/audio/libmikmod/PLIST b/audio/libmikmod/PLIST
index 9e8b4c6ff5a..15da99fb0f8 100644
--- a/audio/libmikmod/PLIST
+++ b/audio/libmikmod/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/30 03:44:41 jlam Exp $
 bin/libmikmod-config
 include/mikmod.h
+info/mikmod.info
 lib/libmikmod.la
 man/man1/libmikmod-config.1
 share/aclocal/libmikmod.m4
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 2f3e1526039..1f8ca948a85 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/17 22:39:02 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/30 03:44:41 jlam Exp $
 
 DISTNAME=	openal-20040816
 PKGREVISION=	1
@@ -16,11 +16,11 @@ USE_TOOLS+=		gmake makeinfo
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-INFO_FILES=		openal.info
-INSTALLATION_DIRS=	info
+INFO_FILES=		# PLIST
+INSTALLATION_DIRS=	${PKGINFODIR}
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/info
+	${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/${PKGINFODIR}
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/openal/PLIST b/audio/openal/PLIST
index f8da9f970a1..cc217de3453 100644
--- a/audio/openal/PLIST
+++ b/audio/openal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/12/01 13:59:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/30 03:44:41 jlam Exp $
 include/AL/al.h
 include/AL/alc.h
 include/AL/alctypes.h
@@ -9,5 +9,6 @@ include/AL/alu.h
 include/AL/alut.h
 include/AL/aluttypes.h
 include/AL/alutypes.h
+info/openal.info
 lib/libopenal.la
 @dirrm include/AL
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index e4af01b5f95..8a044c83bd1 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/03/05 16:27:22 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2006/03/30 03:44:41 jlam Exp $
 #
 
 DISTNAME=	rplay-3.3.2
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--build=BUILD
 
-INFO_FILES=	RPLAY.info RPTP.info librplay.info rplay.info
+INFO_FILES=	# PLIST
 RCD_SCRIPTS=	rplayd
 EGDIR=		${PREFIX}/share/examples/rplay
 
diff --git a/audio/rplay/PLIST b/audio/rplay/PLIST
index bd67aec497c..16523c6c9f3 100644
--- a/audio/rplay/PLIST
+++ b/audio/rplay/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2005/05/02 20:33:57 reed Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/30 03:44:41 jlam Exp $
 bin/rplay
 bin/rptp
 include/rplay.h
+info/RPLAY.info
+info/RPTP.info
+info/librplay.info
+info/rplay.info
 lib/librplay.la
 man/man1/rplay.1
 man/man1/rptp.1
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index b041e1877f3..068cf320719 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/03/17 08:06:51 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2006/03/30 03:44:41 jlam Exp $
 
 DISTNAME=		tracker-5.3
 PKGREVISION=		1
@@ -27,9 +27,9 @@ EGDIR=		${PREFIX}/share/examples/tracker
 CONF_FILES=	${EGDIR}/compression_methods ${PKG_SYSCONFDIR}/compression_methods
 
 USE_TOOLS+=	makeinfo
-INFO_FILES=	tracker.info
+INFO_FILES=	# PLIST
 
-INSTALLATION_DIRS=	bin info ${EGDIR}
+INSTALLATION_DIRS=	bin ${PKGINFODIR} ${EGDIR}
 
 .include "../../mk/oss.buildlink3.mk"
 
@@ -41,6 +41,6 @@ post-build:
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tracker
 	${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
-	${INSTALL_DATA} ${WRKDIR}/tracker.info* ${PREFIX}/info
+	${INSTALL_DATA} ${WRKDIR}/tracker.info* ${PREFIX}/${PKGINFODIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/tracker/PLIST b/audio/tracker/PLIST
index 19c021c7aac..303535676a5 100644
--- a/audio/tracker/PLIST
+++ b/audio/tracker/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/02 18:06:57 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:44:41 jlam Exp $
 bin/tracker
 bin/randomize
+info/tracker.info
 share/doc/tracker/Html/Aix.html
 share/doc/tracker/Html/Introduction.html
 share/doc/tracker/Html/Availability.html