Fix wnn option.

Don't build info (this package does not need info).

Submitted by:	NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
Obtained from:	http://home.jp.freebsd.org/cgi-bin/showmail/ports-jp/12612

54 files changed, 6 insertions, 879 deletions

diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index dda0da1cb9d0..a18087c2bc88 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -46,14 +46,14 @@ CONFIGURE_ARGS=	--with-x=no --with-pop
 .endif
 .if defined(USE_WNN6)
 .if (${USE_WNN6} == "yes" || ${USE_WNN6} == "YES")
-CONFIGURE_ARGS+=--with-wnn6 --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
+CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn6.so
 LIB_DEPENDS+=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
 .endif
 .endif
 .if defined(USE_FREEWNN)
 .if (${USE_FREEWNN} == "yes" || ${USE_FREEWNN} == "YES")
-CONFIGURE_ARGS+=--with-wnn4 --with-wnn-includes=${LOCALBASE}/include/wnn \
+CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
 LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 .endif
diff --git a/japanese/emacs-emcws/files/patch-aa b/japanese/emacs-emcws/files/patch-aa
deleted file mode 100644
index eb174b99eda3..000000000000
--- a/japanese/emacs-emcws/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Apr 10 04:16:24 1999
-+++ Makefile.in	Sat Jul 24 01:03:43 1999
-@@ -188,7 +188,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 leim
-+SUBDIR = lib-src src leim man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
diff --git a/japanese/emacs-emcws/files/patch-ac b/japanese/emacs-emcws/files/patch-ac
deleted file mode 100644
index 7b2aa2c74e65..000000000000
--- a/japanese/emacs-emcws/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/widget.texi.orig	Mon Oct 13 14:20:26 1997
-+++ man/widget.texi	Mon Oct 13 14:21:25 1997
-@@ -3,6 +3,11 @@
- @c %**start of header
- @setfilename ../info/widget
- @settitle The Emacs Widget Library
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Widget: (widget).		The Emacs Widget Library
-+@end direntry
-+
- @iftex
- @afourpaper
- @headings double
diff --git a/japanese/emacs-emcws/files/patch-ad b/japanese/emacs-emcws/files/patch-ad
deleted file mode 100644
index c702deff83dd..000000000000
--- a/japanese/emacs-emcws/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/dired-x.texi.orig	Sun May 17 03:52:28 1998
-+++ man/dired-x.texi	Sat Jul 24 01:19:47 1999
-@@ -19,9 +19,9 @@
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
- 
--@dircategory Editors
-+@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
diff --git a/japanese/emacs-emcws/files/patch-ag b/japanese/emacs-emcws/files/patch-ag
deleted file mode 100644
index 8b4c708b396b..000000000000
--- a/japanese/emacs-emcws/files/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
---- man/Makefile.in.orig	Sat Dec  5 08:33:16 1998
-+++ man/Makefile.in	Sat Jul 24 01:25:06 1999
-@@ -11,7 +11,7 @@
- 
- 
- # The makeinfo program is part of the Texinfo distribution.
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split --force
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
- 		../info/info ../info/message ../info/mh-e ../info/reftex \
-@@ -70,6 +70,7 @@
- 	${srcdir}/glossary.texi \
- 	${srcdir}/ack.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
diff --git a/japanese/emacs-emcws/files/patch-al b/japanese/emacs-emcws/files/patch-al
deleted file mode 100644
index 01116fb1af07..000000000000
--- a/japanese/emacs-emcws/files/patch-al
+++ /dev/null
@@ -1,17 +0,0 @@
---- man/cc-mode.texi.orig	Sun May 17 03:55:23 1998
-+++ man/cc-mode.texi	Sat Jul 24 01:03:42 1999
-@@ -8,10 +8,10 @@
- @settitle     CC MODE Version 5 Documentation
- @footnotestyle end
- 
--@dircategory Editors
--@direntry
--* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
--			  and Java code.
-+@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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/japanese/emacs-emcws/files/patch-am b/japanese/emacs-emcws/files/patch-am
deleted file mode 100644
index 678e11fd9cf6..000000000000
--- a/japanese/emacs-emcws/files/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/cl.texi.orig	Wed Apr  7 03:12:55 1999
-+++ man/cl.texi	Sat Jul 24 01:03:42 1999
-@@ -2,9 +2,9 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
--@dircategory Editors
-+@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
- 
- @iftex
diff --git a/japanese/emacs-emcws/files/patch-an b/japanese/emacs-emcws/files/patch-an
deleted file mode 100644
index 3186c8a1caa3..000000000000
--- a/japanese/emacs-emcws/files/patch-an
+++ /dev/null
@@ -1,23 +0,0 @@
---- man/emacs.texi.orig	Tue Jun 13 04:12:20 2000
-+++ man/emacs.texi	Tue Apr  9 16:23:13 2002
-@@ -11,9 +11,9 @@
- updated for Emacs version 20.7.
- @c Please REMEMBER to update edition number in *three* places in this file.
- 
--@dircategory Editors
-+@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
- 
- Published by the Free Software Foundation
-@@ -119,7 +119,7 @@
- Emacs is the extensible, customizable, self-documenting real-time
- display editor.  This Info file describes how to edit with Emacs and
- some of how to customize it; it corresponds to GNU Emacs version 20.7.
--For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The
-+For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The
- Emacs Lisp Reference Manual}.
- @end ifinfo
- 
diff --git a/japanese/emacs-emcws/files/patch-ao b/japanese/emacs-emcws/files/patch-ao
deleted file mode 100644
index 4a39b602119d..000000000000
--- a/japanese/emacs-emcws/files/patch-ao
+++ /dev/null
@@ -1,26 +0,0 @@
---- man/forms.texi.orig	Mon Aug 24 18:43:18 1998
-+++ man/forms.texi	Sat Jul 24 01:03:41 1999
-@@ -8,18 +8,17 @@
- @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
- @end iftex
- @c      @smallbook
- @comment %**end of header (This is for running Texinfo on a region.)
--
--@dircategory Editors
--@direntry
--* Forms: (forms).	Emacs package for editing data bases
--			  by filling in forms.
--@end direntry
- 
- @ifinfo
- This file documents Forms mode, a form-editing major mode for GNU Emacs.
diff --git a/japanese/emacs-emcws/files/patch-ap b/japanese/emacs-emcws/files/patch-ap
deleted file mode 100644
index 6ccf025d7f78..000000000000
--- a/japanese/emacs-emcws/files/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/gnus.texi.orig	Wed Apr  7 07:46:41 1999
-+++ man/gnus.texi	Sat Jul 24 01:09:33 1999
-@@ -5,8 +5,9 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
- @direntry
--* Gnus: (gnus).         The newsreader Gnus.
-+* Gnus: (gnus).			The newsreader Gnus.
- @end direntry
- @iftex
- @finalout
diff --git a/japanese/emacs-emcws/files/patch-aq b/japanese/emacs-emcws/files/patch-aq
deleted file mode 100644
index 207dde1ea0ec..000000000000
--- a/japanese/emacs-emcws/files/patch-aq
+++ /dev/null
@@ -1,20 +0,0 @@
---- man/mh-e.texi.orig	Sun May 17 03:51:15 1998
-+++ man/mh-e.texi	Sat Jul 24 01:03:41 1999
-@@ -4,13 +4,12 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
--
--@setchapternewpage odd
--
--@dircategory Editors
-+@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
- 
- @c Version variables.
- @set EDITION 1.2
diff --git a/japanese/emacs-emcws/files/patch-ar b/japanese/emacs-emcws/files/patch-ar
deleted file mode 100644
index c7c6cf9f0ea3..000000000000
--- a/japanese/emacs-emcws/files/patch-ar
+++ /dev/null
@@ -1,24 +0,0 @@
---- man/sc.texi.orig	Fri Jul  3 03:48:27 1998
-+++ man/sc.texi	Sat Jul 24 01:03:42 1999
-@@ -3,15 +3,15 @@
- @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
--
--@dircategory Editors
--@direntry
--* SC: (sc).		Supercite lets you cite parts of messages you're 
--			  replying to, in flexible ways.
--@end direntry
- 
- @c @setchapternewpage odd		% For book style double sided manual.
- @comment %**end of header (This is for running Texinfo on a region.)
diff --git a/japanese/emacs-emcws/files/patch-as b/japanese/emacs-emcws/files/patch-as
deleted file mode 100644
index 621927bb0c03..000000000000
--- a/japanese/emacs-emcws/files/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
---- man/vip.texi.orig	Sun May 17 03:48:50 1998
-+++ man/vip.texi	Sat Jul 24 01:03:40 1999
-@@ -2,10 +2,9 @@
- 
- @setfilename ../info/vip
- @settitle VIP
--
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* VIP: (vip).		An older VI-emulation for Emacs.
-+* VIP: (vip).			A VI-emulation for Emacs.
- @end direntry
- 
- @iftex
diff --git a/japanese/emacs-emcws/files/patch-at b/japanese/emacs-emcws/files/patch-at
deleted file mode 100644
index e85d00b27c04..000000000000
--- a/japanese/emacs-emcws/files/patch-at
+++ /dev/null
@@ -1,17 +0,0 @@
---- man/viper.texi.orig	Mon Nov  9 02:13:07 1998
-+++ man/viper.texi	Sat Jul 24 01:03:41 1999
-@@ -5,12 +5,9 @@
- @comment @setfilename viper
- @comment @setfilename viper.info
- @setfilename ../info/viper
--
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* VIPER: (viper).       The newest Emacs VI-emulation mode.
--                          (also, A VI Plan for Emacs Rescue
--                           or the VI PERil.)
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
- @end direntry
- 
- @iftex
diff --git a/japanese/emacs-emcws/files/patch-au b/japanese/emacs-emcws/files/patch-au
deleted file mode 100644
index 2e34ee0d8d9a..000000000000
--- a/japanese/emacs-emcws/files/patch-au
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/ediff.texi.orig	Tue Jun  9 12:29:49 1998
-+++ man/ediff.texi	Sat Jul 24 01:19:48 1999
-@@ -14,9 +14,9 @@
- @synindex fn cp
- @synindex pg cp
- 
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* Ediff: (ediff).       A visual interface for comparing and merging programs.
-+* Ediff: (ediff).		A visual interface for comparing and merging programs.
- @end direntry
- 
- @iftex
diff --git a/japanese/emacs-emcws/files/patch-av b/japanese/emacs-emcws/files/patch-av
deleted file mode 100644
index f188e69269bf..000000000000
--- a/japanese/emacs-emcws/files/patch-av
+++ /dev/null
@@ -1,21 +0,0 @@
---- man/message.texi.orig	Wed Apr  7 07:48:28 1999
-+++ man/message.texi	Sat Jul 24 01:23:30 1999
-@@ -5,15 +5,15 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@ifinfo
-+@dircategory The Emacs editor and associated tools
- @direntry
--* Message: (message).   Mail and news composition mode that goes with Gnus.
-+* Message: (message).		Message, the Emacs message composition mode.
- @end direntry
- @iftex
- @finalout
- @end iftex
- @setchapternewpage odd
--
--@ifinfo
- 
- This file documents Message, the Emacs message composition mode.
- 
diff --git a/japanese/emacs-emcws/files/patch-aw b/japanese/emacs-emcws/files/patch-aw
deleted file mode 100644
index 95c713864516..000000000000
--- a/japanese/emacs-emcws/files/patch-aw
+++ /dev/null
@@ -1,16 +0,0 @@
---- man/reftex.texi.orig	Sat Jul 24 02:31:43 1999
-+++ man/reftex.texi	Sat Jul 24 02:33:26 1999
-@@ -2,10 +2,10 @@
- @c %**start of header
- @setfilename ../info/reftex
- @settitle RefTeX User Manual
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* reftex: (reftex).	Support for LaTeX labels, references, and citations
--                          with Emacs.
-+* reftex: (reftex).		Support for LaTeX labels, references,
-+				 and citations with Emacs.
- @end direntry
- @synindex ky cp
- @syncodeindex vr cp
diff --git a/japanese/emacs-emcws/files/patch-bb b/japanese/emacs-emcws/files/patch-bb
deleted file mode 100644
index 896c8fecaa12..000000000000
--- a/japanese/emacs-emcws/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/info.texi.orig	Fri Apr 17 10:12:19 1998
-+++ man/info.texi	Wed Feb 10 00:18:56 1999
-@@ -2,6 +2,10 @@
- @comment %**start of header 
- @setfilename ../info/info
- @settitle Info 1.0
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Info: (info).			GNU on-line hyper document system.
-+@end direntry
- @comment %**end of header 
- 
- @iftex
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index dda0da1cb9d0..a18087c2bc88 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -46,14 +46,14 @@ CONFIGURE_ARGS=	--with-x=no --with-pop
 .endif
 .if defined(USE_WNN6)
 .if (${USE_WNN6} == "yes" || ${USE_WNN6} == "YES")
-CONFIGURE_ARGS+=--with-wnn6 --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
+CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn6.so
 LIB_DEPENDS+=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
 .endif
 .endif
 .if defined(USE_FREEWNN)
 .if (${USE_FREEWNN} == "yes" || ${USE_FREEWNN} == "YES")
-CONFIGURE_ARGS+=--with-wnn4 --with-wnn-includes=${LOCALBASE}/include/wnn \
+CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
 LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 .endif
diff --git a/japanese/emacs20-emcws/files/patch-aa b/japanese/emacs20-emcws/files/patch-aa
deleted file mode 100644
index eb174b99eda3..000000000000
--- a/japanese/emacs20-emcws/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Apr 10 04:16:24 1999
-+++ Makefile.in	Sat Jul 24 01:03:43 1999
-@@ -188,7 +188,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 leim
-+SUBDIR = lib-src src leim man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
diff --git a/japanese/emacs20-emcws/files/patch-ac b/japanese/emacs20-emcws/files/patch-ac
deleted file mode 100644
index 7b2aa2c74e65..000000000000
--- a/japanese/emacs20-emcws/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/widget.texi.orig	Mon Oct 13 14:20:26 1997
-+++ man/widget.texi	Mon Oct 13 14:21:25 1997
-@@ -3,6 +3,11 @@
- @c %**start of header
- @setfilename ../info/widget
- @settitle The Emacs Widget Library
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Widget: (widget).		The Emacs Widget Library
-+@end direntry
-+
- @iftex
- @afourpaper
- @headings double
diff --git a/japanese/emacs20-emcws/files/patch-ad b/japanese/emacs20-emcws/files/patch-ad
deleted file mode 100644
index c702deff83dd..000000000000
--- a/japanese/emacs20-emcws/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/dired-x.texi.orig	Sun May 17 03:52:28 1998
-+++ man/dired-x.texi	Sat Jul 24 01:19:47 1999
-@@ -19,9 +19,9 @@
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
- 
--@dircategory Editors
-+@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
diff --git a/japanese/emacs20-emcws/files/patch-ag b/japanese/emacs20-emcws/files/patch-ag
deleted file mode 100644
index 8b4c708b396b..000000000000
--- a/japanese/emacs20-emcws/files/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
---- man/Makefile.in.orig	Sat Dec  5 08:33:16 1998
-+++ man/Makefile.in	Sat Jul 24 01:25:06 1999
-@@ -11,7 +11,7 @@
- 
- 
- # The makeinfo program is part of the Texinfo distribution.
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split --force
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
- 		../info/info ../info/message ../info/mh-e ../info/reftex \
-@@ -70,6 +70,7 @@
- 	${srcdir}/glossary.texi \
- 	${srcdir}/ack.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
diff --git a/japanese/emacs20-emcws/files/patch-al b/japanese/emacs20-emcws/files/patch-al
deleted file mode 100644
index 01116fb1af07..000000000000
--- a/japanese/emacs20-emcws/files/patch-al
+++ /dev/null
@@ -1,17 +0,0 @@
---- man/cc-mode.texi.orig	Sun May 17 03:55:23 1998
-+++ man/cc-mode.texi	Sat Jul 24 01:03:42 1999
-@@ -8,10 +8,10 @@
- @settitle     CC MODE Version 5 Documentation
- @footnotestyle end
- 
--@dircategory Editors
--@direntry
--* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
--			  and Java code.
-+@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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/japanese/emacs20-emcws/files/patch-am b/japanese/emacs20-emcws/files/patch-am
deleted file mode 100644
index 678e11fd9cf6..000000000000
--- a/japanese/emacs20-emcws/files/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/cl.texi.orig	Wed Apr  7 03:12:55 1999
-+++ man/cl.texi	Sat Jul 24 01:03:42 1999
-@@ -2,9 +2,9 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
--@dircategory Editors
-+@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
- 
- @iftex
diff --git a/japanese/emacs20-emcws/files/patch-an b/japanese/emacs20-emcws/files/patch-an
deleted file mode 100644
index 3186c8a1caa3..000000000000
--- a/japanese/emacs20-emcws/files/patch-an
+++ /dev/null
@@ -1,23 +0,0 @@
---- man/emacs.texi.orig	Tue Jun 13 04:12:20 2000
-+++ man/emacs.texi	Tue Apr  9 16:23:13 2002
-@@ -11,9 +11,9 @@
- updated for Emacs version 20.7.
- @c Please REMEMBER to update edition number in *three* places in this file.
- 
--@dircategory Editors
-+@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
- 
- Published by the Free Software Foundation
-@@ -119,7 +119,7 @@
- Emacs is the extensible, customizable, self-documenting real-time
- display editor.  This Info file describes how to edit with Emacs and
- some of how to customize it; it corresponds to GNU Emacs version 20.7.
--For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The
-+For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The
- Emacs Lisp Reference Manual}.
- @end ifinfo
- 
diff --git a/japanese/emacs20-emcws/files/patch-ao b/japanese/emacs20-emcws/files/patch-ao
deleted file mode 100644
index 4a39b602119d..000000000000
--- a/japanese/emacs20-emcws/files/patch-ao
+++ /dev/null
@@ -1,26 +0,0 @@
---- man/forms.texi.orig	Mon Aug 24 18:43:18 1998
-+++ man/forms.texi	Sat Jul 24 01:03:41 1999
-@@ -8,18 +8,17 @@
- @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
- @end iftex
- @c      @smallbook
- @comment %**end of header (This is for running Texinfo on a region.)
--
--@dircategory Editors
--@direntry
--* Forms: (forms).	Emacs package for editing data bases
--			  by filling in forms.
--@end direntry
- 
- @ifinfo
- This file documents Forms mode, a form-editing major mode for GNU Emacs.
diff --git a/japanese/emacs20-emcws/files/patch-ap b/japanese/emacs20-emcws/files/patch-ap
deleted file mode 100644
index 6ccf025d7f78..000000000000
--- a/japanese/emacs20-emcws/files/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/gnus.texi.orig	Wed Apr  7 07:46:41 1999
-+++ man/gnus.texi	Sat Jul 24 01:09:33 1999
-@@ -5,8 +5,9 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
- @direntry
--* Gnus: (gnus).         The newsreader Gnus.
-+* Gnus: (gnus).			The newsreader Gnus.
- @end direntry
- @iftex
- @finalout
diff --git a/japanese/emacs20-emcws/files/patch-aq b/japanese/emacs20-emcws/files/patch-aq
deleted file mode 100644
index 207dde1ea0ec..000000000000
--- a/japanese/emacs20-emcws/files/patch-aq
+++ /dev/null
@@ -1,20 +0,0 @@
---- man/mh-e.texi.orig	Sun May 17 03:51:15 1998
-+++ man/mh-e.texi	Sat Jul 24 01:03:41 1999
-@@ -4,13 +4,12 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
--
--@setchapternewpage odd
--
--@dircategory Editors
-+@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
- 
- @c Version variables.
- @set EDITION 1.2
diff --git a/japanese/emacs20-emcws/files/patch-ar b/japanese/emacs20-emcws/files/patch-ar
deleted file mode 100644
index c7c6cf9f0ea3..000000000000
--- a/japanese/emacs20-emcws/files/patch-ar
+++ /dev/null
@@ -1,24 +0,0 @@
---- man/sc.texi.orig	Fri Jul  3 03:48:27 1998
-+++ man/sc.texi	Sat Jul 24 01:03:42 1999
-@@ -3,15 +3,15 @@
- @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
--
--@dircategory Editors
--@direntry
--* SC: (sc).		Supercite lets you cite parts of messages you're 
--			  replying to, in flexible ways.
--@end direntry
- 
- @c @setchapternewpage odd		% For book style double sided manual.
- @comment %**end of header (This is for running Texinfo on a region.)
diff --git a/japanese/emacs20-emcws/files/patch-as b/japanese/emacs20-emcws/files/patch-as
deleted file mode 100644
index 621927bb0c03..000000000000
--- a/japanese/emacs20-emcws/files/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
---- man/vip.texi.orig	Sun May 17 03:48:50 1998
-+++ man/vip.texi	Sat Jul 24 01:03:40 1999
-@@ -2,10 +2,9 @@
- 
- @setfilename ../info/vip
- @settitle VIP
--
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* VIP: (vip).		An older VI-emulation for Emacs.
-+* VIP: (vip).			A VI-emulation for Emacs.
- @end direntry
- 
- @iftex
diff --git a/japanese/emacs20-emcws/files/patch-at b/japanese/emacs20-emcws/files/patch-at
deleted file mode 100644
index e85d00b27c04..000000000000
--- a/japanese/emacs20-emcws/files/patch-at
+++ /dev/null
@@ -1,17 +0,0 @@
---- man/viper.texi.orig	Mon Nov  9 02:13:07 1998
-+++ man/viper.texi	Sat Jul 24 01:03:41 1999
-@@ -5,12 +5,9 @@
- @comment @setfilename viper
- @comment @setfilename viper.info
- @setfilename ../info/viper
--
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* VIPER: (viper).       The newest Emacs VI-emulation mode.
--                          (also, A VI Plan for Emacs Rescue
--                           or the VI PERil.)
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
- @end direntry
- 
- @iftex
diff --git a/japanese/emacs20-emcws/files/patch-au b/japanese/emacs20-emcws/files/patch-au
deleted file mode 100644
index 2e34ee0d8d9a..000000000000
--- a/japanese/emacs20-emcws/files/patch-au
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/ediff.texi.orig	Tue Jun  9 12:29:49 1998
-+++ man/ediff.texi	Sat Jul 24 01:19:48 1999
-@@ -14,9 +14,9 @@
- @synindex fn cp
- @synindex pg cp
- 
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* Ediff: (ediff).       A visual interface for comparing and merging programs.
-+* Ediff: (ediff).		A visual interface for comparing and merging programs.
- @end direntry
- 
- @iftex
diff --git a/japanese/emacs20-emcws/files/patch-av b/japanese/emacs20-emcws/files/patch-av
deleted file mode 100644
index f188e69269bf..000000000000
--- a/japanese/emacs20-emcws/files/patch-av
+++ /dev/null
@@ -1,21 +0,0 @@
---- man/message.texi.orig	Wed Apr  7 07:48:28 1999
-+++ man/message.texi	Sat Jul 24 01:23:30 1999
-@@ -5,15 +5,15 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@ifinfo
-+@dircategory The Emacs editor and associated tools
- @direntry
--* Message: (message).   Mail and news composition mode that goes with Gnus.
-+* Message: (message).		Message, the Emacs message composition mode.
- @end direntry
- @iftex
- @finalout
- @end iftex
- @setchapternewpage odd
--
--@ifinfo
- 
- This file documents Message, the Emacs message composition mode.
- 
diff --git a/japanese/emacs20-emcws/files/patch-aw b/japanese/emacs20-emcws/files/patch-aw
deleted file mode 100644
index 95c713864516..000000000000
--- a/japanese/emacs20-emcws/files/patch-aw
+++ /dev/null
@@ -1,16 +0,0 @@
---- man/reftex.texi.orig	Sat Jul 24 02:31:43 1999
-+++ man/reftex.texi	Sat Jul 24 02:33:26 1999
-@@ -2,10 +2,10 @@
- @c %**start of header
- @setfilename ../info/reftex
- @settitle RefTeX User Manual
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* reftex: (reftex).	Support for LaTeX labels, references, and citations
--                          with Emacs.
-+* reftex: (reftex).		Support for LaTeX labels, references,
-+				 and citations with Emacs.
- @end direntry
- @synindex ky cp
- @syncodeindex vr cp
diff --git a/japanese/emacs20-emcws/files/patch-bb b/japanese/emacs20-emcws/files/patch-bb
deleted file mode 100644
index 896c8fecaa12..000000000000
--- a/japanese/emacs20-emcws/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/info.texi.orig	Fri Apr 17 10:12:19 1998
-+++ man/info.texi	Wed Feb 10 00:18:56 1999
-@@ -2,6 +2,10 @@
- @comment %**start of header 
- @setfilename ../info/info
- @settitle Info 1.0
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Info: (info).			GNU on-line hyper document system.
-+@end direntry
- @comment %**end of header 
- 
- @iftex
diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile
index dda0da1cb9d0..a18087c2bc88 100644
--- a/japanese/emacs21-emcws/Makefile
+++ b/japanese/emacs21-emcws/Makefile
@@ -46,14 +46,14 @@ CONFIGURE_ARGS=	--with-x=no --with-pop
 .endif
 .if defined(USE_WNN6)
 .if (${USE_WNN6} == "yes" || ${USE_WNN6} == "YES")
-CONFIGURE_ARGS+=--with-wnn6 --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
+CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn6.so
 LIB_DEPENDS+=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
 .endif
 .endif
 .if defined(USE_FREEWNN)
 .if (${USE_FREEWNN} == "yes" || ${USE_FREEWNN} == "YES")
-CONFIGURE_ARGS+=--with-wnn4 --with-wnn-includes=${LOCALBASE}/include/wnn \
+CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
 LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 .endif
diff --git a/japanese/emacs21-emcws/files/patch-aa b/japanese/emacs21-emcws/files/patch-aa
deleted file mode 100644
index eb174b99eda3..000000000000
--- a/japanese/emacs21-emcws/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Apr 10 04:16:24 1999
-+++ Makefile.in	Sat Jul 24 01:03:43 1999
-@@ -188,7 +188,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 leim
-+SUBDIR = lib-src src leim man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
diff --git a/japanese/emacs21-emcws/files/patch-ac b/japanese/emacs21-emcws/files/patch-ac
deleted file mode 100644
index 7b2aa2c74e65..000000000000
--- a/japanese/emacs21-emcws/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/widget.texi.orig	Mon Oct 13 14:20:26 1997
-+++ man/widget.texi	Mon Oct 13 14:21:25 1997
-@@ -3,6 +3,11 @@
- @c %**start of header
- @setfilename ../info/widget
- @settitle The Emacs Widget Library
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Widget: (widget).		The Emacs Widget Library
-+@end direntry
-+
- @iftex
- @afourpaper
- @headings double
diff --git a/japanese/emacs21-emcws/files/patch-ad b/japanese/emacs21-emcws/files/patch-ad
deleted file mode 100644
index c702deff83dd..000000000000
--- a/japanese/emacs21-emcws/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/dired-x.texi.orig	Sun May 17 03:52:28 1998
-+++ man/dired-x.texi	Sat Jul 24 01:19:47 1999
-@@ -19,9 +19,9 @@
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
- 
--@dircategory Editors
-+@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
diff --git a/japanese/emacs21-emcws/files/patch-ag b/japanese/emacs21-emcws/files/patch-ag
deleted file mode 100644
index 8b4c708b396b..000000000000
--- a/japanese/emacs21-emcws/files/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
---- man/Makefile.in.orig	Sat Dec  5 08:33:16 1998
-+++ man/Makefile.in	Sat Jul 24 01:25:06 1999
-@@ -11,7 +11,7 @@
- 
- 
- # The makeinfo program is part of the Texinfo distribution.
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split --force
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
- 		../info/info ../info/message ../info/mh-e ../info/reftex \
-@@ -70,6 +70,7 @@
- 	${srcdir}/glossary.texi \
- 	${srcdir}/ack.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
diff --git a/japanese/emacs21-emcws/files/patch-al b/japanese/emacs21-emcws/files/patch-al
deleted file mode 100644
index 01116fb1af07..000000000000
--- a/japanese/emacs21-emcws/files/patch-al
+++ /dev/null
@@ -1,17 +0,0 @@
---- man/cc-mode.texi.orig	Sun May 17 03:55:23 1998
-+++ man/cc-mode.texi	Sat Jul 24 01:03:42 1999
-@@ -8,10 +8,10 @@
- @settitle     CC MODE Version 5 Documentation
- @footnotestyle end
- 
--@dircategory Editors
--@direntry
--* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
--			  and Java code.
-+@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 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/japanese/emacs21-emcws/files/patch-am b/japanese/emacs21-emcws/files/patch-am
deleted file mode 100644
index 678e11fd9cf6..000000000000
--- a/japanese/emacs21-emcws/files/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/cl.texi.orig	Wed Apr  7 03:12:55 1999
-+++ man/cl.texi	Sat Jul 24 01:03:42 1999
-@@ -2,9 +2,9 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
--@dircategory Editors
-+@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
- 
- @iftex
diff --git a/japanese/emacs21-emcws/files/patch-an b/japanese/emacs21-emcws/files/patch-an
deleted file mode 100644
index 3186c8a1caa3..000000000000
--- a/japanese/emacs21-emcws/files/patch-an
+++ /dev/null
@@ -1,23 +0,0 @@
---- man/emacs.texi.orig	Tue Jun 13 04:12:20 2000
-+++ man/emacs.texi	Tue Apr  9 16:23:13 2002
-@@ -11,9 +11,9 @@
- updated for Emacs version 20.7.
- @c Please REMEMBER to update edition number in *three* places in this file.
- 
--@dircategory Editors
-+@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
- 
- Published by the Free Software Foundation
-@@ -119,7 +119,7 @@
- Emacs is the extensible, customizable, self-documenting real-time
- display editor.  This Info file describes how to edit with Emacs and
- some of how to customize it; it corresponds to GNU Emacs version 20.7.
--For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The
-+For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The
- Emacs Lisp Reference Manual}.
- @end ifinfo
- 
diff --git a/japanese/emacs21-emcws/files/patch-ao b/japanese/emacs21-emcws/files/patch-ao
deleted file mode 100644
index 4a39b602119d..000000000000
--- a/japanese/emacs21-emcws/files/patch-ao
+++ /dev/null
@@ -1,26 +0,0 @@
---- man/forms.texi.orig	Mon Aug 24 18:43:18 1998
-+++ man/forms.texi	Sat Jul 24 01:03:41 1999
-@@ -8,18 +8,17 @@
- @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
- @end iftex
- @c      @smallbook
- @comment %**end of header (This is for running Texinfo on a region.)
--
--@dircategory Editors
--@direntry
--* Forms: (forms).	Emacs package for editing data bases
--			  by filling in forms.
--@end direntry
- 
- @ifinfo
- This file documents Forms mode, a form-editing major mode for GNU Emacs.
diff --git a/japanese/emacs21-emcws/files/patch-ap b/japanese/emacs21-emcws/files/patch-ap
deleted file mode 100644
index 6ccf025d7f78..000000000000
--- a/japanese/emacs21-emcws/files/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/gnus.texi.orig	Wed Apr  7 07:46:41 1999
-+++ man/gnus.texi	Sat Jul 24 01:09:33 1999
-@@ -5,8 +5,9 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
- @direntry
--* Gnus: (gnus).         The newsreader Gnus.
-+* Gnus: (gnus).			The newsreader Gnus.
- @end direntry
- @iftex
- @finalout
diff --git a/japanese/emacs21-emcws/files/patch-aq b/japanese/emacs21-emcws/files/patch-aq
deleted file mode 100644
index 207dde1ea0ec..000000000000
--- a/japanese/emacs21-emcws/files/patch-aq
+++ /dev/null
@@ -1,20 +0,0 @@
---- man/mh-e.texi.orig	Sun May 17 03:51:15 1998
-+++ man/mh-e.texi	Sat Jul 24 01:03:41 1999
-@@ -4,13 +4,12 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
--
--@setchapternewpage odd
--
--@dircategory Editors
-+@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
- 
- @c Version variables.
- @set EDITION 1.2
diff --git a/japanese/emacs21-emcws/files/patch-ar b/japanese/emacs21-emcws/files/patch-ar
deleted file mode 100644
index c7c6cf9f0ea3..000000000000
--- a/japanese/emacs21-emcws/files/patch-ar
+++ /dev/null
@@ -1,24 +0,0 @@
---- man/sc.texi.orig	Fri Jul  3 03:48:27 1998
-+++ man/sc.texi	Sat Jul 24 01:03:42 1999
-@@ -3,15 +3,15 @@
- @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
--
--@dircategory Editors
--@direntry
--* SC: (sc).		Supercite lets you cite parts of messages you're 
--			  replying to, in flexible ways.
--@end direntry
- 
- @c @setchapternewpage odd		% For book style double sided manual.
- @comment %**end of header (This is for running Texinfo on a region.)
diff --git a/japanese/emacs21-emcws/files/patch-as b/japanese/emacs21-emcws/files/patch-as
deleted file mode 100644
index 621927bb0c03..000000000000
--- a/japanese/emacs21-emcws/files/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
---- man/vip.texi.orig	Sun May 17 03:48:50 1998
-+++ man/vip.texi	Sat Jul 24 01:03:40 1999
-@@ -2,10 +2,9 @@
- 
- @setfilename ../info/vip
- @settitle VIP
--
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* VIP: (vip).		An older VI-emulation for Emacs.
-+* VIP: (vip).			A VI-emulation for Emacs.
- @end direntry
- 
- @iftex
diff --git a/japanese/emacs21-emcws/files/patch-at b/japanese/emacs21-emcws/files/patch-at
deleted file mode 100644
index e85d00b27c04..000000000000
--- a/japanese/emacs21-emcws/files/patch-at
+++ /dev/null
@@ -1,17 +0,0 @@
---- man/viper.texi.orig	Mon Nov  9 02:13:07 1998
-+++ man/viper.texi	Sat Jul 24 01:03:41 1999
-@@ -5,12 +5,9 @@
- @comment @setfilename viper
- @comment @setfilename viper.info
- @setfilename ../info/viper
--
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* VIPER: (viper).       The newest Emacs VI-emulation mode.
--                          (also, A VI Plan for Emacs Rescue
--                           or the VI PERil.)
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
- @end direntry
- 
- @iftex
diff --git a/japanese/emacs21-emcws/files/patch-au b/japanese/emacs21-emcws/files/patch-au
deleted file mode 100644
index 2e34ee0d8d9a..000000000000
--- a/japanese/emacs21-emcws/files/patch-au
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/ediff.texi.orig	Tue Jun  9 12:29:49 1998
-+++ man/ediff.texi	Sat Jul 24 01:19:48 1999
-@@ -14,9 +14,9 @@
- @synindex fn cp
- @synindex pg cp
- 
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* Ediff: (ediff).       A visual interface for comparing and merging programs.
-+* Ediff: (ediff).		A visual interface for comparing and merging programs.
- @end direntry
- 
- @iftex
diff --git a/japanese/emacs21-emcws/files/patch-av b/japanese/emacs21-emcws/files/patch-av
deleted file mode 100644
index f188e69269bf..000000000000
--- a/japanese/emacs21-emcws/files/patch-av
+++ /dev/null
@@ -1,21 +0,0 @@
---- man/message.texi.orig	Wed Apr  7 07:48:28 1999
-+++ man/message.texi	Sat Jul 24 01:23:30 1999
-@@ -5,15 +5,15 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@ifinfo
-+@dircategory The Emacs editor and associated tools
- @direntry
--* Message: (message).   Mail and news composition mode that goes with Gnus.
-+* Message: (message).		Message, the Emacs message composition mode.
- @end direntry
- @iftex
- @finalout
- @end iftex
- @setchapternewpage odd
--
--@ifinfo
- 
- This file documents Message, the Emacs message composition mode.
- 
diff --git a/japanese/emacs21-emcws/files/patch-aw b/japanese/emacs21-emcws/files/patch-aw
deleted file mode 100644
index 95c713864516..000000000000
--- a/japanese/emacs21-emcws/files/patch-aw
+++ /dev/null
@@ -1,16 +0,0 @@
---- man/reftex.texi.orig	Sat Jul 24 02:31:43 1999
-+++ man/reftex.texi	Sat Jul 24 02:33:26 1999
-@@ -2,10 +2,10 @@
- @c %**start of header
- @setfilename ../info/reftex
- @settitle RefTeX User Manual
--@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
--* reftex: (reftex).	Support for LaTeX labels, references, and citations
--                          with Emacs.
-+* reftex: (reftex).		Support for LaTeX labels, references,
-+				 and citations with Emacs.
- @end direntry
- @synindex ky cp
- @syncodeindex vr cp
diff --git a/japanese/emacs21-emcws/files/patch-bb b/japanese/emacs21-emcws/files/patch-bb
deleted file mode 100644
index 896c8fecaa12..000000000000
--- a/japanese/emacs21-emcws/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/info.texi.orig	Fri Apr 17 10:12:19 1998
-+++ man/info.texi	Wed Feb 10 00:18:56 1999
-@@ -2,6 +2,10 @@
- @comment %**start of header 
- @setfilename ../info/info
- @settitle Info 1.0
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Info: (info).			GNU on-line hyper document system.
-+@end direntry
- @comment %**end of header 
- 
- @iftex