22 files changed, 185 insertions, 163 deletions

diff --git a/editors/emacs/files/patch-aa b/editors/emacs/files/patch-aa
index d503e9112709..63b76da5b888 100644
--- a/editors/emacs/files/patch-aa
+++ b/editors/emacs/files/patch-aa
@@ -6,7 +6,7 @@
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIP: (vip).		A VI-emulation for Emacs.
++* VIP: (vip).			A VI-emulation for Emacs.
 +@end direntry
  
  @iftex
@@ -19,7 +19,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Emacs: (emacs).	The extensible self-documenting text editor.
++* Emacs: (emacs).		The extensible self-documenting text editor.
 +@end direntry
 +
  @c
@@ -33,7 +33,7 @@
  @setfilename ../info/viper
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIPER: (viper).	The new VI-emulation mode in Emacs-19.29.
++* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
 +@end direntry
  
  @iftex
@@ -46,8 +46,8 @@
  @syncodeindex ky cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Forms: (forms).	Emacs package for editing data bases
-+			by filling in forms.
++* Forms: (forms).		Emacs package for editing data bases
++				by filling in forms.
 +@end direntry
  @iftex
  @finalout
@@ -60,7 +60,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* GNUS: (gnus).		The news reader GNUS.
++* GNUS: (gnus).			The news reader GNUS.
 +@end direntry
 +
  @iftex
@@ -74,7 +74,7 @@
  @c %**end of header
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* MH-E: (mh-e).		Emacs interface to the MH mail system.
++* MH-E: (mh-e).			Emacs interface to the MH mail system.
 +@end direntry
  
  @setchapternewpage odd
@@ -87,7 +87,7 @@
  
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
++* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
 +@end direntry
 +
 +
@@ -102,8 +102,8 @@
  @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.
++* SC: (sc).			Supercite lets you cite parts of messages
++				you're replying to, in flexible ways.
 +@end direntry
 +
  @iftex
@@ -117,7 +117,7 @@
  @settitle Dired Extra Version 2 User's Manual
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Dired-X: (dired-x).	Dired Extra Features.
++* Dired-X: (dired-x).		Dired Extra Features.
 +@end direntry
 +
  @iftex
@@ -125,13 +125,14 @@
  @end iftex
 --- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
 +++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,10 @@
+@@ -10,6 +10,11 @@
  @synindex vr cp
  @synindex fn cp
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Ediff: (ediff).	A comprehensive visual interface to diff & patch.
++* Ediff: (ediff).		A comprehensive visual interface to diff
++				and patch.
 +@end direntry
  @iftex
  @finalout
@@ -144,8 +145,8 @@
  
 +@dircategory The Emacs editor and associated tools 
 +@direntry 
-+* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
-+			and Java code.
++* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
++				Objective-C and Java code.
 +@end direntry
 +
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/editors/emacs19/files/patch-aa b/editors/emacs19/files/patch-aa
index d503e9112709..63b76da5b888 100644
--- a/editors/emacs19/files/patch-aa
+++ b/editors/emacs19/files/patch-aa
@@ -6,7 +6,7 @@
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIP: (vip).		A VI-emulation for Emacs.
++* VIP: (vip).			A VI-emulation for Emacs.
 +@end direntry
  
  @iftex
@@ -19,7 +19,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Emacs: (emacs).	The extensible self-documenting text editor.
++* Emacs: (emacs).		The extensible self-documenting text editor.
 +@end direntry
 +
  @c
@@ -33,7 +33,7 @@
  @setfilename ../info/viper
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIPER: (viper).	The new VI-emulation mode in Emacs-19.29.
++* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
 +@end direntry
  
  @iftex
@@ -46,8 +46,8 @@
  @syncodeindex ky cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Forms: (forms).	Emacs package for editing data bases
-+			by filling in forms.
++* Forms: (forms).		Emacs package for editing data bases
++				by filling in forms.
 +@end direntry
  @iftex
  @finalout
@@ -60,7 +60,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* GNUS: (gnus).		The news reader GNUS.
++* GNUS: (gnus).			The news reader GNUS.
 +@end direntry
 +
  @iftex
@@ -74,7 +74,7 @@
  @c %**end of header
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* MH-E: (mh-e).		Emacs interface to the MH mail system.
++* MH-E: (mh-e).			Emacs interface to the MH mail system.
 +@end direntry
  
  @setchapternewpage odd
@@ -87,7 +87,7 @@
  
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
++* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
 +@end direntry
 +
 +
@@ -102,8 +102,8 @@
  @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.
++* SC: (sc).			Supercite lets you cite parts of messages
++				you're replying to, in flexible ways.
 +@end direntry
 +
  @iftex
@@ -117,7 +117,7 @@
  @settitle Dired Extra Version 2 User's Manual
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Dired-X: (dired-x).	Dired Extra Features.
++* Dired-X: (dired-x).		Dired Extra Features.
 +@end direntry
 +
  @iftex
@@ -125,13 +125,14 @@
  @end iftex
 --- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
 +++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,10 @@
+@@ -10,6 +10,11 @@
  @synindex vr cp
  @synindex fn cp
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Ediff: (ediff).	A comprehensive visual interface to diff & patch.
++* Ediff: (ediff).		A comprehensive visual interface to diff
++				and patch.
 +@end direntry
  @iftex
  @finalout
@@ -144,8 +145,8 @@
  
 +@dircategory The Emacs editor and associated tools 
 +@direntry 
-+* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
-+			and Java code.
++* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
++				Objective-C and Java code.
 +@end direntry
 +
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/editors/emacs20/files/patch-aa b/editors/emacs20/files/patch-aa
index d503e9112709..63b76da5b888 100644
--- a/editors/emacs20/files/patch-aa
+++ b/editors/emacs20/files/patch-aa
@@ -6,7 +6,7 @@
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIP: (vip).		A VI-emulation for Emacs.
++* VIP: (vip).			A VI-emulation for Emacs.
 +@end direntry
  
  @iftex
@@ -19,7 +19,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Emacs: (emacs).	The extensible self-documenting text editor.
++* Emacs: (emacs).		The extensible self-documenting text editor.
 +@end direntry
 +
  @c
@@ -33,7 +33,7 @@
  @setfilename ../info/viper
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIPER: (viper).	The new VI-emulation mode in Emacs-19.29.
++* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
 +@end direntry
  
  @iftex
@@ -46,8 +46,8 @@
  @syncodeindex ky cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Forms: (forms).	Emacs package for editing data bases
-+			by filling in forms.
++* Forms: (forms).		Emacs package for editing data bases
++				by filling in forms.
 +@end direntry
  @iftex
  @finalout
@@ -60,7 +60,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* GNUS: (gnus).		The news reader GNUS.
++* GNUS: (gnus).			The news reader GNUS.
 +@end direntry
 +
  @iftex
@@ -74,7 +74,7 @@
  @c %**end of header
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* MH-E: (mh-e).		Emacs interface to the MH mail system.
++* MH-E: (mh-e).			Emacs interface to the MH mail system.
 +@end direntry
  
  @setchapternewpage odd
@@ -87,7 +87,7 @@
  
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
++* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
 +@end direntry
 +
 +
@@ -102,8 +102,8 @@
  @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.
++* SC: (sc).			Supercite lets you cite parts of messages
++				you're replying to, in flexible ways.
 +@end direntry
 +
  @iftex
@@ -117,7 +117,7 @@
  @settitle Dired Extra Version 2 User's Manual
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Dired-X: (dired-x).	Dired Extra Features.
++* Dired-X: (dired-x).		Dired Extra Features.
 +@end direntry
 +
  @iftex
@@ -125,13 +125,14 @@
  @end iftex
 --- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
 +++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,10 @@
+@@ -10,6 +10,11 @@
  @synindex vr cp
  @synindex fn cp
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Ediff: (ediff).	A comprehensive visual interface to diff & patch.
++* Ediff: (ediff).		A comprehensive visual interface to diff
++				and patch.
 +@end direntry
  @iftex
  @finalout
@@ -144,8 +145,8 @@
  
 +@dircategory The Emacs editor and associated tools 
 +@direntry 
-+* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
-+			and Java code.
++* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
++				Objective-C and Java code.
 +@end direntry
 +
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/editors/emacs22/files/patch-aa b/editors/emacs22/files/patch-aa
index d503e9112709..63b76da5b888 100644
--- a/editors/emacs22/files/patch-aa
+++ b/editors/emacs22/files/patch-aa
@@ -6,7 +6,7 @@
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIP: (vip).		A VI-emulation for Emacs.
++* VIP: (vip).			A VI-emulation for Emacs.
 +@end direntry
  
  @iftex
@@ -19,7 +19,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Emacs: (emacs).	The extensible self-documenting text editor.
++* Emacs: (emacs).		The extensible self-documenting text editor.
 +@end direntry
 +
  @c
@@ -33,7 +33,7 @@
  @setfilename ../info/viper
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIPER: (viper).	The new VI-emulation mode in Emacs-19.29.
++* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
 +@end direntry
  
  @iftex
@@ -46,8 +46,8 @@
  @syncodeindex ky cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Forms: (forms).	Emacs package for editing data bases
-+			by filling in forms.
++* Forms: (forms).		Emacs package for editing data bases
++				by filling in forms.
 +@end direntry
  @iftex
  @finalout
@@ -60,7 +60,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* GNUS: (gnus).		The news reader GNUS.
++* GNUS: (gnus).			The news reader GNUS.
 +@end direntry
 +
  @iftex
@@ -74,7 +74,7 @@
  @c %**end of header
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* MH-E: (mh-e).		Emacs interface to the MH mail system.
++* MH-E: (mh-e).			Emacs interface to the MH mail system.
 +@end direntry
  
  @setchapternewpage odd
@@ -87,7 +87,7 @@
  
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
++* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
 +@end direntry
 +
 +
@@ -102,8 +102,8 @@
  @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.
++* SC: (sc).			Supercite lets you cite parts of messages
++				you're replying to, in flexible ways.
 +@end direntry
 +
  @iftex
@@ -117,7 +117,7 @@
  @settitle Dired Extra Version 2 User's Manual
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Dired-X: (dired-x).	Dired Extra Features.
++* Dired-X: (dired-x).		Dired Extra Features.
 +@end direntry
 +
  @iftex
@@ -125,13 +125,14 @@
  @end iftex
 --- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
 +++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,10 @@
+@@ -10,6 +10,11 @@
  @synindex vr cp
  @synindex fn cp
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Ediff: (ediff).	A comprehensive visual interface to diff & patch.
++* Ediff: (ediff).		A comprehensive visual interface to diff
++				and patch.
 +@end direntry
  @iftex
  @finalout
@@ -144,8 +145,8 @@
  
 +@dircategory The Emacs editor and associated tools 
 +@direntry 
-+* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
-+			and Java code.
++* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
++				Objective-C and Java code.
 +@end direntry
 +
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/editors/emacs23/files/patch-aa b/editors/emacs23/files/patch-aa
index d503e9112709..63b76da5b888 100644
--- a/editors/emacs23/files/patch-aa
+++ b/editors/emacs23/files/patch-aa
@@ -6,7 +6,7 @@
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIP: (vip).		A VI-emulation for Emacs.
++* VIP: (vip).			A VI-emulation for Emacs.
 +@end direntry
  
  @iftex
@@ -19,7 +19,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Emacs: (emacs).	The extensible self-documenting text editor.
++* Emacs: (emacs).		The extensible self-documenting text editor.
 +@end direntry
 +
  @c
@@ -33,7 +33,7 @@
  @setfilename ../info/viper
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIPER: (viper).	The new VI-emulation mode in Emacs-19.29.
++* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
 +@end direntry
  
  @iftex
@@ -46,8 +46,8 @@
  @syncodeindex ky cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Forms: (forms).	Emacs package for editing data bases
-+			by filling in forms.
++* Forms: (forms).		Emacs package for editing data bases
++				by filling in forms.
 +@end direntry
  @iftex
  @finalout
@@ -60,7 +60,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* GNUS: (gnus).		The news reader GNUS.
++* GNUS: (gnus).			The news reader GNUS.
 +@end direntry
 +
  @iftex
@@ -74,7 +74,7 @@
  @c %**end of header
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* MH-E: (mh-e).		Emacs interface to the MH mail system.
++* MH-E: (mh-e).			Emacs interface to the MH mail system.
 +@end direntry
  
  @setchapternewpage odd
@@ -87,7 +87,7 @@
  
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
++* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
 +@end direntry
 +
 +
@@ -102,8 +102,8 @@
  @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.
++* SC: (sc).			Supercite lets you cite parts of messages
++				you're replying to, in flexible ways.
 +@end direntry
 +
  @iftex
@@ -117,7 +117,7 @@
  @settitle Dired Extra Version 2 User's Manual
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Dired-X: (dired-x).	Dired Extra Features.
++* Dired-X: (dired-x).		Dired Extra Features.
 +@end direntry
 +
  @iftex
@@ -125,13 +125,14 @@
  @end iftex
 --- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
 +++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,10 @@
+@@ -10,6 +10,11 @@
  @synindex vr cp
  @synindex fn cp
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Ediff: (ediff).	A comprehensive visual interface to diff & patch.
++* Ediff: (ediff).		A comprehensive visual interface to diff
++				and patch.
 +@end direntry
  @iftex
  @finalout
@@ -144,8 +145,8 @@
  
 +@dircategory The Emacs editor and associated tools 
 +@direntry 
-+* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
-+			and Java code.
++* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
++				Objective-C and Java code.
 +@end direntry
 +
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 86ac01954b50..f36f9a169751 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 APR 1997
 # Whom:                 eric
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/06/04 06:32:22 asami Exp $
 #
 
 DISTNAME=       jed0.98-4
@@ -51,7 +51,7 @@ post-install:
 	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	install-info --section="Miscellaneous" \
-		--entry="* JED: (jed).		JED editor documentation." \
+		--entry="* JED: (jed).			JED editor documentation." \
 		${PREFIX}/info/jed.info ${PREFIX}/info/dir
 .endif
 
diff --git a/editors/jed/pkg-plist b/editors/jed/pkg-plist
index ea0d2c75fde3..ea791db98b01 100644
--- a/editors/jed/pkg-plist
+++ b/editors/jed/pkg-plist
@@ -1,13 +1,13 @@
 bin/jed
 bin/rgrep
 bin/xjed
-@unexec install-info --delete --section="Miscellaneous" --entry="* JED: (jed).		JED editor documentation." %D/info/jed.info %D/info/dir
+@unexec install-info --delete --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
 info/jed.1in
 info/jed.2in
 info/jed.3in
 info/jed.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info --section="Miscellaneous" --entry="* JED: (jed).		JED editor documentation." %D/info/jed.info %D/info/dir
+@exec install-info --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
 lib/jed/bin/getmail
 lib/jed/lib/abbrev.sl
 lib/jed/lib/abbrmisc.sl
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 71615e59dcf5..c8f11501b34d 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.27 1997/05/21 07:24:22 asami Exp $
+# $Id: Makefile,v 1.28 1997/05/28 03:06:31 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -39,9 +39,9 @@ post-install:
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/editors/mule-common/files/patch-aa b/editors/mule-common/files/patch-aa
index 8bc54f2d27df..6c7569ed38a9 100644
--- a/editors/mule-common/files/patch-aa
+++ b/editors/mule-common/files/patch-aa
@@ -25,7 +25,7 @@
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIP: (vip).		A VI-emulation for Emacs.
++* VIP: (vip).			A VI-emulation for Emacs.
 +@end direntry
  
  @iftex
@@ -38,7 +38,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Emacs: (emacs).	The extensible self-documenting text editor.
++* Emacs: (emacs).		The extensible self-documenting text editor.
 +@end direntry
 +
  @c
@@ -52,8 +52,8 @@
  @syncodeindex ky cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Forms: (forms).	Emacs package for editing data bases
-+			by filling in forms.
++* Forms: (forms).		Emacs package for editing data bases
++				by filling in forms.
 +@end direntry
  @iftex
  @finalout
@@ -66,7 +66,7 @@
  
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
++* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
 +@end direntry
 +
 +
@@ -81,8 +81,8 @@
  @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.
++* SC: (sc).			Supercite lets you cite parts of messages
++				you're replying to, in flexible ways.
 +@end direntry
 +
  @iftex
@@ -96,7 +96,7 @@
  @settitle Dired Extra Version 2 User's Manual
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Dired-X: (dired-x).	Dired Extra Features.
++* Dired-X: (dired-x).		Dired Extra Features.
 +@end direntry
 +
  @iftex
@@ -150,7 +150,7 @@
 +
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* GNUS: (gnus).		The news reader GNUS.
++* GNUS: (gnus).			The news reader GNUS.
 +@end direntry
 +
  @iftex
diff --git a/editors/mule-common/pkg-plist b/editors/mule-common/pkg-plist
index 66f54f8fa041..fb4e72b549f6 100644
--- a/editors/mule-common/pkg-plist
+++ b/editors/mule-common/pkg-plist
@@ -25,11 +25,12 @@ man/man1/mule.1.gz
 @unexec install-info --delete %D/info/gnus %D/info/dir
 @unexec install-info --delete %D/info/cl %D/info/dir
 @unexec install-info --delete %D/info/sc %D/info/dir
+@unexec install-info --delete %D/info/dired-x %D/info/dir
 @unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
 @comment
 @comment emacs stuff
 @comment
@@ -108,11 +109,12 @@ info/terminology
 @exec install-info %D/info/gnus %D/info/dir
 @exec install-info %D/info/cl %D/info/dir
 @exec install-info %D/info/sc %D/info/dir
+@exec install-info %D/info/dired-x %D/info/dir
 @exec install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).			Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).			Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).			Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
 lib/mule/19.28/etc/3B-MAXMEM
 lib/mule/19.28/etc/AIX.DUMP
 lib/mule/19.28/etc/APPLE
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 71615e59dcf5..c8f11501b34d 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.27 1997/05/21 07:24:22 asami Exp $
+# $Id: Makefile,v 1.28 1997/05/28 03:06:31 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -39,9 +39,9 @@ post-install:
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/editors/mule/pkg-plist b/editors/mule/pkg-plist
index 66f54f8fa041..fb4e72b549f6 100644
--- a/editors/mule/pkg-plist
+++ b/editors/mule/pkg-plist
@@ -25,11 +25,12 @@ man/man1/mule.1.gz
 @unexec install-info --delete %D/info/gnus %D/info/dir
 @unexec install-info --delete %D/info/cl %D/info/dir
 @unexec install-info --delete %D/info/sc %D/info/dir
+@unexec install-info --delete %D/info/dired-x %D/info/dir
 @unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
 @comment
 @comment emacs stuff
 @comment
@@ -108,11 +109,12 @@ info/terminology
 @exec install-info %D/info/gnus %D/info/dir
 @exec install-info %D/info/cl %D/info/dir
 @exec install-info %D/info/sc %D/info/dir
+@exec install-info %D/info/dired-x %D/info/dir
 @exec install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).			Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).			Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).			Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
 lib/mule/19.28/etc/3B-MAXMEM
 lib/mule/19.28/etc/AIX.DUMP
 lib/mule/19.28/etc/APPLE
diff --git a/emulators/mtools/files/patch-c b/emulators/mtools/files/patch-c
new file mode 100644
index 000000000000..e790edab9322
--- /dev/null
+++ b/emulators/mtools/files/patch-c
@@ -0,0 +1,11 @@
+--- ./mtools.texi.org	Sun Apr 13 00:59:18 1997
++++ ./mtools.texi	Sun Jun  8 05:33:03 1997
+@@ -26,7 +26,7 @@
+ @ifinfo
+ @format
+ START-INFO-DIR-ENTRY
+-* Mtools: (mtools).        Mtools: utilities to access DOS disks in Unix.
++* Mtools: (mtools).		Mtools: utilities to access DOS disks in Unix.
+ END-INFO-DIR-ENTRY
+ @end format
+ @end ifinfo
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index f38aa0733f45..2f319bae8bba 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.27 1997/05/21 07:24:26 asami Exp $
+# $Id: Makefile,v 1.28 1997/05/28 03:06:35 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -43,9 +43,9 @@ post-install:
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 6d490f85c440..542763a1c759 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.27 1997/05/21 07:24:28 asami Exp $
+# $Id: Makefile,v 1.28 1997/05/28 03:06:38 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -43,9 +43,9 @@ post-install:
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile
index 5f008f36243c..a13a9ba623dd 100644
--- a/japanese/mule-sj3/Makefile
+++ b/japanese/mule-sj3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		8 August 1996
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
-# $Id: Makefile,v 1.4 1997/05/21 07:24:27 asami Exp $
+# $Id: Makefile,v 1.5 1997/05/28 03:06:37 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -42,9 +42,9 @@ post-install:
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 6d490f85c440..542763a1c759 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.27 1997/05/21 07:24:28 asami Exp $
+# $Id: Makefile,v 1.28 1997/05/28 03:06:38 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -43,9 +43,9 @@ post-install:
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 6d490f85c440..542763a1c759 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.27 1997/05/21 07:24:28 asami Exp $
+# $Id: Makefile,v 1.28 1997/05/28 03:06:38 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -43,9 +43,9 @@ post-install:
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/japanese/skk/Makefile b/japanese/skk/Makefile
index 01277422344a..c096d156c137 100644
--- a/japanese/skk/Makefile
+++ b/japanese/skk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		04 Mar 1997
 # Whom:			Makoto Matsushita <matusita@jp.freebsd.org>
 #
-# $Id: Makefile,v 1.6 1997/06/07 11:19:57 asami Exp $
+# $Id: Makefile,v 1.7 1997/06/08 11:40:13 asami Exp $
 #
 
 DISTNAME=	skk9.6
@@ -40,6 +40,6 @@ post-install:
 	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 # Our makeinfo can't handle files with Japanese characters. :<
-	install-info --section="The Emacs editor and associated tools" --entry="* Skk: (skk.info).	Yet another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/skk.info ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Skk: (skk.info).		Yet another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/skk.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index 71615e59dcf5..c8f11501b34d 100644
--- a/textproc/coco/Makefile
+++ b/textproc/coco/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.27 1997/05/21 07:24:22 asami Exp $
+# $Id: Makefile,v 1.28 1997/05/28 03:06:31 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -39,9 +39,9 @@ post-install:
 .endfor
 # Our makeinfo can't handle files with Japanese characters. :<
 	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
+	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/textproc/coco/files/patch-aa b/textproc/coco/files/patch-aa
index 8bc54f2d27df..6c7569ed38a9 100644
--- a/textproc/coco/files/patch-aa
+++ b/textproc/coco/files/patch-aa
@@ -25,7 +25,7 @@
  @settitle VIP
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* VIP: (vip).		A VI-emulation for Emacs.
++* VIP: (vip).			A VI-emulation for Emacs.
 +@end direntry
  
  @iftex
@@ -38,7 +38,7 @@
  @synindex pg cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Emacs: (emacs).	The extensible self-documenting text editor.
++* Emacs: (emacs).		The extensible self-documenting text editor.
 +@end direntry
 +
  @c
@@ -52,8 +52,8 @@
  @syncodeindex ky cp
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Forms: (forms).	Emacs package for editing data bases
-+			by filling in forms.
++* Forms: (forms).		Emacs package for editing data bases
++				by filling in forms.
 +@end direntry
  @iftex
  @finalout
@@ -66,7 +66,7 @@
  
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
++* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
 +@end direntry
 +
 +
@@ -81,8 +81,8 @@
  @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.
++* SC: (sc).			Supercite lets you cite parts of messages
++				you're replying to, in flexible ways.
 +@end direntry
 +
  @iftex
@@ -96,7 +96,7 @@
  @settitle Dired Extra Version 2 User's Manual
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* Dired-X: (dired-x).	Dired Extra Features.
++* Dired-X: (dired-x).		Dired Extra Features.
 +@end direntry
 +
  @iftex
@@ -150,7 +150,7 @@
 +
 +@dircategory The Emacs editor and associated tools
 +@direntry
-+* GNUS: (gnus).		The news reader GNUS.
++* GNUS: (gnus).			The news reader GNUS.
 +@end direntry
 +
  @iftex
diff --git a/textproc/coco/pkg-plist b/textproc/coco/pkg-plist
index 66f54f8fa041..fb4e72b549f6 100644
--- a/textproc/coco/pkg-plist
+++ b/textproc/coco/pkg-plist
@@ -25,11 +25,12 @@ man/man1/mule.1.gz
 @unexec install-info --delete %D/info/gnus %D/info/dir
 @unexec install-info --delete %D/info/cl %D/info/dir
 @unexec install-info --delete %D/info/sc %D/info/dir
+@unexec install-info --delete %D/info/dired-x %D/info/dir
 @unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).	Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).	Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).	Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
+@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
 @comment
 @comment emacs stuff
 @comment
@@ -108,11 +109,12 @@ info/terminology
 @exec install-info %D/info/gnus %D/info/dir
 @exec install-info %D/info/cl %D/info/dir
 @exec install-info %D/info/sc %D/info/dir
+@exec install-info %D/info/dired-x %D/info/dir
 @exec install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).		Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).			Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).			Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir
+@exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).			Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
 lib/mule/19.28/etc/3B-MAXMEM
 lib/mule/19.28/etc/AIX.DUMP
 lib/mule/19.28/etc/APPLE