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

7 files changed, 15 insertions, 11 deletions

diff --git a/misc/git/Makefile b/misc/git/Makefile
index 48a994d3ab5..ac0ab0bb423 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:30:11 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/05 23:01:16 jlam Exp $
 
 DISTNAME=	git-4.3.20
 CATEGORIES=	misc
@@ -9,7 +9,7 @@ HOMEPAGE=	http://hulubei.net/tudor/git/
 COMMENT=	GNU Interactive Tools - a file system browser for UNIX systems
 
 GNU_CONFIGURE=	YES
-INFO_FILES=	git.info git.info-1 git.info-2 git.info-3
+INFO_FILES=	# PLIST
 
 post-extract:
 	${CP} ${WRKSRC}/term/.gitrc.ansi ${WRKSRC}/term/.gitrc.cons25
diff --git a/misc/git/PLIST b/misc/git/PLIST
index b233256eb8d..14c6a337607 100644
--- a/misc/git/PLIST
+++ b/misc/git/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/01/26 17:58:18 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/05 23:01:16 jlam Exp $
 bin/.gitaction
 bin/git
 bin/gitaction
@@ -12,6 +12,7 @@ bin/gitview
 bin/gitwhich
 bin/gitwipe
 bin/gitxgrep
+info/git.info
 man/man1/git.1
 man/man1/gitaction.1
 man/man1/gitkeys.1
diff --git a/misc/lookup/Makefile b/misc/lookup/Makefile
index adaf8eb569a..11d55ad4b4f 100644
--- a/misc/lookup/Makefile
+++ b/misc/lookup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:10:12 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/05 23:01:16 jlam Exp $
 #
 
 DISTNAME=	lookup-1.4
@@ -18,8 +18,7 @@ EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
 
 GNU_CONFIGURE=	YES
 MAKEFLAGS+=	lispdir=${EMACS_LISPPREFIX}/lookup
-
-INFO_FILES=	lookup.info lookup-guide.info
+INFO_FILES=	# PLIST
 
 CONFIGURE_ARGS+=${EMACS_FLAVOR}
 
diff --git a/misc/lookup/PLIST b/misc/lookup/PLIST
index 0b07600d80d..f28ec27885c 100644
--- a/misc/lookup/PLIST
+++ b/misc/lookup/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/19 16:05:49 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/05 23:01:16 jlam Exp $
+${EMACS_INFOPREFIX}/lookup.info
+${EMACS_INFOPREFIX}/lookup-guide.info
 ${EMACS_LISPPREFIX}/lookup/evi-mule.el
 ${EMACS_LISPPREFIX}/lookup/evi-mule.elc
 ${EMACS_LISPPREFIX}/lookup/evi.el
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 9cc33e51cd0..03f819d0d7b 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2006/01/19 02:01:18 joerg Exp $
+# $NetBSD: Makefile,v 1.66 2006/04/05 23:01:16 jlam Exp $
 
 DISTNAME=	screen-4.0.2
 PKGREVISION=	4
@@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NOT_FOR_PLATFORM=	Interix-*-* # user auth and username size fixes needed
 
-INFO_FILES=		screen.info
 PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
 
 GNU_CONFIGURE=		yes
@@ -22,6 +21,7 @@ CONFIGURE_ARGS+=	--with-sys-screenrc=${PKG_SYSCONFDIR}/screenrc
 CONFIGURE_ARGS+=	--enable-telnet
 
 PKG_SHELL=		bin/screen
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/screen/PLIST b/misc/screen/PLIST
index 00563572a61..86af6b5a4d9 100644
--- a/misc/screen/PLIST
+++ b/misc/screen/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2005/12/28 17:53:24 reed Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/04/05 23:01:16 jlam Exp $
 bin/screen
 bin/${DISTNAME}
+info/screen.info
 man/man1/screen.1
 @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
 share/examples/screen/etcscreenrc
diff --git a/misc/screen/PLIST.SunOS b/misc/screen/PLIST.SunOS
index d56160c89bc..a0ff5c773cc 100644
--- a/misc/screen/PLIST.SunOS
+++ b/misc/screen/PLIST.SunOS
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST.SunOS,v 1.11 2005/12/28 17:53:24 reed Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.12 2006/04/05 23:01:16 jlam Exp $
 bin/screen
 bin/${DISTNAME}
+info/screen.info
 man/man1/screen.1
 @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
 share/examples/screen/etcscreenrc