Add package includes coco & m2ps.

Those commands are included in mule-2.3 but not integrated in emacs-2x distribution even after merging MULE feature. (repo-copied from editors/mule-common) PR: ports/33287 Submitted by: Teruaki Ata <PFA03027@nifty.ne.jp>
author: Yoichi NAKAYAMA <yoichi@FreeBSD.org> 2002-03-01 04:16:14 +0000
committer: Yoichi NAKAYAMA <yoichi@FreeBSD.org> 2002-03-01 04:16:14 +0000
commit: ddcb5293b500b7d82448746c7b1dfcad91c007dd (patch)
tree: 32488ca5eaa1b778c56e77299dc5dc8f30c0a281 /textproc/coco/files
parent: add gps 0.9.1 (diff)
33 files changed, 725 insertions, 1106 deletions
diff --git a/textproc/coco/files/cannainfo.el b/textproc/coco/files/cannainfo.el
deleted file mode 100644
index a64d76b5aa5b..000000000000
--- a/textproc/coco/files/cannainfo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-; reformat canna's info file
-(find-file "canna-jp.texi")
-(texinfo-format-buffer)
-(save-buffer)
diff --git a/textproc/coco/files/dir b/textproc/coco/files/dir
deleted file mode 100644
index 8478445ba8a7..000000000000
--- a/textproc/coco/files/dir
+++ /dev/null
@@ -1,39 +0,0 @@
--*- Text -*-
-This is the file .../info/dir, which contains the topmost node of the
-Info hierarchy.  The first time you invoke Info you start off
-looking at that node, which is (dir)Top.
-
-File: dir	Node: Top	This is the top of the INFO tree
-  This (the Directory node) gives a menu of major topics. 
-  Typing "d" returns here, "q" exits, "?" lists all INFO commands, "h" 
-  gives a primer for first-timers, "mTexinfo<Return>" visits Texinfo topic,
-  etc.
-  Or click mouse button 2 on a menu item or cross reference to select it.
-  --- PLEASE ADD DOCUMENTATION TO THIS TREE. (See INFO topic first.) ---
-
-* Menu: The list of major topics begins on the next line.
-
-* Info: (info).		Documentation browsing system.
-* Emacs: (emacs).	The extensible self-documenting text editor.
-* VIP: (vip).		A VI-emulation for Emacs.
-* Forms: (forms).	Emacs package for editing data bases
-			  by filling in forms.
-* GNUS: (gnus).		The news reader GNUS.
-* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
-* SC: (sc).		Supercite lets you cite parts of messages you're 
-			  replying to, in hairy ways.
-* Dired-X: (dired-x).   Dired Extra Features.
-
-	MULE
-
-* Antenews-jp: (antenews-jp).   (japanese).
-* Canna-jp: (canna-jp).         Kana to Kanji translation (japanese).
-* Egg: (egg).                   Japanese/Chinese inputting.
-* Egg-jp: (egg-jp).             Japanese/Chinese inputting (japanese).
-* Kbd-trans: (kbd-trans).       Redefining keyboard layout for languages.
-* Languages: (languages).       Using Asian and European languages under Mule.
-* M2PS: (m2ps).                 Translating Multi-language docs to postscript.
-* Mule: (mule).                 Mule (v2.1).
-* Mule-jp: (mule-jp).           Mule (v2.1) (japanese).
-* Quail: (quail).               Multilanguage inputting.
-* Terminology: (terminology).   Overview of multilanguage inputting methods.
diff --git a/textproc/coco/files/mule.sh b/textproc/coco/files/mule.sh
deleted file mode 100644
index c6976c1b8a18..000000000000
--- a/textproc/coco/files/mule.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	if [ -d /var/run/emacs/lock ]
-	then
-	    rm -f /var/run/emacs/lock/*
-	else
-	    mkdir -p /var/run/emacs/lock
-	fi
-	chmod 1777 /var/run/emacs/lock
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/textproc/coco/files/patch-Makefile.in b/textproc/coco/files/patch-Makefile.in
new file mode 100644
index 000000000000..645b8d2a8860
--- /dev/null
+++ b/textproc/coco/files/patch-Makefile.in
@@ -0,0 +1,150 @@
+diff -rBbc Makefile.in Makefile.in
+*** Makefile.in	Tue Aug 18 14:48:19 1998
+--- Makefile.in	Sat Dec 29 03:49:52 2001
+***************
+*** 191,197 ****
+  # 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
+  
+  # The makefiles of the directories in $SUBDIR.
+  SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
+--- 191,197 ----
+  # 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 man
+  
+  # The makefiles of the directories in $SUBDIR.
+  SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
+***************
+*** 306,323 ****
+  install: ${SUBDIR} install-arch-indep install-arch-dep blessmail
+  	@true
+  
+  ### Install the executables that were compiled specifically for this machine.
+  ### It would be nice to do something for a parallel make
+  ### to ensure that install-arch-indep finishes before this starts.
+  install-arch-dep: mkdir
+- 	(cd lib-src; \
+- 	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
+- 	    exec_prefix=${exec_prefix} bindir=${bindir} \
+- 	    libexecdir=${libexecdir} archlibdir=${archlibdir})
+  	${INSTALL_PROGRAM} src/emacs ${bindir}/${executable}-${version}
+  	-chmod 1755  ${bindir}/${executable}-${version}
+  	rm -f ${bindir}/$(EMACS)
+  	-ln ${bindir}/${executable}-${version} ${bindir}/$(EMACS)
+  
+  ### Install the files that are machine-independent.
+  ### Most of them come straight from the distribution;
+--- 306,354 ----
+  install: ${SUBDIR} install-arch-indep install-arch-dep blessmail
+  	@true
+  
++ ## 
++ install-coco: ${SUBDIR}
++ 	(cd lib-src; \
++ 	  $(MAKE) install-coco $(MFLAGS) prefix=${prefix} \
++ 	    exec_prefix=${exec_prefix} bindir=${bindir} \
++ 	    libexecdir=${libexecdir} archlibdir=${archlibdir})
++ 	-mkdir ${etcdir}; \
++ 	   chmod a+r ${etcdir}
++ 	(thisdir=`/bin/pwd`; \
++ 	 cd ${thisdir}; \
++ 	 ${INSTALL_DATA} ${srcdir}/etc/coco.1 ${man1dir}/coco${manext}; \
++ 	   chmod a+r ${man1dir}/coco${manext}; \
++ 	 ${INSTALL_DATA} ${srcdir}/etc/CODINGS ${etcdir}/CODINGS; \
++ 	   chmod a+r ${etcdir}/CODINGS; \
++ 	 ${INSTALL_DATA} ${srcdir}/etc/CHARSETS ${etcdir}/CHARSETS; \
++ 	   chmod a+r ${etcdir}/CHARSETS )
++ 
++ install-m2ps: ${SUBDIR}
++ 	(cd lib-src; \
++ 	 $(MAKE) install-m2ps $(MFLAGS) prefix=${prefix} \
++ 	    exec_prefix=${exec_prefix} bindir=${bindir} \
++ 	    libexecdir=${libexecdir} archlibdir=${archlibdir})
++ 	-mkdir ${etcdir}; \
++ 	   chmod a+r ${etcdir}
++ 	(thisdir=`/bin/pwd`; \
++ 	 cd ${thisdir}; \
++ 	 ${INSTALL_DATA} ${srcdir}/etc/m2ps.1 ${man1dir}/m2ps${manext}; \
++ 	   chmod a+r ${man1dir}/m2ps${manext}; \
++ 	 ${INSTALL_DATA} ${srcdir}/etc/m2ps.ps ${etcdir}/m2ps.ps; \
++ 	   chmod a+r ${etcdir}/m2ps.ps )
++ 
+  ### Install the executables that were compiled specifically for this machine.
+  ### It would be nice to do something for a parallel make
+  ### to ensure that install-arch-indep finishes before this starts.
+  install-arch-dep: mkdir
+  	${INSTALL_PROGRAM} src/emacs ${bindir}/${executable}-${version}
+  	-chmod 1755  ${bindir}/${executable}-${version}
+  	rm -f ${bindir}/$(EMACS)
+  	-ln ${bindir}/${executable}-${version} ${bindir}/$(EMACS)
++ 	echo "Copying etc/DOC-* to ${docdir} ..." ; \
++ 	   (cd ./etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
++ 	   (cd $(docdir); chmod a+r DOC*; rm DOC) \
++ 
+  
+  ### Install the files that are machine-independent.
+  ### Most of them come straight from the distribution;
+***************
+*** 327,332 ****
+--- 358,367 ----
+  ### Note that we copy DOC* and then delete DOC
+  ### as a workaround for a bug in tar on Ultrix 4.2.
+  install-arch-indep: mkdir
++ 	(cd lib-src; \
++ 	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
++ 	    exec_prefix=${exec_prefix} bindir=${bindir} \
++ 	    libexecdir=${libexecdir} archlibdir=${archlibdir})
+  	-set ${COPYDESTS} ; \
+  	for dir in ${COPYDIR} ; do \
+  	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
+***************
+*** 360,368 ****
+  	-chmod -R a+r ${COPYDESTS}
+  	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
+  	then \
+! 	   echo "Copying etc/DOC-*, etc/CHARSETS, and etc/CODINGS to ${docdir} ..." ; \
+! 	   (cd ./etc; tar -cf - DOC* CHARSETS CODINGS)|(cd ${docdir}; umask 0; tar -xvf - ); \
+! 	   (cd $(docdir); chmod a+r DOC* CHARSETS CODINGS; rm DOC) \
+  	else true; fi
+  	if [ -r ./lisp ] \
+  	   && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
+--- 395,403 ----
+  	-chmod -R a+r ${COPYDESTS}
+  	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
+  	then \
+! 	   echo "Copying etc/CHARSETS, and etc/CODINGS to ${docdir} ..." ; \
+! 	   (cd ./etc; tar -cf - CHARSETS CODINGS)|(cd ${docdir}; umask 0; tar -xvf - ); \
+! 	   (cd $(docdir); chmod a+r CHARSETS CODINGS) \
+  	else true; fi
+  	if [ -r ./lisp ] \
+  	   && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
+***************
+*** 375,388 ****
+  	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+  	then \
+  	  (cd ${infodir};  \
+- 	   if [ -f dir ]; then \
+- 	     if [ ! -f dir.old ]; then mv -f dir dir.old; \
+- 	     else mv -f dir dir.bak; fi; \
+- 	   fi; \
+  	   cd ${srcdir}/info ; \
+- 	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
+  	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
+! 	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip* \
+  		antenews* canna* egg* languages* m2ps* mule* kbd-trans* \
+  		quail* terminology* CCL* ISO2022* R2L* XFONT*; do \
+  	     (cd $${thisdir}; \
+--- 410,418 ----
+  	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+  	then \
+  	  (cd ${infodir};  \
+  	   cd ${srcdir}/info ; \
+  	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
+! 	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip* \
+  		antenews* canna* egg* languages* m2ps* mule* kbd-trans* \
+  		quail* terminology* CCL* ISO2022* R2L* XFONT*; do \
+  	     (cd $${thisdir}; \
diff --git a/textproc/coco/files/patch-aa b/textproc/coco/files/patch-aa
deleted file mode 100644
index f536f9e09936..000000000000
--- a/textproc/coco/files/patch-aa
+++ /dev/null
@@ -1,228 +0,0 @@
---- ./man/vip.texi.org	Fri Jun 16 15:31:11 1995
-+++ ./man/vip.texi	Tue May 20 01:28:33 1997
-@@ -2,6 +2,10 @@
- 
- @setfilename ../info/vip
- @settitle VIP
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIP: (vip).			A VI-emulation for Emacs.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/emacs.texi.org	Mon Aug 19 21:15:12 1996
-+++ ./man/emacs.texi	Tue May 20 01:20:11 1997
-@@ -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/viper.texi.org	Wed Aug  7 10:59:45 1996
-+++ ./man/viper.texi	Tue May 20 01:29:17 1997
-@@ -4,6 +4,10 @@
- \input texinfo
- 
- @setfilename ../info/viper
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
-+@end direntry
- 
- @iftex
- @finalout
---- ./man/forms.texi.org	Sat Mar 23 06:42:27 1996
-+++ ./man/forms.texi	Tue May 20 01:22:37 1997
-@@ -9,6 +9,11 @@
- @syncodeindex vr cp
- @syncodeindex fn cp
- @syncodeindex ky cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Forms: (forms).		Emacs package for editing data bases
-+				by filling in forms.
-+@end direntry
- @iftex
- @finalout
- @setchapternewpage odd
---- ./man/gnus.texi.org	Wed Jun 26 14:49:29 1996
-+++ ./man/gnus.texi	Tue May 20 01:23:15 1997
-@@ -5,6 +5,11 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* GNUS: (gnus).			The news reader GNUS.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/mh-e.texi.org	Sun Aug  4 00:00:29 1996
-+++ ./man/mh-e.texi	Tue May 20 01:23:49 1997
-@@ -4,6 +4,10 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* MH-E: (mh-e).			Emacs interface to the MH mail system.
-+@end direntry
- 
- @setchapternewpage odd
- 
---- ./man/cl.texi.org	Mon Apr 15 21:36:53 1996
-+++ ./man/cl.texi	Tue May 20 01:24:18 1997
-@@ -2,6 +2,12 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
-+@end direntry
-+
-+
- @iftex
- @finalout
- @end iftex
---- ./man/sc.texi.org	Thu Jan  4 12:55:23 1996
-+++ ./man/sc.texi	Tue May 20 01:25:13 1997
-@@ -3,6 +3,12 @@
- @comment %**start of header (This is for running Texinfo on a region.)
- @setfilename ../info/sc
- @settitle Supercite Version 3.1 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* SC: (sc).			Supercite lets you cite parts of messages
-+				you're replying to, in flexible ways.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/dired-x.texi.org	Thu Jan  4 12:54:19 1996
-+++ ./man/dired-x.texi	Tue May 20 01:25:55 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
---- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
-+++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -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
-+				and patch.
-+@end direntry
- @iftex
- @finalout
- @end iftex
---- ./man/cc-mode.texi.org	Sun Aug  4 21:56:21 1996
-+++ ./man/cc-mode.texi	Tue May 20 01:27:18 1997
-@@ -9,6 +9,12 @@
- @settitle     CC-MODE Version 4 Documentation
- @footnotestyle end
- 
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
-+				Objective-C and Java code.
-+@end direntry
-+
- @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- @comment @setchapternewpage odd !! we don't want blank pages !!
- @comment %**end of header (This is for running Texinfo on a region)
---- ./man/message.texi.org	Wed Jun 26 14:49:43 1996
-+++ ./man/message.texi	Sat Dec 13 17:46:31 1997
-@@ -5,6 +5,10 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message: (message).		Editing mail and news messages.
-+@end direntry
- @iftex
- @finalout
- @end iftex
---- Makefile.in.~1~	Sat Jul 11 17:57:16 1998
-+++ Makefile.in	Sat Jul 11 17:58:45 1998
-@@ -191,7 +191,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 man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
---- Makefile.in.~1~	Fri Jul 10 00:00:50 1998
-+++ Makefile.in	Fri Jul 10 00:10:50 1998
-@@ -375,14 +375,9 @@
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
- 	then \
- 	  (cd ${infodir};  \
--	   if [ -f dir ]; then \
--	     if [ ! -f dir.old ]; then mv -f dir dir.old; \
--	     else mv -f dir dir.bak; fi; \
--	   fi; \
- 	   cd ${srcdir}/info ; \
--	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
- 	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
--	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip* \
-+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip* \
- 		antenews* canna* egg* languages* m2ps* mule* kbd-trans* \
- 		quail* terminology* CCL* ISO2022* R2L* XFONT*; do \
- 	     (cd $${thisdir}; \
---- ./man/Makefile.in.org	Thu Jun 27 15:27:19 1996
-+++ ./man/Makefile.in	Tue Apr 15 00:29:52 1997
-@@ -13,7 +13,7 @@
- # The makeinfo program is part of the Texinfo distribution.
- MAKEINFO = makeinfo
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
--	       ../info/ediff ../info/forms ../info/gnus ../info/info \
-+	       ../info/ediff ../info/forms ../info/gnus \
- 	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
- 	       ../info/message
- DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
-@@ -66,6 +66,7 @@
- 	${srcdir}/gnu1.texi \
- 	${srcdir}/glossary.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
-@@ -74,12 +75,6 @@
- # in srcdir.  There is no provision for Info files
- # to exist in the build directory.
- # In a distribution of Emacs, the Info files should be up to date.
--
--../info/info: ${INFOSOURCES}
--	cd $(srcdir); $(MAKEINFO) --no-split info.texi
--
--info.dvi: ${INFOSOURCES}
--	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
- 
- ../info/emacs: ${EMACSSOURCES}
- 	cd $(srcdir); $(MAKEINFO) emacs.texi
diff --git a/textproc/coco/files/patch-ac b/textproc/coco/files/patch-ac
deleted file mode 100644
index ddd9d1faabab..000000000000
--- a/textproc/coco/files/patch-ac
+++ /dev/null
@@ -1,79 +0,0 @@
---- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Sat Jan 16 22:17:58 1999
-@@ -1,5 +1,15 @@
- /* s/ file for freebsd system.  */
- 
-+/* Get the correct __FreeBSD_version, even if this is before that was
-+   defined. */
-+#ifndef __FreeBSD__
-+#define __FreeBSD_version 199401
-+#elif __FreeBSD__ == 1
-+#define __FreeBSD_version 199405
-+#else
-+#include <osreldate.h>
-+#endif
-+
- /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
-    Earlier versions do not have shared libraries, so inhibit them.
-    You can inhibit them on newer systems if you wish
-@@ -34,7 +44,6 @@
- #define LIBS_DEBUG
- #define LIBS_SYSTEM -lutil
- #define LIBS_TERMCAP -ltermcap
--#define LIB_GCC -lgcc
- 
- #define SYSV_SYSTEM_DIR
- 
-@@ -42,12 +51,33 @@
- #undef BSD_PGRPS
- #define GETPGRP_NO_ARG
- 
-+#ifdef __ELF__
-+
-+#define LD_SWITCH_SYSTEM
-+#ifdef i386
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#else
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-+#endif
-+#define UNEXEC unexelf.o
-+#undef LIB_GCC
-+#define LIB_GCC
-+
-+#else /* not __ELF__ */
-+
- #ifndef NO_SHARED_LIBS
- #define LD_SWITCH_SYSTEM -e start -dc -dp
- #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
-+#if __FreeBSD_version >= 300002
-+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
-+#else /* __FreeBSD_version < 300002 */
- #define START_FILES pre-crt0.o /usr/lib/crt0.o
--#define UNEXEC unexsunos4.o
-+#endif /* __FreeBSD_version < 300002 */
-+#define UNEXEC unexfreebsd.o
- #define RUN_TIME_REMAP
-+#define LIB_GCC -lgcc
- 
- #ifndef N_TRELOFF
- #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +93,8 @@
- #endif /* __FreeBSD__ */
- #endif /* NO_SHARED_LIBS */
- 
-+#endif /* not __ELF__ */
-+
- #define HAVE_WAIT_HEADER
- #define HAVE_GETLOADAVG
- /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +112,8 @@
- #define BSD 199103
- #elif __FreeBSD__ == 2
- #define BSD 199306
-+#elif __FreeBSD__ >= 3
-+#define BSD 199506
- #endif
- 
- #define WAITTYPE int
diff --git a/textproc/coco/files/patch-ae b/textproc/coco/files/patch-ae
deleted file mode 100644
index 1728255a75cd..000000000000
--- a/textproc/coco/files/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
-+++ src/unexelf.c	Fri Oct  2 13:02:05 1998
-@@ -678,7 +678,8 @@
-   if (n < 0)
-     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
- 
--  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
-+/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
-+  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
-   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
- 
- #if 0 /* Maybe allow section after data2 - does this ever happen? */
-@@ -845,7 +846,9 @@
- 
-       for (; symp < symendp; symp ++)
- 	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
--	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
-+	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
- 	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
-     }
- 
diff --git a/textproc/coco/files/patch-af b/textproc/coco/files/patch-af
deleted file mode 100644
index 23092a4a8ca0..000000000000
--- a/textproc/coco/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Tue Aug 20 13:11:26 1996
-+++ configure	Sat Jan 16 23:18:54 1999
-@@ -756,6 +756,10 @@
-     machine=alpha opsys=gnu-linux
-   ;;
- 
-+  alpha-*-freebsd* )
-+    machine=alpha opsys=freebsd
-+  ;;
-+
-   ## Altos 3068
-   m68*-altos-sysv* )
-     machine=altos opsys=usg5-2
diff --git a/textproc/coco/files/patch-ag b/textproc/coco/files/patch-ag
deleted file mode 100644
index a556bd24f5eb..000000000000
--- a/textproc/coco/files/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
-+++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
-@@ -234,7 +234,11 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <alloca.h>
-+#else
-+#include <stdlib.h>
-+#endif
- 
- /* Hack alert!  For reasons unknown to mankind the string.h file insists
-    on defining bcopy etc. as taking char pointers as arguments.  With
-@@ -299,10 +303,18 @@
-    termio and struct termios are mutually incompatible.  */
- #define NO_TERMIO
- 
--#ifdef LINUX
-+#if defined(LINUX) || \
-+	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
- # define TEXT_END ({ extern int _etext; &_etext; })
- # ifndef __ELF__
- #  define COFF
- #  define DATA_END ({ extern int _EDATA; &_EDATA; })
- # endif /* notdef __ELF__ */
- #endif
-+
-+#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
-+	&& defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
-+
-+
diff --git a/textproc/coco/files/patch-ah b/textproc/coco/files/patch-ah
deleted file mode 100644
index 3f990e4b5970..000000000000
--- a/textproc/coco/files/patch-ah
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
-+++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
-@@ -423,12 +423,50 @@
- #include <elf.h>
- #include <sys/mman.h>
- 
--#ifdef __alpha__
-+#if defined(__alpha__) && defined(__osf__)
- # include <sym.h>	/* get COFF debugging symbol table declaration */
-+#else if defined(__alpha__)
-+typedef struct {
-+	short magic;
-+	short vstamp;
-+	int ilineMax;
-+	int idnMax;
-+	int ipdMax;
-+	int isymMax;
-+	int ioptMax;
-+	int iauxMax;
-+	int issMax;
-+	int issExtMax;
-+	int ifdMax;
-+	int crfd;
-+	int iextMax;
-+	long cbLine;
-+	long cbLineOffset;
-+	long cbDnOffset;
-+	long cbPdOffset;
-+	long cbSymOffset;
-+	long cbOptOffset;
-+	long cbAuxOffset;
-+	long cbSsOffset;
-+	long cbSsExtOffset;
-+	long cbFdOffset;
-+	long cbRfdOffset;
-+	long cbExtOffset;
-+} HDRR, *pHDRR; 
-+#define cbHDRR sizeof(HDRR)
-+#define hdrNil ((pHDRR)0)
- #endif
- 
- #if __GNU_LIBRARY__ - 0 >= 6
- # include <link.h>	/* get ElfW etc */
-+#endif
-+
-+#ifdef __FreeBSD__
-+# ifdef __STDC__
-+#  define ElfW(type)	Elf_##type
-+# else
-+#  define ElfW(type)	Elf_/**/type
-+# endif
- #endif
- 
- #ifndef ElfW
diff --git a/textproc/coco/files/patch-ba b/textproc/coco/files/patch-ba
deleted file mode 100644
index c9f637aa3ba4..000000000000
--- a/textproc/coco/files/patch-ba
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib-src/emacsclient.c.old	Tue Jul 23 23:18:33 1996
-+++ lib-src/emacsclient.c	Thu Oct  8 22:34:54 1998
-@@ -94,6 +94,8 @@
-     struct stat statbfr;
- 
-     gethostname (system_name, sizeof (system_name));
-+    system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-     sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-     if (stat (server.sun_path, &statbfr) == -1)
---- lib-src/emacsserver.c.old	Wed Jul 17 07:09:29 1996
-+++ lib-src/emacsserver.c	Thu Oct  8 22:35:08 1998
-@@ -115,6 +115,8 @@
-   server.sun_family = AF_UNIX;
- #ifndef SERVER_HOME_DIR
-   gethostname (system_name, sizeof (system_name));
-+  system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-   sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-   if (unlink (server.sun_path) == -1 && errno != ENOENT)
diff --git a/textproc/coco/files/patch-ca b/textproc/coco/files/patch-ca
deleted file mode 100644
index c3fdb4604aa6..000000000000
--- a/textproc/coco/files/patch-ca
+++ /dev/null
@@ -1,26 +0,0 @@
-Cannot view a gzpipped info file in mule Info-mode
-when the next line is in ~/.emacs:
-  (set-default-process-coding-system *autoconv*unix *junet*)
-
---- lisp/info.el.save	Thu Jan  6 17:26:03 2000
-+++ lisp/info.el	Wed Feb 19 15:17:14 2000
-@@ -204,12 +204,13 @@
- 	     (jka-compr-installed-p)
- 	     (jka-compr-get-compression-info fullname))
- 	(setq decoder nil))
--    (insert-file-contents fullname visit)
--    (if decoder
--	(let ((buffer-read-only nil)
--	      (default-directory (or (file-name-directory fullname)
--				     default-directory)))
--	  (call-process-region (point-min) (point-max) decoder t t)))))
-+    (cond (decoder
-+	   (let ((buffer-read-only nil)
-+		 (default-directory (or (file-name-directory fullname)
-+					default-directory)))
-+	     (call-process decoder fullname t) ))
-+	  (t
-+	   (insert-file-contents fullname visit) ))))
- 
- ;;;###autoload (add-hook 'same-window-buffer-names "*info*")
- 
diff --git a/textproc/coco/files/patch-configure b/textproc/coco/files/patch-configure
new file mode 100644
index 000000000000..4225c445faf5
--- /dev/null
+++ b/textproc/coco/files/patch-configure
@@ -0,0 +1,114 @@
+diff -rBbc configure configure
+*** configure	Tue Aug 18 14:48:19 1998
+--- configure	Sat Dec 29 03:49:52 2001
+***************
+*** 38,43 ****
+--- 38,47 ----
+  ac_help="$ac_help
+    --with-wnn6             Use Wnn6 library to input Japanese or Chinese"
+  ac_help="$ac_help
++   --with-cwnn4            Use Wnn4 library to input Chinese"
++ ac_help="$ac_help
++   --with-kwnn4            Use Wnn4 library to input Korean"
++ ac_help="$ac_help
+    --with-wnn-includes=DIR Search for WNN header files in DIR"
+  ac_help="$ac_help
+    --with-wnn-libraries=DIR Search for WNN libraries in DIR"
+***************
+*** 92,97 ****
+--- 96,102 ----
+  infodir='${prefix}/info'
+  mandir='${prefix}/man'
+  
++ wnnlib='-lwnn'
+  # Initialize some other variables.
+  subdirs=
+  MFLAGS= MAKEFLAGS=
+***************
+*** 564,574 ****
+  emacs_prefix=emacs
+  lispdir='${datadir}/${emacs_prefix}/${version}/lisp'
+  locallisppath='${datadir}/${emacs_prefix}/${version}/site-lisp:'\
+! '${datadir}/${emacs_prefix}/site-lisp'
+  lisppath='${locallisppath}:${lispdir}'
+! etcdir='${datadir}/${emacs_prefix}/${version}/etc'
+  # share lockdir with emacs and mule.
+! lockdir='${sharedstatedir}/emacs/lock'
+  archlibdir='${libexecdir}/${emacs_prefix}/${version}/${configuration}'
+  docdir='${datadir}/${emacs_prefix}/${version}/etc'
+  
+--- 569,579 ----
+  emacs_prefix=emacs
+  lispdir='${datadir}/${emacs_prefix}/${version}/lisp'
+  locallisppath='${datadir}/${emacs_prefix}/${version}/site-lisp:'\
+! '${datadir}/${emacs_prefix}/site-lisp:${datadir}/emacs/site-lisp'
+  lisppath='${locallisppath}:${lispdir}'
+! etcdir='${datadir}/coco'
+  # share lockdir with emacs and mule.
+! lockdir='/var/run/emacs/lock'
+  archlibdir='${libexecdir}/${emacs_prefix}/${version}/${configuration}'
+  docdir='${datadir}/${emacs_prefix}/${version}/etc'
+  
+***************
+*** 671,679 ****
+--- 676,695 ----
+  
+  fi
+  
++ if test "${with_cwnn4+set}" = set; then
++     wnnlib=-lcwnn
++ elif test "${with_kwnn4+set}" = set; then
++     wnnlib=-lkwnn
++ fi
++ 
+  # Check whether --with-wnn6 or --without-wnn6 was given.
+  if test "${with_wnn6+set}" = set; then
+    withval="$with_wnn6"
++ if test "${with_wnn6}" = yes; then
++    wnnlib=-lwnn6
++ else
++    wnnlib=$with_wnn6
++ fi
+    with_wnn=${withval}; cat >> confdefs.h <<\EOF
+  #define WNN6 1
+  EOF
+***************
+*** 932,937 ****
+--- 948,957 ----
+      machine=alpha opsys=gnu-linux
+    ;;
+  
++   alpha-*-freebsd* )
++     machine=alpha opsys=freebsd
++   ;;
++ 
+    ## Altos 3068
+    m68*-altos-sysv* )
+      machine=altos opsys=usg5-2
+***************
+*** 3100,3111 ****
+    if test -n "${with_wnn_libraries}" ; then
+      if test -d ${with_wnn_libraries} ; then
+        LD_SWITCH_WNN="-L${with_wnn_libraries}"
+!       LIBS_MULE="${LIBS_MULE} -lwnn"
+      else
+        LIBS_MULE="${LIBS_MULE} ${with_wnn_libraries}"
+      fi
+    else
+!     LIBS_MULE="${LIBS_MULE} -lwnn"
+    fi
+  fi
+  
+--- 3120,3131 ----
+    if test -n "${with_wnn_libraries}" ; then
+      if test -d ${with_wnn_libraries} ; then
+        LD_SWITCH_WNN="-L${with_wnn_libraries}"
+!       LIBS_MULE="${LIBS_MULE} ${wnnlib}"
+      else
+        LIBS_MULE="${LIBS_MULE} ${with_wnn_libraries}"
+      fi
+    else
+!     LIBS_MULE="${LIBS_MULE} ${wnnlib}"
+    fi
+  fi
+  
diff --git a/textproc/coco/files/patch-etl b/textproc/coco/files/patch-etl
deleted file mode 100644
index d65fea4a6ac7..000000000000
--- a/textproc/coco/files/patch-etl
+++ /dev/null
@@ -1,73 +0,0 @@
-From ftp://ftp.etl.go.jp/pub/mule/BUG-INFO
-
-6) This fix a bug of displaying multilingual text in mode lines.
-
---- /usr/dist/mule/mule-2.3/src/xdisp.c	Fri Jun  9 17:37:14 1995
-+++ ./src/xdisp.c	Wed Mar  6 17:08:03 1996
-@@ -3973,8 +3973,9 @@
- 
-   /* 91.10.21 by K.Handa, 92.4.30 by Y.Niibe */
-   int mc_flag = !NILP(XBUFFER (w->buffer)->mc_flag);
--  /* 92.3.21, 92.9.7 by K.Handa */
--  register unsigned char *endp = string + strlen(string);
-+  /* 92.3.21, 92.9.7, 95.8.31 by K.Handa */
-+  register unsigned char *endp
-+    = string + (length < 0 ? strlen(string) : length);
-   char *hexa = "0123456789ABCDEF"; /* 92.4.9 by K.Handa */
-   /* 92.4.9 by K.Handa, 92.4.30 by Y.Niibe */
-   int ctl_hexa = !NILP (XBUFFER (w->buffer)->ctl_hexa);
-
-8) Another fix for a severe bug for writing *viscii* file.
-
---- mule/lisp/mule-init.el.old	Wed May  8 13:05:30 1996
-+++ ./lisp/mule-init.el	Wed May  8 13:04:06 1996
-@@ -638,7 +638,7 @@
- 		  (r0 -= 160)
- 		  (write-read-repeat
- 		   r0
--	       [  0 129 130 131 132 165 134 135 136 137 138 139 140 141 142 143
-+	       [  0 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
- 	        144 145 146   0   0 147 150 151 152   0   0   0   0 180 149   0
- 		  0   0   0   0   0   0   2   5   0   0   0   0   0   0   0 159
- 		  0 186   0   0   0 128  20 187 188   0   0  25  30   0 179 191
-
-
-11) This patch fixes Single Shift 3 handling.
-
---- /usr/dist/mule/mule-2.3/src/coding.c	Wed Nov 30 16:45:02 1994
-+++ ./src/coding.c	Sat Sep 28 09:41:51 1996
-@@ -1044,7 +1044,7 @@
- { \
-   if (lc != lcg) dp = designate(dp, lcg, lc, 3, form), lcg = lc; \
-   if (form & CODE_SEVEN) \
--    *dp++ = ESC, *dp++ = 'N'; \
-+    *dp++ = ESC, *dp++ = 'O'; \
-   else \
-     *dp++ = SS3; \
-   cntl = (cntl & ~CC_GRAPHIC_MASK) | CC_IN_G3; \
-
-12) This patch fixes wrong handling of *iso-2022-lock* by coco.
---- /usr/dist/mule/mule-2.3/lib-src/mulelib.c	Mon Jul 17 15:03:43 1995
-+++ ./lib-src/mulelib.c	Fri Oct  4 21:28:48 1996
-@@ -287,13 +287,18 @@
-   p0 = p1 + 1;
-   if (CODE_TYPE (cs) == ISO2022)  {
-     long flags[12];
--    for (i = 0; i < 11; i++) {
--      if (!(flags[i] = atoi(p0))) flags[i] = Qnil;
-+    for (i = 0; i < 4; i++) {
-+      if ((flags[i] = atoi(p0)) == -1) flags[i] = LCASCII;
-       PROCEED_CHAR(',');
-       p0 = p1 + 1;
-     }
--    flags[i] = atoi(p0);
-     CODE_LC_SET(cs, flags[0], flags[1], flags[2], flags[3]);
-+    for (; i < 11; i++) {
-+      if (!(flags[i] = atoi(p0))) flags[i] = Qnil;
-+      PROCEED_CHAR(',');
-+      p0 = p1 + 1;
-+    }
-+    if (!(flags[i] = atoi(p0))) flags[i] = Qnil;
-     CODE_FORM_SET(cs, (Lisp_Object)flags[4], (Lisp_Object)flags[5],
- 		  (Lisp_Object)flags[6], (Lisp_Object)flags[7],
- 		  (Lisp_Object)flags[8], (Lisp_Object)flags[9],
diff --git a/textproc/coco/files/patch-lib-src_Makefile.in b/textproc/coco/files/patch-lib-src_Makefile.in
new file mode 100644
index 000000000000..b5fc947e7658
--- /dev/null
+++ b/textproc/coco/files/patch-lib-src_Makefile.in
@@ -0,0 +1,57 @@
+diff -rBbc lib-src/Makefile.in lib-src/Makefile.in
+*** lib-src/Makefile.in	Tue Aug 18 14:48:25 1998
+--- lib-src/Makefile.in	Sat Dec 29 03:49:52 2001
+***************
+*** 92,97 ****
+--- 92,100 ----
+  # Things that a user might actually run,
+  # which should be installed in bindir.
+  INSTALLABLES = etags ctags emacsclient b2m m2ps coco
++ INSTALLABLES_COCO = coco
++ INSTALLABLES_M2PS = m2ps
++ INSTALLABLE_SCRIPTS_M2PS = any2ps
+  INSTALLABLE_SCRIPTS = rcs-checkin any2ps
+  
+  # Things that Emacs runs internally, or during the build process,
+***************
+*** 266,276 ****
+--- 269,307 ----
+  	  chmod a+rx ${bindir}/$${file}; \
+  	done
+  
++ install-coco: all
++ 	@echo
++ 	@echo "Installing utility coco for users to run."
++ 	for file in ${INSTALLABLES_COCO} ; do \
++ 	  $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \
++ 	  chmod a+rx ${bindir}/$${file}; \
++ 	done
++ 
++ install-m2ps: all
++ 	@echo
++ 	@echo "Installing utilities, m2ps and any2ps, for users to run."
++ 	for file in ${INSTALLABLES_M2PS} ; do \
++ 	  $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \
++ 	  chmod a+rx ${bindir}/$${file}; \
++ 	done
++ 	for file in ${INSTALLABLE_SCRIPTS_M2PS} ; do \
++ 	  $(INSTALL) ${srcdir}/$${file} ${bindir}/$${file} ; \
++ 	  chmod a+rx ${bindir}/$${file}; \
++ 	done
++ 
+  uninstall:
+  	(cd ${bindir}; \
+  	 rm -f ${INSTALLABLES} ${INSTALLABLE_SCRIPTS})
+  	(cd ${archlibdir}; \
+  	 rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
++ 
++ uninstall-coco:
++ 	(cd ${bindir}; \
++ 	 rm -f ${INSTALLABLES_COCO})
++ 
++ uninstall-m2ps:
++ 	(cd ${bindir}; \
++ 	 rm -f ${INSTALLABLES_M2PS} ${INSTALLABLE_SCRIPTS_M2PS})
+  
+  mostlyclean:
+  	-rm -f core *.o
diff --git a/textproc/coco/files/patch-lib-src_mulelib.c b/textproc/coco/files/patch-lib-src_mulelib.c
new file mode 100644
index 000000000000..aeaf77ca5366
--- /dev/null
+++ b/textproc/coco/files/patch-lib-src_mulelib.c
@@ -0,0 +1,37 @@
+diff -rBbc lib-src/mulelib.c lib-src/mulelib.c
+*** lib-src/mulelib.c	Tue Aug 18 14:48:25 1998
+--- lib-src/mulelib.c	Sat Dec 29 03:49:31 2001
+***************
+*** 287,299 ****
+    p0 = p1 + 1;
+    if (CODE_TYPE (cs) == ISO2022)  {
+      long flags[12];
+!     for (i = 0; i < 11; i++) {
+!       if (!(flags[i] = atoi(p0))) flags[i] = Qnil;
+        PROCEED_CHAR(',');
+        p0 = p1 + 1;
+      }
+-     flags[i] = atoi(p0);
+      CODE_LC_SET(cs, flags[0], flags[1], flags[2], flags[3]);
+      CODE_FORM_SET(cs, (Lisp_Object)flags[4], (Lisp_Object)flags[5],
+  		  (Lisp_Object)flags[6], (Lisp_Object)flags[7],
+  		  (Lisp_Object)flags[8], (Lisp_Object)flags[9],
+--- 287,304 ----
+    p0 = p1 + 1;
+    if (CODE_TYPE (cs) == ISO2022)  {
+      long flags[12];
+!     for (i = 0; i < 4; i++) {
+!       if ((flags[i] = atoi(p0)) == -1) flags[i] = LCASCII;
+        PROCEED_CHAR(',');
+        p0 = p1 + 1;
+      }
+      CODE_LC_SET(cs, flags[0], flags[1], flags[2], flags[3]);
++     for (; i < 11; i++) {
++       if (!(flags[i] = atoi(p0))) flags[i] = Qnil;
++       PROCEED_CHAR(',');
++       p0 = p1 + 1;
++     }
++     if (!(flags[i] = atoi(p0))) flags[i] = Qnil;
+      CODE_FORM_SET(cs, (Lisp_Object)flags[4], (Lisp_Object)flags[5],
+  		  (Lisp_Object)flags[6], (Lisp_Object)flags[7],
+  		  (Lisp_Object)flags[8], (Lisp_Object)flags[9],
diff --git a/textproc/coco/files/patch-man_Makefile.in b/textproc/coco/files/patch-man_Makefile.in
new file mode 100644
index 000000000000..624a59dc9aee
--- /dev/null
+++ b/textproc/coco/files/patch-man_Makefile.in
@@ -0,0 +1,45 @@
+diff -rBbc man/Makefile.in man/Makefile.in
+*** man/Makefile.in	Fri Jun 28 07:27:19 1996
+--- man/Makefile.in	Sat Dec 29 03:49:32 2001
+***************
+*** 13,19 ****
+  # The makeinfo program is part of the Texinfo distribution.
+  MAKEINFO = makeinfo
+  INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
+! 	       ../info/ediff ../info/forms ../info/gnus ../info/info \
+  	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
+  	       ../info/message
+  DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
+--- 13,19 ----
+  # The makeinfo program is part of the Texinfo distribution.
+  MAKEINFO = makeinfo
+  INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
+! 	       ../info/ediff ../info/forms ../info/gnus \
+  	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
+  	       ../info/message
+  DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
+***************
+*** 66,71 ****
+--- 66,72 ----
+  	${srcdir}/gnu1.texi \
+  	${srcdir}/glossary.texi
+  
++ all: info
+  info: $(INFO_TARGETS)
+  
+  dvi: $(DVI_TARGETS)
+***************
+*** 74,85 ****
+  # in srcdir.  There is no provision for Info files
+  # to exist in the build directory.
+  # In a distribution of Emacs, the Info files should be up to date.
+- 
+- ../info/info: ${INFOSOURCES}
+- 	cd $(srcdir); $(MAKEINFO) --no-split info.texi
+- 
+- info.dvi: ${INFOSOURCES}
+- 	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
+  
+  ../info/emacs: ${EMACSSOURCES}
+  	cd $(srcdir); $(MAKEINFO) emacs.texi
+--- 75,80 ----
diff --git a/textproc/coco/files/patch-mc b/textproc/coco/files/patch-mc
deleted file mode 100644
index 3ed24fa0acd6..000000000000
--- a/textproc/coco/files/patch-mc
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/s/freebsd.h.orig	Mon Apr  5 18:00:36 1999
-+++ src/s/freebsd.h	Mon Apr  5 17:57:30 1999
-@@ -42,7 +42,7 @@
- #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
- 
- #define LIBS_DEBUG
--#define LIBS_SYSTEM -lutil
-+#define LIBS_SYSTEM -lutil -lcrypt -lxpg4
- #define LIBS_TERMCAP -ltermcap
- 
- #define SYSV_SYSTEM_DIR
-@@ -131,3 +131,6 @@
-    It is already a controlling terminal of subprocess, because we did
-    ioctl TIOCSCTTY.  */
- #define DONT_REOPEN_PTY
-+
-+/* XIM does not work very well, so the next is set (by taoka@FreeBSD.org) */
-+#define X_I18N_INHIBITED
diff --git a/textproc/coco/files/patch-md b/textproc/coco/files/patch-md
deleted file mode 100644
index 99ab69813330..000000000000
--- a/textproc/coco/files/patch-md
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -arcN ../mule-2.3.org/etc/FAQ-Mule.jp ./etc/FAQ-Mule.jp
-*** ../mule-2.3.org/etc/FAQ-Mule.jp	Fri Jul 21 20:40:06 1995
---- ./etc/FAQ-Mule.jp	Wed Aug 21 11:33:22 1996
-***************
-*** 1867,1872 ****
---- 1867,1874 ----
-  
-     $B$H=q$/J}K!$b$"$j$^$9!#(B 
-  
-+    ($BCm5-(B : FreeBSD$B$G$O!"B>$H6%9g$9$k$?$a%]!<%HHV9f$O(B3086$B$K$7$F$"$j$^$9!#(B)
-+ 
-  Emacs lisp $B%W%m%0%i%_%s%0(B
-  =========================
-  
-diff -arcN ../mule-2.3.org/lisp/eggrc-sj3 ./lisp/eggrc-sj3
-*** ../mule-2.3.org/lisp/eggrc-sj3	Fri Oct 21 13:18:21 1994
---- ./lisp/eggrc-sj3	Wed Aug 21 13:05:24 1996
-***************
-*** 3,11 ****
-  ;;;	Version 1.0
-  ;;;	Copyright 1990 Kiyoji Ishii
-  ;;;
-  
-! (set-default-sys-dic-directory "/usr/sony/dict/sj3")
-! (set-default-usr-dic-directory "/usr/sony/dict/sj3/user/$USER")
-  
-  ;;;
-  ;;; System Dictionary
---- 3,17 ----
-  ;;;	Version 1.0
-  ;;;	Copyright 1990 Kiyoji Ishii
-  ;;;
-+ ;;;
-+ ;;; Change dictionary paths.
-+ ;;; Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ ;;; Remove $USER variable. Use (user-login-name).
-+ ;;; Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+ ;;;
-  
-! (set-default-sys-dic-directory "/usr/local/lib/sj3/dict")
-! (set-default-usr-dic-directory (concat "/usr/local/lib/sj3/dict/user/" (user-login-name)))
-  
-  ;;;
-  ;;; System Dictionary
-diff -arcN ../mule-2.3.org/lisp/sj3-egg.el ./lisp/sj3-egg.el
-*** ../mule-2.3.org/lisp/sj3-egg.el	Fri Feb 17 17:23:31 1995
---- ./lisp/sj3-egg.el	Wed Aug 21 13:32:36 1996
-***************
-*** 294,301 ****
-  ;;;
-  ;;; Entry functions for egg-startup-file
-  ;;;
-  
-! (defvar *default-sys-dic-directory* "/usr/sony/dict/sj3")
-  
-  (defun set-default-sys-dic-directory (pathname)
-    "$B%7%9%F%`<-=q$NI8=`(Bdirectory PATHNAME$B$r;XDj$9$k!#(B
---- 294,307 ----
-  ;;;
-  ;;; Entry functions for egg-startup-file
-  ;;;
-+ ;;;
-+ ;;; Change dictionary paths.
-+ ;;; Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ ;;; Remove $USER variable. Use (user-login-name).
-+ ;;; Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+ ;;;
-  
-! (defvar *default-sys-dic-directory* "/usr/local/lib/sj3/dict")
-  
-  (defun set-default-sys-dic-directory (pathname)
-    "$B%7%9%F%`<-=q$NI8=`(Bdirectory PATHNAME$B$r;XDj$9$k!#(B
-***************
-*** 310,316 ****
-  	 (format "System Default directory(%s) $B$,$"$j$^$;$s!#(B" pathname))
-        (setq *default-sys-dic-directory* (file-name-as-directory pathname)))))
-  
-! (defvar *default-usr-dic-directory* "/usr/sony/dict/sj3/user/$USER")
-  
-  (defun set-default-usr-dic-directory (pathname)
-    "$BMxMQ<T<-=q$NI8=`(Bdirectory PATHNAME$B$r;XDj$9$k!#(B
---- 316,322 ----
-  	 (format "System Default directory(%s) $B$,$"$j$^$;$s!#(B" pathname))
-        (setq *default-sys-dic-directory* (file-name-as-directory pathname)))))
-  
-! (defvar *default-usr-dic-directory* (concat "/usr/local/lib/sj3/dict/user/" (user-login-name)))
-  
-  (defun set-default-usr-dic-directory (pathname)
-    "$BMxMQ<T<-=q$NI8=`(Bdirectory PATHNAME$B$r;XDj$9$k!#(B
diff --git a/textproc/coco/files/patch-mf b/textproc/coco/files/patch-mf
deleted file mode 100644
index b6f10dd53c8c..000000000000
--- a/textproc/coco/files/patch-mf
+++ /dev/null
@@ -1,60 +0,0 @@
---- ../mule.org/lisp/eggrc-wnn	Fri Jul 28 20:12:41 1995
-+++ ./lisp/eggrc-wnn	Wed Oct 29 12:13:50 1997
-@@ -24,7 +24,7 @@
- ;;;
- ;;;      modified for Wnn V4 - Use compatible library of Wnn v3
- ;;;	 Copyright 1989 OMRON Tateisi Electronics, Co.
--;;;	 1989 7/12 by H.Kuribayashi kuri@frf.oron.junet
-+;;;	 1989 7/12 by H.Kuribayashi kuri@frf.omron.junet
- 
- ;;; 92.5.19  modified for Wnn V4 by T.Shingu <shingu@cpr.canon.co.jp>
- ;;;	Use non compatible library.
-@@ -50,14 +50,16 @@
- 		     (concat wnn-usr-dic-dir "/symbol.h") 1 nil t)
-        (add-wnn-dict "iwanami/tankan.dic" "" 1 nil nil)
-        (add-wnn-dict "iwanami/tankan2.dic" "" 1 nil nil)
--       (add-wnn-dict "iwanami/tel.dic" "" 1 nil nil)
--       (add-wnn-dict "iwanami/zip.dic" "" 1 nil nil)
-+       (add-wnn-dict "iwanami/tel.dic"
-+		     (concat wnn-usr-dic-dir "/tel.h") 1 nil t)
-+       (add-wnn-dict "iwanami/zip.dic"
-+		     (concat wnn-usr-dic-dir "/zip.h") 1 nil t)
-        (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t)
- ;       (add-wnn-dict "wnncons/tankan2.dic" "" 1 nil nil)
- ;       (add-wnn-dict "wnncons/tankan3.dic" "" 1 nil nil)
-        (set-wnn-param  5 10 2 45 0  80 5 1 20  0 400 -100 400   80 200 2 200)
- 
--       (add-wnn-notrans-dict (concat wnn-usr-dic-dir "/katakana") 15 t)
-+       (add-wnn-notrans-dict (concat wnn-usr-dic-dir "/muhenkan") 15 t)
-        (add-wnn-bmodify-dict (concat wnn-usr-dic-dir "/bunsetsu") 15 t)
- 
-        (set-last-is-first-mode t)
-@@ -101,7 +103,9 @@
-        (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 5 t t)
- ;       (add-wnn-dict "wnncons/tankan2.dic" "" 1 nil nil)
- ;       (add-wnn-dict "wnncons/tankan3.dic" "" 1 nil nil)
--       (set-wnn-param  2 10 2 45 5  80 5 1 40  0 400 -100 400   80 200 2 200)
-+;       (set-wnn-param  2 10 2 45 5  80 5 1 40  0 400 -100 400   80 200 2 200)
-+; New Parameter
-+       (set-wnn-param  2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200)
-        (set-wnn-reverse t)
-        (set-wnn-fuzokugo "pubdic/full.fzk")
-        (add-wnn-dict "pubdic/kihon.dic" (concat wnn-usr-dic-dir "/kihon.h") 5 nil t)
-@@ -158,7 +162,7 @@
-       ((eq wnn-server-type 'kserver)
-        (set-wnn-reverse nil)
-        (set-wnn-fuzokugo "sys/full.fzk")
--					;       (add-wnn-dict "sys/hword.dic" (concat wnn-usr-dic-dir "/hword.h") 4 nil t)
-+       (add-wnn-dict "sys/hword.dic" (concat wnn-usr-dic-dir "/hword.h") 4 nil t)
-        (add-wnn-dict "sys/single.dic" (concat wnn-usr-dic-dir "/single.h") 1 nil t)
-        (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 5 t t)
- 					;       (add-wnn-dict (concat wnn-usr-dic-dir "/hangul") "" 5 t t)
-@@ -166,7 +170,7 @@
-        (set-wnn-param 1 5 2 750 10 80 10 5 1000 50  0 -200 0 0 0 16 0)
-        (set-wnn-reverse t)
-        (set-wnn-fuzokugo "sys/full.fzk")
--					;       (add-wnn-dict "sys/hword.dic" (concat wnn-usr-dic-dir "/hword.h") 4 nil t)
-+       (add-wnn-dict "sys/hword.dic" (concat wnn-usr-dic-dir "/hword.h") 4 nil t)
-        (add-wnn-dict "sys/single.dic" (concat wnn-usr-dic-dir "/single.h") 1 nil t)
-        (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 5 t t)
- 					;       (add-wnn-dict (concat wnn-usr-dic-dir "/hangul") "" 5 t t)
diff --git a/textproc/coco/files/patch-mk b/textproc/coco/files/patch-mk
deleted file mode 100644
index 55c3795a558c..000000000000
--- a/textproc/coco/files/patch-mk
+++ /dev/null
@@ -1,45 +0,0 @@
---- Makefile.in.orig	Fri Jul 10 11:22:07 1998
-+++ Makefile.in	Fri Jul 10 11:27:03 1998
-@@ -310,14 +310,14 @@
- ### It would be nice to do something for a parallel make
- ### to ensure that install-arch-indep finishes before this starts.
- install-arch-dep: mkdir
--	(cd lib-src; \
--	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
--	    exec_prefix=${exec_prefix} bindir=${bindir} \
--	    libexecdir=${libexecdir} archlibdir=${archlibdir})
- 	${INSTALL_PROGRAM} src/emacs ${bindir}/${executable}-${version}
- 	-chmod 1755  ${bindir}/${executable}-${version}
- 	rm -f ${bindir}/$(EMACS)
- 	-ln ${bindir}/${executable}-${version} ${bindir}/$(EMACS)
-+	echo "Copying etc/DOC-* to ${docdir} ..." ; \
-+	   (cd ./etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
-+	   (cd $(docdir); chmod a+r DOC*; rm DOC) \
-+
- 
- ### Install the files that are machine-independent.
- ### Most of them come straight from the distribution;
-@@ -327,6 +327,10 @@
- ### Note that we copy DOC* and then delete DOC
- ### as a workaround for a bug in tar on Ultrix 4.2.
- install-arch-indep: mkdir
-+	(cd lib-src; \
-+	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
-+	    exec_prefix=${exec_prefix} bindir=${bindir} \
-+	    libexecdir=${libexecdir} archlibdir=${archlibdir})
- 	-set ${COPYDESTS} ; \
- 	for dir in ${COPYDIR} ; do \
- 	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
-@@ -360,9 +364,9 @@
- 	-chmod -R a+r ${COPYDESTS}
- 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
- 	then \
--	   echo "Copying etc/DOC-*, etc/CHARSETS, and etc/CODINGS to ${docdir} ..." ; \
--	   (cd ./etc; tar -cf - DOC* CHARSETS CODINGS)|(cd ${docdir}; umask 0; tar -xvf - ); \
--	   (cd $(docdir); chmod a+r DOC* CHARSETS CODINGS; rm DOC) \
-+	   echo "Copying etc/CHARSETS, and etc/CODINGS to ${docdir} ..." ; \
-+	   (cd ./etc; tar -cf - CHARSETS CODINGS)|(cd ${docdir}; umask 0; tar -xvf - ); \
-+	   (cd $(docdir); chmod a+r CHARSETS CODINGS) \
- 	else true; fi
- 	if [ -r ./lisp ] \
- 	   && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
diff --git a/textproc/coco/files/patch-ml b/textproc/coco/files/patch-ml
deleted file mode 100644
index bf5a5c1c7b13..000000000000
--- a/textproc/coco/files/patch-ml
+++ /dev/null
@@ -1,5 +0,0 @@
---- lisp/its/han-kata.el~       Thu Aug  6 19:55:01 1998
-+++ lisp/its/han-kata.el        Mon Aug 10 13:24:50 1998
-@@ -45 +45 @@
--(defvar enable-double-n-syntax nil "*Enable ""nn"" input for ""(I](B"" ")
-+(defvar enable-double-n-syntax nil "*Enable \"nn\" input for \"(I](B\" ")
diff --git a/textproc/coco/files/patch-mm b/textproc/coco/files/patch-mm
deleted file mode 100644
index 9a61745a872b..000000000000
--- a/textproc/coco/files/patch-mm
+++ /dev/null
@@ -1,71 +0,0 @@
---- configure.orig	Wed Jul 18 16:03:57 2001
-+++ configure	Wed Jul 18 16:37:11 2001
-@@ -38,6 +38,10 @@
- ac_help="$ac_help
-   --with-wnn6             Use Wnn6 library to input Japanese or Chinese"
- ac_help="$ac_help
-+  --with-cwnn4            Use Wnn4 library to input Chinese"
-+ac_help="$ac_help
-+  --with-kwnn4            Use Wnn4 library to input Korean"
-+ac_help="$ac_help
-   --with-wnn-includes=DIR Search for WNN header files in DIR"
- ac_help="$ac_help
-   --with-wnn-libraries=DIR Search for WNN libraries in DIR"
-@@ -92,6 +96,7 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+wnnlib='-lwnn'
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -564,11 +569,11 @@
- emacs_prefix=emacs
- lispdir='${datadir}/${emacs_prefix}/${version}/lisp'
- locallisppath='${datadir}/${emacs_prefix}/${version}/site-lisp:'\
--'${datadir}/${emacs_prefix}/site-lisp'
-+'${datadir}/${emacs_prefix}/site-lisp:${datadir}/emacs/site-lisp'
- lisppath='${locallisppath}:${lispdir}'
- etcdir='${datadir}/${emacs_prefix}/${version}/etc'
- # share lockdir with emacs and mule.
--lockdir='${sharedstatedir}/emacs/lock'
-+lockdir='/var/run/emacs/lock'
- archlibdir='${libexecdir}/${emacs_prefix}/${version}/${configuration}'
- docdir='${datadir}/${emacs_prefix}/${version}/etc'
- 
-@@ -671,9 +676,20 @@
- 
- fi
- 
-+if test "${with_cwnn4+set}" = set; then
-+    wnnlib=-lcwnn
-+elif test "${with_kwnn4+set}" = set; then
-+    wnnlib=-lkwnn
-+fi
-+
- # Check whether --with-wnn6 or --without-wnn6 was given.
- if test "${with_wnn6+set}" = set; then
-   withval="$with_wnn6"
-+if test "${with_wnn6}" = yes; then
-+   wnnlib=-lwnn6
-+else
-+   wnnlib=$with_wnn6
-+fi
-   with_wnn=${withval}; cat >> confdefs.h <<\EOF
- #define WNN6 1
- EOF
-@@ -3104,12 +3120,12 @@
-   if test -n "${with_wnn_libraries}" ; then
-     if test -d ${with_wnn_libraries} ; then
-       LD_SWITCH_WNN="-L${with_wnn_libraries}"
--      LIBS_MULE="${LIBS_MULE} -lwnn"
-+      LIBS_MULE="${LIBS_MULE} ${wnnlib}"
-     else
-       LIBS_MULE="${LIBS_MULE} ${with_wnn_libraries}"
-     fi
-   else
--    LIBS_MULE="${LIBS_MULE} -lwnn"
-+    LIBS_MULE="${LIBS_MULE} ${wnnlib}"
-   fi
- fi
- 
diff --git a/textproc/coco/files/patch-mn b/textproc/coco/files/patch-mn
deleted file mode 100644
index 2ac99a2b4caa..000000000000
--- a/textproc/coco/files/patch-mn
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/coding.c.orig	Sun Jan 17 04:48:45 1999
-+++ src/coding.c	Sun Jan 17 04:49:02 1999
-@@ -154,7 +154,7 @@
- /* 92.4.3, 92.12.18 by K.Handa */
- Lisp_Object Qcoding_system, Qcoding_system_p, Qnon_nil_coding_system_p;
- Lisp_Object Qeol_type;
--Lisp_Object Qpriority;
-+extern Lisp_Object Qpriority;
- /* end of patch */
- #endif /* emacs */
- 
diff --git a/textproc/coco/files/patch-na b/textproc/coco/files/patch-na
deleted file mode 100644
index 68edbae7ba58..000000000000
--- a/textproc/coco/files/patch-na
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/s/freebsd.h.~1~	Tue Jan 25 16:40:44 2000
-+++ src/s/freebsd.h	Tue Jan 25 16:45:23 2000
-@@ -43,7 +43,16 @@
- 
- #define LIBS_DEBUG
- #define LIBS_SYSTEM -lutil -lcrypt -lxpg4
-+#if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
-+#else
-+#ifdef HAVE_LIBNCURSES
-+#define TERMINFO
-+#define LIBS_TERMCAP -lncurses
-+#else
-+#define LIBS_TERMCAP -ltermcap
-+#endif
-+#endif
- 
- #define SYSV_SYSTEM_DIR
- 
diff --git a/textproc/coco/files/patch-oa b/textproc/coco/files/patch-oa
deleted file mode 100644
index dfcc9c9d2630..000000000000
--- a/textproc/coco/files/patch-oa
+++ /dev/null
@@ -1,117 +0,0 @@
---- lisp/eggrc-wnn.orig	Mon Jul 16 04:31:14 2001
-+++ lisp/eggrc-wnn	Mon Jul 16 04:33:22 2001
-@@ -86,6 +86,99 @@
- 
-        )
- 
-+(defun wnn7-jserver-setup ()
-+  (set-wnn-reverse nil)
-+  (set-wnn-fuzokugo "system/kougo.fzk")
-+  (add-wnn-fisys-dict "system/fisd"
-+		       (concat wnn-usr-dic-dir "/fisd.h") t)
-+  (add-wnn-fiusr-dict (concat wnn-usr-dic-dir "/fiud") "" t nil)
-+  (add-wnn-dict "system/kihon.dic"
-+		 (concat wnn-usr-dic-dir "/kihon.h") 6 nil t)
-+  (add-wnn-dict "system/symbol.dic"
-+		 (concat wnn-usr-dic-dir "/symbol.h") 1 nil t)
-+;;  (add-wnn-dict "system/symbol_noat.dic"
-+;;		 (concat wnn-usr-dic-dir "/symbol_noat.h") 1 nil t)
-+  (add-wnn-dict "system/tel.dic"
-+		 (concat wnn-usr-dic-dir "/tel.h") 1 nil t)
-+  (add-wnn-dict "system/zip.dic"
-+		 (concat wnn-usr-dic-dir "/zip.h") 1 nil t)
-+  (add-wnn-dict "system/tankan.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/tankan2.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/ikeiji.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/rensou.dic" "" 1 nil nil)
-+  (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t)
-+
-+;  (add-wnn-dict "option/jinmei.dic"
-+;		  (concat wnn-usr-dic-dir "/jinmei.h") 1 nil t)
-+;  (add-wnn-dict "option/chimei.dic"
-+;		  (concat wnn-usr-dic-dir "/chimei.h") 1 nil t)
-+;  (add-wnn-dict "option/address.dic"
-+;		  (concat wnn-usr-dic-dir "/address.h") 1 nil t)
-+;  (add-wnn-dict "option/station.dic"
-+;		  (concat wnn-usr-dic-dir "/station.h") 1 nil t)
-+;  (add-wnn-dict "option/kana_english.dic"
-+;		  (concat wnn-usr-dic-dir "/kana_english.h") 1 nil t)
-+;  (add-wnn-dict "option/enterprise.dic"
-+;		  (concat wnn-usr-dic-dir "/enterprise.h") 1 nil t)
-+;  (add-wnn-dict "option/airport.dic"
-+;		  (concat wnn-usr-dic-dir "/airport.h") 1 nil t)
-+;  (add-wnn-dict "option/university.dic"
-+;		  (concat wnn-usr-dic-dir "/university.h") 1 nil t)
-+;  (add-wnn-dict "option/zoo.dic"
-+;		  (concat wnn-usr-dic-dir "/zoo.h") 1 nil t)
-+;  (add-wnn-dict "option/botanical_garden.dic"
-+;		  (concat wnn-usr-dic-dir "/botanical_garden.h") 1 nil t)
-+;  (add-wnn-dict "option/aquarium.dic"
-+;		  (concat wnn-usr-dic-dir "/aquarium.h") 1 nil t)
-+;  (add-wnn-dict "option/conveni.dic"
-+;		  (concat wnn-usr-dic-dir "/conveni.h") 1 nil t)
-+;  (add-wnn-dict "option/amusement.dic"
-+;		  (concat wnn-usr-dic-dir "/amusement.h") 1 nil t)
-+
-+  (set-wnn-param  5 10 2 45 0  80 5 1 20  0 400 -100 400   80 200 2 200)
-+  
-+  (add-wnn-notrans-dict (concat wnn-usr-dic-dir "/katakana") 15 t)
-+  (add-wnn-bmodify-dict (concat wnn-usr-dic-dir "/bunsetsu") 15 t)
-+
-+  (set-last-is-first-mode t)
-+  (set-complex-conv-mode nil)
-+;  (set-okuri-flag -1)
-+  (set-prefix-flag 0)
-+       
-+  (set-okuri-learn-mode t)
-+  (set-prefix-learn-mode t)
-+  (set-suffix-learn-mode t)
-+  (set-common-learn-mode t)
-+  (set-yuragi-mode nil)
-+
-+  (set-freq-func-mode 4)
-+
-+;  (set-numeric-mode -12)
-+;  (set-alphabet-mode -30)
-+;  (set-symbol-mode -40)
-+       
-+  (set-wnn-reverse t)
-+  (set-wnn-fuzokugo "system/kougo.fzk")
-+  (add-wnn-dict "system/kihonR.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/telR.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/zipR.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/tankanR.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/tankan2R.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/stationR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/kana_englishR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/enterpriseR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/airportR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/universityR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/zooR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/botanical_gardenR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/aquariumR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/conveniR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/amusementR.dic" "" 1 nil nil)
-+
-+  (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t)
-+  (set-wnn-param  2 10 2 45 1 80 5 1 50 -20 400 -10  100  -100 200 0 200)
-+  )
-+
- 
- (defun wnn4-jserver-setup ()
-        (set-wnn-reverse nil)
-@@ -126,9 +219,11 @@
- )
- 
- (cond ((eq wnn-server-type 'jserver)
--       (if (is-wnn6-server)
--	   (wnn6-jserver-setup)
--	 (wnn4-jserver-setup)))
-+       (if (is-wnn7-server)
-+	   (wnn7-jserver-setup)
-+	 (if (is-wnn6-server)
-+	     (wnn6-jserver-setup)
-+	   (wnn4-jserver-setup))))
-       ((eq wnn-server-type 'cserver)
-        (set-wnn-reverse nil)
-        (set-wnn-fuzokugo "sys/full.con")
diff --git a/textproc/coco/files/patch-ob b/textproc/coco/files/patch-ob
deleted file mode 100644
index 9d512f97cc25..000000000000
--- a/textproc/coco/files/patch-ob
+++ /dev/null
@@ -1,12 +0,0 @@
---- lisp/wnn-egg.el.bak	Mon Jul 16 04:37:50 2001
-+++ lisp/wnn-egg.el	Mon Jul 16 04:42:05 2001
-@@ -606,6 +606,9 @@
- (defun is-wnn6-server ()
-   (= (wnn-server-version) 61697))
- 
-+(defun is-wnn7-server ()
-+  (= (wnn-server-version) 61698))
-+
- (defun add-wnn-dict (dfile hfile priority dmode hmode &optional dpaswd hpaswd)
- ;  (open-wnn-if-disconnected)
-   (if (null (wnn-server-dict-add
diff --git a/textproc/coco/files/patch-src_coding.c b/textproc/coco/files/patch-src_coding.c
new file mode 100644
index 000000000000..54da3130fd88
--- /dev/null
+++ b/textproc/coco/files/patch-src_coding.c
@@ -0,0 +1,37 @@
+diff -rBbc src/coding.c src/coding.c
+*** src/coding.c	Sat Dec 29 03:50:32 2001
+--- src/coding.c	Sat Dec 29 03:49:32 2001
+***************
+*** 154,160 ****
+  /* 92.4.3, 92.12.18 by K.Handa */
+  Lisp_Object Qcoding_system, Qcoding_system_p, Qnon_nil_coding_system_p;
+  Lisp_Object Qeol_type;
+! Lisp_Object Qpriority;
+  /* end of patch */
+  #endif /* emacs */
+  
+--- 154,160 ----
+  /* 92.4.3, 92.12.18 by K.Handa */
+  Lisp_Object Qcoding_system, Qcoding_system_p, Qnon_nil_coding_system_p;
+  Lisp_Object Qeol_type;
+! extern Lisp_Object Qpriority;
+  /* end of patch */
+  #endif /* emacs */
+  
+***************
+*** 1044,1050 ****
+  { \
+    if (lc != lcg) dp = designate(dp, lcg, lc, 3, form), lcg = lc; \
+    if (form & CODE_SEVEN) \
+!     *dp++ = ESC, *dp++ = 'N'; \
+    else \
+      *dp++ = SS3; \
+    cntl = (cntl & ~CC_GRAPHIC_MASK) | CC_IN_G3; \
+--- 1044,1050 ----
+  { \
+    if (lc != lcg) dp = designate(dp, lcg, lc, 3, form), lcg = lc; \
+    if (form & CODE_SEVEN) \
+!     *dp++ = ESC, *dp++ = 'O'; \
+    else \
+      *dp++ = SS3; \
+    cntl = (cntl & ~CC_GRAPHIC_MASK) | CC_IN_G3; \
diff --git a/textproc/coco/files/patch-src_m_alpha.h b/textproc/coco/files/patch-src_m_alpha.h
new file mode 100644
index 000000000000..47dfb791203b
--- /dev/null
+++ b/textproc/coco/files/patch-src_m_alpha.h
@@ -0,0 +1,48 @@
+diff -rBbc src/m/alpha.h src/m/alpha.h
+*** src/m/alpha.h	Sat Aug 10 07:03:36 1996
+--- src/m/alpha.h	Sat Dec 29 03:49:32 2001
+***************
+*** 234,240 ****
+--- 234,244 ----
+  
+  #ifndef NOT_C_CODE
+  /* We need these because pointers are larger than the default ints.  */
++ #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+  #include <alloca.h>
++ #else
++ #include <stdlib.h>
++ #endif
+  
+  /* Hack alert!  For reasons unknown to mankind the string.h file insists
+     on defining bcopy etc. as taking char pointers as arguments.  With
+***************
+*** 299,308 ****
+     termio and struct termios are mutually incompatible.  */
+  #define NO_TERMIO
+  
+! #ifdef LINUX
+  # define TEXT_END ({ extern int _etext; &_etext; })
+  # ifndef __ELF__
+  #  define COFF
+  #  define DATA_END ({ extern int _EDATA; &_EDATA; })
+  # endif /* notdef __ELF__ */
+  #endif
+--- 303,320 ----
+     termio and struct termios are mutually incompatible.  */
+  #define NO_TERMIO
+  
+! #if defined(LINUX) || \
+! 	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+  # define TEXT_END ({ extern int _etext; &_etext; })
+  # ifndef __ELF__
+  #  define COFF
+  #  define DATA_END ({ extern int _EDATA; &_EDATA; })
+  # endif /* notdef __ELF__ */
+  #endif
++ 
++ #if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
++ 	&& defined (__ELF__)
++ #define HAVE_TEXT_START
++ #endif
++ 
++ 
diff --git a/textproc/coco/files/patch-src_s_freebsd.h b/textproc/coco/files/patch-src_s_freebsd.h
new file mode 100644
index 000000000000..335ddbe7220b
--- /dev/null
+++ b/textproc/coco/files/patch-src_s_freebsd.h
@@ -0,0 +1,129 @@
+diff -rBbc src/s/freebsd.h src/s/freebsd.h
+*** src/s/freebsd.h	Mon Jun 10 05:14:32 1996
+--- src/s/freebsd.h	Sat Dec 29 03:49:32 2001
+***************
+*** 1,5 ****
+--- 1,15 ----
+  /* s/ file for freebsd system.  */
+  
++ /* Get the correct __FreeBSD_version, even if this is before that was
++    defined. */
++ #ifndef __FreeBSD__
++ #define __FreeBSD_version 199401
++ #elif __FreeBSD__ == 1
++ #define __FreeBSD_version 199405
++ #else
++ #include <osreldate.h>
++ #endif
++ 
+  /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
+     Earlier versions do not have shared libraries, so inhibit them.
+     You can inhibit them on newer systems if you wish
+***************
+*** 32,40 ****
+  #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
+  
+  #define LIBS_DEBUG
+! #define LIBS_SYSTEM -lutil
+  #define LIBS_TERMCAP -ltermcap
+! #define LIB_GCC -lgcc
+  
+  #define SYSV_SYSTEM_DIR
+  
+--- 42,58 ----
+  #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
+  
+  #define LIBS_DEBUG
+! #define LIBS_SYSTEM -lutil -lcrypt -lxpg4
+! #if __FreeBSD_version < 400000
+  #define LIBS_TERMCAP -ltermcap
+! #else
+! #ifdef HAVE_LIBNCURSES
+! #define TERMINFO
+! #define LIBS_TERMCAP -lncurses
+! #else
+! #define LIBS_TERMCAP -ltermcap
+! #endif
+! #endif
+  
+  #define SYSV_SYSTEM_DIR
+  
+***************
+*** 42,53 ****
+  #undef BSD_PGRPS
+  #define GETPGRP_NO_ARG
+  
+  #ifndef NO_SHARED_LIBS
+  #define LD_SWITCH_SYSTEM -e start -dc -dp
+  #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+! #define UNEXEC unexsunos4.o
+  #define RUN_TIME_REMAP
+  
+  #ifndef N_TRELOFF
+  #define N_PAGSIZ(x) __LDPGSZ
+--- 60,92 ----
+  #undef BSD_PGRPS
+  #define GETPGRP_NO_ARG
+  
++ #ifdef __ELF__
++ 
++ #define LD_SWITCH_SYSTEM
++ #ifdef i386
++ #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
++ #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
++ #else
++ #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
++ #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
++ #endif
++ #define UNEXEC unexelf.o
++ #undef LIB_GCC
++ #define LIB_GCC
++ 
++ #else /* not __ELF__ */
++ 
+  #ifndef NO_SHARED_LIBS
+  #define LD_SWITCH_SYSTEM -e start -dc -dp
+  #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
++ #if __FreeBSD_version >= 300002
++ #define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
++ #else /* __FreeBSD_version < 300002 */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+! #endif /* __FreeBSD_version < 300002 */
+! #define UNEXEC unexfreebsd.o
+  #define RUN_TIME_REMAP
++ #define LIB_GCC -lgcc
+  
+  #ifndef N_TRELOFF
+  #define N_PAGSIZ(x) __LDPGSZ
+***************
+*** 63,68 ****
+--- 102,109 ----
+  #endif /* __FreeBSD__ */
+  #endif /* NO_SHARED_LIBS */
+  
++ #endif /* not __ELF__ */
++ 
+  #define HAVE_WAIT_HEADER
+  #define HAVE_GETLOADAVG
+  /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
+***************
+*** 80,85 ****
+--- 121,128 ----
+  #define BSD 199103
+  #elif __FreeBSD__ == 2
+  #define BSD 199306
++ #elif __FreeBSD__ >= 3
++ #define BSD 199506
+  #endif
+  
+  #define WAITTYPE int
+***************
+*** 97,99 ****
+--- 140,145 ----
+     It is already a controlling terminal of subprocess, because we did
+     ioctl TIOCSCTTY.  */
+  #define DONT_REOPEN_PTY
++ 
++ /* XIM does not work very well, so the next is set (by taoka@FreeBSD.org) */
++ #define X_I18N_INHIBITED
diff --git a/textproc/coco/files/patch-src_unexelf.c b/textproc/coco/files/patch-src_unexelf.c
new file mode 100644
index 000000000000..8f03c091bbab
--- /dev/null
+++ b/textproc/coco/files/patch-src_unexelf.c
@@ -0,0 +1,40 @@
+diff -rBbc src/unexelf.c src/unexelf.c
+*** src/unexelf.c	Tue Aug 18 14:48:41 1998
+--- src/unexelf.c	Sat Dec 29 03:49:32 2001
+***************
+*** 678,684 ****
+    if (n < 0)
+      fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
+  
+!   NEW_PROGRAM_H (n).p_filesz += new_data2_size;
+    NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
+  
+  #if 0 /* Maybe allow section after data2 - does this ever happen? */
+--- 678,685 ----
+    if (n < 0)
+      fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
+  
+! /*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
+!   NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
+    NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
+  
+  #if 0 /* Maybe allow section after data2 - does this ever happen? */
+***************
+*** 849,855 ****
+  
+        for (; symp < symendp; symp ++)
+  	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
+! 	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
+  	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
+      }
+  
+--- 850,858 ----
+  
+        for (; symp < symendp; symp ++)
+  	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
+! 	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
+! 	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
+! 	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
+  	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
+      }
+  
diff --git a/textproc/coco/files/patch-src_unexelf1.c b/textproc/coco/files/patch-src_unexelf1.c
new file mode 100644
index 000000000000..e1b17ffe59ff
--- /dev/null
+++ b/textproc/coco/files/patch-src_unexelf1.c
@@ -0,0 +1,68 @@
+diff -rBbc src/unexelf1.c src/unexelf1.c
+*** src/unexelf1.c	Sat Aug 10 06:56:52 1996
+--- src/unexelf1.c	Sat Dec 29 03:49:32 2001
+***************
+*** 423,434 ****
+  #include <elf.h>
+  #include <sys/mman.h>
+  
+! #ifdef __alpha__
+  # include <sym.h>	/* get COFF debugging symbol table declaration */
+  #endif
+  
+  #if __GNU_LIBRARY__ - 0 >= 6
+  # include <link.h>	/* get ElfW etc */
+  #endif
+  
+  #ifndef ElfW
+--- 423,472 ----
+  #include <elf.h>
+  #include <sys/mman.h>
+  
+! #if defined(__alpha__) && defined(__osf__)
+  # include <sym.h>	/* get COFF debugging symbol table declaration */
++ #else if defined(__alpha__)
++ typedef struct {
++ 	short magic;
++ 	short vstamp;
++ 	int ilineMax;
++ 	int idnMax;
++ 	int ipdMax;
++ 	int isymMax;
++ 	int ioptMax;
++ 	int iauxMax;
++ 	int issMax;
++ 	int issExtMax;
++ 	int ifdMax;
++ 	int crfd;
++ 	int iextMax;
++ 	long cbLine;
++ 	long cbLineOffset;
++ 	long cbDnOffset;
++ 	long cbPdOffset;
++ 	long cbSymOffset;
++ 	long cbOptOffset;
++ 	long cbAuxOffset;
++ 	long cbSsOffset;
++ 	long cbSsExtOffset;
++ 	long cbFdOffset;
++ 	long cbRfdOffset;
++ 	long cbExtOffset;
++ } HDRR, *pHDRR; 
++ #define cbHDRR sizeof(HDRR)
++ #define hdrNil ((pHDRR)0)
+  #endif
+  
+  #if __GNU_LIBRARY__ - 0 >= 6
+  # include <link.h>	/* get ElfW etc */
++ #endif
++ 
++ #ifdef __FreeBSD__
++ # ifdef __STDC__
++ #  define ElfW(type)	Elf_##type
++ # else
++ #  define ElfW(type)	Elf_/**/type
++ # endif
+  #endif
+  
+  #ifndef ElfW
diff --git a/textproc/coco/files/site-start.el.tmpl b/textproc/coco/files/site-start.el.tmpl
deleted file mode 100644
index 79e43ffdc229..000000000000
--- a/textproc/coco/files/site-start.el.tmpl
+++ /dev/null
@@ -1,43 +0,0 @@
-;; BEGIN mule-family
-;;
-;; Chinese
-;;(load "its/erpin")
-;;(load "its/zhuyin")
-;;(load "its/quanjiao")
-;;(set-primary-environment 'chinese);;CHINESE
-
-;; Korean
-;;(if (boundp 'WNN);;KOREAN
-;;    (load "its/Korean"));;KOREAN
-;;(set-primary-environment 'korean);;KOREAN
-
-;; Japanese
-;;(set-primary-environment 'japanese);;JAPANESE
-
-;; For languages except Korean (kr-mule-wnn)
-(defun set-korean-environment ()
-  (setq *coding-category-iso-8-2* '*euc-korea*)
-
-  (set-coding-priority
-   '(*coding-category-iso-8-2*
-     *coding-category-iso-8-1*))
-
-  (set-default-file-coding-system '*iso-2022-kr*)
-
-  (if (boundp 'WNN)
-      (progn
-;;	(load "its/Korean");;not KOREAN
-	(set-default-wnn-environment 'kserver)))
-
-  (setq-default quail-current-package (assoc "hangul" quail-package-alist))
-  )
-
-(setq Info-default-directory-list
-      (append (list
-	       "%%LOCALBASE%%/share/mule/19.34/info"
-	       "%%LOCALBASE%%/share/mule/info"
-	       "%%X11BASE%%/info"
-	       "/usr/share/info"
-	       ) Info-default-directory-list)) 
-
-;; END mule-family
author	Yoichi NAKAYAMA <yoichi@FreeBSD.org>	2002-03-01 04:16:14 +0000
committer	Yoichi NAKAYAMA <yoichi@FreeBSD.org>	2002-03-01 04:16:14 +0000
commit	ddcb5293b500b7d82448746c7b1dfcad91c007dd (patch)
tree	32488ca5eaa1b778c56e77299dc5dc8f30c0a281 /textproc/coco/files
parent	add gps 0.9.1 (diff)