List info files directly in the PLIST and honor PKG{INFO,MAN}DIR.

14 files changed, 30 insertions, 24 deletions

diff --git a/time/gcal/Makefile b/time/gcal/Makefile
index 46e3d1ca811..c321a2ab0ac 100644
--- a/time/gcal/Makefile
+++ b/time/gcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:09 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/08 05:02:59 jlam Exp $
 #
 
 DISTNAME=		gcal-3.01
@@ -12,7 +12,7 @@ COMMENT=		Gnu version of the standard calendar utility
 
 USE_PKGLOCALEDIR=	yes
 
-INFO_FILES=		gcal.info
+INFO_FILES=		# PLIST
 GNU_CONFIGURE=		yes
 BUILD_USES_MSGFMT=	yes
 BROKEN_GETTEXT_DETECTION=	yes
diff --git a/time/gcal/PLIST b/time/gcal/PLIST
index 9e264889a7d..7fcb00c3a09 100644
--- a/time/gcal/PLIST
+++ b/time/gcal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/11 14:18:38 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/08 05:02:59 jlam Exp $
 bin/gcal
 bin/gcal-daily
 bin/gcal-ddiff
@@ -13,6 +13,7 @@ bin/gcal-wlocdrv
 bin/gcal2txt
 bin/tcal
 bin/txt2gcal
+info/gcal.info
 man/man1/gcal.1
 man/man1/gcal2txt.1
 man/man1/tcal.1
diff --git a/time/gnutime/Makefile b/time/gnutime/Makefile
index f1dedf57741..606b6f55f3e 100644
--- a/time/gnutime/Makefile
+++ b/time/gnutime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:21 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/08 05:02:59 jlam Exp $
 #
 
 DISTNAME=		time-1.7
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.gnu.org/directory/GNU/time.html
 COMMENT=		Report user, system, and real time used by a process
 
 GNU_CONFIGURE=		yes
-INFO_FILES=		time.info
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX:Q}
 PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
diff --git a/time/gnutime/PLIST b/time/gnutime/PLIST
index cc544d97f33..5b3018624da 100644
--- a/time/gnutime/PLIST
+++ b/time/gnutime/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/05/27 21:52:46 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/08 05:02:59 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}time
+info/time.info
diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile
index 830bb412060..e92c9095d1c 100644
--- a/wm/ratpoison/Makefile
+++ b/wm/ratpoison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/11 10:07:50 ghen Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/08 05:02:59 jlam Exp $
 #
 
 DISTNAME=	ratpoison-1.4.0-beta4
@@ -10,10 +10,9 @@ MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/ratpoison/
 COMMENT=	Simple window manager with no fat library dependencies
 
-GNU_CONFIGURE=	YES
-USE_GNU_READLINE= YES
-
-INFO_FILES=	ratpoison.info
+GNU_CONFIGURE=		YES
+USE_GNU_READLINE=	YES
+INFO_FILES=		# PLIST
 
 REPLACE_INTERPRETER+=	bash
 REPLACE.bash.old=	/usr/bin/env bash
diff --git a/wm/ratpoison/PLIST b/wm/ratpoison/PLIST
index b468eacef82..978f1da198c 100644
--- a/wm/ratpoison/PLIST
+++ b/wm/ratpoison/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2005/03/19 15:24:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/08 05:02:59 jlam Exp $
 bin/ratpoison
 bin/rpws
+info/ratpoison.info
 man/man1/ratpoison.1
 share/doc/ratpoison/AUTHORS
 share/doc/ratpoison/COPYING
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index a5424cf838d..a1432e0540a 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/08 05:02:59 jlam Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
@@ -16,7 +16,7 @@ MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 BUILD_USES_MSGFMT=	YES
 
 USE_TOOLS+=		makeinfo
-INFO_FILES=		sawfish.info
+INFO_FILES=		# PLIST
 
 PLIST_SUBST+=		SF_VERS=${SF_VERS:Q}
 
diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST
index 4c1cc9b728c..7d73a5d1008 100644
--- a/wm/sawfish/PLIST
+++ b/wm/sawfish/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:56 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/08 05:02:59 jlam Exp $
 bin/sawfish
 bin/sawfish-capplet
 bin/sawfish-client
 bin/sawfish-themer
 bin/sawfish-ui
+info/sawfish.info
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/DOC
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.la
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gtk-style
diff --git a/www/cronolog/Makefile b/www/cronolog/Makefile
index ee2b7d56d16..52841662809 100644
--- a/www/cronolog/Makefile
+++ b/www/cronolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/08 05:02:59 jlam Exp $
 #
 
 DISTNAME=	cronolog-1.6.2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.cronolog.org/
 COMMENT=	Web log rotation utility that provides datestamp filenames
 
 GNU_CONFIGURE=	YES
-INFO_FILES=	cronolog.info
+INFO_FILES=	# PLIST
 
 post-patch:
 	${SED} "s,/www/sbin/cronolog,${PREFIX}/sbin/cronolog,g"		\
diff --git a/www/cronolog/PLIST b/www/cronolog/PLIST
index b4bc357a5d2..2f664e39ed4 100644
--- a/www/cronolog/PLIST
+++ b/www/cronolog/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/11 15:33:29 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/08 05:02:59 jlam Exp $
+info/cronolog.info
 man/man8/cronolog.8
 man/man8/cronosplit.8
 sbin/cronolog
diff --git a/www/thy/Makefile b/www/thy/Makefile
index 2cd9898e055..61cd1d6c5be 100644
--- a/www/thy/Makefile
+++ b/www/thy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/06 00:18:26 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/08 05:03:00 jlam Exp $
 
 DISTNAME=	thy-0.9.4
 PKGREVISION=	3
@@ -34,7 +34,7 @@ CONF_FILES=		${EGDIR}/thyrc ${PKG_SYSCONFDIR}/thyrc \
 			${EGDIR}/http503.html ${PKG_SYSCONFDIR}/http503.html \
 			${EGDIR}/http505.html ${PKG_SYSCONFDIR}/http505.html
 RCD_SCRIPTS=		thy
-INFO_FILES=		thy.info
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 MAKE_FLAGS+=		pkgconfdir=${EGDIR:Q}
diff --git a/www/thy/PLIST b/www/thy/PLIST
index fd63ff0b01b..dbe72949729 100644
--- a/www/thy/PLIST
+++ b/www/thy/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:34:07 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/08 05:03:00 jlam Exp $
+info/thy.info
 man/man7/thy-auth.7
 man/man8/thy.8
 sbin/thy
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index 069a2f8f671..70f8a9eb5d2 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/08 05:03:00 jlam Exp $
 #
 
 DISTNAME=		XaoS-3.1
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-curses-driver=no
 # DGA fails to link somehow, XXX should be fixed
 CONFIGURE_ARGS+=	--with-dga-driver=no
-INFO_FILES=		xaos.info
+INFO_FILES=		# PLIST
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
diff --git a/x11/XaoS/PLIST b/x11/XaoS/PLIST
index cc05cfd7bb4..3c8fe96eeab 100644
--- a/x11/XaoS/PLIST
+++ b/x11/XaoS/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2004/08/15 04:13:18 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/08 05:03:00 jlam Exp $
 bin/xaos
+info/xaos.info
 man/man6/xaos.6
 share/XaoS/catalogs/README
 share/XaoS/catalogs/cesky.cat