* Honor PKGINFODIR.

* List the info files directly in the PLIST.

4 files changed, 45 insertions, 10 deletions

diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common
index 98d2beeafae..78556a522e9 100644
--- a/editors/emacs/Makefile.common
+++ b/editors/emacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2006/03/25 02:48:22 uebayasi Exp $
+# $NetBSD: Makefile.common,v 1.7 2006/03/30 03:44:43 jlam Exp $
 
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 MAINTAINER=	markd@NetBSD.org
@@ -59,10 +59,7 @@ LDFLAGS+=	-Z
 CFLAGS+=	-fno-zero-initialized-in-bss
 .endif
 
-INFO_FILES=	ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs
-INFO_FILES+=	emacs-mime eshell eudc forms gnus idlwave message mh-e pcl-cvs
-INFO_FILES+=	reftex sc speedbar vip viper widget woman
-
+INFO_FILES=	# PLIST
 REPLACE_PERL=	lib-src/grep-changelog
 
 post-extract:
diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST
index cfd11228a60..b7b520c7f93 100644
--- a/editors/emacs/PLIST
+++ b/editors/emacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/09 05:23:40 minskim Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/05/09 05:23:40 minskim Exp
 bin/emacs
 bin/emacs-${EMACSVERSION}
 bin/emacs-b2m
@@ -20,6 +20,31 @@ libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/rcs2log
 libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/sorted-doc
 libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
 libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/yow
+info/ada-mode
+info/autotype
+info/ccmode
+info/cl
+info/dired-x
+info/ebrowse
+info/ediff
+info/efaq
+info/emacs
+info/emacs-mime
+info/eshell
+info/eudc
+info/forms
+info/gnus
+info/idlwave
+info/message
+info/mh-e
+info/pcl-cvs
+info/reftex
+info/sc
+info/speedbar
+info/vip
+info/viper
+info/widget
+info/woman
 man/man1/emacs-ctags.1
 man/man1/emacs-etags.1
 man/man1/emacs-gfdl.1
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index cbcf36ad15b..cee61a1c2ce 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:29:31 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/03/30 03:44:43 jlam Exp $
 
 DISTNAME=	emacs-20.7
 PKGREVISION=	7
@@ -84,8 +84,7 @@ MAKE_ENV+=	INSTALL_STRIP=${_STRIPFLAG_INSTALL:Q}
 CFLAGS+=	-fno-zero-initialized-in-bss
 .endif
 
-INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
-		    ccmode message widget reftex
+INFO_FILES=	# PLIST
 
 INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
diff --git a/editors/emacs20/PLIST b/editors/emacs20/PLIST
index ae50f8336e3..e9884af389c 100644
--- a/editors/emacs20/PLIST
+++ b/editors/emacs20/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/16 21:09:56 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/30 03:44:43 jlam Exp $
 bin/emacs
 bin/emacs-${PKGVERSION}
 bin/emacs-b2m
@@ -6,6 +6,20 @@ bin/emacs-ctags
 bin/emacs-etags
 bin/emacs-rcs-checkin
 bin/emacsclient
+info/ccmode
+info/cl 
+info/dired-x
+info/ediff
+info/emacs 
+info/forms
+info/gnus
+info/message 
+info/mh-e
+info/reftex
+info/sc
+info/vip
+info/viper
+info/widget
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver