* Honor PKGINFODIR.

* List the info files directly in the PLIST.

10 files changed, 25 insertions, 19 deletions

diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index f13ea4813bb..e63fa5c495e 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/04 21:29:08 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/03/30 03:44:41 jlam Exp $
 #
 
 DISTNAME=	gdbm-1.8.3
@@ -14,6 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-INFO_FILES=		gdbm.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gdbm/PLIST b/databases/gdbm/PLIST
index d9234edb7af..5f9c681bb33 100644
--- a/databases/gdbm/PLIST
+++ b/databases/gdbm/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/30 03:44:41 jlam Exp $
 include/gdbm.h
+info/gdbm.info
 lib/libgdbm.la
 man/man3/gdbm.3
diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index da5c06dd655..4a382b01544 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/10 23:26:31 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/30 03:44:41 jlam Exp $
 
 DISTNAME=	gnats-4.1.0
 PKGREVISION=	2
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--with-gnats-dblist-file=${GNATS_DB_FILE:Q}
 CONFIGURE_ARGS+=	--with-gnats-default-db=${GNATS_DBHOME:Q}
 CONFIGURE_ARGS+=	--with-lispdir=${PREFIX}/share/gnats
 
-INFO_FILES=	gnats.info gnats-faq.info
+INFO_FILES=		# PLIST
 
 PKG_SYSCONFSUBDIR=	gnats
 
diff --git a/databases/gnats/PLIST b/databases/gnats/PLIST
index fc615be53a4..cfc2d88e07c 100644
--- a/databases/gnats/PLIST
+++ b/databases/gnats/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/08/27 22:24:02 recht Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/30 03:44:41 jlam Exp $
 bin/edit-pr
 bin/getclose
 bin/install-sid
 bin/query-pr
 bin/send-pr
+info/gnats.info
+info/gnats-faq.info
 libexec/gnats/at-pr
 libexec/gnats/check-db
 libexec/gnats/delete-pr
diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index 79591924b17..c61a34423ea 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:31 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/30 03:44:41 jlam Exp $
 #
 
 DISTNAME=	guile-pg-0.29
@@ -13,11 +13,10 @@ COMMENT=	PostgreSQL interface for Guile
 USE_LIBTOOL=	YES
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
+INFO_FILES=	# PLIST
 
 TEST_TARGET=	check
 
-INFO_FILES=	guile-pg.info
-
 # There are several versions of guile; the relevant ones for this
 # module are 1.6.x, which is the current FSF version, and ttn-1.4,
 # which is a forked version of 1.4 by Thien-Thi Nguyen, the maintainer
diff --git a/databases/guile-pg/PLIST b/databases/guile-pg/PLIST
index 8f9fd9a974f..30f15d02e52 100644
--- a/databases/guile-pg/PLIST
+++ b/databases/guile-pg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2005/12/09 16:01:10 gdt Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/30 03:44:41 jlam Exp $
+info/guile-pg.info
 lib/guile/site/database/libpostgres.la
 lib/guile/site/database/postgres-col-defs.scm
 lib/guile/site/database/postgres-gxrepl.scm
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
index 6b9934bd427..5615da7b1c0 100644
--- a/databases/mysql4-client/Makefile
+++ b/databases/mysql4-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/03/30 03:44:41 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 PKGREVISION=		1
@@ -13,8 +13,7 @@ CONFIGURE_ARGS+=	--without-extra-tools
 CONFIGURE_ARGS+=	--without-server
 CONFIGURE_ARGS+=	--enable-thread-safe-client
 UNWRAP_FILES=		scripts/mysql_config
-
-INFO_FILES=		mysql.info
+INFO_FILES=		# PLIST
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
index bb0aa3b9d45..4f0fb1204e4 100644
--- a/databases/mysql4-client/PLIST
+++ b/databases/mysql4-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/01/10 15:47:18 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/30 03:44:42 jlam Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -53,6 +53,7 @@ include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
+info/mysql.info
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.la
 man/man1/mysql.1
diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index c8fd5bc4ca0..f7477226eb3 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/03/30 03:44:42 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 PKGREVISION=		1
@@ -13,11 +13,13 @@ CONFIGURE_ARGS+=	--without-extra-tools
 CONFIGURE_ARGS+=	--without-server
 CONFIGURE_ARGS+=	--enable-thread-safe-client
 UNWRAP_FILES=		scripts/mysql_config
-
-INFO_FILES=		mysql.info
+INFO_FILES=		# PLIST
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
+	cd ${WRKSRC}; for f in mysql.info mysql.info-[0-9]*; do		\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql
 .for f in huge large innodb-heavy-4G small medium
 	${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
diff --git a/databases/mysql5-client/PLIST b/databases/mysql5-client/PLIST
index 8eff0a1f6a5..9988f631b39 100644
--- a/databases/mysql5-client/PLIST
+++ b/databases/mysql5-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/08 17:45:23 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/30 03:44:42 jlam Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -54,6 +54,7 @@ include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
+info/mysql.info
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.la
 man/man1/mysql.1