Lots of bug fixes:

- sync package list with reality and use "mkdir -p"
- add missing RCSIds
- split patches
- don't install texinfo documentation
- avoid conflict with "xemacs" and "vim"
- remove unnecessary "${WRKSRC}"
- add missing info files to "${INFO}"
- don't remove "share/emacs/20.3/etc/DOC-20.3.[13-9]*" (fixes PR pkg/6097)

21 files changed, 313 insertions, 221 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index d223c4c74d6..48bcc925b6f 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.19 1998/09/01 20:04:33 mellon Exp $
+# $NetBSD: Makefile,v 1.20 1998/09/04 02:28:52 tron Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 #
 
 DISTNAME=	emacs-20.3
-WRKSRC=		${WRKDIR}/emacs-20.3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU}
 
-MAINTAINER=	mellon@netbsd.org
+MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 
 CONFLICTS=	emacs-20.2
@@ -16,19 +15,15 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--with-pop --with-x --with-x-toolkit=lucid
 OPSYS!=         uname -s
-MAKE_ENV+=	INSTALL_STRIP=${STRIPFLAG} \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
+MAKE_ENV+=	INSTALL_STRIP=${STRIPFLAG}
+INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message widget reftex forms customize
 
 INSTALL_PROGRAM= ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
+pre-install:
+	@find ${WRKSRC} -type f -name "*.orig" | xargs rm -f
+
 post-install:
-	${RM} -f ${PREFIX}/share/emacs/20.3/etc/DOC-20.3.[13-9]*
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
-.if (${OPSYS} != "NetBSD")
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs/patches/patch-aa b/editors/emacs/patches/patch-aa
index 42a67ed6a2a..61fd2a7f5ae 100644
--- a/editors/emacs/patches/patch-aa
+++ b/editors/emacs/patches/patch-aa
@@ -1,154 +1,34 @@
-$NetBSD: patch-aa,v 1.6 1998/09/01 20:04:34 mellon Exp $
+$NetBSD: patch-aa,v 1.7 1998/09/04 02:28:53 tron Exp $
 
---- ./man/widget.texi.orig    Sat Oct 11 04:47:03 1997
-+++ ./man/widget.texi Sat Oct 11 04:46:38 1997
-@@ -3,6 +3,10 @@
- @c %**start of header
- @setfilename ../info/widget
- @settitle The Emacs Widget Library
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Widget: (Widget).            Emacs Widget Library
-+@end direntry
- @iftex
- @afourpaper
- @headings double
---- ./man/message.texi.orig   Sat Oct 11 04:45:08 1997
-+++ ./man/message.texi        Sat Oct 11 04:45:11 1997
-@@ -2,6 +2,11 @@
- 
- @setfilename ../info/message
- @settitle Message 5.5 Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message: (message).		Emacs message composition mode.
-+@end direntry
-+
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
---- ./man/vip.texi.org	Fri Jun 16 15:31:11 1995
-+++ ./man/vip.texi	Tue May 20 01:28:33 1997
-@@ -2,6 +2,10 @@
- 
- @setfilename ../info/vip
- @settitle VIP
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIP: (vip).			A VI-emulation for Emacs.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/emacs.texi.org	Mon Aug 19 21:15:12 1996
-+++ ./man/emacs.texi	Tue May 20 01:20:11 1997
-@@ -50,6 +50,10 @@
- @settitle GNU Emacs Manual
- @setfilename ../info/emacs
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Emacs: (emacs).		The extensible self-documenting text editor.
-+@end direntry
-
- @c in general, keep the following line commented out, unless doing a
- @c copy of this manual that will be published.  the manual should go
---- ./man/viper.texi.org	Wed Aug  7 10:59:45 1996
-+++ ./man/viper.texi	Tue May 20 01:29:17 1997
-@@ -4,6 +4,10 @@
- \input texinfo
- 
- @setfilename ../info/viper
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/forms.texi.org	Sat Mar 23 06:42:27 1996
-+++ ./man/forms.texi	Tue May 20 01:22:37 1997
-@@ -9,6 +9,11 @@
- @syncodeindex vr cp
- @syncodeindex fn cp
- @syncodeindex ky cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Forms: (forms).		Emacs package for editing data bases
-+				by filling in forms.
-+@end direntry
- @iftex
- @finalout
- @setchapternewpage odd
---- ./man/gnus.texi.org	Wed Jun 26 14:49:29 1996
-+++ ./man/gnus.texi	Tue May 20 01:23:15 1997
-@@ -5,6 +5,11 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* GNUS: (gnus).			The news reader GNUS.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/mh-e.texi.org	Sun Aug  4 00:00:29 1996
-+++ ./man/mh-e.texi	Tue May 20 01:23:49 1997
-@@ -4,6 +4,10 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* MH-E: (mh-e).			Emacs interface to the MH mail system.
-+@end direntry
- 
- @setchapternewpage odd
- 
---- ./man/cl.texi.org	Mon Apr 15 21:36:53 1996
-+++ ./man/cl.texi	Tue May 20 01:24:18 1997
-@@ -2,6 +2,12 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
-+@end direntry
-+
-+
- @iftex
- @finalout
- @end iftex
---- ./man/sc.texi.org	Thu Jan  4 12:55:23 1996
-+++ ./man/sc.texi	Tue May 20 01:25:13 1997
-@@ -3,6 +3,12 @@
- @comment %**start of header (This is for running Texinfo on a region.)
- @setfilename ../info/sc
- @settitle Supercite Version 3.1 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* SC: (sc).			Supercite lets you cite parts of messages
-+				you're replying to, in flexible ways.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/cc-mode.texi.org	Sun Aug  4 21:56:21 1996
-+++ ./man/cc-mode.texi	Tue May 20 01:27:18 1997
-@@ -9,6 +9,12 @@
- @settitle     CC-MODE Version 4 Documentation
- @footnotestyle end
- 
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
-+				Objective-C and Java code.
-+@end direntry
-+
- @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- @comment @setchapternewpage odd !! we don't want blank pages !!
- @comment %**end of header (This is for running Texinfo on a region)
+--- man/Makefile.in.orig	Sat May 16 21:00:22 1998
++++ man/Makefile.in	Mon Aug 31 00:53:10 1998
+@@ -14,7 +14,7 @@
+ MAKEINFO = makeinfo
+ INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/customize \
+ 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+-		../info/info ../info/message ../info/mh-e ../info/reftex \
++		../info/message ../info/mh-e ../info/reftex \
+ 		../info/sc ../info/vip ../info/viper ../info/widget
+ DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi  customize.dvi dired-x.dvi \
+ 		 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
+@@ -70,6 +70,7 @@
+ 	${srcdir}/glossary.texi \
+ 	${srcdir}/ack.texi
+ 
++all: info
+ info: $(INFO_TARGETS)
+ 
+ dvi: $(DVI_TARGETS)
+@@ -78,12 +79,6 @@
+ # in srcdir.  There is no provision for Info files
+ # to exist in the build directory.
+ # In a distribution of Emacs, the Info files should be up to date.
+-
+-../info/info: ${INFOSOURCES}
+-	cd $(srcdir); $(MAKEINFO) --no-split info.texi
+-
+-info.dvi: ${INFOSOURCES}
+-	$(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
+ 
+ ../info/emacs: ${EMACSSOURCES}
+ 	cd $(srcdir); $(MAKEINFO) emacs.texi
diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab
index 711d2c52a68..286dc8a834d 100644
--- a/editors/emacs/patches/patch-ab
+++ b/editors/emacs/patches/patch-ab
@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.6 1998/09/04 02:28:53 tron Exp $
+
 --- ./configure.orig	Fri Aug 28 13:38:44 1998
 +++ ./configure	Sun Aug 16 03:48:36 1998
 @@ -759,6 +748,7 @@
diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac
index 85cc9af39f3..f4cb3aa0e24 100644
--- a/editors/emacs/patches/patch-ac
+++ b/editors/emacs/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.7 1998/09/04 02:28:53 tron Exp $
+
 --- /dev/null	Fri Aug 28 10:35:45 1998
 +++ lisp/site-load.el	Fri Aug 28 12:51:28 1998
 @@ -0,0 +1,4 @@
diff --git a/editors/emacs/patches/patch-ae b/editors/emacs/patches/patch-ae
index 36c58851a83..b0128619bca 100644
--- a/editors/emacs/patches/patch-ae
+++ b/editors/emacs/patches/patch-ae
@@ -1,8 +1,29 @@
-$NetBSD: patch-ae,v 1.4 1998/09/01 20:04:34 mellon Exp $
+$NetBSD: patch-ae,v 1.5 1998/09/04 02:28:54 tron Exp $
 
---- Makefile.in.orig	Tue Sep 16 22:23:57 1997
-+++ Makefile.in	Sat Feb 21 23:49:32 1998
-@@ -374,8 +368,13 @@
+--- Makefile.in.orig	Sun Aug  2 02:21:22 1998
++++ Makefile.in	Fri Sep  4 03:46:00 1998
+@@ -383,27 +383,23 @@
+ 	      chmod a+r ${infodir}/dir); \
+ 	   fi; \
+ 	   cd ${srcdir}/info ; \
+-	   for f in ccmode* cl* customize* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* reftex* sc* vip* widget*; do \
++	   for f in ccmode* cl* customize* dired-x* ediff* emacs* forms* gnus* message* mh-e* reftex* sc* vip* widget*; do \
+ 	     (cd $${thisdir}; \
+-	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
+-	      chmod a+r ${infodir}/$$f); \
++	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
+ 	   done); \
+ 	else true; fi
+-	-thisdir=`/bin/pwd`; \
+-	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+-	then \
+-	  for f in ccmode cl customize dired-x ediff emacs forms gnus info message mh-e reftex sc vip widget; do \
+-	    (cd $${thisdir}; \
+-	     ${INSTALL_INFO} --dir-file=${infodir}/dir --info-file=${infodir}/$$f); \
+-	  done; \
+-	else true; fi
+ 	-chmod -R a+r ${COPYDESTS} ${infodir}
+ 	thisdir=`/bin/pwd`; \
  	cd ${srcdir}/etc; \
  	for page in emacs etags ctags ; do \
  	  (cd $${thisdir}; \
@@ -18,7 +39,7 @@ $NetBSD: patch-ae,v 1.4 1998/09/01 20:04:34 mellon Exp $
  	done
  
  ### Install LEIM files.  Although they are machine-independent, we
-@@ -421,7 +420,7 @@
+@@ -451,7 +447,7 @@
  	    esac ;					\
  	  fi ;						\
  	done
diff --git a/editors/emacs/patches/patch-ag b/editors/emacs/patches/patch-ag
index 9df3301c500..c6926e51ef3 100644
--- a/editors/emacs/patches/patch-ag
+++ b/editors/emacs/patches/patch-ag
@@ -1,3 +1,5 @@
+$NetBSD: patch-ag,v 1.5 1998/09/04 02:28:54 tron Exp $
+
 --- info/customize~	Mon Sep 15 03:56:06 1997
 +++ info/customize	Fri Aug 28 22:11:30 1998
 @@ -1,6 +1,11 @@
@@ -12,46 +14,3 @@
  Distribution
  ************
  
---- info/info~	Thu May 28 14:14:49 1998
-+++ info/info	Fri Aug 28 22:12:46 1998
-@@ -1,6 +1,11 @@
- This is Info file ../info/info, produced by Makeinfo version 1.68 from
- the input file info.texi.
- 
-+INFO-DIR-SECTION Editors
-+START-INFO-DIR-ENTRY
-+* Info: (info).		The on-line, menu-driven GNU documentation system.
-+END-INFO-DIR-ENTRY
-+
-    This file describes how to use Info, the on-line, menu-driven GNU
- documentation system.
- 
---- info/reftex~	Sun Apr 26 15:19:42 1998
-+++ info/reftex	Fri Aug 28 22:13:45 1998
-@@ -1,6 +1,12 @@
- This is Info file ../info/reftex, produced by Makeinfo version 1.68
- from the input file reftex.texi.
- 
-+INFO-DIR-SECTION Editors
-+START-INFO-DIR-ENTRY
-+* RefTeX: (reftex).	Labels, references and citations for LaTeX
-+			documents with Emacs.
-+END-INFO-DIR-ENTRY
-+
-    This file documents RefTeX, a package to do labels, references and
- citations for LaTeX documents with Emacs.
- 
---- info/widget~	Mon Mar 30 00:12:27 1998
-+++ info/widget	Fri Aug 28 22:14:36 1998
-@@ -1,6 +1,11 @@
- This is Info file ../info/widget, produced by Makeinfo version 1.68
- from the input file widget.texi.
- 
-+INFO-DIR-SECTION Editors
-+START-INFO-DIR-ENTRY
-+* Widget: (widget).	The GNU Emacs text widget package.
-+END-INFO-DIR-ENTRY
-+
- 
- File: widget,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
- 
diff --git a/editors/emacs/patches/patch-ai b/editors/emacs/patches/patch-ai
new file mode 100644
index 00000000000..7863f8ea870
--- /dev/null
+++ b/editors/emacs/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- info/reftex~	Sun Apr 26 15:19:42 1998
++++ info/reftex	Fri Aug 28 22:13:45 1998
+@@ -1,6 +1,12 @@
+ This is Info file ../info/reftex, produced by Makeinfo version 1.68
+ from the input file reftex.texi.
+ 
++INFO-DIR-SECTION Editors
++START-INFO-DIR-ENTRY
++* RefTeX: (reftex).	Labels, references and citations for LaTeX
++			documents with Emacs.
++END-INFO-DIR-ENTRY
++
+    This file documents RefTeX, a package to do labels, references and
+ citations for LaTeX documents with Emacs.
+ 
diff --git a/editors/emacs/patches/patch-aj b/editors/emacs/patches/patch-aj
new file mode 100644
index 00000000000..934d789e542
--- /dev/null
+++ b/editors/emacs/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- info/widget~	Mon Mar 30 00:12:27 1998
++++ info/widget	Fri Aug 28 22:14:36 1998
+@@ -1,6 +1,11 @@
+ This is Info file ../info/widget, produced by Makeinfo version 1.68
+ from the input file widget.texi.
+ 
++INFO-DIR-SECTION Editors
++START-INFO-DIR-ENTRY
++* Widget: (widget).	The GNU Emacs text widget package.
++END-INFO-DIR-ENTRY
++
+ 
+ File: widget,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
+ 
diff --git a/editors/emacs/patches/patch-ak b/editors/emacs/patches/patch-ak
new file mode 100644
index 00000000000..d4abb5349e7
--- /dev/null
+++ b/editors/emacs/patches/patch-ak
@@ -0,0 +1,23 @@
+$NetBSD: patch-ak,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- lib-src/Makefile.in.orig	Sun Aug  2 02:22:55 1998
++++ lib-src/Makefile.in	Fri Sep  4 01:40:32 1998
+@@ -286,12 +286,14 @@
+ 	@echo
+ 	@echo "Installing utilities for users to run."
+ 	for file in ${INSTALLABLES} ; do \
+-	  $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
+-	  chmod a+rx ${bindir}/$${file}; \
++	  if [ $${file} = emacsclient ] ; then \
++	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
++	  else \
++	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/emacs-$${file} ; \
++	  fi ; \
+ 	done
+ 	for file in ${INSTALLABLE_SCRIPTS} ; do \
+-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
+-	  chmod a+rx ${bindir}/$${file}; \
++	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/emacs-$${file} ; \
+ 	done
+ 
+ uninstall:
diff --git a/editors/emacs/patches/patch-al b/editors/emacs/patches/patch-al
new file mode 100644
index 00000000000..48a5fe971ea
--- /dev/null
+++ b/editors/emacs/patches/patch-al
@@ -0,0 +1,17 @@
+$NetBSD: patch-al,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- man/cc-mode.texi.orig	Sat May 16 20:55:23 1998
++++ man/cc-mode.texi	Fri Sep  4 01:56:10 1998
+@@ -14,6 +14,12 @@
+ 			  and Java code.
+ @end direntry
+ 
++@dircategory The Emacs editor and associated tools 
++@direntry 
++* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
++				Objective-C and Java code.
++@end direntry
++
+ @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ @comment @setchapternewpage odd !! we don't want blank pages !!
+ @comment %**end of header (This is for running Texinfo on a region)
diff --git a/editors/emacs/patches/patch-am b/editors/emacs/patches/patch-am
new file mode 100644
index 00000000000..827e2b0cb2a
--- /dev/null
+++ b/editors/emacs/patches/patch-am
@@ -0,0 +1,17 @@
+$NetBSD: patch-am,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- man/cl.texi.orig	Sat May 16 20:51:46 1998
++++ man/cl.texi	Fri Sep  4 01:56:10 1998
+@@ -7,6 +7,12 @@
+ * CL: (cl).		Partial Common Lisp support for Emacs Lisp.
+ @end direntry
+ 
++@dircategory The Emacs editor and associated tools
++@direntry
++* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
++@end direntry
++
++
+ @iftex
+ @finalout
+ @end iftex
diff --git a/editors/emacs/patches/patch-an b/editors/emacs/patches/patch-an
new file mode 100644
index 00000000000..27ff81895cd
--- /dev/null
+++ b/editors/emacs/patches/patch-an
@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- man/emacs.texi.orig	Tue Aug 18 10:45:18 1998
++++ man/emacs.texi	Fri Sep  4 01:56:09 1998
+@@ -4,6 +4,10 @@
+ @settitle GNU Emacs Manual
+ @setfilename ../info/emacs
+ @synindex pg cp
++@dircategory The Emacs editor and associated tools
++@direntry
++* Emacs: (emacs).		The extensible self-documenting text editor.
++@end direntry
+ 
+ @ifinfo
+ @c The edition number appears in several places in this file
diff --git a/editors/emacs/patches/patch-ao b/editors/emacs/patches/patch-ao
new file mode 100644
index 00000000000..0c40a79f2e5
--- /dev/null
+++ b/editors/emacs/patches/patch-ao
@@ -0,0 +1,16 @@
+$NetBSD: patch-ao,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- man/forms.texi.orig	Sat May 16 20:49:28 1998
++++ man/forms.texi	Fri Sep  4 01:56:09 1998
+@@ -8,6 +8,11 @@
+ @syncodeindex vr cp
+ @syncodeindex fn cp
+ @syncodeindex ky cp
++@dircategory The Emacs editor and associated tools
++@direntry
++* Forms: (forms).		Emacs package for editing data bases
++				by filling in forms.
++@end direntry
+ @iftex
+ @finalout
+ @setchapternewpage odd
diff --git a/editors/emacs/patches/patch-ap b/editors/emacs/patches/patch-ap
new file mode 100644
index 00000000000..8664959fe80
--- /dev/null
+++ b/editors/emacs/patches/patch-ap
@@ -0,0 +1,16 @@
+$NetBSD: patch-ap,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- man/gnus.texi.orig	Sat May 16 20:50:27 1998
++++ man/gnus.texi	Fri Sep  4 01:56:10 1998
+@@ -5,6 +5,11 @@
+ @synindex fn cp
+ @synindex vr cp
+ @synindex pg cp
++@dircategory The Emacs editor and associated tools
++@direntry
++* GNUS: (gnus).			The news reader GNUS.
++@end direntry
++
+ @iftex
+ @finalout
+ @end iftex
diff --git a/editors/emacs/patches/patch-aq b/editors/emacs/patches/patch-aq
new file mode 100644
index 00000000000..366a70980fd
--- /dev/null
+++ b/editors/emacs/patches/patch-aq
@@ -0,0 +1,16 @@
+$NetBSD: patch-aq,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- man/message.texi.orig	Sat May 16 20:50:48 1998
++++ man/message.texi	Fri Sep  4 01:56:09 1998
+@@ -2,6 +2,11 @@
+ 
+ @setfilename ../info/message
+ @settitle Message 5.5 Manual
++@dircategory The Emacs editor and associated tools
++@direntry
++* Message: (message).		Emacs message composition mode.
++@end direntry
++
+ @synindex fn cp
+ @synindex vr cp
+ @synindex pg cp
diff --git a/editors/emacs/patches/patch-ar b/editors/emacs/patches/patch-ar
new file mode 100644
index 00000000000..98fdcd0a58b
--- /dev/null
+++ b/editors/emacs/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.1 1998/09/04 02:28:54 tron Exp $
+
+--- man/mh-e.texi.orig	Sat May 16 20:51:15 1998
++++ man/mh-e.texi	Fri Sep  4 01:56:10 1998
+@@ -4,6 +4,10 @@
+ @setfilename ../info/mh-e
+ @settitle mh-e
+ @c %**end of header
++@dircategory The Emacs editor and associated tools
++@direntry
++* MH-E: (mh-e).			Emacs interface to the MH mail system.
++@end direntry
+ 
+ @setchapternewpage odd
+ 
diff --git a/editors/emacs/patches/patch-as b/editors/emacs/patches/patch-as
new file mode 100644
index 00000000000..eb24b5a3d58
--- /dev/null
+++ b/editors/emacs/patches/patch-as
@@ -0,0 +1,17 @@
+$NetBSD: patch-as,v 1.1 1998/09/04 02:28:55 tron Exp $
+
+--- man/sc.texi.orig	Thu Jul  2 20:48:27 1998
++++ man/sc.texi	Fri Sep  4 01:56:10 1998
+@@ -3,6 +3,12 @@
+ @comment %**start of header (This is for running Texinfo on a region.)
+ @setfilename ../info/sc
+ @settitle Supercite Version 3.1 User's Manual
++@dircategory The Emacs editor and associated tools
++@direntry
++* SC: (sc).			Supercite lets you cite parts of messages
++				you're replying to, in flexible ways.
++@end direntry
++
+ @iftex
+ @finalout
+ @end iftex
diff --git a/editors/emacs/patches/patch-at b/editors/emacs/patches/patch-at
new file mode 100644
index 00000000000..2389605be2c
--- /dev/null
+++ b/editors/emacs/patches/patch-at
@@ -0,0 +1,15 @@
+$NetBSD: patch-at,v 1.1 1998/09/04 02:28:55 tron Exp $
+
+--- man/vip.texi.orig	Sat May 16 20:48:50 1998
++++ man/vip.texi	Fri Sep  4 01:56:09 1998
+@@ -2,6 +2,10 @@
+ 
+ @setfilename ../info/vip
+ @settitle VIP
++@dircategory The Emacs editor and associated tools
++@direntry
++* VIP: (vip).			A VI-emulation for Emacs.
++@end direntry
+ 
+ @dircategory Editors
+ @direntry
diff --git a/editors/emacs/patches/patch-au b/editors/emacs/patches/patch-au
new file mode 100644
index 00000000000..1e093ad1cac
--- /dev/null
+++ b/editors/emacs/patches/patch-au
@@ -0,0 +1,15 @@
+$NetBSD: patch-au,v 1.1 1998/09/04 02:28:55 tron Exp $
+
+--- man/viper.texi.orig	Tue Jun  9 05:19:18 1998
++++ man/viper.texi	Fri Sep  4 01:56:09 1998
+@@ -5,6 +5,10 @@
+ @comment @setfilename viper
+ @comment @setfilename viper.info
+ @setfilename ../info/viper
++@dircategory The Emacs editor and associated tools
++@direntry
++* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
++@end direntry
+ 
+ @dircategory Editors
+ @direntry
diff --git a/editors/emacs/patches/patch-av b/editors/emacs/patches/patch-av
new file mode 100644
index 00000000000..29cac11a07d
--- /dev/null
+++ b/editors/emacs/patches/patch-av
@@ -0,0 +1,15 @@
+$NetBSD: patch-av,v 1.1 1998/09/04 02:28:55 tron Exp $
+
+--- man/widget.texi.orig	Thu Jul 10 03:42:38 1997
++++ man/widget.texi	Fri Sep  4 01:56:09 1998
+@@ -3,6 +3,10 @@
+ @c %**start of header
+ @setfilename ../info/widget
+ @settitle The Emacs Widget Library
++@dircategory The Emacs editor and associated tools
++@direntry
++* Widget: (Widget).            Emacs Widget Library
++@end direntry
+ @iftex
+ @afourpaper
+ @headings double
diff --git a/editors/emacs/pkg/PLIST b/editors/emacs/pkg/PLIST
index 5c43f1ba6cd..952391df59f 100644
--- a/editors/emacs/pkg/PLIST
+++ b/editors/emacs/pkg/PLIST
@@ -1,5 +1,11 @@
+@comment $NetBSD: PLIST,v 1.14 1998/09/04 02:28:55 tron Exp $
 bin/emacs
 bin/emacs-20.3
+bin/emacs-etags
+bin/emacs-ctags
+bin/emacsclient
+bin/emacs-b2m
+bin/emacs-rcs-checkin
 @unexec %D/bin/install-info --delete %D/info/widget %D/info/dir
 info/widget
 @exec   %D/bin/install-info          %D/info/widget %D/info/dir
@@ -38,9 +44,6 @@ info/mh-e
 @unexec %D/bin/install-info --delete %D/info/message %D/info/dir
 info/message
 @exec   %D/bin/install-info          %D/info/message %D/info/dir
-@unexec %D/bin/install-info --delete %D/info/info %D/info/dir
-info/info
-@exec   %D/bin/install-info          %D/info/info %D/info/dir
 info/gnus-9
 info/gnus-8
 info/gnus-7
@@ -1370,16 +1373,16 @@ share/emacs/site-lisp/subdirs.el
 @dirrm share/emacs/20.3/lisp/gnus
 @dirrm share/emacs/20.3/lisp/emulation
 @dirrm share/emacs/20.3/lisp/emacs-lisp
-@exec   f=%D/share/emacs/20.3/site-lisp ; [ ! -d $f ] && mkdir $f
-@dirrm share/emacs/20.3/site-lisp
-@exec   f=%D/share/emacs/20.3/leim ; [ ! -d $f ] && mkdir $f
+@exec mkdir -p %D/share/emacs/20.3/site-lisp
+@unexec rm -rf %D/share/emacs/20.3/site-lisp
+@exec mkdir -p %D/share/emacs/20.3/leim
 @dirrm share/emacs/20.3/leim
 @dirrm share/emacs/20.3/lisp
 @dirrm share/emacs/20.3/etc/e
 @dirrm share/emacs/20.3/etc
 @dirrm share/emacs/20.3
-@exec   f=%D/share/emacs/site-lisp ; [ ! -d $f ] && mkdir $f
-@dirrm share/emacs/site-lisp
+@exec mkdir -p %D/share/emacs/site-lisp
+@unexec rm -rf %D/share/emacs/site-lisp
 @dirrm share/emacs
 @dirrm libexec/emacs/20.3/${MACHINE_GNU_ARCH}--netbsd
 @dirrm libexec/emacs/20.3