13 files changed, 559 insertions, 59 deletions

diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index 9dd12c31984f..16fe44a0de7a 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.25 1996/11/17 07:01:29 obrien Exp $
+# $Id: Makefile,v 1.26 1996/11/30 10:13:15 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -28,11 +28,20 @@ pre-build:
 
 post-install:
 # note that any2ps is a script
-	strip ${PREFIX}/bin/b2m
-	strip ${PREFIX}/bin/coco
-	strip ${PREFIX}/bin/ctags
-	strip ${PREFIX}/bin/etags
-	strip ${PREFIX}/bin/m2ps
-	strip ${PREFIX}/bin/mule-19.28
+.for file in b2m coco ctags etags m2ps mule-19.28
+	strip ${PREFIX}/bin/${file}
+.endfor
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+.for info in emacs vip forms gnus cl sc
+	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.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
 
 .include <bsd.port.mk>
diff --git a/editors/mule-common/files/patch-aa b/editors/mule-common/files/patch-aa
new file mode 100644
index 000000000000..8bc54f2d27df
--- /dev/null
+++ b/editors/mule-common/files/patch-aa
@@ -0,0 +1,181 @@
+--- ./man/Makefile.org	Sat Jul  2 14:35:17 1994
++++ ./man/Makefile	Tue May 20 22:28:50 1997
+@@ -4,7 +4,7 @@
+ MAKEINFO = makeinfo
+ TEXINDEX_OBJS = texindex.o getopt.o
+ INFO_TARGETS = ../info/emacs ../info/cl ../info/forms ../info/vip \
+-	       ../info/gnus ../info/sc ../info/info ../info/dired-x
++	       ../info/gnus ../info/sc ../info/dired-x
+ DVI_TARGETS = emacs.dvi cl.dvi forms.dvi vip.dvi gnus.dvi sc.dvi dired-x.dvi
+ INFOSOURCES = info.texi info-stnd.texi
+ 
+@@ -54,6 +54,7 @@
+ 	gnu1.texi \
+ 	glossary.texi
+ 
++all: info
+ info: $(INFO_TARGETS)
+ 
+ dvi: $(DVI_TARGETS)
+--- ./man/vip.texi.org	Tue May 20 22:29:04 1997
++++ ./man/vip.texi	Tue May 20 22:30:32 1997
+@@ -24,6 +24,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	Fri Nov  4 03:08:52 1994
++++ ./man/emacs.texi	Tue May 20 22:30:32 1997
+@@ -49,6 +49,11 @@
+ @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
+ @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/forms.texi.org	Thu Jul 28 13:46:45 1994
++++ ./man/forms.texi	Tue May 20 22:30:32 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/cl.texi.org	Sat Jan  8 00:42:47 1994
++++ ./man/cl.texi	Tue May 20 22:30:32 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	Sat Jan  8 00:41:40 1994
++++ ./man/sc.texi	Tue May 20 22:30:32 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/dired-x.texi.org	Sat Aug 13 09:58:50 1994
++++ ./man/dired-x.texi	Tue May 20 22:48:19 1997
+@@ -18,6 +18,11 @@
+ @setfilename ../info/dired-x
+ @c dired-x.el REVISION NUMBER
+ @settitle Dired Extra Version 2 User's Manual
++@dircategory The Emacs editor and associated tools
++@direntry
++* Dired-X: (dired-x).	Dired Extra Features.
++@end direntry
++
+ @iftex
+ @finalout
+ @end iftex
+@@ -196,32 +201,32 @@
+ @enumerate
+ @item
+ Omitting of uninteresting files from dired listing. 
+-@itemize
++@itemize @bullet
+ @xref{Omitting Files in Dired}
+ @end itemize
+ @item
+ Local variables for dired directories.
+-@itemize
++@itemize @bullet
+ @xref{Local Variables}
+ @end itemize
+ @item
+ Guessing shell commands in dired buffers.
+-@itemize
++@itemize @bullet
+ @xref{Shell Command Guessing}
+ @end itemize
+ @item
+ Running dired command in non-dired buffers.
+-@itemize
++@itemize @bullet
+ @xref{Virtual Dired}
+ @end itemize
+ @item
+ Finding a file mentioned in a buffer
+-@itemize
++@itemize @bullet
+ @xref{Find File At Point}
+ @end itemize
+ @item
+ Commands using file marking.
+-@itemize
++@itemize @bullet
+ @xref{Advanced Mark Commands}
+ @end itemize
+ @end enumerate
+--- ./man/gnus.texi.org	Sun Sep 11 11:52:45 1994
++++ ./man/gnus.texi	Tue May 20 23:23:03 1997
+@@ -3,6 +3,12 @@
+ @comment %**start of header (This is for running Texinfo on a region.)
+ @setfilename ../info/gnus
+ @settitle GNUS 3.15 Manual
++
++@dircategory The Emacs editor and associated tools
++@direntry
++* GNUS: (gnus).		The news reader GNUS.
++@end direntry
++
+ @iftex
+ @finalout
+ @end iftex
+--- ./Makefile.in.org	Mon Dec 19 18:01:54 1994
++++ ./Makefile.in	Tue May 20 22:28:03 1997
+@@ -186,7 +186,7 @@
+ # Subdirectories to make recursively.  `lisp' is not included
+ # because the compiled lisp files are part of the distribution
+ # and you cannot remake them without installing Emacs first.
+-SUBDIR = lib-src src
++SUBDIR = lib-src src man
+ 
+ # The makefiles of the directories in $SUBDIR.
+ SUBDIR_MAKEFILES = lib-src/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
+@@ -338,10 +338,7 @@
+ 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+ 	then \
+ 	  (cd ${srcdir}/info ; \
+-	   if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
+-	     (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
+-	   fi ; \
+-	   for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* \
++	   for f in cl* dired-x* emacs* forms* gnus* sc* vip* \
+ 		antenews* canna* egg* languages* m2ps* mule* kbd-trans* \
+ 		quail* terminology* CCL* ISO2022* R2L* XFONT*; do \
+ 	     (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
diff --git a/editors/mule-common/pkg-plist b/editors/mule-common/pkg-plist
index 9824f538030c..99afff216d5b 100644
--- a/editors/mule-common/pkg-plist
+++ b/editors/mule-common/pkg-plist
@@ -19,6 +19,17 @@ man/man1/ctags.1.gz
 man/man1/etags.1.gz
 man/man1/m2ps.1.gz
 man/man1/mule.1.gz
+@unexec install-info --delete %D/info/emacs %D/info/dir
+@unexec install-info --delete %D/info/vip %D/info/dir
+@unexec install-info --delete %D/info/forms %D/info/dir
+@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 --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
 @comment
 @comment emacs stuff
 @comment
@@ -60,7 +71,6 @@ info/gnus
 info/gnus-1
 info/gnus-2
 info/gnus-3
-info/info
 info/sc
 info/sc-1
 info/sc-2
@@ -91,6 +101,18 @@ info/mule-jp-2
 info/mule-jp-3
 info/quail
 info/terminology
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/emacs %D/info/dir
+@exec install-info %D/info/vip %D/info/dir
+@exec install-info %D/info/forms %D/info/dir
+@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 --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
 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 9dd12c31984f..16fe44a0de7a 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.25 1996/11/17 07:01:29 obrien Exp $
+# $Id: Makefile,v 1.26 1996/11/30 10:13:15 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -28,11 +28,20 @@ pre-build:
 
 post-install:
 # note that any2ps is a script
-	strip ${PREFIX}/bin/b2m
-	strip ${PREFIX}/bin/coco
-	strip ${PREFIX}/bin/ctags
-	strip ${PREFIX}/bin/etags
-	strip ${PREFIX}/bin/m2ps
-	strip ${PREFIX}/bin/mule-19.28
+.for file in b2m coco ctags etags m2ps mule-19.28
+	strip ${PREFIX}/bin/${file}
+.endfor
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+.for info in emacs vip forms gnus cl sc
+	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.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
 
 .include <bsd.port.mk>
diff --git a/editors/mule/pkg-plist b/editors/mule/pkg-plist
index 9824f538030c..99afff216d5b 100644
--- a/editors/mule/pkg-plist
+++ b/editors/mule/pkg-plist
@@ -19,6 +19,17 @@ man/man1/ctags.1.gz
 man/man1/etags.1.gz
 man/man1/m2ps.1.gz
 man/man1/mule.1.gz
+@unexec install-info --delete %D/info/emacs %D/info/dir
+@unexec install-info --delete %D/info/vip %D/info/dir
+@unexec install-info --delete %D/info/forms %D/info/dir
+@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 --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
 @comment
 @comment emacs stuff
 @comment
@@ -60,7 +71,6 @@ info/gnus
 info/gnus-1
 info/gnus-2
 info/gnus-3
-info/info
 info/sc
 info/sc-1
 info/sc-2
@@ -91,6 +101,18 @@ info/mule-jp-2
 info/mule-jp-3
 info/quail
 info/terminology
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/emacs %D/info/dir
+@exec install-info %D/info/vip %D/info/dir
+@exec install-info %D/info/forms %D/info/dir
+@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 --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
 lib/mule/19.28/etc/3B-MAXMEM
 lib/mule/19.28/etc/AIX.DUMP
 lib/mule/19.28/etc/APPLE
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index 2bc2ea1ce718..a6afffe71e20 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.25 1996/11/11 10:12:30 max Exp $
+# $Id: Makefile,v 1.26 1996/11/13 12:41:01 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -32,11 +32,20 @@ pre-build:
 
 post-install:
 # note that rcs-checkn and any2ps are scripts
-	strip ${PREFIX}/bin/b2m
-	strip ${PREFIX}/bin/coco
-	strip ${PREFIX}/bin/ctags
-	strip ${PREFIX}/bin/etags
-	strip ${PREFIX}/bin/m2ps
-	strip ${PREFIX}/bin/mule-19.28
+.for file in b2m coco ctags etags m2ps mule-19.28
+	strip ${PREFIX}/bin/${file}
+.endfor
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+.for info in emacs vip forms gnus cl sc
+	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.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
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 5dedba42f286..ceb29352e8a6 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.25 1996/11/11 10:12:33 max Exp $
+# $Id: Makefile,v 1.26 1996/11/13 12:41:04 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -32,11 +32,20 @@ pre-build:
 
 post-install:
 # note that rcs-checkn and any2ps are scripts
-	strip ${PREFIX}/bin/b2m
-	strip ${PREFIX}/bin/coco
-	strip ${PREFIX}/bin/ctags
-	strip ${PREFIX}/bin/etags
-	strip ${PREFIX}/bin/m2ps
-	strip ${PREFIX}/bin/mule-19.28
+.for file in b2m coco ctags etags m2ps mule-19.28
+	strip ${PREFIX}/bin/${file}
+.endfor
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+.for info in emacs vip forms gnus cl sc
+	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.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
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile
index b60ef6375bae..e3c1c23e9fc1 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.2 1996/11/11 10:12:31 max Exp $
+# $Id: Makefile,v 1.3 1996/11/13 12:41:03 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -31,11 +31,20 @@ pre-build:
 
 post-install:
 # note that rcs-checkn and any2ps are scripts
-	strip ${PREFIX}/bin/b2m
-	strip ${PREFIX}/bin/coco
-	strip ${PREFIX}/bin/ctags
-	strip ${PREFIX}/bin/etags
-	strip ${PREFIX}/bin/m2ps
-	strip ${PREFIX}/bin/mule-19.28
+.for file in b2m coco ctags etags m2ps mule-19.28
+	strip ${PREFIX}/bin/${file}
+.endfor
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+.for info in emacs vip forms gnus cl sc
+	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.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
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 5dedba42f286..ceb29352e8a6 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.25 1996/11/11 10:12:33 max Exp $
+# $Id: Makefile,v 1.26 1996/11/13 12:41:04 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -32,11 +32,20 @@ pre-build:
 
 post-install:
 # note that rcs-checkn and any2ps are scripts
-	strip ${PREFIX}/bin/b2m
-	strip ${PREFIX}/bin/coco
-	strip ${PREFIX}/bin/ctags
-	strip ${PREFIX}/bin/etags
-	strip ${PREFIX}/bin/m2ps
-	strip ${PREFIX}/bin/mule-19.28
+.for file in b2m coco ctags etags m2ps mule-19.28
+	strip ${PREFIX}/bin/${file}
+.endfor
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+.for info in emacs vip forms gnus cl sc
+	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.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
 
 .include <bsd.port.mk>
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 5dedba42f286..ceb29352e8a6 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.25 1996/11/11 10:12:33 max Exp $
+# $Id: Makefile,v 1.26 1996/11/13 12:41:04 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -32,11 +32,20 @@ pre-build:
 
 post-install:
 # note that rcs-checkn and any2ps are scripts
-	strip ${PREFIX}/bin/b2m
-	strip ${PREFIX}/bin/coco
-	strip ${PREFIX}/bin/ctags
-	strip ${PREFIX}/bin/etags
-	strip ${PREFIX}/bin/m2ps
-	strip ${PREFIX}/bin/mule-19.28
+.for file in b2m coco ctags etags m2ps mule-19.28
+	strip ${PREFIX}/bin/${file}
+.endfor
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+.for info in emacs vip forms gnus cl sc
+	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.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
 
 .include <bsd.port.mk>
diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile
index 9dd12c31984f..16fe44a0de7a 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.25 1996/11/17 07:01:29 obrien Exp $
+# $Id: Makefile,v 1.26 1996/11/30 10:13:15 asami Exp $
 #
 
 DISTNAME=	mule-2.3
@@ -28,11 +28,20 @@ pre-build:
 
 post-install:
 # note that any2ps is a script
-	strip ${PREFIX}/bin/b2m
-	strip ${PREFIX}/bin/coco
-	strip ${PREFIX}/bin/ctags
-	strip ${PREFIX}/bin/etags
-	strip ${PREFIX}/bin/m2ps
-	strip ${PREFIX}/bin/mule-19.28
+.for file in b2m coco ctags etags m2ps mule-19.28
+	strip ${PREFIX}/bin/${file}
+.endfor
+	if [ ! -f ${PREFIX}/info/dir ]; then \
+	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+.for info in emacs vip forms gnus cl sc
+	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
+.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
 
 .include <bsd.port.mk>
diff --git a/textproc/coco/files/patch-aa b/textproc/coco/files/patch-aa
new file mode 100644
index 000000000000..8bc54f2d27df
--- /dev/null
+++ b/textproc/coco/files/patch-aa
@@ -0,0 +1,181 @@
+--- ./man/Makefile.org	Sat Jul  2 14:35:17 1994
++++ ./man/Makefile	Tue May 20 22:28:50 1997
+@@ -4,7 +4,7 @@
+ MAKEINFO = makeinfo
+ TEXINDEX_OBJS = texindex.o getopt.o
+ INFO_TARGETS = ../info/emacs ../info/cl ../info/forms ../info/vip \
+-	       ../info/gnus ../info/sc ../info/info ../info/dired-x
++	       ../info/gnus ../info/sc ../info/dired-x
+ DVI_TARGETS = emacs.dvi cl.dvi forms.dvi vip.dvi gnus.dvi sc.dvi dired-x.dvi
+ INFOSOURCES = info.texi info-stnd.texi
+ 
+@@ -54,6 +54,7 @@
+ 	gnu1.texi \
+ 	glossary.texi
+ 
++all: info
+ info: $(INFO_TARGETS)
+ 
+ dvi: $(DVI_TARGETS)
+--- ./man/vip.texi.org	Tue May 20 22:29:04 1997
++++ ./man/vip.texi	Tue May 20 22:30:32 1997
+@@ -24,6 +24,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	Fri Nov  4 03:08:52 1994
++++ ./man/emacs.texi	Tue May 20 22:30:32 1997
+@@ -49,6 +49,11 @@
+ @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
+ @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/forms.texi.org	Thu Jul 28 13:46:45 1994
++++ ./man/forms.texi	Tue May 20 22:30:32 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/cl.texi.org	Sat Jan  8 00:42:47 1994
++++ ./man/cl.texi	Tue May 20 22:30:32 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	Sat Jan  8 00:41:40 1994
++++ ./man/sc.texi	Tue May 20 22:30:32 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/dired-x.texi.org	Sat Aug 13 09:58:50 1994
++++ ./man/dired-x.texi	Tue May 20 22:48:19 1997
+@@ -18,6 +18,11 @@
+ @setfilename ../info/dired-x
+ @c dired-x.el REVISION NUMBER
+ @settitle Dired Extra Version 2 User's Manual
++@dircategory The Emacs editor and associated tools
++@direntry
++* Dired-X: (dired-x).	Dired Extra Features.
++@end direntry
++
+ @iftex
+ @finalout
+ @end iftex
+@@ -196,32 +201,32 @@
+ @enumerate
+ @item
+ Omitting of uninteresting files from dired listing. 
+-@itemize
++@itemize @bullet
+ @xref{Omitting Files in Dired}
+ @end itemize
+ @item
+ Local variables for dired directories.
+-@itemize
++@itemize @bullet
+ @xref{Local Variables}
+ @end itemize
+ @item
+ Guessing shell commands in dired buffers.
+-@itemize
++@itemize @bullet
+ @xref{Shell Command Guessing}
+ @end itemize
+ @item
+ Running dired command in non-dired buffers.
+-@itemize
++@itemize @bullet
+ @xref{Virtual Dired}
+ @end itemize
+ @item
+ Finding a file mentioned in a buffer
+-@itemize
++@itemize @bullet
+ @xref{Find File At Point}
+ @end itemize
+ @item
+ Commands using file marking.
+-@itemize
++@itemize @bullet
+ @xref{Advanced Mark Commands}
+ @end itemize
+ @end enumerate
+--- ./man/gnus.texi.org	Sun Sep 11 11:52:45 1994
++++ ./man/gnus.texi	Tue May 20 23:23:03 1997
+@@ -3,6 +3,12 @@
+ @comment %**start of header (This is for running Texinfo on a region.)
+ @setfilename ../info/gnus
+ @settitle GNUS 3.15 Manual
++
++@dircategory The Emacs editor and associated tools
++@direntry
++* GNUS: (gnus).		The news reader GNUS.
++@end direntry
++
+ @iftex
+ @finalout
+ @end iftex
+--- ./Makefile.in.org	Mon Dec 19 18:01:54 1994
++++ ./Makefile.in	Tue May 20 22:28:03 1997
+@@ -186,7 +186,7 @@
+ # Subdirectories to make recursively.  `lisp' is not included
+ # because the compiled lisp files are part of the distribution
+ # and you cannot remake them without installing Emacs first.
+-SUBDIR = lib-src src
++SUBDIR = lib-src src man
+ 
+ # The makefiles of the directories in $SUBDIR.
+ SUBDIR_MAKEFILES = lib-src/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
+@@ -338,10 +338,7 @@
+ 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+ 	then \
+ 	  (cd ${srcdir}/info ; \
+-	   if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
+-	     (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
+-	   fi ; \
+-	   for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* \
++	   for f in cl* dired-x* emacs* forms* gnus* sc* vip* \
+ 		antenews* canna* egg* languages* m2ps* mule* kbd-trans* \
+ 		quail* terminology* CCL* ISO2022* R2L* XFONT*; do \
+ 	     (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
diff --git a/textproc/coco/pkg-plist b/textproc/coco/pkg-plist
index 9824f538030c..99afff216d5b 100644
--- a/textproc/coco/pkg-plist
+++ b/textproc/coco/pkg-plist
@@ -19,6 +19,17 @@ man/man1/ctags.1.gz
 man/man1/etags.1.gz
 man/man1/m2ps.1.gz
 man/man1/mule.1.gz
+@unexec install-info --delete %D/info/emacs %D/info/dir
+@unexec install-info --delete %D/info/vip %D/info/dir
+@unexec install-info --delete %D/info/forms %D/info/dir
+@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 --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
 @comment
 @comment emacs stuff
 @comment
@@ -60,7 +71,6 @@ info/gnus
 info/gnus-1
 info/gnus-2
 info/gnus-3
-info/info
 info/sc
 info/sc-1
 info/sc-2
@@ -91,6 +101,18 @@ info/mule-jp-2
 info/mule-jp-3
 info/quail
 info/terminology
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/emacs %D/info/dir
+@exec install-info %D/info/vip %D/info/dir
+@exec install-info %D/info/forms %D/info/dir
+@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 --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
 lib/mule/19.28/etc/3B-MAXMEM
 lib/mule/19.28/etc/AIX.DUMP
 lib/mule/19.28/etc/APPLE