* List the info file entries directly in the PLIST.

* Honor PKGINFODIR and PKGMANDIR.

6 files changed, 22 insertions, 16 deletions

diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile
index e5b1196dd3d..efcbec84ec0 100644
--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:09:16 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/04 14:45:44 jlam Exp $
 
 DISTNAME=	gnugo-3.6
 PKGREVISION=	1
@@ -9,10 +9,9 @@ MAINTAINER=	bad@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gnugo/
 COMMENT=	Go playing program
 
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-
-INFO_FILES=	gnugo.info
+USE_TOOLS+=	gmake
+GNU_CONFIGURE=	yes
+INFO_FILES=	# PLIST
 
 TEST_TARGET=	check
 
diff --git a/games/gnugo/PLIST b/games/gnugo/PLIST
index d29fc7fc709..d9dba71c360 100644
--- a/games/gnugo/PLIST
+++ b/games/gnugo/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/17 16:10:36 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/04 14:45:44 jlam Exp $
 bin/gnugo
+info/gnugo.info
 man/man6/gnugo.6
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 608d1b422b6..dd6e9f1f05a 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/02/05 23:09:24 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/04 14:45:44 jlam Exp $
 
 DISTNAME=	xboard-4.2.6
 PKGREVISION=	3
@@ -14,8 +14,7 @@ CONFIGURE_ARGS+=	--enable-zippy	# interface to ICS
 CONFIGURE_ENV+=		PERLPATH=${PERL5:Q}
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		perl:run
-
-INFO_FILES=	xboard.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/games/xboard/PLIST b/games/xboard/PLIST
index d773eb8f8a8..0a0095484af 100644
--- a/games/xboard/PLIST
+++ b/games/xboard/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/17 16:14:34 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/04 14:45:44 jlam Exp $
 bin/cmail
 bin/pxboard
 bin/xboard
 bin/zic2xpm
+info/xboard.info
 man/man6/cmail.6
 man/man6/xboard.6
 man/man6/zic2xpm.6
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index c66bdb089ac..59d603bc897 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/05 16:27:25 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/04/04 14:45:44 jlam Exp $
 
 DISTNAME=		xconq-7.4.1
 PKGREVISION=		5
@@ -17,14 +17,17 @@ CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
 CONFIGURE_ARGS+=	--with-tkconfig="${BUILDLINK_PREFIX.tk}/lib"
 
 MAKE_ENV+=		LOCALBASE=${LOCALBASE:Q}
-
-INFO_FILES=     	hacking.info xcdesign.info xconq.info
+MAKE_FLAGS+=		mandir=${PREFIX:Q}/${PKGMANDIR:Q}		\
+			infodir=${PREFIX:Q}/${PKGINFODIR:Q}
+INFO_FILES=     	# PLIST
 
 post-build:
-	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} info
+	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} info
 
 post-install:
-	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-info
+	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} install-info
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff --git a/games/xconq/PLIST b/games/xconq/PLIST
index 48902c09972..4d44551d3b5 100644
--- a/games/xconq/PLIST
+++ b/games/xconq/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/17 16:21:00 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/04 14:45:44 jlam Exp $
 bin/imf2x
 bin/x2imf
 bin/xconq
 bin/ximfapp
+info/hacking.info
+info/xcdesign.info
+info/xconq.info
 man/man6/xconq.6
 share/xconq/images/advt24x26.gif
 share/xconq/images/advt32x32.gif